Fix adding column to sqlite table created outside phinx

Co-authored-by: SlavaAurim <[email protected]>

Author: MasterOdin

src/Phinx/Db/Adapter/SQLiteAdapter.php

@@ -734,6 +734,21 @@ protected function getDeclaringSql($tableName)
             }
         }
 
+        $columnsInfo = $this->getTableInfo($tableName);
+
+        foreach ($columnsInfo as $column) {
+            $columnName = $column['name'];
+            $columnNamePattern = "\"$columnName\"|`$columnName`|\\[$columnName\\]|$columnName";
+            $columnNamePattern = "#([\(,]+\\s*)($columnNamePattern)(\\s)#iU";
+
+            $sql = preg_replace($columnNamePattern, "$1`$columnName`$3", $sql);
+        }
+
+        $tableNamePattern = "\"$tableName\"|`$tableName`|\\[$tableName\\]|$tableName";
+        $tableNamePattern = "#^(CREATE TABLE)\s*($tableNamePattern)\s*(\()#Ui";
+
+        $sql = preg_replace($tableNamePattern, "$1 `$tableName` $3", $sql, 1);
+
         return $sql;
     }
 

tests/Phinx/Db/Adapter/SQLiteAdapterTest.php

@@ -488,6 +488,33 @@ public function testAddColumnWithDefaultEmptyString()
         $this->assertEquals("''", $rows[1]['dflt_value']);
     }
 
+    public function irregularCreateTableProvider()
+    {
+        return [
+            ["CREATE TABLE \"users\"\n( `id` INTEGER NOT NULL )", ['id', 'foo']],
+            ['CREATE TABLE users   (    id INTEGER NOT NULL )', ['id', 'foo']],
+            ["CREATE TABLE [users]\n(\nid INTEGER NOT NULL)", ['id', 'foo']],
+            ["CREATE TABLE \"users\" ([id] \n INTEGER NOT NULL\n, \"bar\" INTEGER)", ['id', 'bar', 'foo']],
+        ];
+    }
+
+    /**
+     * @dataProvider irregularCreateTableProvider
+     */
+    public function testAddColumnToIrregularCreateTableStatements(string $createTableSql, array $expectedColumns): void
+    {
+        $this->adapter->execute($createTableSql);
+        $table = new \Phinx\Db\Table('users', [], $this->adapter);
+        $table->addColumn('foo', 'string');
+        $table->update();
+
+        $columns = $this->adapter->getColumns('users');
+        $columnCount = count($columns);
+        for ($i = 0; $i < $columnCount; $i++) {
+            $this->assertEquals($expectedColumns[$i], $columns[$i]->getName());
+        }
+    }
+
     public function testAddDoubleColumn()
     {
         $table = new \Phinx\Db\Table('table1', [], $this->adapter);