Rename ColumnSchemaInterface to ColumnInterface

CHANGELOG.md

@@ -25,6 +25,7 @@
 - Enh #374: Use `ColumnDefinitionBuilder` to generate table column SQL representation (@Tigrov)
 - Enh #378: Improve loading schemas of views (@Tigrov)
 - Enh #379: Remove `ColumnInterface` (@Tigrov)
+- Enh #380: Rename `ColumnSchemaInterface` to `ColumnInterface` (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 

src/Builder/StructuredExpressionBuilder.php

@@ -13,7 +13,7 @@
 use Yiisoft\Db\Expression\StructuredExpression;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
 
-use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
+use Yiisoft\Db\Schema\Column\ColumnInterface;
 
 use function implode;
 
@@ -62,7 +62,7 @@ public function build(ExpressionInterface $expression, array &$params = []): str
      * Builds a placeholder array out of $expression values.
      *
      * @param array|object $value The expression value.
-     * @param ColumnSchemaInterface[] $columns The structured type columns.
+     * @param ColumnInterface[] $columns The structured type columns.
      * @param array $params The binding parameters.
      *
      * @throws Exception

src/Column/ArrayColumnSchema.php → src/Column/ArrayColumn.php

@@ -5,10 +5,10 @@
 namespace Yiisoft\Db\Pgsql\Column;
 
 use Yiisoft\Db\Pgsql\ArrayParser;
-use Yiisoft\Db\Schema\Column\ArrayColumnSchema as BaseArrayColumnSchema;
+use Yiisoft\Db\Schema\Column\ArrayColumn as BaseArrayColumn;
 use Yiisoft\Db\Syntax\ParserToArrayInterface;
 
