summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDurham Hale <[email protected]>2012-08-28 22:13:10 +0100
committerDurham Hale <[email protected]>2012-08-28 22:13:10 +0100
commit3758914a55fcdce8f7e757b763525662dde2a0a7 (patch)
tree719b115e12603bf7056e7a6464c04323bf2a2ae3 /test
parent089336fcd9417d6c4e40be802b3dec37b11c7d51 (diff)
parentf9af1ffce3b01e6e87ded22cc5903c0bf253fbc1 (diff)
Merge remote-tracking branch 'sandermarechal/raw-query' into develop
Diffstat (limited to 'test')
-rw-r--r--test/test_queries.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/test_queries.php b/test/test_queries.php
index 35896e3..217b7fd 100644
--- a/test/test_queries.php
+++ b/test/test_queries.php
@@ -128,9 +128,13 @@
$expected = "SELECT * FROM `widget` WHERE `age` = '18' AND (`name` = 'Fred' OR `name` = 'Bob') AND `size` = 'large'";
Tester::check_equal("Raw WHERE clause in method chain", $expected);
+ ORM::for_table('widget')->raw_query('SELECT `w`.* FROM `widget` w')->find_many();
+ $expected = "SELECT `w`.* FROM `widget` w";
+ Tester::check_equal("Raw query", $expected);
+
ORM::for_table('widget')->raw_query('SELECT `w`.* FROM `widget` w WHERE `name` = ? AND `age` = ?', array('Fred', 5))->find_many();
$expected = "SELECT `w`.* FROM `widget` w WHERE `name` = 'Fred' AND `age` = '5'";
- Tester::check_equal("Raw query", $expected);
+ Tester::check_equal("Raw query with parameters", $expected);
ORM::for_table('widget')->select('name')->find_many();
$expected = "SELECT `name` FROM `widget`";