Fixes introduced in v3 (#86)

Author: Bizley

.gitignore

@@ -2,4 +2,5 @@
 vendor
 docker
 runtime
-composer.lock
+composer.lock
+.phpunit.result.cache

README.md

@@ -9,19 +9,7 @@
 
 Generates migration file based on the existing database table and previous migrations.
 
-## Installation for PHP >= 7.1 and Yii >= 2.0.15.1
-
-Add the package to your composer.json:
-
-    {
-        "require": {
-            "bizley/migration": "^3.6"
-        }
-    }
-
-and run `composer update` or alternatively run `composer require bizley/migration:^3.6`
-
-## Installation for PHP < 7.1
+## Installation
 
 Add the package to your composer.json:
 
@@ -33,6 +21,13 @@ Add the package to your composer.json:
 
 and run `composer update` or alternatively run `composer require bizley/migration:^2.9`
 
+## Other versions
+
+| version constraint | PHP requirements | Yii requirements                                                             
+|:------------------:|:----------------:|:----------------:
+| ^4.0               | >= 7.2           | >= 2.0.19
+| ^3.6               | >= 7.1           | >= 2.0.15.1
+
 ## Configuration
 
 Add the following in your configuration file (preferably console configuration file):
@@ -167,4 +162,4 @@ in columns definition in form of an instance of `yii\db\ColumnSchemaBuilder` (li
 ## Tests
 
 Tests for MySQL, PostgreSQL, and SQLite. Database configuration is stored in `tests/config.php` (you can override it by 
-creating `config.local.php` file there).
+creating `config.local.php` file there).

composer.json

@@ -2,11 +2,11 @@
   "name": "bizley/migration",
   "description": "Migration generator for Yii 2.",
   "type": "yii2-extension",
-  "keywords": ["yii2", "migration", "migrate", "generator", "console"],
+  "keywords": ["yii2", "migration", "migrate", "generator", "console", "updater"],
   "license": "Apache-2.0",
   "authors": [
     {
-      "name": "Pawel Bizley Brzozowski",
+      "name": "Paweł Bizley Brzozowski",
       "email": "[email protected]"
     }
   ],

src/Updater.php

@@ -198,8 +198,7 @@ protected function extract($migration)
             require_once $file;
         }
 
-        $subject = new $migration();
-        $subject->db = $this->db;
+        $subject = new $migration(['db' => clone $this->db]);
         $subject->up();
 
         return $subject->changes;
@@ -387,21 +386,25 @@ protected function compareStructures()
 
             $previousColumn = $name;
 
