Fix #284: Add tests for binary type and fix casting of default value

Tigrov · web-flow · commit 2f8f130913d0 · 2023-06-26T07:09:21.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 1.0.1 under development
 
 - Enh #282: Support `numeric` arrays, improve support of domain types and `int` and `varchar` array types (@Tigrov)
+- Enh #284: Add tests for `binary` type and fix casting of default value (@Tigrov)
 
 ## 1.0.0 April 12, 2023
 
diff --git a/src/Schema.php b/src/Schema.php
@@ -26,9 +26,12 @@
 use function array_values;
 use function bindec;
 use function explode;
+use function hex2bin;
+use function is_string;
 use function preg_match;
 use function preg_replace;
 use function str_replace;
+use function str_starts_with;
 use function substr;
 
 /**
@@ -792,7 +795,11 @@ protected function findColumns(TableSchemaInterface $table): bool
                 } elseif (is_string($defaultValue) && preg_match("/^'(\d+)'::\"bit\"$/", $defaultValue, $matches)) {
                     $loadColumnSchema->defaultValue(bindec($matches[1]));
                 } elseif (is_string($defaultValue) && preg_match("/^'(.*?)'::/", $defaultValue, $matches)) {
-                    $loadColumnSchema->defaultValue($loadColumnSchema->phpTypecast($matches[1]));
+                    if ($loadColumnSchema->getType() === 'binary' && str_starts_with($matches[1], '\\x')) {
+                        $loadColumnSchema->defaultValue(hex2bin(substr($matches[1], 2)));
+                    } else {
+                        $loadColumnSchema->defaultValue($loadColumnSchema->phpTypecast($matches[1]));
+                    }
                 } elseif (
                     is_string($defaultValue) &&
                     preg_match('/^(\()?(.*?)(?(1)\))(?:::.+)?$/', $defaultValue, $matches)
diff --git a/tests/ColumnSchemaTest.php b/tests/ColumnSchemaTest.php
@@ -16,6 +16,8 @@
 use Yiisoft\Db\Query\Query;
 use Yiisoft\Db\Schema\SchemaInterface;
 
+use function stream_get_contents;
+
 /**
  * @group pgsql
  *
@@ -64,6 +66,7 @@ public function testPhpTypeCast(): void
         $intColPhpTypeCast = $tableSchema->getColumn('int_col')?->phpTypecast($query['int_col']);
         $charColPhpTypeCast = $tableSchema->getColumn('char_col')?->phpTypecast($query['char_col']);
         $floatColPhpTypeCast = $tableSchema->getColumn('float_col')?->phpTypecast($query['float_col']);
+        $blobColPhpTypeCast = $tableSchema->getColumn('blob_col')?->phpTypecast($query['blob_col']);
         $boolColPhpTypeCast = $tableSchema->getColumn('bool_col')?->phpTypecast($query['bool_col']);
         $numericColPhpTypeCast = $tableSchema->getColumn('numeric_col')?->phpTypecast($query['numeric_col']);
         $intArrayColPhpType = $tableSchema->getColumn('intarray_col')?->phpTypecast($query['intarray_col']);
@@ -77,6 +80,7 @@ public function testPhpTypeCast(): void
         $this->assertSame(1, $intColPhpTypeCast);
         $this->assertSame(str_repeat('x', 100), $charColPhpTypeCast);
         $this->assertSame(1.234, $floatColPhpTypeCast);
+        $this->assertSame("\x10\x11\x12", stream_get_contents($blobColPhpTypeCast));
         $this->assertFalse($boolColPhpTypeCast);
         $this->assertSame(33.22, $numericColPhpTypeCast);
         $this->assertSame([1, -2, null, 42], $intArrayColPhpType);
diff --git a/tests/Provider/SchemaProvider.php b/tests/Provider/SchemaProvider.php
@@ -141,7 +141,7 @@ public static function columns(): array
                         'size' => null,
                         'precision' => null,
                         'scale' => null,
-                        'defaultValue' => null,
+                        'defaultValue' => 'a binary value',
                     ],
                     'numeric_col' => [
                         'type' => 'decimal',
diff --git a/tests/Support/Fixture/pgsql.sql b/tests/Support/Fixture/pgsql.sql
@@ -146,7 +146,7 @@ CREATE TABLE "type" (
   char_col3 text,
   float_col double precision NOT NULL,
   float_col2 double precision DEFAULT '1.23',
-  blob_col bytea,
+  blob_col bytea DEFAULT 'a binary value',
   numeric_col decimal(5,2) DEFAULT '33.22',
   time timestamp NOT NULL DEFAULT '2002-01-01 00:00:00',
   bool_col boolean NOT NULL,
