Fix using addColumn() with autoincrementKey types in SQLite.

horde · Nov 17, 2014 · 0d80dfc · 0d80dfc
1 parent 915774f
commit 0d80dfc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php
@@ -230,15 +230,27 @@ public function renameTable($name, $newName)
      *                            Horde_Db_Adapter_Base_TableDefinition#column()
      *                            for details.
      */
-    public function addColumn($tableName, $columnName, $type, $options=array())
+    public function addColumn($tableName, $columnName, $type, $options = array())
     {
-        /* Ignore ':autoincrement' - it is handled automatically by SQLite
-         * for any 'INTEGER PRIMARY KEY' column. */
         if ($this->transactionStarted()) {
             throw new Horde_Db_Exception('Cannot add columns to a SQLite database while inside a transaction');
         }
 
-        parent::addColumn($tableName, $columnName, $type, $options);
+        if ($type == 'autoincrementKey') {
+            $this->_alterTable(
+                $tableName,
+                array(),
+                create_function(
+                    '$definition',
+                    sprintf(
+                        '$definition->column("%s", "%s", %s);',
+                        $columnName, $type, var_export($options, true)
+                    )
+                )
+            );
+        } else {
+            parent::addColumn($tableName, $columnName, $type, $options);
+        }
 
         // See last paragraph on http://www.sqlite.org/lang_altertable.html
         $this->execute('VACUUM');
@@ -271,7 +283,7 @@ public function removeColumn($tableName, $columnName)
      *                            Horde_Db_Adapter_Base_TableDefinition#column()
      *                            for details.
      */
-    public function changeColumn($tableName, $columnName, $type, $options=array())
+    public function changeColumn($tableName, $columnName, $type, $options = array())
     {
         $this->_clearTableCache($tableName);
 

diff --git a/framework/Db/package.xml b/framework/Db/package.xml
@@ -34,6 +34,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
+* [jan] Fix using addColumn() with autoincrementKey types in SQLite.
 * [jan] Fix several issues with changing autoincrementKey columns in Oracle.
 * [mms] Fix SplitRead driver to work with the recent blob changes.
  </notes>
@@ -858,6 +859,7 @@
    <date>2014-11-06</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
+* [jan] Fix using addColumn() with autoincrementKey types in SQLite.
 * [jan] Fix several issues with changing autoincrementKey columns in Oracle.
 * [mms] Fix SplitRead driver to work with the recent blob changes.
    </notes>