RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

immediate fetching bug fixed

Browse source
This commit is contained in:
doctrine 2006-04-16 22:46:05 +00:00
parent d444bd9a61
commit 61790d31cf
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
classes/Collection.class.php
View file

@ -26,7 +26,7 @@ class Doctrine_Collection extends Doctrine_Access implements Countable, Iterator
*/ */
protected $reference_field; protected $reference_field;
/** /**
* @var Doctrine_Relation * @var Doctrine_Relation the record this collection is related to, if any
*/ */
protected $relation; protected $relation;
/** /**

2
classes/DQL/Parser.class.php
View file

@ -714,7 +714,7 @@ class Doctrine_DQL_Parser {
$b = array_shift($a); $b = array_shift($a);
$b = array_shift($a); $b = array_shift($a);
$graph = new Doctrine_DQL_Parser($this->session); $graph = new Doctrine_DQL_Parser($this->session);
$graph->parseQuery("FROM $b WHERE $where"); $graph->parseQuery("FROM $b-l WHERE $where");
$where = $this->tnames[$root]->getTableName().".id IN (SELECT ".$fk->getLocal()." FROM ".$asf->getTableName()." WHERE ".$fk->getForeign()." IN (".$graph->getQuery()."))"; $where = $this->tnames[$root]->getTableName().".id IN (SELECT ".$fk->getLocal()." FROM ".$asf->getTableName()." WHERE ".$fk->getForeign()." IN (".$graph->getQuery()."))";
break; break;
endswitch; endswitch;

9
tests/DQLParserTestCase.class.php
View file

@ -3,6 +3,8 @@ require_once("UnitTestCase.class.php");
class Doctrine_DQL_ParserTestCase extends Doctrine_UnitTestCase { class Doctrine_DQL_ParserTestCase extends Doctrine_UnitTestCase {
public function testLimit() { public function testLimit() {
$graph = new Doctrine_DQL_Parser($this->session); $graph = new Doctrine_DQL_Parser($this->session);
$coll = $graph->query("FROM User LIMIT 3"); $coll = $graph->query("FROM User LIMIT 3");
$this->assertEqual($graph->getLimit(), 3); $this->assertEqual($graph->getLimit(), 3);
@ -141,7 +143,7 @@ class Doctrine_DQL_ParserTestCase extends Doctrine_UnitTestCase {
//$this->clearCache(); //$this->clearCache();
$users = $graph->query("FROM User-b, User.Phonenumber"); $users = $graph->query("FROM User-b, User.Phonenumber-b");
$this->assertEqual(trim($graph->getQuery()), $this->assertEqual(trim($graph->getQuery()),
"SELECT entity.id AS User__id, phonenumber.id AS Phonenumber__id FROM entity LEFT JOIN phonenumber ON entity.id = phonenumber.entity_id WHERE (entity.type = 0)"); "SELECT entity.id AS User__id, phonenumber.id AS Phonenumber__id FROM entity LEFT JOIN phonenumber ON entity.id = phonenumber.entity_id WHERE (entity.type = 0)");
@ -157,13 +159,13 @@ class Doctrine_DQL_ParserTestCase extends Doctrine_UnitTestCase {
$users = $graph->query("FROM User-b, User.Email"); $users = $graph->query("FROM User-b, User.Email-b");
$this->assertEqual(trim($graph->getQuery()), $this->assertEqual(trim($graph->getQuery()),
"SELECT entity.id AS User__id, email.id AS Email__id FROM entity, email WHERE (entity.email_id = email.id) AND (entity.type = 0)"); "SELECT entity.id AS User__id, email.id AS Email__id FROM entity, email WHERE (entity.email_id = email.id) AND (entity.type = 0)");
$this->assertEqual($users->count(),8); $this->assertEqual($users->count(),8);
$users = $graph->query("FROM Email WHERE Email.address LIKE '%@example%'"); $users = $graph->query("FROM Email-b WHERE Email.address LIKE '%@example%'");
$this->assertEqual($graph->getQuery(), $this->assertEqual($graph->getQuery(),
"SELECT email.id AS Email__id FROM email WHERE (email.address LIKE '%@example%')"); "SELECT email.id AS Email__id FROM email WHERE (email.address LIKE '%@example%')");
$this->assertEqual($users->count(),8); $this->assertEqual($users->count(),8);
@ -184,7 +186,6 @@ class Doctrine_DQL_ParserTestCase extends Doctrine_UnitTestCase {
"SELECT entity.id AS User__id FROM entity LEFT JOIN phonenumber ON entity.id = phonenumber.entity_id WHERE (phonenumber.phonenumber REGEXP '[123]') AND (entity.type = 0)"); "SELECT entity.id AS User__id FROM entity LEFT JOIN phonenumber ON entity.id = phonenumber.entity_id WHERE (phonenumber.phonenumber REGEXP '[123]') AND (entity.type = 0)");
$this->assertEqual($users->count(),8); $this->assertEqual($users->count(),8);
$users = $graph->query("FROM User-b WHERE User.Group.name = 'Action Actors'"); $users = $graph->query("FROM User-b WHERE User.Group.name = 'Action Actors'");
$this->assertEqual(trim($graph->getQuery()), $this->assertEqual(trim($graph->getQuery()),
"SELECT entity.id AS User__id FROM entity WHERE (entity.id IN (SELECT user_id FROM groupuser WHERE group_id IN (SELECT entity.id AS Group__id FROM entity WHERE (entity.name = 'Action Actors') AND (entity.type = 1)))) AND (entity.type = 0)"); "SELECT entity.id AS User__id FROM entity WHERE (entity.id IN (SELECT user_id FROM groupuser WHERE group_id IN (SELECT entity.id AS Group__id FROM entity WHERE (entity.name = 'Action Actors') AND (entity.type = 1)))) AND (entity.type = 0)");

2
tests/UnitTestCase.class.php
View file

@ -37,7 +37,7 @@ class Doctrine_UnitTestCase extends UnitTestCase {
$this->manager = Doctrine_Manager::getInstance(); $this->manager = Doctrine_Manager::getInstance();
$this->manager->setAttribute(Doctrine::ATTR_CACHE, Doctrine::CACHE_NONE); $this->manager->setAttribute(Doctrine::ATTR_CACHE, Doctrine::CACHE_NONE);
$this->manager->setAttribute(Doctrine::ATTR_FETCHMODE, Doctrine::FETCH_IMMEDIATE);
if($this->manager->count() > 0) { if($this->manager->count() > 0) {
$this->session = $this->manager->getSession(0); $this->session = $this->manager->getSession(0);
$this->session->clear(); $this->session->clear();

2
tests/classes.php
View file

@ -3,7 +3,7 @@ class Entity extends Doctrine_Record {
public function setUp() { public function setUp() {
$this->ownsOne("Email","Entity.email_id"); $this->ownsOne("Email","Entity.email_id");
$this->ownsMany("Phonenumber","Phonenumber.entity_id"); $this->ownsMany("Phonenumber","Phonenumber.entity_id");
$this->setAttribute(Doctrine::ATTR_FETCHMODE,Doctrine::FETCH_BATCH);
} }
public function setTableDefinition() { public function setTableDefinition() {
$this->hasColumn("name","string",50); $this->hasColumn("name","string",50);

1
tests/run.php
View file

@ -47,6 +47,7 @@ $test->addTestCase(new Doctrine_DQL_ParserTestCase());
$test->addTestCase(new Doctrine_CollectionTestCase()); $test->addTestCase(new Doctrine_CollectionTestCase());
$test->addTestCase(new Doctrine_ConfigurableTestCase()); $test->addTestCase(new Doctrine_ConfigurableTestCase());
$test->addTestCase(new Sensei_UnitTestCase()); $test->addTestCase(new Sensei_UnitTestCase());