This commit is contained in:
parent
865f620658
commit
2e5c96dffb
@ -936,7 +936,7 @@ class Doctrine_Query extends Doctrine_Access {
|
|||||||
|
|
||||||
if($fk instanceof Doctrine_ForeignKey ||
|
if($fk instanceof Doctrine_ForeignKey ||
|
||||||
$fk instanceof Doctrine_LocalKey) {
|
$fk instanceof Doctrine_LocalKey) {
|
||||||
|
|
||||||
switch($mark):
|
switch($mark):
|
||||||
case ":":
|
case ":":
|
||||||
$this->parts["join"][$tname][$tname2] = "INNER JOIN ".$tname2." ON ".$tname.".".$fk->getLocal()." = ".$tname2.".".$fk->getForeign();
|
$this->parts["join"][$tname][$tname2] = "INNER JOIN ".$tname2." ON ".$tname.".".$fk->getLocal()." = ".$tname2.".".$fk->getForeign();
|
||||||
|
@ -54,7 +54,7 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase {
|
|||||||
$this->assertEqual($count, count($this->dbh));
|
$this->assertEqual($count, count($this->dbh));
|
||||||
|
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
public function testMultipleFetching() {
|
public function testMultipleFetching() {
|
||||||
$count = $this->dbh->count();
|
$count = $this->dbh->count();
|
||||||
$this->session->getTable('User')->clear();
|
$this->session->getTable('User')->clear();
|
||||||
@ -565,6 +565,5 @@ class Doctrine_QueryTestCase extends Doctrine_UnitTestCase {
|
|||||||
//$this->assertTrue(isset($values['max']));
|
//$this->assertTrue(isset($values['max']));
|
||||||
|
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
@ -23,7 +23,7 @@ error_reporting(E_ALL);
|
|||||||
$test = new GroupTest("Doctrine Framework Unit Tests");
|
$test = new GroupTest("Doctrine Framework Unit Tests");
|
||||||
|
|
||||||
//$test->addTestCase(new Sensei_UnitTestCase());
|
//$test->addTestCase(new Sensei_UnitTestCase());
|
||||||
/**
|
|
||||||
$test->addTestCase(new Doctrine_RecordTestCase());
|
$test->addTestCase(new Doctrine_RecordTestCase());
|
||||||
|
|
||||||
$test->addTestCase(new Doctrine_SessionTestCase());
|
$test->addTestCase(new Doctrine_SessionTestCase());
|
||||||
@ -45,7 +45,7 @@ $test->addTestCase(new Doctrine_ConfigurableTestCase());
|
|||||||
$test->addTestCase(new Doctrine_Collection_OffsetTestCase());
|
$test->addTestCase(new Doctrine_Collection_OffsetTestCase());
|
||||||
|
|
||||||
$test->addTestCase(new Doctrine_CollectionTestCase());
|
$test->addTestCase(new Doctrine_CollectionTestCase());
|
||||||
*/
|
|
||||||
$test->addTestCase(new Doctrine_QueryTestCase());
|
$test->addTestCase(new Doctrine_QueryTestCase());
|
||||||
|
|
||||||
//$test->addTestCase(new Doctrine_Cache_FileTestCase());
|
//$test->addTestCase(new Doctrine_Cache_FileTestCase());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user