Fix #229: Fix bugs related with default value

Author: Tigrov

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Enh #226: Add support for auto increment in primary key column. (@terabytesoftw)
 - Enh #225: Typecast refactoring (@Tigrov)
+- Bug #229: Fix bugs related with default value (@Tigrov)
 
 ## 1.0.0 April 12, 2023
 

src/Schema.php

@@ -26,9 +26,9 @@
 use function implode;
 use function is_array;
 use function md5;
+use function preg_match;
 use function serialize;
-use function strlen;
-use function substr;
+use function str_replace;
 use function trim;
 
 /**
@@ -440,26 +440,28 @@ protected function createColumnSchema(array $info): ColumnSchemaInterface
      * @param ColumnSchemaInterface $column The column schema object.
      *
      * @return mixed The normalized default value.
-     *
-     * @psalm-suppress PossiblyNullArgument
      */
-    private function normalizeDefaultValue(?string $defaultValue, ColumnSchemaInterface $column): mixed
+    private function normalizeDefaultValue(string|null $defaultValue, ColumnSchemaInterface $column): mixed
     {
-        return match (true) {
-            $defaultValue === null, $column->isPrimaryKey() => null,
+        if ($defaultValue === null || $column->isPrimaryKey()) {
+            return null;
+        }
 
-            /** @var string $defaultValue */
-            $defaultValue === 'CURRENT_TIMESTAMP'
-            && $column->getType() === self::TYPE_TIMESTAMP
-                => new Expression($defaultValue),
+        $defaultValue = trim($defaultValue);
 
-            strlen($defaultValue) > 2
-            && str_starts_with($defaultValue, "'")
-            && str_ends_with($defaultValue, "'")
-                => $column->phpTypecast(substr($defaultValue, 1, -1)),
+        if ($defaultValue === 'NULL') {
+            return null;
+        }
 
-            default => $column->phpTypecast(trim($defaultValue)),
-        };
+        if ($column->getType() === self::TYPE_TIMESTAMP && $defaultValue === 'CURRENT_TIMESTAMP') {
+            return new Expression($defaultValue);
+        }
+
+        if (preg_match("/^'(.*)'$/s", $defaultValue, $matches) === 1) {
+            $defaultValue = str_replace("''", "'", $matches[1]);
+        }
+
+        return $column->phpTypecast($defaultValue);
     }
 
     /**

tests/Provider/SchemaProvider.php

@@ -5,6 +5,7 @@
 namespace Yiisoft\Db\Oracle\Tests\Provider;
 
 use Yiisoft\Db\Constraint\CheckConstraint;
+use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Tests\Support\AnyValue;
 
 final class SchemaProvider extends \Yiisoft\Db\Tests\Provider\SchemaProvider
@@ -90,7 +91,7 @@ public static function columns(): array
                         'size' => 100,
                         'precision' => null,
                         'scale' => null,
-                        'defaultValue' => 'something',
+                        'defaultValue' => 'some\'thing',
                     ],
                     'char_col3' => [
                         'type' => 'string',
@@ -105,6 +106,19 @@ public static function columns(): array
                         'scale' => null,
                         'defaultValue' => null,
                     ],
+                    'nvarchar_col' => [
+                        'type' => 'string',
+                        'dbType' => 'NVARCHAR2',
+                        'phpType' => 'string',
+                        'primaryKey' => false,
+                        'allowNull' => true,
+                        'autoIncrement' => false,
+                        'enumValues' => null,
+                        'size' => 100,
+                        'precision' => null,
+                        'scale' => null,
+                        'defaultValue' => '',
+                    ],
                     'float_col' => [
                         'type' => 'double',
                         'dbType' => 'FLOAT',
@@ -207,7 +221,7 @@ public static function columns(): array
                         'size' => 11,
                         'precision' => null,
                         'scale' => 6,
-                        'defaultValue' => 'CURRENT_TIMESTAMP',
+                        'defaultValue' => new Expression('CURRENT_TIMESTAMP'),
                     ],
                     'bit_col' => [
                         'type' => 'string',

tests/Support/Fixture/oci.sql

@@ -167,11 +167,12 @@ CREATE TABLE "type" (
   "tinyint_col" number(3) DEFAULT 1,
   "smallint_col" smallint DEFAULT 1,
   "char_col" char(100) NOT NULL,
-  "char_col2" varchar2(100) DEFAULT 'something',
+  "char_col2" varchar2(100) DEFAULT 'some''thing',
   "char_col3" varchar2(4000),
+  "nvarchar_col" nvarchar2(100) DEFAULT '',
   "float_col" double precision NOT NULL,
   "float_col2" double precision DEFAULT 1.23,
-  "blob_col" blob,
+  "blob_col" blob DEFAULT NULL,
   "numeric_col" decimal(5,2) DEFAULT 33.22,
   "time" timestamp DEFAULT to_timestamp('2002-01-01 00:00:00', 'yyyy-mm-dd hh24:mi:ss') NOT NULL,
   "bool_col" char NOT NULL check ("bool_col" in (0,1)),