Merge branch '0.x' into 0.next

cakephp · Jul 15, 2022 · 18bf93e · 18bf93e
2 parents 9ba5deb + 9a6ce1e
commit 18bf93e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/Phinx/Db/Adapter/SqlServerAdapter.php b/src/Phinx/Db/Adapter/SqlServerAdapter.php
@@ -494,9 +494,13 @@ public function getColumns(string $tableName): array
      */
     protected function parseDefault(?string $default)
     {
+        // if a column is non-nullable and has no default, the value of column_default is null,
+        // otherwise it should be a string value that we parse below, including "(NULL)" which
+        // also stands for a null default
         if ($default === null) {
             return null;
         }
+
         $result = preg_replace(["/\('(.*)'\)/", "/\(\((.*)\)\)/", "/\((.*)\)/"], '$1', $default);
 
         if (strtoupper($result) === 'NULL') {

diff --git a/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php b/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php
@@ -426,6 +426,21 @@ public function testAddColumnWithDefaultNull()
         }
     }
 
+    public function testAddColumnWithNotNullableNoDefault()
+    {
+        $table = new \Phinx\Db\Table('table1', [], $this->adapter);
+        $table
+            ->addColumn('col', 'string', ['null' => false])
+            ->create();
+
+        $columns = $this->adapter->getColumns('table1');
+        $this->assertCount(2, $columns);
+        $this->assertArrayHasKey('id', $columns);
+        $this->assertArrayHasKey('col', $columns);
+        $this->assertFalse($columns['col']->isNull());
+        $this->assertNull($columns['col']->getDefault());
+    }
+
     public function testAddColumnWithDefaultBool()
     {
         $table = new \Phinx\Db\Table('table1', [], $this->adapter);