Merge pull request #61 from bizley/column-size-2x

Author: Bizley

src/Generator.php

@@ -192,6 +192,7 @@ protected function getTableColumns($indexes = [], $schema = null)
                     'schema' => $schema,
                     'name' => $column->name,
                     'type' => $column->type,
+                    'defaultMapping' => $this->db->schema->queryBuilder->typeMap[$column->type],
                     'size' => $column->size,
                     'precision' => $column->precision,
                     'scale' => $column->scale,

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.8.0
+ * @version 2.9.0
  * @license Apache 2.0
  * https://github.com/bizley/yii2-migration
  */
 class MigrationController extends Controller
 {
-    protected $version = '2.8.0';
+    protected $version = '2.9.0';
 
     /**
      * @var string Default command action.

src/table/TableColumn.php

@@ -24,6 +24,12 @@ class TableColumn extends Object
      */
     public $type;
 
+    /**
+     * @var string
+     * @since 2.9.0
+     */
+    public $defaultMapping;
+
     /**
      * @var bool|null
      */
@@ -66,13 +72,15 @@ class TableColumn extends Object
 
     /**
      * @var bool
+     * Starting from 2.9.0 it's false by default.
      */
-    public $isPrimaryKey;
+    public $isPrimaryKey = false;
 
     /**
      * @var bool
+     * Starting from 2.9.0 it's false by default.
      */
-    public $autoIncrement;
+    public $autoIncrement = false;
 
     /**
      * @var string
@@ -287,4 +295,52 @@ public function removePKAppend()
 
         return !empty($formattedAppend) ? $formattedAppend : null;
     }
+
+    /**
+     * @param bool $generalSchema
+     * @return string|null
+     * @since 2.9.0
+     */
+    public function getRenderLength($generalSchema)
+    {
+        $length = $this->length;
+
+        if ($length === null) {
+            return $length;
+        }
+
+        if (!$generalSchema) {
+            if ($length === 'max') {
+                return '\'max\'';
+            }
+
+            return (string)$length;
+        }
+
+        if (str_replace(' ', '', (string)$length) !== $this->getDefaultLength()) {
+            if ($length === 'max') {
+                return '\'max\'';
+            }
+
+            return (string)$length;
+        }
+
+        return null;
+    }
+
+    private function getDefaultLength()
+    {
+        if ($this->defaultMapping !== null) {
+            if (preg_match('/\(([\d,]+)\)/', $this->defaultMapping, $matches)) {
+                return $matches[1];
+            }
+
+            if (preg_match('/\(max\)/', $this->defaultMapping)) {
+                // MSSQL
+                return 'max';
+            }
+        }
+
+        return null;
+    }
 }

src/table/TableColumnBigInt.php

@@ -44,9 +44,9 @@ public function buildSpecificDefinition($table)
         if ($table->generalSchema && !$table->primaryKey->isComposite() && $this->isColumnInPK($table->primaryKey)) {
             $this->isPkPossible = false;
             $this->isNotNullPossible = false;
-            $this->definition[] = 'bigPrimaryKey()';
+            $this->definition[] = 'bigPrimaryKey(' . $this->getRenderLength($table->generalSchema) . ')';
         } else {
-            $this->definition[] = 'bigInteger(' . ($table->generalSchema ? null : $this->length) . ')';
+            $this->definition[] = 'bigInteger(' . $this->getRenderLength($table->generalSchema) . ')';
         }
     }
 }

src/table/TableColumnBigPK.php

@@ -41,7 +41,7 @@ public function setLength($value)
      */
     public function buildSpecificDefinition($table)
     {
-        $this->definition[] = 'bigPrimaryKey(' . ($table->generalSchema ? null : $this->length) . ')';
+        $this->definition[] = 'bigPrimaryKey(' . $this->getRenderLength($table->generalSchema) . ')';
         if ($table->generalSchema) {
             $this->isPkPossible = false;
             $this->isNotNullPossible = false;

src/table/TableColumnBinary.php

@@ -41,6 +41,6 @@ public function setLength($value)
      */
     public function buildSpecificDefinition($table)
     {
-        $this->definition[] = 'binary(' . ($table->generalSchema ? null : $this->length) . ')';
+        $this->definition[] = 'binary(' . $this->getRenderLength($table->generalSchema) . ')';
     }
 }

src/table/TableColumnChar.php

@@ -33,6 +33,6 @@ public function setLength($value)
      */
     public function buildSpecificDefinition($table)
     {
-        $this->definition[] = 'char(' . ($table->generalSchema ? null : $this->length) . ')';
+        $this->definition[] = 'char(' . $this->getRenderLength($table->generalSchema) . ')';
     }
 }

src/table/TableColumnDateTime.php

@@ -40,6 +40,6 @@ public function setLength($value)
      */
     public function buildSpecificDefinition($table)
     {
-        $this->definition[] = 'dateTime(' . ($table->generalSchema ? null : $this->length) . ')';
+        $this->definition[] = 'dateTime(' . $this->getRenderLength($table->generalSchema) . ')';
     }
 }

src/table/TableColumnDecimal.php

@@ -27,7 +27,7 @@ class TableColumnDecimal extends TableColumn
     public function getLength()
     {
         return in_array($this->schema, $this->lengthSchemas, true)
-            ? ($this->precision . ($this->scale ? ', ' . $this->scale : null))
+            ? ($this->precision . (($this->scale || (int)$this->scale === 0) ? ', ' . $this->scale : null))
             : null;
     }
 
@@ -38,18 +38,18 @@ public function getLength()
     public function setLength($value)
     {
         if (in_array($this->schema, $this->lengthSchemas, true)) {
-            if (is_array($value)) {
-                $length = $value;
-            } else {
-                $length = preg_split('/\s*,\s*/', $value);
-            }
+            $length = is_array($value) ? $value : preg_split('/\s*,\s*/', $value);
 
             if (isset($length[0]) && !empty($length[0])) {
                 $this->precision = $length[0];
+            } else {
+                $this->precision = 0;
             }
 
             if (isset($length[1]) && !empty($length[1])) {
                 $this->scale = $length[1];
+            } else {
+                $this->scale = 0;
             }
         }
     }
@@ -60,6 +60,6 @@ public function setLength($value)
      */
     public function buildSpecificDefinition($table)
     {
-        $this->definition[] = 'decimal(' . ($table->generalSchema ? null : $this->length) . ')';
+        $this->definition[] = 'decimal(' . $this->getRenderLength($table->generalSchema) . ')';
     }
 }

src/table/TableColumnDouble.php

@@ -40,6 +40,6 @@ public function setLength($value)
      */
     public function buildSpecificDefinition($table)
     {
-        $this->definition[] = 'double(' . ($table->generalSchema ? null : $this->length) . ')';
+        $this->definition[] = 'double(' . $this->getRenderLength($table->generalSchema) . ')';
     }
 }