From b2951691e2c476a2c87212fdf9d0b8deec88d390 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 28 Jul 2011 10:46:38 +0200 Subject: [PATCH 1/3] [DDC-1301] Added tests for fetch="EXTRA_LAZY" count() on a "legacy" database --- .../Tests/Models/Legacy/LegacyArticle.php | 33 ++++ .../Tests/Models/Legacy/LegacyCar.php | 41 +++++ .../Tests/Models/Legacy/LegacyUser.php | 80 ++++++++++ .../Models/Legacy/LegacyUserReference.php | 65 ++++++++ .../ORM/Functional/Ticket/DDC1301Test.php | 148 ++++++++++++++++++ .../Doctrine/Tests/OrmFunctionalTestCase.php | 12 ++ 6 files changed, 379 insertions(+) create mode 100644 tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php create mode 100644 tests/Doctrine/Tests/Models/Legacy/LegacyCar.php create mode 100644 tests/Doctrine/Tests/Models/Legacy/LegacyUser.php create mode 100644 tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php new file mode 100644 index 000000000..e373c337d --- /dev/null +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php @@ -0,0 +1,33 @@ +user = $author; + } +} diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php new file mode 100644 index 000000000..a27d3c34c --- /dev/null +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php @@ -0,0 +1,41 @@ +description; + } + + public function addUser(LegacyUser $user) { + $this->users[] = $user; + } + + public function getUsers() { + return $this->users; + } +} diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php new file mode 100644 index 000000000..fb06263a2 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php @@ -0,0 +1,80 @@ +articles = new ArrayCollection; + $this->references = new ArrayCollection; + $this->cars = new ArrayCollection; + } + + public function getId() { + return $this->id; + } + + public function getUsername() { + return $this->username; + } + + public function addArticle(LegacyArticle $article) { + $this->articles[] = $article; + $article->setAuthor($this); + } + + public function addReference($reference) + { + $this->references[] = $reference; + } + + public function references() + { + return $this->references; + } + + public function addCar(LegacyCar $car) { + $this->cars[] = $car; + $car->addUser($this); + } + + public function getCars() { + return $this->cars; + } +} diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php new file mode 100644 index 000000000..8b1ee9407 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php @@ -0,0 +1,65 @@ +addReference($this); + $target->addReference($this); + + $this->source = $source; + $this->target = $target; + $this->description = $description; + $this->created = new \DateTime("now"); + } + + public function source() + { + return $this->source; + } + + public function target() + { + return $this->target; + } + + public function setDescription($desc) + { + $this->description = $desc; + } + + public function getDescription() + { + return $this->description; + } +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php new file mode 100644 index 000000000..f1dd02498 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php @@ -0,0 +1,148 @@ +useModelSet('legacy'); + parent::setUp(); + + $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); + $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + + $this->loadFixture(); + } + + public function tearDown() + { + parent::tearDown(); + + $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); + $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + } + + public function testCountNotInitializesLegacyCollection() + { + $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); + $queryCount = $this->getCurrentQueryCount(); + + $this->assertFalse($user->articles->isInitialized()); + $this->assertEquals(2, count($user->articles)); + $this->assertFalse($user->articles->isInitialized()); + + foreach ($user->articles AS $article) { } + + $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); + } + + public function testCountNotInitializesLegacyCollectionWithForeignIdentifier() + { + $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); + $queryCount = $this->getCurrentQueryCount(); + + $this->assertFalse($user->references->isInitialized()); + $this->assertEquals(2, count($user->references)); + $this->assertFalse($user->references->isInitialized()); + + foreach ($user->references AS $reference) { } + + $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); + } + + public function testCountNotInitializesLegacyManyToManyCollection() + { + $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); + $queryCount = $this->getCurrentQueryCount(); + + $this->assertFalse($user->cars->isInitialized()); + $this->assertEquals(3, count($user->cars)); + $this->assertFalse($user->cars->isInitialized()); + + foreach ($user->cars AS $reference) { } + + $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); + } + + public function loadFixture() + { + $user1 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); + $user1->username = "beberlei"; + $user1->name = "Benjamin"; + $user1->status = "active"; + + $user2 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); + $user2->username = "jwage"; + $user2->name = "Jonathan"; + $user2->status = "active"; + + $user3 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); + $user3->username = "romanb"; + $user3->name = "Roman"; + $user3->status = "active"; + + $this->_em->persist($user1); + $this->_em->persist($user2); + $this->_em->persist($user3); + + $article1 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); + $article1->topic = "Test"; + $article1->text = "Test"; + $article1->setAuthor($user1); + + $article2 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); + $article2->topic = "Test"; + $article2->text = "Test"; + $article2->setAuthor($user1); + + $this->_em->persist($article1); + $this->_em->persist($article2); + + $car1 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); + $car1->description = "Test1"; + + $car2 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); + $car2->description = "Test2"; + + $car3 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); + $car3->description = "Test3"; + + $user1->addCar($car1); + $user1->addCar($car2); + $user1->addCar($car3); + + $user2->addCar($car1); + $user3->addCar($car1); + + $this->_em->persist($car1); + $this->_em->persist($car2); + $this->_em->persist($car3); + + $this->_em->flush(); + + $detail1 = new \Doctrine\Tests\Models\Legacy\LegacyUserReference($user1, $user2, "foo"); + $detail2 = new \Doctrine\Tests\Models\Legacy\LegacyUserReference($user1, $user3, "bar"); + + $this->_em->persist($detail1); + $this->_em->persist($detail2); + + $this->_em->flush(); + $this->_em->clear(); + + $this->userId = $user1->getId(); + } +} diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 1f8032aeb..66d20b38f 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -104,6 +104,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\StockExchange\Stock', 'Doctrine\Tests\Models\StockExchange\Market', ), + 'legacy' => array( + 'Doctrine\Tests\Models\Legacy\LegacyUser', + 'Doctrine\Tests\Models\Legacy\LegacyUserReference', + 'Doctrine\Tests\Models\Legacy\LegacyArticle', + 'Doctrine\Tests\Models\Legacy\LegacyCar', + ), ); protected function useModelSet($setName) @@ -202,6 +208,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $conn->executeUpdate('DELETE FROM exchange_stocks'); $conn->executeUpdate('DELETE FROM exchange_markets'); } + if (isset($this->_usedModelSets['legacy'])) { + $conn->executeUpdate('DELETE FROM legacy_articles'); + $conn->executeUpdate('DELETE FROM legacy_cars'); + $conn->executeUpdate('DELETE FROM legacy_users'); + $conn->executeUpdate('DELETE FROM legacy_users_reference'); + } $this->_em->clear(); } From d7dbde8f3e2ecbc341e8de47127d0706411bb910 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 28 Jul 2011 11:01:52 +0200 Subject: [PATCH 2/3] [DDC-1301] Fixed count() for fetch="EXTRA_LAZY" on OneToMany association --- .../ORM/Persisters/OneToManyPersister.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php index 5e889ddb9..e9fcf06c5 100644 --- a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php @@ -124,24 +124,26 @@ class OneToManyPersister extends AbstractCollectionPersister public function count(PersistentCollection $coll) { $mapping = $coll->getMapping(); - $class = $this->_em->getClassMetadata($mapping['targetEntity']); + $targetClass = $this->_em->getClassMetadata($mapping['targetEntity']); + $sourceClass = $this->_em->getClassMetadata($mapping['sourceEntity']); + $params = array(); $id = $this->_em->getUnitOfWork()->getEntityIdentifier($coll->getOwner()); $where = ''; - foreach ($class->associationMappings[$mapping['mappedBy']]['joinColumns'] AS $joinColumn) { + foreach ($targetClass->associationMappings[$mapping['mappedBy']]['joinColumns'] AS $joinColumn) { if ($where != '') { $where .= ' AND '; } $where .= $joinColumn['name'] . " = ?"; - if ($class->containsForeignIdentifier) { - $params[] = $id[$class->getFieldForColumn($joinColumn['referencedColumnName'])]; + if ($targetClass->containsForeignIdentifier) { + $params[] = $id[$sourceClass->getFieldForColumn($joinColumn['referencedColumnName'])]; } else { - $params[] = $id[$class->fieldNames[$joinColumn['referencedColumnName']]]; + $params[] = $id[$sourceClass->fieldNames[$joinColumn['referencedColumnName']]]; } } - $sql = "SELECT count(*) FROM " . $class->getQuotedTableName($this->_conn->getDatabasePlatform()) . " WHERE " . $where; + $sql = "SELECT count(*) FROM " . $targetClass->getQuotedTableName($this->_conn->getDatabasePlatform()) . " WHERE " . $where; return $this->_conn->fetchColumn($sql, $params); } @@ -180,4 +182,4 @@ class OneToManyPersister extends AbstractCollectionPersister return $uow->getEntityPersister($mapping['targetEntity']) ->exists($element, array($mapping['mappedBy'] => $id)); } -} \ No newline at end of file +} From d439f67df5afe43858defbf8e4777afb0fcbb680 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 28 Jul 2011 12:25:23 +0200 Subject: [PATCH 3/3] [DDC-1301] Prefixed all Legacy models properties with _ --- .../Tests/Models/Legacy/LegacyArticle.php | 12 ++-- .../Tests/Models/Legacy/LegacyCar.php | 14 ++-- .../Tests/Models/Legacy/LegacyUser.php | 38 +++++------ .../Models/Legacy/LegacyUserReference.php | 28 ++++---- .../ORM/Functional/Ticket/DDC1301Test.php | 68 +++++++++---------- 5 files changed, 80 insertions(+), 80 deletions(-) diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php index e373c337d..fb754462e 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php @@ -13,21 +13,21 @@ class LegacyArticle * @Column(name="iArticleId", type="integer") * @GeneratedValue(strategy="AUTO") */ - public $id; + public $_id; /** * @Column(name="sTopic", type="string", length=255) */ - public $topic; + public $_topic; /** * @Column(name="sText", type="text") */ - public $text; + public $_text; /** - * @ManyToOne(targetEntity="LegacyUser", inversedBy="articles") + * @ManyToOne(targetEntity="LegacyUser", inversedBy="_articles") * @JoinColumn(name="iUserId", referencedColumnName="iUserId") */ - public $user; + public $_user; public function setAuthor(LegacyUser $author) { - $this->user = $author; + $this->_user = $author; } } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php index a27d3c34c..ac3834145 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php @@ -15,27 +15,27 @@ class LegacyCar * @GeneratedValue * @Column(name="iCarId", type="integer", nullable=false) */ - public $id; + public $_id; /** - * @ManyToMany(targetEntity="LegacyUser", mappedBy="cars") + * @ManyToMany(targetEntity="LegacyUser", mappedBy="_cars") */ - public $users; + public $_users; /** * @Column(name="sDescription", type="string", length=255, unique=true) */ - public $description; + public $_description; function getDescription() { - return $this->description; + return $this->_description; } public function addUser(LegacyUser $user) { - $this->users[] = $user; + $this->_users[] = $user; } public function getUsers() { - return $this->users; + return $this->_users; } } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php index fb06263a2..d7c9a5c37 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php @@ -15,66 +15,66 @@ class LegacyUser * @GeneratedValue * @Column(name="iUserId", type="integer", nullable=false) */ - public $id; + public $_id; /** * @Column(name="sUsername", type="string", length=255, unique=true) */ - public $username; + public $_username; /** * @Column(type="string", length=255) */ - public $name; + public $_name; /** - * @OneToMany(targetEntity="LegacyArticle", mappedBy="user") + * @OneToMany(targetEntity="LegacyArticle", mappedBy="_user") */ - public $articles; + public $_articles; /** - * @OneToMany(targetEntity="LegacyUserReference", mappedBy="source", cascade={"remove"}) + * @OneToMany(targetEntity="LegacyUserReference", mappedBy="_source", cascade={"remove"}) */ - public $references; + public $_references; /** - * @ManyToMany(targetEntity="LegacyCar", inversedBy="users", cascade={"persist", "merge"}) + * @ManyToMany(targetEntity="LegacyCar", inversedBy="_users", cascade={"persist", "merge"}) * @JoinTable(name="legace_users_cars", * joinColumns={@JoinColumn(name="iUserId", referencedColumnName="iUserId")}, * inverseJoinColumns={@JoinColumn(name="iCarId", referencedColumnName="iCarId")} * ) */ - public $cars; + public $_cars; public function __construct() { - $this->articles = new ArrayCollection; - $this->references = new ArrayCollection; - $this->cars = new ArrayCollection; + $this->_articles = new ArrayCollection; + $this->_references = new ArrayCollection; + $this->_cars = new ArrayCollection; } public function getId() { - return $this->id; + return $this->_id; } public function getUsername() { - return $this->username; + return $this->_username; } public function addArticle(LegacyArticle $article) { - $this->articles[] = $article; + $this->_articles[] = $article; $article->setAuthor($this); } public function addReference($reference) { - $this->references[] = $reference; + $this->_references[] = $reference; } public function references() { - return $this->references; + return $this->_references; } public function addCar(LegacyCar $car) { - $this->cars[] = $car; + $this->_cars[] = $car; $car->addUser($this); } public function getCars() { - return $this->cars; + return $this->_cars; } } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php index 8b1ee9407..c6cd891a1 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php @@ -10,56 +10,56 @@ class LegacyUserReference { /** * @Id - * @ManyToOne(targetEntity="LegacyUser", inversedBy="references") + * @ManyToOne(targetEntity="LegacyUser", inversedBy="_references") * @JoinColumn(name="iUserIdSource", referencedColumnName="iUserId") */ - private $source; + private $_source; /** * @Id - * @ManyToOne(targetEntity="LegacyUser", inversedBy="references") + * @ManyToOne(targetEntity="LegacyUser", inversedBy="_references") * @JoinColumn(name="iUserIdTarget", referencedColumnName="iUserId") */ - private $target; + private $_target; /** * @column(type="string") */ - private $description; + private $_description; /** * @column(type="datetime") */ - private $created; + private $_created; public function __construct($source, $target, $description) { $source->addReference($this); $target->addReference($this); - $this->source = $source; - $this->target = $target; - $this->description = $description; - $this->created = new \DateTime("now"); + $this->_source = $source; + $this->_target = $target; + $this->_description = $description; + $this->_created = new \DateTime("now"); } public function source() { - return $this->source; + return $this->_source; } public function target() { - return $this->target; + return $this->_target; } public function setDescription($desc) { - $this->description = $desc; + $this->_description = $desc; } public function getDescription() { - return $this->description; + return $this->_description; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php index f1dd02498..94d02f905 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php @@ -19,9 +19,9 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); - $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; - $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; - $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['_articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['_references']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['_cars']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; $this->loadFixture(); } @@ -31,9 +31,9 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::tearDown(); $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); - $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; - $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_LAZY; - $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['_articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['_references']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['_cars']['fetch'] = ClassMetadataInfo::FETCH_LAZY; } public function testCountNotInitializesLegacyCollection() @@ -41,11 +41,11 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); $queryCount = $this->getCurrentQueryCount(); - $this->assertFalse($user->articles->isInitialized()); - $this->assertEquals(2, count($user->articles)); - $this->assertFalse($user->articles->isInitialized()); + $this->assertFalse($user->_articles->isInitialized()); + $this->assertEquals(2, count($user->_articles)); + $this->assertFalse($user->_articles->isInitialized()); - foreach ($user->articles AS $article) { } + foreach ($user->_articles AS $article) { } $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); } @@ -55,11 +55,11 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); $queryCount = $this->getCurrentQueryCount(); - $this->assertFalse($user->references->isInitialized()); - $this->assertEquals(2, count($user->references)); - $this->assertFalse($user->references->isInitialized()); + $this->assertFalse($user->_references->isInitialized()); + $this->assertEquals(2, count($user->_references)); + $this->assertFalse($user->_references->isInitialized()); - foreach ($user->references AS $reference) { } + foreach ($user->_references AS $reference) { } $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); } @@ -69,11 +69,11 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); $queryCount = $this->getCurrentQueryCount(); - $this->assertFalse($user->cars->isInitialized()); - $this->assertEquals(3, count($user->cars)); - $this->assertFalse($user->cars->isInitialized()); + $this->assertFalse($user->_cars->isInitialized()); + $this->assertEquals(3, count($user->_cars)); + $this->assertFalse($user->_cars->isInitialized()); - foreach ($user->cars AS $reference) { } + foreach ($user->_cars AS $reference) { } $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); } @@ -81,45 +81,45 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase public function loadFixture() { $user1 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); - $user1->username = "beberlei"; - $user1->name = "Benjamin"; - $user1->status = "active"; + $user1->_username = "beberlei"; + $user1->_name = "Benjamin"; + $user1->_status = "active"; $user2 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); - $user2->username = "jwage"; - $user2->name = "Jonathan"; - $user2->status = "active"; + $user2->_username = "jwage"; + $user2->_name = "Jonathan"; + $user2->_status = "active"; $user3 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); - $user3->username = "romanb"; - $user3->name = "Roman"; - $user3->status = "active"; + $user3->_username = "romanb"; + $user3->_name = "Roman"; + $user3->_status = "active"; $this->_em->persist($user1); $this->_em->persist($user2); $this->_em->persist($user3); $article1 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); - $article1->topic = "Test"; - $article1->text = "Test"; + $article1->_topic = "Test"; + $article1->_text = "Test"; $article1->setAuthor($user1); $article2 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); - $article2->topic = "Test"; - $article2->text = "Test"; + $article2->_topic = "Test"; + $article2->_text = "Test"; $article2->setAuthor($user1); $this->_em->persist($article1); $this->_em->persist($article2); $car1 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); - $car1->description = "Test1"; + $car1->_description = "Test1"; $car2 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); - $car2->description = "Test2"; + $car2->_description = "Test2"; $car3 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); - $car3->description = "Test3"; + $car3->_description = "Test3"; $user1->addCar($car1); $user1->addCar($car2);