UUID PK support (#222)

darkdef · web-flow · commit 0dd9f7cfa2d9 · 2023-03-18T17:28:30.000+03:00
* UUID PK support

* styleci

* styleci

* fixes
diff --git a/src/Column.php b/src/Column.php
@@ -39,6 +39,8 @@ public function asString(): string
         $format = match ($this->getTypeCategory()) {
             self::CATEGORY_PK => '{type}{check}{append}',
             self::CATEGORY_NUMERIC => '{type}{length}{unsigned}{notnull}{unique}{check}{default}{append}',
+            self::CATEGORY_UUID => '{type}{notnull}{unique}{default}{check}{comment}{append}',
+            self::CATEGORY_UUID_PK => '{type}{notnull}{default}{check}{comment}{append}',
             default => '{type}{length}{notnull}{unique}{check}{default}{append}',
         };
 
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
@@ -40,6 +40,8 @@ final class QueryBuilder extends AbstractQueryBuilder
         SchemaInterface::TYPE_BINARY => 'blob',
         SchemaInterface::TYPE_BOOLEAN => 'boolean',
         SchemaInterface::TYPE_MONEY => 'decimal(19,4)',
+        SchemaInterface::TYPE_UUID => 'blob(16)',
+        SchemaInterface::TYPE_UUID_PK => 'blob(16) PRIMARY KEY',
     ];
 
     public function __construct(QuoterInterface $quoter, SchemaInterface $schema)
diff --git a/tests/ColumnSchemaBuilderTest.php b/tests/ColumnSchemaBuilderTest.php
@@ -23,4 +23,12 @@ public function testCustomTypes(string $expected, string $type, int|null $length
     {
         $this->checkBuildString($expected, $type, $length, $calls);
     }
+
+    /**
+     * @dataProvider \Yiisoft\Db\Sqlite\Tests\Provider\ColumnSchemaBuilderProvider::createColumnTypes
+     */
+    public function testCreateColumnTypes(string $expected, string $type, ?int $length, array $calls): void
+    {
+        parent::testCreateColumnTypes($expected, $type, $length, $calls);
+    }
 }
diff --git a/tests/Provider/ColumnSchemaBuilderProvider.php b/tests/Provider/ColumnSchemaBuilderProvider.php
@@ -8,6 +8,8 @@
 
 final class ColumnSchemaBuilderProvider extends \Yiisoft\Db\Tests\Provider\ColumnSchemaBuilderProvider
 {
+    protected static string $driverName = 'sqlite';
+
     public static function types(): array
     {
         $types = parent::types();
@@ -22,4 +24,23 @@ public static function types(): array
             ],
         );
     }
+
+    public static function createColumnTypes(): array
+    {
+        $types = parent::createColumnTypes();
+
+        $types['uuid'][0] = '`column` blob(16)';
+        $types['uuid not null'][0] = '`column` blob(16) NOT NULL';
+
+        $types['uuid with default'][0] = '`column` blob(16) DEFAULT (UNHEX(REPLACE(\'875343b3-6bd0-4bec-81bb-aa68bb52d945\',\'-\',\'\')))';
+        $types['uuid with default'][3] = [['defaultExpression', '(UNHEX(REPLACE(\'875343b3-6bd0-4bec-81bb-aa68bb52d945\',\'-\',\'\')))']];
+
+        $types['uuid pk'][0] = '`column` blob(16) PRIMARY KEY';
+        $types['uuid pk not null'][0] = '`column` blob(16) PRIMARY KEY NOT NULL';
+
+        $types['uuid pk not null with default'][0] = '`column` blob(16) PRIMARY KEY NOT NULL DEFAULT (RANDOMBLOB(16))';
+        $types['uuid pk not null with default'][3] = [['notNull'],['defaultExpression', '(RANDOMBLOB(16))']];
+
+        return $types;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,12 @@ public function testCustomTypes(string $expected, string $type, int\|null $length`
`23`	`23`	`{`
`24`	`24`	`$this->checkBuildString($expected, $type, $length, $calls);`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ /**`
	`28`	`+ * @dataProvider \Yiisoft\Db\Sqlite\Tests\Provider\ColumnSchemaBuilderProvider::createColumnTypes`
	`29`	`+ */`
	`30`	`+ public function testCreateColumnTypes(string $expected, string $type, ?int $length, array $calls): void`
	`31`	`+ {`
	`32`	`+ parent::testCreateColumnTypes($expected, $type, $length, $calls);`
	`33`	`+ }`
`26`	`34`	`}`