From 2e5c96dffb82beb9a560334c1627e648ce4c5ef0 Mon Sep 17 00:00:00 2001 From: doctrine Date: Tue, 30 May 2006 22:35:00 +0000 Subject: [PATCH] --- Doctrine/Query.php | 2 +- tests/QueryTestCase.class.php | 3 +-- tests/run.php | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Doctrine/Query.php b/Doctrine/Query.php index 7b1a127b6..cf3e30f7c 100644 --- a/Doctrine/Query.php +++ b/Doctrine/Query.php @@ -936,7 +936,7 @@ class Doctrine_Query extends Doctrine_Access { if($fk instanceof Doctrine_ForeignKey || $fk instanceof Doctrine_LocalKey) { - + switch($mark): case ":": $this->parts["join"][$tname][$tname2] = "INNER JOIN ".$tname2." ON ".$tname.".".$fk->getLocal()." = ".$tname2.".".$fk->getForeign(); diff --git a/tests/QueryTestCase.class.php b/tests/QueryTestCase.class.php index 59de3fc6c..ff99c20e2 100644 --- a/tests/QueryTestCase.class.php +++ b/tests/QueryTestCase.class.php @@ -54,7 +54,7 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase { $this->assertEqual($count, count($this->dbh)); } -/** + public function testMultipleFetching() { $count = $this->dbh->count(); $this->session->getTable('User')->clear(); @@ -565,6 +565,5 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase { //$this->assertTrue(isset($values['max'])); } - */ } ?> diff --git a/tests/run.php b/tests/run.php index 48fd8d101..892fd0e96 100644 --- a/tests/run.php +++ b/tests/run.php @@ -23,7 +23,7 @@ error_reporting(E_ALL); $test = new GroupTest("Doctrine Framework Unit Tests"); //$test->addTestCase(new Sensei_UnitTestCase()); -/** + $test->addTestCase(new Doctrine_RecordTestCase()); $test->addTestCase(new Doctrine_SessionTestCase()); @@ -45,7 +45,7 @@ $test->addTestCase(new Doctrine_ConfigurableTestCase()); $test->addTestCase(new Doctrine_Collection_OffsetTestCase()); $test->addTestCase(new Doctrine_CollectionTestCase()); -*/ + $test->addTestCase(new Doctrine_QueryTestCase()); //$test->addTestCase(new Doctrine_Cache_FileTestCase());