2.4

Author: Paweł Brzozowski

.travis.yml

@@ -8,13 +8,15 @@ env:
 
 services:
 - mysql
+- postgresql
 
 cache:
   directories:
   - vendor
   - $HOME/.composer/cache
 
 addons:
+  postgresql: "9.6"
   apt:
     sources:
     - mysql-5.7-trusty
@@ -39,8 +41,10 @@ before_script:
 - sudo mysql_upgrade
 - travis_retry mysql -e 'CREATE DATABASE `migrationtest`;'
 - mysql -e "SET GLOBAL sql_mode = 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION';"
+- mysql -e "SET GLOBAL explicit_defaults_for_timestamp = 'ON';"
 - mysql -e "CREATE USER 'migration'@'localhost' IDENTIFIED BY 'migration';"
 - mysql -e "GRANT ALL PRIVILEGES ON migrationtest.* TO 'migration'@'localhost';"
+- psql -U postgres -c 'CREATE DATABASE migrationtest;';
 
 script:
 - vendor/bin/phpunit --verbose $PHPUNIT_FLAGS

README.md

@@ -15,23 +15,23 @@ Add the package to your composer.json:
 
     {
         "require": {
-            "bizley/migration": "^3.0"
+            "bizley/migration": "^3.1"
         }
     }
 
-and run `composer update` or alternatively run `composer require bizley/migration:^3.0`
+and run `composer update` or alternatively run `composer require bizley/migration:^3.1`
 
 ## Installation for PHP < 7.1
 
 Add the package to your composer.json:
 
     {
         "require": {
-            "bizley/migration": "^2.3"
+            "bizley/migration": "^2.4"
         }
     }
 
-and run `composer update` or alternatively run `composer require bizley/migration:^2.3`
+and run `composer update` or alternatively run `composer require bizley/migration:^2.4`
 
 ## Configuration
 
@@ -141,8 +141,6 @@ This extension should work with all database types supported in Yii 2 core:
 - PostgreSQL (9.x and above)
 - SQLite (2/3)
 
-Let me know if something is wrong with databases other than MySQL (and in case of MySQL let me know as well).
-
 Yii 2 limitations:
 - version 2.0.13 is required to track non-unique indexes,
 - version 2.0.14 is required to handle TINYINT and JSON type columns.
@@ -154,5 +152,5 @@ etc.) are not tracked.
 
 ## Tests
 
-Currently only MySQL tests are provided. Database configuration is stored in `tests/config.php` (you can override it by 
+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).

src/Generator.php

@@ -120,6 +120,7 @@ public function getTableSchema()
     protected function getTablePrimaryKey()
     {
         $data = [];
+
         if (method_exists($this->db->schema, 'getTablePrimaryKey')) { // requires Yii 2.0.13
             /* @var $constraint \yii\db\Constraint */
             $constraint = $this->db->schema->getTablePrimaryKey($this->tableName, true);
@@ -128,24 +129,32 @@ protected function getTablePrimaryKey()
                     'columns' => $constraint->columnNames,
                     'name' => $constraint->name,
                 ];
+            } elseif ($this->db->schema instanceof \yii\db\sqlite\Schema) {
+                // SQLite bug-case fixed in Yii 2.0.16 https://github.com/yiisoft/yii2/issues/16897
+
+                if ($this->tableSchema !== null && $this->tableSchema->primaryKey) {
+                    $data = [
+                        'columns' => $this->tableSchema->primaryKey,
+                    ];
+                }
             }
-        } elseif ($this->tableSchema instanceof TableSchema) {
-            if ($this->tableSchema->primaryKey) {
-                $data = [
-                    'columns' => $this->tableSchema->primaryKey,
-                ];
-            }
+        } elseif ($this->tableSchema !== null && $this->tableSchema->primaryKey) {
+            $data = [
+                'columns' => $this->tableSchema->primaryKey,
+            ];
         }
+
         return new TablePrimaryKey($data);
     }
 
     /**
      * Returns columns structure.
      * @param TableIndex[] $indexes
+     * @param string $schema
      * @return TableColumn[]
      * @throws InvalidConfigException
      */
-    protected function getTableColumns($indexes = [])
+    protected function getTableColumns($indexes = [], $schema = null)
     {
         $columns = [];
         if ($this->tableSchema instanceof TableSchema) {
@@ -159,6 +168,7 @@ protected function getTableColumns($indexes = [])
                     }
                 }
                 $columns[$column->name] = TableColumnFactory::build([
+                    'schema' => $schema,
                     'name' => $column->name,
                     'type' => $column->type,
                     'size' => $column->size,
@@ -167,11 +177,11 @@ protected function getTableColumns($indexes = [])
                     'isNotNull' => $column->allowNull ? null : true,
                     'isUnique' => $isUnique,
                     'check' => null,
-                    'default' => $column->defaultValue,
+                    'default' => $column->defaultValue ?: null,
                     'isPrimaryKey' => $column->isPrimaryKey,
                     'autoIncrement' => $column->autoIncrement,
                     'isUnsigned' => $column->unsigned,
-                    'comment' => $column->comment,
+                    'comment' => $column->comment ?: null,
                 ]);
             }
         }
@@ -269,13 +279,14 @@ public function getTable()
                 'usePrefix' => $this->useTablePrefix,
                 'dbPrefix' => $this->db->tablePrefix,
                 'primaryKey' => $this->getTablePrimaryKey(),
-                'columns' => $this->getTableColumns($indexes),
                 'foreignKeys' => $this->getTableForeignKeys(),
                 'indexes' => $indexes,
                 'tableOptionsInit' => $this->tableOptionsInit,
                 'tableOptions' => $this->tableOptions,
             ]);
+            $this->_table->columns = $this->getTableColumns($indexes, $this->_table->schema);
         }
+
         return $this->_table;
     }