Merge pull request #528 from doctrine/hotfix/sqlite-auto-increment

Applying patch suggested by @guilhermeblanco for SQLite's auto-inc integer PKs
doctrine · Feb 14, 2014 · da43b76 · da43b76
2 parents 594e326 + 5523678
commit da43b76
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php b/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
@@ -289,6 +289,11 @@ public function getTimeTypeDeclarationSQL(array $fieldDeclaration)
      */
     protected function _getCommonIntegerTypeDeclarationSQL(array $columnDef)
     {
+        // sqlite autoincrement is implicit for integer PKs, but not when the field is unsigned
+        if ( ! empty($columnDef['autoincrement'])) {
+            return '';
+        }
+
         return ! empty($columnDef['unsigned']) ? ' UNSIGNED' : '';
     }
 

diff --git a/tests/Doctrine/Tests/DBAL/Platforms/SqlitePlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/SqlitePlatformTest.php
@@ -63,6 +63,14 @@ public function testPrefersIdentityColumns()
         $this->assertTrue($this->_platform->prefersIdentityColumns());
     }
 
+    public function testIgnoresUnsignedIntegerDeclarationForAutoIncrementalIntegers()
+    {
+        $this->assertSame(
+            'INTEGER',
+            $this->_platform->getIntegerTypeDeclarationSQL(array('autoincrement' => true, 'unsigned' => true))
+        );
+    }
+
     /**
      * @group DBAL-752
      */