-            foreach ([
-                'type',
-                'isNotNull',
-                'length',
-                'isUnique',
-                'isUnsigned',
-                'default',
-                'append',
-                'comment'
-            ] as $property) {
-                if (!$this->generalSchema
+            foreach (
+                [
+                    'type',
+                    'isNotNull',
+                    'length',
+                    'isUnique',
+                    'isUnsigned',
+                    'default',
+                    'append',
+                    'comment'
+                ] as $property
+            ) {
+                if (
+                    !$this->generalSchema
                     && $property === 'append'
                     && $column->append === null
                     && !$this->table->primaryKey->isComposite()
-                    && $column->isColumnInPK($this->table->primaryKey)) {
+                    && $column->isColumnInPK($this->table->primaryKey)
+                ) {
                     $column->append = $column->prepareSchemaAppend(true, $column->autoIncrement);
                 }
 
@@ -491,12 +494,14 @@ protected function compareStructures()
                 ? $this->oldTable->foreignKeys[$name]->columns
                 : [];
 
-            if (count(
-                array_merge(
-                    array_diff($tableFKColumns, array_intersect($tableFKColumns, $oldTableFKColumns)),
-                    array_diff($oldTableFKColumns, array_intersect($tableFKColumns, $oldTableFKColumns))
+            if (
+                count(
+                    array_merge(
+                        array_diff($tableFKColumns, array_intersect($tableFKColumns, $oldTableFKColumns)),
+                        array_diff($oldTableFKColumns, array_intersect($tableFKColumns, $oldTableFKColumns))
+                    )
                 )
-            )) {
+            ) {
                 if ($this->showOnly) {
                     echo "   - different foreign key '$name' columns (";
                     echo 'DB: (' . implode(', ', $tableFKColumns) . ') <> ';
@@ -526,12 +531,14 @@ protected function compareStructures()
                 ? $this->oldTable->foreignKeys[$name]->refColumns
                 : [];
 
-            if (count(
-                array_merge(
-                    array_diff($tableFKRefColumns, array_intersect($tableFKRefColumns, $oldTableFKRefColumns)),
-                    array_diff($oldTableFKRefColumns, array_intersect($tableFKRefColumns, $oldTableFKRefColumns))
+            if (
+                count(
+                    array_merge(
+                        array_diff($tableFKRefColumns, array_intersect($tableFKRefColumns, $oldTableFKRefColumns)),
+                        array_diff($oldTableFKRefColumns, array_intersect($tableFKRefColumns, $oldTableFKRefColumns))
+                    )
                 )
-            )) {
+            ) {
                 if ($this->showOnly) {
                     echo "   - different foreign key '$name' referral columns (";
                     echo 'DB: (' . implode(', ', $tableFKRefColumns) . ') <> ';
@@ -645,12 +652,14 @@ protected function compareStructures()
                 ? $this->oldTable->indexes[$name]->columns
                 : [];
 
-            if (count(
-                array_merge(
-                    array_diff($tableIndexColumns, array_intersect($tableIndexColumns, $oldTableIndexColumns)),
-                    array_diff($oldTableIndexColumns, array_intersect($tableIndexColumns, $oldTableIndexColumns))
+            if (
+                count(
+                    array_merge(
+                        array_diff($tableIndexColumns, array_intersect($tableIndexColumns, $oldTableIndexColumns)),
+                        array_diff($oldTableIndexColumns, array_intersect($tableIndexColumns, $oldTableIndexColumns))
+                    )
                 )
-            )) {
+            ) {
                 if ($this->showOnly) {
                     echo "   - different index '$name' columns (";
                     echo 'DB: (' . implode(', ', $tableIndexColumns) . ') <> ';

src/controllers/MigrationController.php

@@ -26,13 +26,13 @@
  * Generates migration file based on the existing database table and previous migrations.
  *
  * @author Paweł Bizley Brzozowski
- * @version 2.9.4
+ * @version 2.9.5
  * @license Apache 2.0
  * https://github.com/bizley/yii2-migration
  */
 class MigrationController extends Controller
 {
-    protected $version = '2.9.4';
+    protected $version = '2.9.5';
 
     /**
      * @var string Default command action.
@@ -252,6 +252,7 @@ public function init()
     }
 
     protected $workingPath;
+    protected $workingNamespace;
 
     /**
      * This method is invoked right before an action is to be executed (after all possible filters).
@@ -280,8 +281,10 @@ public function beforeAction($action)
                         $this->workingPath = $this->preparePathDirectory(
                             '@' . FileHelper::normalizePath($namespace, '/')
                         );
+                        $this->workingNamespace = $namespace;
                     }
                 }
+                unset($namespace);
             } elseif ($this->migrationPath !== null) {
                 if (!is_array($this->migrationPath)) {
                     $this->migrationPath = [$this->migrationPath];
@@ -455,8 +458,10 @@ public function actionCreate($table)
             $tables = $arrangedTables['order'];
             $suppressForeignKeys = $arrangedTables['suppressForeignKeys'];
 
-            if (count($suppressForeignKeys)
-                && TableStructure::identifySchema(get_class($this->db->schema)) === TableStructure::SCHEMA_SQLITE) {
+            if (
+                count($suppressForeignKeys)
+                && TableStructure::identifySchema(get_class($this->db->schema)) === TableStructure::SCHEMA_SQLITE
+            ) {
                 $this->stdout(
                     "WARNING!\n > Creating provided tables in batch requires manual migration!\n",
                     Console::FG_RED
@@ -523,7 +528,7 @@ public function actionCreate($table)
                     $this->createMigrationHistoryTable();
                 }
 
-                $this->addMigrationHistory($className, $this->migrationNamespace);
+                $this->addMigrationHistory($className, $this->workingNamespace);
             }
 
             $this->stdout("\n");
@@ -544,11 +549,19 @@ public function actionCreate($table)
             );
             $file = $this->workingPath . DIRECTORY_SEPARATOR . $className . '.php';
 
-            if ($this->generateFile($file, $this->view->renderFile(Yii::getAlias($this->templateFileForeignKey), [
-                    'fks' => $postponedForeignKeys,
-                    'className' => $className,
-                    'namespace' => $this->migrationNamespace
-                ])) === false) {
+            if (
+                $this->generateFile(
+                    $file,
+                    $this->view->renderFile(
+                        Yii::getAlias($this->templateFileForeignKey),
+                        [
+                            'fks' => $postponedForeignKeys,
+                            'className' => $className,
+                            'namespace' => $this->migrationNamespace
+                        ]
+                    )
+                ) === false
+            ) {
                 $this->stdout(
                     "ERROR!\n > Migration file for foreign keys can not be generated!\n\n",
                     Console::FG_RED
@@ -561,7 +574,7 @@ public function actionCreate($table)
             $this->stdout(" > Saved as '{$file}'\n");
 
             if ($this->fixHistory) {
-                $this->addMigrationHistory($className, $this->migrationNamespace);
+                $this->addMigrationHistory($className, $this->workingNamespace);
             }
         }
 
@@ -681,7 +694,7 @@ public function actionUpdate($table)
                         $this->createMigrationHistoryTable();
                     }
 
-                    $this->addMigrationHistory($className, $this->migrationNamespace);
+                    $this->addMigrationHistory($className, $this->workingNamespace);
                 }
             }
 

src/table/TableColumn.php

@@ -120,7 +120,9 @@ class TableColumn extends Object
      * Sets length of the column.
      * @param string|int $value
      */
-    public function setLength($value) {}
+    public function setLength($value)
+    {
+    }
 
     /**
      * Returns length of the column.
@@ -131,7 +133,9 @@ public function getLength()
         return null;
     }
 
-    protected function buildSpecificDefinition($table) {}
+    protected function buildSpecificDefinition($table)
+    {
+    }
 
     protected $definition = [];
     protected $isUnsignedPossible = true;
@@ -230,7 +234,8 @@ public function isColumnAppendPK()
         }
 
         if ($this->schema === TableStructure::SCHEMA_MSSQL) {
-            if (stripos($this->append, 'IDENTITY') !== false
+            if (
+                stripos($this->append, 'IDENTITY') !== false
                 && stripos($this->append, 'PRIMARY KEY') !== false
             ) {
                 return true;
@@ -290,34 +295,34 @@ public function escapeQuotes($value)
     public function removePKAppend()
     {
         if (!$this->isColumnAppendPK()) {
-            return null;
+            return $this->append;
         }
 
-        $uppercaseAppend = preg_replace('/\s+/', ' ', mb_strtoupper($this->append, 'UTF-8'));
+        $append = preg_replace('/\s+/', ' ', $this->append);
 
         switch ($this->schema) {
             case TableStructure::SCHEMA_MSSQL:
-                $formattedAppend = str_replace(['PRIMARY KEY', 'IDENTITY'], '', $uppercaseAppend);
+                $filteredAppend = str_ireplace(['PRIMARY KEY', 'IDENTITY'], '', $append);
                 break;
 
             case TableStructure::SCHEMA_OCI:
             case TableStructure::SCHEMA_PGSQL:
-                $formattedAppend = str_replace('PRIMARY KEY', '', $uppercaseAppend);
+                $filteredAppend = str_ireplace('PRIMARY KEY', '', $append);
                 break;
 
             case TableStructure::SCHEMA_SQLITE:
-                $formattedAppend = str_replace(['PRIMARY KEY', 'AUTOINCREMENT'], '', $uppercaseAppend);
+                $filteredAppend = str_ireplace(['PRIMARY KEY', 'AUTOINCREMENT'], '', $append);
                 break;
 
             case TableStructure::SCHEMA_CUBRID:
             case TableStructure::SCHEMA_MYSQL:
             default:
-                $formattedAppend = str_replace(['PRIMARY KEY', 'AUTO_INCREMENT'], '', $uppercaseAppend);
+                $filteredAppend = str_ireplace(['PRIMARY KEY', 'AUTO_INCREMENT'], '', $append);
         }
 
-        $formattedAppend = trim($formattedAppend);
+        $filteredAppend = trim($filteredAppend);
 
-        return !empty($formattedAppend) ? $formattedAppend : null;
+        return !empty($filteredAppend) ? $filteredAppend : null;
     }
 
     /**