Simplify where_raw method. This method can now be used in method chains.

1 files changed, 5 insertions, 0 deletions

diff --git a/test/test_queries.php b/test/test_queries.php
index aadfe46..013b897 100644
--- a/test/test_queries.php
+++ b/test/test_queries.php
@@ -86,6 +86,11 @@
     $expected = 'SELECT * FROM `widget` WHERE `name` = "Fred" AND (`age` = "5" OR `age` = "10")';
     Tester::check_equal("Raw WHERE clause", $expected);
 
+    ORM::for_table('widget')->where('age', 18)->where_raw('(`name` = ? OR `name` = ?)', array('Fred', 'Bob'))->where('size', 'large')->find_many();
+    $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 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);