Merge pull request #295 from cakephp/decimal-support

Improve support for baking diff including the addition of a column with the `decimal` type
cakephp · Jan 7, 2017 · 7d3dcad · 7d3dcad
2 parents 7e252a3 + 739b12c
commit 7d3dcad
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/src/View/Helper/MigrationHelper.php b/src/View/Helper/MigrationHelper.php
@@ -306,6 +306,14 @@ public function column($tableSchema, $column)
         ];
     }
 
+    /**
+     * Compute the final array of options to display in a `addColumn` or `changeColumn` instruction.
+     * The method also takes care of translating properties names between CakePHP database layer and phinx database
+     * layer.
+     *
+     * @param array $options Array of options to compute the final list from.
+     * @return array
+     */
     public function getColumnOption($options)
     {
         $wantedOptions = array_flip([
@@ -334,8 +342,15 @@ public function getColumnOption($options)
         } else {
             // due to Phinx using different naming for the precision and scale to CakePHP
             $columnOptions['scale'] = $columnOptions['precision'];
-            $columnOptions['precision'] = $columnOptions['limit'];
-            unset($columnOptions['limit']);
+
+            if (isset($columnOptions['limit'])) {
+                $columnOptions['precision'] = $columnOptions['limit'];
+                unset($columnOptions['limit']);
+            }
+            if (isset($columnOptions['length'])) {
+                $columnOptions['precision'] = $columnOptions['length'];
+                unset($columnOptions['length']);
+            }
         }
 
         return $columnOptions;

diff --git a/tests/comparisons/Diff/the_diff.php b/tests/comparisons/Diff/the_diff.php
@@ -69,6 +69,13 @@ public function up()
                 'length' => 11,
                 'null' => false,
             ])
+            ->addColumn('average_note', 'decimal', [
+                'after' => 'category_id',
+                'default' => null,
+                'null' => true,
+                'precision' => 5,
+                'scale' => 5,
+            ])
             ->addIndex(
                 [
                     'slug',
@@ -154,6 +161,7 @@ public function down()
                 'null' => false,
             ])
             ->removeColumn('category_id')
+            ->removeColumn('average_note')
             ->addIndex(
                 [
                     'slug',

diff --git a/tests/comparisons/Diff/the_diff_mysql.php b/tests/comparisons/Diff/the_diff_mysql.php
@@ -69,6 +69,13 @@ public function up()
                 'length' => 11,
                 'null' => false,
             ])
+            ->addColumn('average_note', 'decimal', [
+                'after' => 'category_id',
+                'default' => null,
+                'null' => true,
+                'precision' => 5,
+                'scale' => 5,
+            ])
             ->addIndex(
                 [
                     'slug',
@@ -154,6 +161,7 @@ public function down()
                 'null' => false,
             ])
             ->removeColumn('category_id')
+            ->removeColumn('average_note')
             ->addIndex(
                 [
                     'slug',

diff --git a/tests/comparisons/Diff/the_diff_pgsql.php b/tests/comparisons/Diff/the_diff_pgsql.php
@@ -69,6 +69,13 @@ public function up()
                 'length' => 10,
                 'null' => false,
             ])
+            ->addColumn('average_note', 'decimal', [
+                'after' => 'category_id',
+                'default' => null,
+                'null' => true,
+                'precision' => 5,
+                'scale' => 5,
+            ])
             ->addIndex(
                 [
                     'category_id',
@@ -154,6 +161,7 @@ public function down()
                 'null' => false,
             ])
             ->removeColumn('category_id')
+            ->removeColumn('average_note')
             ->addIndex(
                 [
                     'slug',