Rename columns for column. (#676)

yiisoft · Apr 7, 2023 · 0a74d2d · 0a74d2d
1 parent 4c37a2a
commit 0a74d2d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/Schema/AbstractTableSchema.php b/src/Schema/AbstractTableSchema.php
@@ -103,9 +103,9 @@ public function primaryKey(string $value): void
         $this->primaryKey[] = $value;
     }
 
-    public function columns(string $index, ColumnSchemaInterface $value): void
+    public function column(string $name, ColumnSchemaInterface $value): void
     {
-        $this->columns[$index] = $value;
+        $this->columns[$name] = $value;
     }
 
     public function getCatalogName(): string|null

diff --git a/src/Schema/TableSchemaInterface.php b/src/Schema/TableSchemaInterface.php
@@ -124,9 +124,9 @@ public function primaryKey(string $value): void;
      * Set one column metadata of this table. Each array element is a {@see ColumnSchemaInterface} object, indexed by
      * column names.
      *
-     * @param string $index The column name.
+     * @param string $name The column name.
      */
-    public function columns(string $index, ColumnSchemaInterface $value): void;
+    public function column(string $name, ColumnSchemaInterface $value): void;
 
     /**
      * @return string|null The name of the catalog (database) that this table belongs to. Defaults to null, meaning no

diff --git a/tests/AbstractTableSchemaTest.php b/tests/AbstractTableSchemaTest.php
@@ -56,7 +56,7 @@ public function testGetColumn(): void
 
         $this->assertNull($tableSchema->getColumn('id'));
 
-        $tableSchema->columns('id', $columnSchema);
+        $tableSchema->column('id', $columnSchema);
 
         $this->assertSame($columnSchema, $tableSchema->getColumn('id'));
     }
@@ -71,7 +71,7 @@ public function testGetColumns(): void
 
         $this->assertSame([], $tableSchema->getColumns());
 
-        $tableSchema->columns('id', $columnSchema);
+        $tableSchema->column('id', $columnSchema);
 
         $this->assertSame(['id' => $columnSchema], $tableSchema->getColumns());
     }
@@ -86,7 +86,7 @@ public function testGetColumnName(): void
 
         $this->assertNull($tableSchema->getColumn('id'));
 
-        $tableSchema->columns('id', $columnSchema);
+        $tableSchema->column('id', $columnSchema);
 
         $this->assertSame(['id'], $tableSchema->getColumnNames());
     }

diff --git a/tests/Db/Schema/SchemaTest.php b/tests/Db/Schema/SchemaTest.php
@@ -470,11 +470,11 @@ private function createTableSchemaStub(): TableSchemaInterface
 
         // defined table T_constraints_1
         $tableSchema = new TableSchema();
-        $tableSchema->columns('C_id', $columnCid);
-        $tableSchema->columns('C_not_null', $columnCNotNull);
-        $tableSchema->columns('C_check', $columnCCheck);
-        $tableSchema->columns('C_default', $columnCDefault);
-        $tableSchema->columns('C_unique', $columnCUnique);
+        $tableSchema->column('C_id', $columnCid);
+        $tableSchema->column('C_not_null', $columnCNotNull);
+        $tableSchema->column('C_check', $columnCCheck);
+        $tableSchema->column('C_default', $columnCDefault);
+        $tableSchema->column('C_unique', $columnCUnique);
         $tableSchema->fullName('T_constraints_1');
         $tableSchema->name('T_constraints_1');
         $tableSchema->primaryKey('C_id');