Merge pull request cakephp#32 from zuker/0.1.x-dev

cakephp#29 fix for ignoring default value 0
zuker · Dec 8, 2012 · 05bcbf0 · 05bcbf0
2 parents c804ae6 + 9237a1f
commit 05bcbf0
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 1 deletion.
diff --git a/src/Phinx/Db/Adapter/MysqlAdapter.php b/src/Phinx/Db/Adapter/MysqlAdapter.php
@@ -724,7 +724,12 @@ protected function getColumnSqlDefinition(Column $column)
                      ? '(' . ($column->getLimit() ? $column->getLimit() : $sqlType['limit']) . ')' : '';
         $def .= ($column->isNull() == false) ? ' NOT NULL' : ' NULL';
         $def .= ($column->isIdentity()) ? ' AUTO_INCREMENT' : '';
-        $def .= ($column->getDefault()) ? ' DEFAULT \'' . $column->getDefault() . '\'' : '';
+        $default = $column->getDefault();
+        if (is_numeric($default)) {
+            $def .= ' DEFAULT ' . $column->getDefault();
+        } else {
+            $def .= is_null($column->getDefault()) ? '' : ' DEFAULT \'' . $column->getDefault() . '\'';
+        }
         // TODO - add precision & scale for decimals
         return $def;
     }

diff --git a/src/Phinx/Db/Table/Column.php b/src/Phinx/Db/Table/Column.php
@@ -175,6 +175,9 @@ public function isNull()
      */
     public function setDefault($default)
     {
+        if ($default === false || $default === '') {
+            $default = null;
+        }
         $this->default = $default;
         return $this;
     }

diff --git a/tests/Phinx/Db/Adapter/MysqlAdapterTest.php b/tests/Phinx/Db/Adapter/MysqlAdapterTest.php
@@ -201,6 +201,37 @@ public function testAddColumn()
         $rows = $this->adapter->fetchAll('SHOW COLUMNS FROM table1');
         $this->assertEquals('realname', $rows[1]['Field']);
     }
+
+    public function testAddColumnWithDefaultValue()
+    {
+        $table = new \Phinx\Db\Table('table1', array(), $this->adapter);
+        $table->save();
+        $table->addColumn('default_zero', 'string', array('default' => 'test'))
+            ->save();
+        $rows = $this->adapter->fetchAll('SHOW COLUMNS FROM table1');
+        $this->assertEquals("test", $rows[1]['Default']);
+    }
+
+    public function testAddColumnWithDefaultZero()
+    {
+        $table = new \Phinx\Db\Table('table1', array(), $this->adapter);
+        $table->save();
+        $table->addColumn('default_zero', 'integer', array('default' => 0))
+            ->save();
+        $rows = $this->adapter->fetchAll('SHOW COLUMNS FROM table1');
+        $this->assertNotNull($rows[1]['Default']);
+        $this->assertEquals("0", $rows[1]['Default']);
+    }
+
+    public function testAddColumnWithDefaultEmptyString()
+    {
+        $table = new \Phinx\Db\Table('table1', array(), $this->adapter);
+        $table->save();
+        $table->addColumn('default_zero', 'integer', array('default' => null))
+            ->save();
+        $rows = $this->adapter->fetchAll('SHOW COLUMNS FROM table1');
+        $this->assertNull($rows[1]['Default']);
+    }
 
     public function testRenameColumn()
     {
@@ -247,6 +278,48 @@ public function testChangeColumn()
         $this->assertFalse($this->adapter->hasColumn('t', 'column1'));
         $this->assertTrue($this->adapter->hasColumn('t', 'column2'));
     }
+
+    public function testChangeColumnDefaultValue()
+    {
+        $table = new \Phinx\Db\Table('t', array(), $this->adapter);
+        $table->addColumn('column1', 'string', array('default' => 'test'))
+            ->save();
+        $newColumn1 = new \Phinx\Db\Table\Column();
+        $newColumn1->setDefault('test1')
+            ->setType('string');
+        $table->changeColumn('column1', $newColumn1);
+        $rows = $this->adapter->fetchAll('SHOW COLUMNS FROM t');
+        $this->assertNotNull($rows[1]['Default']);
+        $this->assertEquals("test1", $rows[1]['Default']);
+    }
+
+
+    public function testChangeColumnDefaultToZero()
+    {
+        $table = new \Phinx\Db\Table('t', array(), $this->adapter);
+        $table->addColumn('column1', 'integer')
+            ->save();
+        $newColumn1 = new \Phinx\Db\Table\Column();
+        $newColumn1->setDefault(0)
+            ->setType('integer');
+        $table->changeColumn('column1', $newColumn1);
+        $rows = $this->adapter->fetchAll('SHOW COLUMNS FROM t');
+        $this->assertNotNull($rows[1]['Default']);
+        $this->assertEquals("0", $rows[1]['Default']);
+    }
+
+    public function testChangeColumnDefaultToNull()
+    {
+        $table = new \Phinx\Db\Table('t', array(), $this->adapter);
+        $table->addColumn('column1', 'string', array('default' => 'test'))
+            ->save();
+        $newColumn1 = new \Phinx\Db\Table\Column();
+        $newColumn1->setDefault(null)
+            ->setType('string');
+        $table->changeColumn('column1', $newColumn1);
+        $rows = $this->adapter->fetchAll('SHOW COLUMNS FROM t');
+        $this->assertNull($rows[1]['Default']);
+    }
 
     public function testDropColumn()
     {