diff --git a/Doctrine/RawSql.php b/Doctrine/RawSql.php index 60bae9f9b..f0b19b4f2 100644 --- a/Doctrine/RawSql.php +++ b/Doctrine/RawSql.php @@ -88,8 +88,7 @@ class Doctrine_RawSql extends Doctrine_Hydrate { $p = $low; if( ! isset($parts[$low])) $parts[$low] = array(); - else - $count[$low]++; + break; case "order": case "group": diff --git a/tests/RawSqlTestCase.php b/tests/RawSqlTestCase.php index e0d08a830..cccfdcb48 100644 --- a/tests/RawSqlTestCase.php +++ b/tests/RawSqlTestCase.php @@ -12,6 +12,7 @@ class Doctrine_RawSql_TestCase extends Doctrine_UnitTestCase { $query->parseQuery($sql); $this->assertEqual($query->from, array("(SELECT p.* FROM photos p LEFT JOIN photos_tags t ON t.photo_id = p.id WHERE t.tag_id = 65) p LEFT JOIN photos_tags t ON t.photo_id = p.id")); + $this->assertEqual($query->where, array('p.can_see = -1 AND t.tag_id = 62')); $this->assertEqual($query->limit, array(200)); } diff --git a/tests/run.php b/tests/run.php index b9510a0bb..509e4bb02 100644 --- a/tests/run.php +++ b/tests/run.php @@ -28,7 +28,7 @@ require_once("QueryLimitTestCase.php"); error_reporting(E_ALL); $test = new GroupTest("Doctrine Framework Unit Tests"); -/** + $test->addTestCase(new Doctrine_RecordTestCase()); $test->addTestCase(new Doctrine_SessionTestCase()); @@ -66,7 +66,7 @@ $test->addTestCase(new Doctrine_CollectionTestCase()); $test->addTestCase(new Doctrine_QueryTestCase()); $test->addTestCase(new Doctrine_Query_Limit_TestCase()); -*/ + $test->addTestCase(new Doctrine_RawSql_TestCase()); //$test->addTestCase(new Doctrine_Cache_FileTestCase()); //$test->addTestCase(new Doctrine_Cache_SqliteTestCase());