Merge branch 'default-empty-str'

bizley · Apr 8, 2019 · bc02e3f · bc02e3f
2 parents 5829543 + 2879580
commit bc02e3f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -183,7 +183,7 @@ protected function getTableColumns(array $indexes = [], ?string $schema = null):
                     'isNotNull' => $column->allowNull ? null : true,
                     'isUnique' => $isUnique,
                     'check' => null,
-                    'default' => $column->defaultValue ?: null,
+                    'default' => $column->defaultValue,
                     'isPrimaryKey' => $column->isPrimaryKey,
                     'autoIncrement' => $column->autoIncrement,
                     'isUnsigned' => $column->unsigned,

diff --git a/src/table/TableChange.php b/src/table/TableChange.php
@@ -57,7 +57,7 @@ public function getValue()
                         'isUnique' => $schema['isUnique'] ?? null,
                         'isPrimaryKey' => $schema['isPrimaryKey'] ?? null,
                         'check' => $schema['check'] ?? null,
-                        'default' => !empty($schema['default']) ? $schema['default'] : null,
+                        'default' => $schema['default'],
                         'append' => $schema['append'] ?? null,
                         'isUnsigned' => $schema['isUnsigned'] ?? null,
                         'comment' => !empty($schema['comment']) ? $schema['comment'] : null,
@@ -82,7 +82,7 @@ public function getValue()
                     'isUnique' => $this->data[1]['isUnique'] ?? null,
                     'isPrimaryKey' => $this->data[1]['isPrimaryKey'] ?? null,
                     'check' => $this->data[1]['check'] ?? null,
-                    'default' => !empty($this->data[1]['default']) ? $this->data[1]['default'] : null,
+                    'default' => $this->data[1]['default'],
                     'append' => $this->data[1]['append'] ?? null,
                     'isUnsigned' => $this->data[1]['isUnsigned'] ?? null,
                     'comment' => !empty($this->data[1]['comment']) ? $this->data[1]['comment'] : null,

diff --git a/tests/cases/GeneratorAddonsTestCase.php b/tests/cases/GeneratorAddonsTestCase.php
@@ -37,4 +37,11 @@ public function testColumnDefaultValue(): void
         $this->assertArrayHasKey('col_default_value', $table->columns);
         $this->assertEquals(1, $table->columns['col_default_value']->default);
     }
+
+    public function testColumnDefaultEmptyValue(): void
+    {
+        $table = $this->getGenerator()->table;
+        $this->assertArrayHasKey('col_default_empty_value', $table->columns);
+        $this->assertSame('', $table->columns['col_default_empty_value']->default);
+    }
 }
diff --git a/tests/migrations/m180324_153800_create_table_test_addons.php b/tests/migrations/m180324_153800_create_table_test_addons.php
@@ -20,6 +20,7 @@ public function up(): void
             'col_unsigned' => $this->integer()->unsigned(),
             'col_not_null' => $this->integer()->notNull(),
             'col_default_value' => $this->integer()->defaultValue(1),
+            'col_default_empty_value' => $this->string()->defaultValue(''),
         ];
         if ($this->db->driverName !== 'sqlite') {
             $structure['col_comment'] = $this->string()->comment('comment');