Update Schema::normalizeDefaultValue() (#294)

Tigrov · web-flow · commit 56df5ac9907e · 2023-07-20T12:00:32.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,8 @@
 - Bug #287: Fix `bit` type (@Tigrov)
 - Enh #289: Array parser refactoring (@Tigrov)
 - Chg #288: Typecast refactoring (@Tigrov)
-- Chg #291: Update phpTypecast for bool type (@Tigrov) 
+- Chg #291: Update phpTypecast for bool type (@Tigrov)
+- Enh #294: Refactoring of `Schema::normalizeDefaultValue()` method (@Tigrov)
 
 ## 1.0.0 April 12, 2023
 
diff --git a/src/Schema.php b/src/Schema.php
@@ -842,9 +842,13 @@ protected function getColumnPhpType(ColumnSchemaInterface $column): string
      *
      * @return mixed The normalized default value.
      */
-    private function normalizeDefaultValue(?string $defaultValue, ColumnSchemaInterface $column): mixed
+    private function normalizeDefaultValue(string|null $defaultValue, ColumnSchemaInterface $column): mixed
     {
-        if ($defaultValue === null || $column->isPrimaryKey()) {
+        if (
+            $defaultValue === null
+            || $column->isPrimaryKey()
+            || str_starts_with($defaultValue, 'NULL::')
+        ) {
             return null;
         }
 
@@ -859,19 +863,13 @@ private function normalizeDefaultValue(?string $defaultValue, ColumnSchemaInterf
             return new Expression($defaultValue);
         }
 
-        if (preg_match("/^B?'(.*?)'::/", $defaultValue, $matches) === 1) {
-            return $column->getType() === self::TYPE_BINARY && str_starts_with($matches[1], '\\x')
-                ? hex2bin(substr($matches[1], 2))
-                : $column->phpTypecast($matches[1]);
-        }
+        $value = preg_replace("/^B?['(](.*?)[)']::[^:]+$/", '$1', $defaultValue);
 
-        if (preg_match('/^(\()?(.*?)(?(1)\))(?:::.+)?$/', $defaultValue, $matches) === 1) {
-            return $matches[2] !== 'NULL'
-                ? $column->phpTypecast($matches[2])
-                : null;
+        if ($column->getType() === self::TYPE_BINARY && str_starts_with($value, '\\x')) {
+            return hex2bin(substr($value, 2));
         }
 
-        return $column->phpTypecast($defaultValue);
+        return $column->phpTypecast($value);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -842,9 +842,13 @@ protected function getColumnPhpType(ColumnSchemaInterface $column): string`
`842`	`842`	`*`
`843`	`843`	`* @return mixed The normalized default value.`
`844`	`844`	`*/`
`845`		`- private function normalizeDefaultValue(?string $defaultValue, ColumnSchemaInterface $column): mixed`
	`845`	`+ private function normalizeDefaultValue(string\|null $defaultValue, ColumnSchemaInterface $column): mixed`
`846`	`846`	`{`
`847`		`- if ($defaultValue === null \|\| $column->isPrimaryKey()) {`
	`847`	`+ if (`
	`848`	`+ $defaultValue === null`
	`849`	`+ \|\| $column->isPrimaryKey()`
	`850`	`+ \|\| str_starts_with($defaultValue, 'NULL::')`
	`851`	`+ ) {`
`848`	`852`	`return null;`
`849`	`853`	`}`
`850`	`854`
`@@ -859,19 +863,13 @@ private function normalizeDefaultValue(?string $defaultValue, ColumnSchemaInterf`
`859`	`863`	`return new Expression($defaultValue);`
`860`	`864`	`}`
`861`	`865`
`862`		`- if (preg_match("/^B?'(.*?)'::/", $defaultValue, $matches) === 1) {`
`863`		`- return $column->getType() === self::TYPE_BINARY && str_starts_with($matches[1], '\\x')`
`864`		`- ? hex2bin(substr($matches[1], 2))`
`865`		`- : $column->phpTypecast($matches[1]);`
`866`		`- }`
	`866`	`+ $value = preg_replace("/^B?['(](.*?)[)']::[^:]+$/", '$1', $defaultValue);`
`867`	`867`
`868`		`- if (preg_match('/^(\()?(.*?)(?(1)\))(?:::.+)?$/', $defaultValue, $matches) === 1) {`
`869`		`- return $matches[2] !== 'NULL'`
`870`		`- ? $column->phpTypecast($matches[2])`
`871`		`- : null;`
	`868`	`+ if ($column->getType() === self::TYPE_BINARY && str_starts_with($value, '\\x')) {`
	`869`	`+ return hex2bin(substr($value, 2));`
`872`	`870`	`}`
`873`	`871`
`874`		`- return $column->phpTypecast($defaultValue);`
	`872`	`+ return $column->phpTypecast($value);`
`875`	`873`	`}`
`876`	`874`
`877`	`875`	`/**`