Refactor column schema (#223)

yiisoft · Mar 21, 2023 · d0cb221 · d0cb221
1 parent 91a96a7
commit d0cb221
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -69,7 +69,7 @@ jobs:
       - name: Install db.
         uses: yiisoft/actions/db/subpackage-install@master
         with:
-          BRANCH_NAME: ${{ github.head_ref }}
+          BRANCH_NAME: ${{ env.BRANCH_NAME }}
           COMPOSER_ROOT_VERSION: ${{ env.COMPOSER_ROOT_VERSION }}
           CURRENT_PACKAGE: db
           FULL_BRANCH_NAME: ${{ env.FULL_BRANCH_NAME }}

diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Install db.
         uses: yiisoft/actions/db/subpackage-install@master
         with:
-          BRANCH_NAME: ${{ github.head_ref }}
+          BRANCH_NAME: ${{ env.BRANCH_NAME }}
           COMPOSER_ROOT_VERSION: ${{ env.COMPOSER_ROOT_VERSION }}
           CURRENT_PACKAGE: db
           FULL_BRANCH_NAME: ${{ env.FULL_BRANCH_NAME }}

diff --git a/src/Schema.php b/src/Schema.php
@@ -457,8 +457,7 @@ public function getSchemaDefaultValues(string $schema = '', bool $refresh = fals
      */
     protected function loadColumnSchema(array $info): ColumnSchemaInterface
     {
-        $column = $this->createColumnSchema();
-        $column->name($info['name']);
+        $column = $this->createColumnSchema($info['name']);
         $column->allowNull(!$info['notnull']);
         $column->primaryKey($info['pk'] != '0');
         $column->dbType(strtolower($info['type']));
@@ -603,10 +602,14 @@ private function loadTableConstraints(string $tableName, string $returnType): Co
      * Creates a column schema for the database.
      *
      * This method may be overridden by child classes to create a DBMS-specific column schema.
+     *
+     * @param string $name Name of the column.
+     *
+     * @return ColumnSchemaInterface
      */
-    private function createColumnSchema(): ColumnSchemaInterface
+    private function createColumnSchema(string $name): ColumnSchemaInterface
     {
-        return new ColumnSchema();
+        return new ColumnSchema($name);
     }
 
     /**