Merge branch 'DDC-698'

lib/Doctrine/ORM/Query/SqlWalker.php

@@ -760,7 +760,7 @@ class SqlWalker implements TreeWalker
             $joinTableAlias = $this->getSqlTableAlias($joinTable['name'], $joinedDqlAlias);
             $sql .= $assoc->getQuotedJoinTableName($this->_platform) . ' ' . $joinTableAlias . ' ON ';
 
-            $first = true;
+			$first = true;
             if ($relation->isOwningSide) {
                 foreach ($assoc->relationToSourceKeyColumns as $relationColumn => $sourceColumn) {
                     if ( ! $first) $sql .= ' AND '; else $first = false;
@@ -773,7 +773,7 @@ class SqlWalker implements TreeWalker
                 foreach ($assoc->relationToTargetKeyColumns as $relationColumn => $targetColumn) {
                     if ( ! $first) $sql .= ' AND '; else $first = false;
 
-                    $sql .= $sourceTableAlias . '.' . $targetClass->getQuotedColumnName($targetClass->fieldNames[$targetColumn], $this->_platform)
+                    $sql .= $sourceTableAlias . '.' . $sourceClass->getQuotedColumnName($sourceClass->fieldNames[$targetColumn], $this->_platform)
                           . ' = '
                           . $joinTableAlias . '.' . $relationColumn;
                 }
@@ -784,7 +784,7 @@ class SqlWalker implements TreeWalker
             	? ' LEFT JOIN ' : ' INNER JOIN ';
             $sql .= $targetTableName . ' ' . $targetTableAlias . ' ON ';
 
-            $first = true;
+			$first = true;
             if ($relation->isOwningSide) {
                 foreach ($assoc->relationToTargetKeyColumns as $relationColumn => $targetColumn) {
                     if ( ! $first) $sql .= ' AND '; else $first = false;
@@ -797,7 +797,7 @@ class SqlWalker implements TreeWalker
                 foreach ($assoc->relationToSourceKeyColumns as $relationColumn => $sourceColumn) {
                     if ( ! $first) $sql .= ' AND '; else $first = false;
 
-                    $sql .= $targetTableAlias . '.' . $sourceClass->getQuotedColumnName($sourceClass->fieldNames[$sourceColumn], $this->_platform)
+                    $sql .= $targetTableAlias . '.' . $targetClass->getQuotedColumnName($targetClass->fieldNames[$sourceColumn], $this->_platform)
                           . ' = '
                           . $joinTableAlias . '.' . $relationColumn;
                 }

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use DateTime;
+
+require_once __DIR__ . '/../../../TestInit.php';
+
+class DDC698Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    protected function setUp()
+    {
+        parent::setUp();
+        try {
+            $this->_schemaTool->createSchema(array(
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC698Role'),
+                $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC698Privilege')
+            ));
+        } catch(\Exception $e) {
+
+        }
+    }
+
+    public function testTicket()
+    {
+        $qb = $this->_em->createQueryBuilder();
+        $qb->select('p', 'r')
+		   ->from(__NAMESPACE__ .  '\DDC698Privilege', 'p')
+		   ->leftJoin('p.roles', 'r');
+
+        $sql = $qb->getQuery()->getSQL();
+
+        $this->assertEquals('SELECT p0_.privilegeID AS privilegeID0, p0_.name AS name1, r1_.roleID AS roleID2, r1_.name AS name3, r1_.shortName AS shortName4 FROM Privileges p0_ LEFT JOIN RolePrivileges r2_ ON p0_.privilegeID = r2_.privilegeID LEFT JOIN Roles r1_ ON r1_.roleID = r2_.roleID', $sql);
+    }
+}
+
+/**
+ *
+ * @Table(name="Roles")
+ * @Entity
+ */
+class DDC698Role
+{
+	/**
+	 *  @Id @Column(name="roleID", type="integer")
+	 *  @GeneratedValue(strategy="AUTO")
+	 *
+	 */
+	protected $roleID;
+
+	/**
+	 * @Column(name="name", type="string", length="45")
+	 *
+	 *
+	 */
+	protected $name;
+
+	/**
+	 * @Column(name="shortName", type="string", length="45")
+	 *
+	 *
+	 */
+	protected $shortName;
+
+
+
+	/**
+	 * @ManyToMany(targetEntity="DDC698Privilege", inversedBy="roles")
+	 * @JoinTable(name="RolePrivileges",
+	 *     joinColumns={@JoinColumn(name="roleID", referencedColumnName="roleID")},
+	 *     inverseJoinColumns={@JoinColumn(name="privilegeID", referencedColumnName="privilegeID")}
+	 * )
+	 */
+	protected $privilege;
+
+}
+
+
+/**
+ *
+ * @Table(name="Privileges")
+ * @Entity()
+ */
+class DDC698Privilege
+{
+	/**
+	 *  @Id  @Column(name="privilegeID", type="integer")
+	 *  @GeneratedValue(strategy="AUTO")
+	 *
+	 */
+	protected $privilegeID;
+
+	/**
+	 * @Column(name="name", type="string", length="45")
+	 *
+	 *
+	 */
+	protected $name;
+
+	/**
+     * @ManyToMany(targetEntity="DDC698Role", mappedBy="privilege")
+     */
+	protected $roles;
+}