Add AbstractColumnDefinitionBuilder::getDefaultUuidExpression() method

yiisoft · Dec 11, 2024 · 5e06392 · 5e06392
1 parent b60e908
commit 5e06392
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/QueryBuilder/AbstractColumnDefinitionBuilder.php b/src/QueryBuilder/AbstractColumnDefinitionBuilder.php
@@ -21,11 +21,6 @@ abstract class AbstractColumnDefinitionBuilder implements ColumnDefinitionBuilde
      */
     protected const AUTO_INCREMENT_KEYWORD = '';
 
-    /**
-     * @var string The expression used to generate a UUID value.
-     */
-    protected const GENERATE_UUID_EXPRESSION = '';
-
     /**
      * @var string[] The list of database column types (in lower case) that allow size specification.
      */
@@ -119,12 +114,14 @@ protected function buildComment(ColumnSchemaInterface $column): string
      */
     protected function buildDefault(ColumnSchemaInterface $column): string
     {
-        if (!empty(static::GENERATE_UUID_EXPRESSION)
+        $uuidExpression = $this->getDefaultUuidExpression();
+
+        if (!empty($uuidExpression)
             && $column->getType() === ColumnType::UUID
             && $column->isAutoIncrement()
             && $column->getDefaultValue() === null
         ) {
-            return ' DEFAULT ' . static::GENERATE_UUID_EXPRESSION;
+            return " DEFAULT $uuidExpression";
         }
 
         if ($column->isAutoIncrement() && $column->getType() !== ColumnType::UUID
@@ -303,4 +300,12 @@ protected function buildUnsigned(ColumnSchemaInterface $column): string
     {
         return $column->isUnsigned() ? ' UNSIGNED' : '';
     }
+
+    /**
+     * Get the expression used to generate a UUID as a default value.
+     */
+    protected function getDefaultUuidExpression(): string
+    {
+        return '';
+    }
 }
diff --git a/tests/AbstractQueryBuilderTest.php b/tests/AbstractQueryBuilderTest.php
@@ -2403,6 +2403,8 @@ public function testBuildColumnDefinition(string $expected, ColumnSchemaInterfac
         $qb = $db->getQueryBuilder();
 
         $this->assertSame($expected, $qb->buildColumnDefinition($column));
+
+        $db->close();
     }
 
     #[DataProviderExternal(QueryBuilderProvider::class, 'prepareParam')]

diff --git a/tests/Support/Stub/ColumnDefinitionBuilder.php b/tests/Support/Stub/ColumnDefinitionBuilder.php
@@ -12,8 +12,6 @@ final class ColumnDefinitionBuilder extends AbstractColumnDefinitionBuilder
 {
     protected const AUTO_INCREMENT_KEYWORD = 'AUTOINCREMENT';
 
-    protected const GENERATE_UUID_EXPRESSION = 'uuid()';
-
     protected const TYPES_WITH_SIZE = [
         'bit',
         'tinyint',
@@ -66,4 +64,9 @@ protected function getDbType(ColumnSchemaInterface $column): string
             default => 'varchar',
         };
     }
+
+    protected function getDefaultUuidExpression(): string
+    {
+        return 'uuid()';
+    }
 }