From 9b877499c778ef01379d8f391ab15f1c19c484ec Mon Sep 17 00:00:00 2001
From: Bernhard Schussek <bschussek@gmail.com>
Date: Sun, 18 Dec 2011 12:13:58 +0100
Subject: [PATCH 1/2] Added test case for DDC-1545

---
 .../ORM/Functional/Ticket/DDC1545Test.php     | 203 ++++++++++++++++++
 1 file changed, 203 insertions(+)
 create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
new file mode 100644
index 000000000..6c028b5ac
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
@@ -0,0 +1,203 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\Models\Qelista\User;
+
+use Doctrine\Tests\Models\Qelista\ShoppingList;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Tests\Models\CMS\CmsComment;
+use Doctrine\Tests\Models\CMS\CmsArticle;
+use Doctrine\Tests\Models\CMS\CmsUser;
+require_once __DIR__ . '/../../../TestInit.php';
+
+/**
+ * @group DDC-1040
+ */
+class ATest extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    private $articleId;
+
+    private $userId;
+
+    private $user2Id;
+
+    public function setUp()
+    {
+        $this->useModelSet('cms');
+        parent::setUp();
+    }
+
+    private function initDb($link)
+    {
+        $article = new CmsArticle();
+        $article->topic = 'foo';
+        $article->text = 'foo';
+
+        $user = new CmsUser();
+        $user->status = 'foo';
+        $user->username = 'foo';
+        $user->name = 'foo';
+
+        $user2 = new CmsUser();
+        $user2->status = 'bar';
+        $user2->username = 'bar';
+        $user2->name = 'bar';
+
+        if ($link) {
+            $article->user = $user;
+        }
+
+        $this->_em->persist($article);
+        $this->_em->persist($user);
+        $this->_em->persist($user2);
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $this->articleId = $article->id;
+        $this->userId = $user->id;
+        $this->user2Id = $user2->id;
+    }
+
+    public function testLinkObjects()
+    {
+        $this->initDb(false);
+
+        // don't join association
+        $article = $this->_em->find('Doctrine\Tests\Models\Cms\CmsArticle', $this->articleId);
+
+        $user = $this->_em->find('Doctrine\Tests\Models\Cms\CmsUser', $this->userId);
+
+        $article->user = $user;
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $article = $this->_em
+            ->createQuery('SELECT a, u FROM Doctrine\Tests\Models\Cms\CmsArticle a LEFT JOIN a.user u WHERE a.id = :id')
+            ->setParameter('id', $this->articleId)
+            ->getOneOrNullResult();
+
+        $this->assertNotNull($article->user);
+        $this->assertEquals($user->id, $article->user->id);
+    }
+
+    public function testLinkObjectsWithAssociationLoaded()
+    {
+        $this->initDb(false);
+
+        // join association
+        $article = $this->_em
+            ->createQuery('SELECT a, u FROM Doctrine\Tests\Models\Cms\CmsArticle a LEFT JOIN a.user u WHERE a.id = :id')
+            ->setParameter('id', $this->articleId)
+            ->getOneOrNullResult();
+
+        $user = $this->_em->find('Doctrine\Tests\Models\Cms\CmsUser', $this->userId);
+
+        $article->user = $user;
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $article = $this->_em
+            ->createQuery('SELECT a, u FROM Doctrine\Tests\Models\Cms\CmsArticle a LEFT JOIN a.user u WHERE a.id = :id')
+            ->setParameter('id', $this->articleId)
+            ->getOneOrNullResult();
+
+        $this->assertNotNull($article->user);
+        $this->assertEquals($user->id, $article->user->id);
+    }
+
+    public function testUnlinkObjects()
+    {
+        $this->initDb(true);
+
+        // don't join association
+        $article = $this->_em->find('Doctrine\Tests\Models\Cms\CmsArticle', $this->articleId);
+
+        $article->user = null;
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $article = $this->_em
+            ->createQuery('SELECT a, u FROM Doctrine\Tests\Models\Cms\CmsArticle a LEFT JOIN a.user u WHERE a.id = :id')
+            ->setParameter('id', $this->articleId)
+            ->getOneOrNullResult();
+
+        $this->assertNull($article->user);
+    }
+
+    public function testUnlinkObjectsWithAssociationLoaded()
+    {
+        $this->initDb(true);
+
+        // join association
+        $article = $this->_em
+            ->createQuery('SELECT a, u FROM Doctrine\Tests\Models\Cms\CmsArticle a LEFT JOIN a.user u WHERE a.id = :id')
+            ->setParameter('id', $this->articleId)
+            ->getOneOrNullResult();
+
+        $article->user = null;
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $article = $this->_em
+            ->createQuery('SELECT a, u FROM Doctrine\Tests\Models\Cms\CmsArticle a LEFT JOIN a.user u WHERE a.id = :id')
+            ->setParameter('id', $this->articleId)
+            ->getOneOrNullResult();
+
+        $this->assertNull($article->user);
+    }
+
+    public function testChangeLink()
+    {
+        $this->initDb(false);
+
+        // don't join association
+        $article = $this->_em->find('Doctrine\Tests\Models\Cms\CmsArticle', $this->articleId);
+
+        $user2 = $this->_em->find('Doctrine\Tests\Models\Cms\CmsUser', $this->user2Id);
+
+        $article->user = $user2;
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $article = $this->_em
+            ->createQuery('SELECT a, u FROM Doctrine\Tests\Models\Cms\CmsArticle a LEFT JOIN a.user u WHERE a.id = :id')
+            ->setParameter('id', $this->articleId)
+            ->getOneOrNullResult();
+
+        $this->assertNotNull($article->user);
+        $this->assertEquals($user2->id, $article->user->id);
+    }
+
+    public function testChangeLinkWithAssociationLoaded()
+    {
+        $this->initDb(false);
+
+        // join association
+        $article = $this->_em
+            ->createQuery('SELECT a, u FROM Doctrine\Tests\Models\Cms\CmsArticle a LEFT JOIN a.user u WHERE a.id = :id')
+            ->setParameter('id', $this->articleId)
+            ->getOneOrNullResult();
+
+        $user2 = $this->_em->find('Doctrine\Tests\Models\Cms\CmsUser', $this->user2Id);
+
+        $article->user = $user2;
+
+        $this->_em->flush();
+        $this->_em->clear();
+
+        $article = $this->_em
+            ->createQuery('SELECT a, u FROM Doctrine\Tests\Models\Cms\CmsArticle a LEFT JOIN a.user u WHERE a.id = :id')
+            ->setParameter('id', $this->articleId)
+            ->getOneOrNullResult();
+
+        $this->assertNotNull($article->user);
+        $this->assertEquals($user2->id, $article->user->id);
+    }
+}
\ No newline at end of file

From e035fe7949851a2162794467f7d236368f6d5ee7 Mon Sep 17 00:00:00 2001
From: Bernhard Schussek <bschussek@gmail.com>
Date: Mon, 19 Dec 2011 11:20:37 +0100
Subject: [PATCH 2/2] Fixed class name of test for DDC-1545

---
 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
index 6c028b5ac..e7b55eb1f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
@@ -13,9 +13,9 @@ use Doctrine\Tests\Models\CMS\CmsUser;
 require_once __DIR__ . '/../../../TestInit.php';
 
 /**
- * @group DDC-1040
+ * @group DDC-1545
  */
-class ATest extends \Doctrine\Tests\OrmFunctionalTestCase
+class DDC1545Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     private $articleId;