Merge master into 2.2

lib/Doctrine/DBAL/Schema/Index.php

@@ -77,6 +77,14 @@ class Index extends AbstractAsset implements Constraint
         return $this->_columns;
     }
 
+    /**
+     * @return array
+     */
+    public function getUnquotedColumns()
+    {
+        return array_map(array($this, 'trimQuotes'), $this->getColumns());
+    }
+
     /**
      * Is the index neither unique nor primary key?
      *
@@ -108,11 +116,11 @@ class Index extends AbstractAsset implements Constraint
      * @param  int $pos
      * @return bool
      */
-    public function hasColumnAtPosition($columnName, $pos=0)
+    public function hasColumnAtPosition($columnName, $pos = 0)
     {
-        $columnName = strtolower($columnName);
-        $indexColumns = \array_map('strtolower', $this->getColumns());
-        return \array_search($columnName, $indexColumns) === $pos;
+        $columnName   = $this->trimQuotes(strtolower($columnName));
+        $indexColumns = array_map('strtolower', $this->getUnquotedColumns());
+        return array_search($columnName, $indexColumns) === $pos;
     }
 
     /**
@@ -125,7 +133,7 @@ class Index extends AbstractAsset implements Constraint
     {
         $sameColumns = true;
         for ($i = 0; $i < count($this->_columns); $i++) {
-            if (!isset($columnNames[$i]) || strtolower($this->_columns[$i]) != strtolower($columnNames[$i])) {
+            if (!isset($columnNames[$i]) || $this->trimQuotes(strtolower($this->_columns[$i])) != $this->trimQuotes(strtolower($columnNames[$i]))) {
                 $sameColumns = false;
             }
         }
@@ -185,4 +193,4 @@ class Index extends AbstractAsset implements Constraint
         }
         return false;
     }
-}
\ No newline at end of file
+}

tests/Doctrine/Tests/DBAL/Schema/IndexTest.php

@@ -81,4 +81,19 @@ class IndexTest extends \PHPUnit_Framework_TestCase
         $this->assertTrue($idx1->isFullfilledBy($pri));
         $this->assertTrue($idx1->isFullfilledBy($uniq));
     }
-}
\ No newline at end of file
+
+    /**
+     * @group DBAL-285
+     */
+    public function testIndexQuotes()
+    {
+        $index = new Index("foo", array("`bar`", "`baz`"));
+
+        $this->assertTrue($index->spansColumns(array("bar", "baz")));
+        $this->assertTrue($index->hasColumnAtPosition("bar", 0));
+        $this->assertTrue($index->hasColumnAtPosition("baz", 1));
+
+        $this->assertFalse($index->hasColumnAtPosition("bar", 1));
+        $this->assertFalse($index->hasColumnAtPosition("baz", 0));
+    }
+}