-final class ArrayColumnSchema extends BaseArrayColumnSchema
+final class ArrayColumn extends BaseArrayColumn
 {
     protected function getParser(): ParserToArrayInterface
     {

src/Column/BigIntColumn.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Pgsql\Column;
+
+use Yiisoft\Db\Schema\Column\BigIntColumn as BaseBigIntColumn;
+
+final class BigIntColumn extends BaseBigIntColumn implements SequenceColumnInterface
+{
+    use SequenceColumnTrait;
+}

src/Column/BinaryColumnSchema.php → src/Column/BinaryColumn.php

@@ -4,14 +4,14 @@
 
 namespace Yiisoft\Db\Pgsql\Column;
 
-use Yiisoft\Db\Schema\Column\BinaryColumnSchema as BaseBinaryColumnSchema;
+use Yiisoft\Db\Schema\Column\BinaryColumn as BaseBinaryColumn;
 
 use function hex2bin;
 use function is_string;
 use function str_starts_with;
 use function substr;
 
-final class BinaryColumnSchema extends BaseBinaryColumnSchema
+final class BinaryColumn extends BaseBinaryColumn
 {
     public function phpTypecast(mixed $value): mixed
     {

src/Column/BitColumnSchema.php → src/Column/BitColumn.php

@@ -5,14 +5,14 @@
 namespace Yiisoft\Db\Pgsql\Column;
 
 use Yiisoft\Db\Expression\ExpressionInterface;
-use Yiisoft\Db\Schema\Column\BitColumnSchema as BaseBitColumnSchema;
+use Yiisoft\Db\Schema\Column\BitColumn as BaseBitColumn;
 
 use function bindec;
 use function decbin;
 use function gettype;
 use function str_pad;
 
-final class BitColumnSchema extends BaseBitColumnSchema
+final class BitColumn extends BaseBitColumn
 {
     /** @psalm-suppress RedundantCast */
     public function dbTypecast(mixed $value): string|ExpressionInterface|null

src/Column/BooleanColumnSchema.php → src/Column/BooleanColumn.php

@@ -4,9 +4,9 @@
 
 namespace Yiisoft\Db\Pgsql\Column;
 
-use Yiisoft\Db\Schema\Column\BooleanColumnSchema as BaseBooleanColumnSchema;
+use Yiisoft\Db\Schema\Column\BooleanColumn as BaseBooleanColumn;
 
-final class BooleanColumnSchema extends BaseBooleanColumnSchema
+final class BooleanColumn extends BaseBooleanColumn
 {
     public function phpTypecast(mixed $value): bool|null
     {

src/Column/ColumnBuilder.php

@@ -5,52 +5,52 @@
 namespace Yiisoft\Db\Pgsql\Column;
 
 use Yiisoft\Db\Constant\ColumnType;
-use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
+use Yiisoft\Db\Schema\Column\ColumnInterface;
 
 final class ColumnBuilder extends \Yiisoft\Db\Schema\Column\ColumnBuilder
 {
-    public static function boolean(): ColumnSchemaInterface
+    public static function boolean(): ColumnInterface
     {
-        return new BooleanColumnSchema(ColumnType::BOOLEAN);
+        return new BooleanColumn(ColumnType::BOOLEAN);
     }
 
-    public static function bit(int|null $size = null): ColumnSchemaInterface
+    public static function bit(int|null $size = null): ColumnInterface
     {
-        return new BitColumnSchema(ColumnType::BIT, size: $size);
+        return new BitColumn(ColumnType::BIT, size: $size);
     }
 
-    public static function tinyint(int|null $size = null): ColumnSchemaInterface
+    public static function tinyint(int|null $size = null): ColumnInterface
     {
-        return new IntegerColumnSchema(ColumnType::TINYINT, size: $size);
+        return new IntegerColumn(ColumnType::TINYINT, size: $size);
     }
 
-    public static function smallint(int|null $size = null): ColumnSchemaInterface
+    public static function smallint(int|null $size = null): ColumnInterface
     {
-        return new IntegerColumnSchema(ColumnType::SMALLINT, size: $size);
+        return new IntegerColumn(ColumnType::SMALLINT, size: $size);
     }
 
-    public static function integer(int|null $size = null): ColumnSchemaInterface
+    public static function integer(int|null $size = null): ColumnInterface
     {
-        return new IntegerColumnSchema(ColumnType::INTEGER, size: $size);
+        return new IntegerColumn(ColumnType::INTEGER, size: $size);
     }
 
-    public static function bigint(int|null $size = null): ColumnSchemaInterface
+    public static function bigint(int|null $size = null): ColumnInterface
     {
-        return new IntegerColumnSchema(ColumnType::BIGINT, size: $size);
+        return new IntegerColumn(ColumnType::BIGINT, size: $size);
     }
 
-    public static function binary(int|null $size = null): ColumnSchemaInterface
+    public static function binary(int|null $size = null): ColumnInterface
     {
-        return new BinaryColumnSchema(ColumnType::BINARY, size: $size);
+        return new BinaryColumn(ColumnType::BINARY, size: $size);
     }
 
-    public static function array(ColumnSchemaInterface|null $column = null): ColumnSchemaInterface
+    public static function array(ColumnInterface|null $column = null): ColumnInterface
     {
-        return new ArrayColumnSchema(ColumnType::ARRAY, column: $column);
+        return new ArrayColumn(ColumnType::ARRAY, column: $column);
     }
 
-    public static function structured(string|null $dbType = null, array $columns = []): ColumnSchemaInterface
+    public static function structured(string|null $dbType = null, array $columns = []): ColumnInterface
     {
-        return new StructuredColumnSchema(ColumnType::STRUCTURED, dbType: $dbType, columns: $columns);
+        return new StructuredColumn(ColumnType::STRUCTURED, dbType: $dbType, columns: $columns);
     }
 }

src/Column/ColumnDefinitionBuilder.php

@@ -6,7 +6,7 @@
 
 use Yiisoft\Db\Constant\ColumnType;
 use Yiisoft\Db\QueryBuilder\AbstractColumnDefinitionBuilder;
-use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
+use Yiisoft\Db\Schema\Column\ColumnInterface;
 
 use function version_compare;
 
@@ -35,7 +35,7 @@ final class ColumnDefinitionBuilder extends AbstractColumnDefinitionBuilder
         'numeric',
     ];
 
-    public function build(ColumnSchemaInterface $column): string
+    public function build(ColumnInterface $column): string
     {
         return $this->buildType($column)
             . $this->buildNotNull($column)
@@ -47,22 +47,22 @@ public function build(ColumnSchemaInterface $column): string
             . $this->buildExtra($column);
     }
 
-    public function buildAlter(ColumnSchemaInterface $column): string
+    public function buildAlter(ColumnInterface $column): string
     {
         return $this->buildType($column)
             . $this->buildExtra($column);
     }
 
-    protected function buildType(ColumnSchemaInterface $column): string
+    protected function buildType(ColumnInterface $column): string
     {
-        if ($column instanceof \Yiisoft\Db\Schema\Column\ArrayColumnSchema) {
+        if ($column instanceof \Yiisoft\Db\Schema\Column\ArrayColumn) {
             return $this->buildType($column->getColumn()) . str_repeat('[]', $column->getDimension());
         }
 
         return parent::buildType($column);
     }
 
-    protected function getDbType(ColumnSchemaInterface $column): string
+    protected function getDbType(ColumnInterface $column): string
     {
         /** @psalm-suppress DocblockTypeContradiction */
         return $column->getDbType() ?? match ($column->getType()) {

src/Column/ColumnFactory.php

@@ -8,7 +8,7 @@
 use Yiisoft\Db\Constraint\ForeignKeyConstraint;
 use Yiisoft\Db\Expression\Expression;
 use Yiisoft\Db\Schema\Column\AbstractColumnFactory;
-use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
+use Yiisoft\Db\Schema\Column\ColumnInterface;
 
 use function preg_replace;
 use function str_starts_with;
@@ -20,8 +20,8 @@
  * @psalm-type ColumnInfo = array{
  *     auto_increment?: bool|string,
  *     check?: string|null,
- *     column?: ColumnSchemaInterface,
- *     columns?: array<string, ColumnSchemaInterface>,
+ *     column?: ColumnInterface,
+ *     columns?: array<string, ColumnInterface>,
  *     comment?: string|null,
  *     computed?: bool|string,
  *     db_type?: string|null,
@@ -119,11 +119,11 @@ final class ColumnFactory extends AbstractColumnFactory
         'jsonb' => ColumnType::JSON,
     ];
 
-    public function fromType(string $type, array $info = []): ColumnSchemaInterface
+    public function fromType(string $type, array $info = []): ColumnInterface
     {
         $column = parent::fromType($type, $info);
 
-        if ($column instanceof StructuredColumnSchema) {
+        if ($column instanceof StructuredColumn) {
             /** @psalm-var array|null $defaultValue */
             $defaultValue = $column->getDefaultValue();
 
@@ -142,22 +142,22 @@ public function fromType(string $type, array $info = []): ColumnSchemaInterface
     protected function getColumnClass(string $type, array $info = []): string
     {
         return match ($type) {
-            ColumnType::BOOLEAN => BooleanColumnSchema::class,
-            ColumnType::BIT => BitColumnSchema::class,
-            ColumnType::TINYINT => IntegerColumnSchema::class,
-            ColumnType::SMALLINT => IntegerColumnSchema::class,
-            ColumnType::INTEGER => IntegerColumnSchema::class,
+            ColumnType::BOOLEAN => BooleanColumn::class,
+            ColumnType::BIT => BitColumn::class,
+            ColumnType::TINYINT => IntegerColumn::class,
+            ColumnType::SMALLINT => IntegerColumn::class,
+            ColumnType::INTEGER => IntegerColumn::class,
             ColumnType::BIGINT => PHP_INT_SIZE !== 8
-                ? BigIntColumnSchema::class
-                : IntegerColumnSchema::class,
-            ColumnType::BINARY => BinaryColumnSchema::class,
-            ColumnType::ARRAY => ArrayColumnSchema::class,
-            ColumnType::STRUCTURED => StructuredColumnSchema::class,
+                ? BigIntColumn::class
+                : IntegerColumn::class,
+            ColumnType::BINARY => BinaryColumn::class,
+            ColumnType::ARRAY => ArrayColumn::class,
+            ColumnType::STRUCTURED => StructuredColumn::class,
             default => parent::getColumnClass($type, $info),
         };
     }
 
-    protected function normalizeNotNullDefaultValue(string $defaultValue, ColumnSchemaInterface $column): mixed
+    protected function normalizeNotNullDefaultValue(string $defaultValue, ColumnInterface $column): mixed
     {
         $value = preg_replace("/::[^:']+$/", '$1', $defaultValue);
 

src/Column/IntegerColumn.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Db\Pgsql\Column;
+
+use Yiisoft\Db\Schema\Column\IntegerColumn as BaseIntegerColumn;
+
+final class IntegerColumn extends BaseIntegerColumn implements SequenceColumnInterface
+{
+    use SequenceColumnTrait;
+}

src/Column/SequenceColumnSchemaInterface.php → src/Column/SequenceColumnInterface.php

@@ -4,9 +4,9 @@
 
 namespace Yiisoft\Db\Pgsql\Column;
 
-use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
+use Yiisoft\Db\Schema\Column\ColumnInterface;
 
-interface SequenceColumnSchemaInterface extends ColumnSchemaInterface
+interface SequenceColumnInterface extends ColumnInterface
 {
     /**
      * Returns name of an associated sequence if column is auto incremental.

src/Column/SequenceColumnSchemaTrait.php → src/Column/SequenceColumnTrait.php

@@ -4,7 +4,7 @@
 
 namespace Yiisoft\Db\Pgsql\Column;
 
-trait SequenceColumnSchemaTrait
+trait SequenceColumnTrait
 {
     /**
      * @var string|null Name of an associated sequence if column is auto incremental.

src/Column/StructuredColumnSchema.php → src/Column/StructuredColumn.php

@@ -5,10 +5,10 @@
 namespace Yiisoft\Db\Pgsql\Column;
 
 use Yiisoft\Db\Pgsql\StructuredParser;
-use Yiisoft\Db\Schema\Column\StructuredColumnSchema as BaseStructuredColumnSchema;
+use Yiisoft\Db\Schema\Column\StructuredColumn as BaseStructuredColumn;
 use Yiisoft\Db\Syntax\ParserToArrayInterface;
 
-final class StructuredColumnSchema extends BaseStructuredColumnSchema
+final class StructuredColumn extends BaseStructuredColumn
 {
     protected function getParser(): ParserToArrayInterface
     {

src/DDLQueryBuilder.php

@@ -7,7 +7,7 @@
 use Throwable;
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\QueryBuilder\AbstractDDLQueryBuilder;
-use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
+use Yiisoft\Db\Schema\Column\ColumnInterface;
 
 use function array_diff;
 use function explode;
@@ -27,7 +27,7 @@ public function addDefaultValue(string $table, string $name, string $column, mix
         throw new NotSupportedException(__METHOD__ . ' is not supported by PostgreSQL.');
     }
 
-    public function alterColumn(string $table, string $column, ColumnSchemaInterface|string $type): string
+    public function alterColumn(string $table, string $column, ColumnInterface|string $type): string
     {
         $columnName = $this->quoter->quoteColumnName($column);
         $tableName = $this->quoter->quoteTableName($table);