Ignore SQLite indexes with reserved names

These are internal, automatically-created and shouldn't be considered part of
the schema. They cannot be recreated because of their reserved names.

lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php

@@ -93,18 +93,21 @@ class SqliteSchemaManager extends AbstractSchemaManager
 
         // fetch regular indexes
         foreach($tableIndexes AS $tableIndex) {
-            $keyName = $tableIndex['name'];
-            $idx = array();
-            $idx['key_name'] = $keyName;
-            $idx['primary'] = false;
-            $idx['non_unique'] = $tableIndex['unique']?false:true;
-
-            $stmt = $this->_conn->executeQuery( "PRAGMA INDEX_INFO ( '{$keyName}' )" );
-            $indexArray = $stmt->fetchAll(\PDO::FETCH_ASSOC);
-
-            foreach ( $indexArray as $indexColumnRow ) {
-                $idx['column_name'] = $indexColumnRow['name'];
-                $indexBuffer[] = $idx;
+            // Ignore indexes with reserved names, e.g. autoindexes
+            if (strpos($tableIndex['name'], 'sqlite_') !== 0) {
+                $keyName = $tableIndex['name'];
+                $idx = array();
+                $idx['key_name'] = $keyName;
+                $idx['primary'] = false;
+                $idx['non_unique'] = $tableIndex['unique']?false:true;
+
+                $stmt = $this->_conn->executeQuery( "PRAGMA INDEX_INFO ( '{$keyName}' )" );
+                $indexArray = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+
+                foreach ( $indexArray as $indexColumnRow ) {
+                    $idx['column_name'] = $indexColumnRow['name'];
+                    $indexBuffer[] = $idx;
+                }
             }
         }
 

tests/Doctrine/Tests/DBAL/Functional/Schema/SchemaManagerFunctionalTestCase.php

@@ -199,7 +199,7 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $this->assertEquals(3, count($tableIndexes));
 
         $this->assertArrayHasKey('primary', $tableIndexes, 'listTableIndexes() has to return a "primary" array key.');
-        $this->assertEquals(array('id'), array_map('strtolower', $tableIndexes['primary']->getColumns()));
+        $this->assertEquals(array('id', 'other_id'), array_map('strtolower', $tableIndexes['primary']->getColumns()));
         $this->assertTrue($tableIndexes['primary']->isUnique());
         $this->assertTrue($tableIndexes['primary']->isPrimary());
 
@@ -505,7 +505,8 @@ class SchemaManagerFunctionalTestCase extends \Doctrine\Tests\DbalFunctionalTest
         $table = new \Doctrine\DBAL\Schema\Table($name, array(), array(), array(), false, $options);
         $table->setSchemaConfig($this->_sm->createSchemaConfig());
         $table->addColumn('id', 'integer', array('notnull' => true));
-        $table->setPrimaryKey(array('id'));
+        $table->addColumn('other_id', 'integer', array('notnull' => true));
+        $table->setPrimaryKey(array('id', 'other_id'));
         $table->addColumn('test', 'string', array('length' => 255));
         $table->addColumn('foreign_key_test', 'integer');
         return $table;