Skip to content

Commit

Permalink
Remove ColumnInterface (#296)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tigrov authored Jan 8, 2025
1 parent a43382d commit e375640
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 147 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- New #292: Override `QueryBuilder::prepareBinary()` method (@Tigrov)
- Chg #294: Update `QueryBuilder` constructor (@Tigrov)
- Enh #293: Use `ColumnDefinitionBuilder` to generate table column SQL representation (@Tigrov)
- Enh #296: Remove `ColumnInterface` (@Tigrov)

## 1.3.0 March 21, 2024

Expand Down
55 changes: 0 additions & 55 deletions src/Column.php

This file was deleted.

3 changes: 1 addition & 2 deletions src/DDLQueryBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use Yiisoft\Db\Exception\Exception;
use Yiisoft\Db\Exception\NotSupportedException;
use Yiisoft\Db\QueryBuilder\AbstractDDLQueryBuilder;
use Yiisoft\Db\Schema\Builder\ColumnInterface;
use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;

/**
Expand Down Expand Up @@ -46,7 +45,7 @@ public function addForeignKey(
return $sql;
}

public function alterColumn(string $table, string $column, ColumnInterface|ColumnSchemaInterface|string $type): string
public function alterColumn(string $table, string $column, ColumnSchemaInterface|string $type): string
{
return 'ALTER TABLE '
. $this->quoter->quoteTableName($table)
Expand Down
31 changes: 0 additions & 31 deletions src/QueryBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
namespace Yiisoft\Db\Oracle;

use Yiisoft\Db\Connection\ServerInfoInterface;
use Yiisoft\Db\Constant\ColumnType;
use Yiisoft\Db\Constant\PseudoType;
use Yiisoft\Db\Oracle\Column\ColumnDefinitionBuilder;
use Yiisoft\Db\QueryBuilder\AbstractQueryBuilder;
use Yiisoft\Db\Schema\QuoterInterface;
Expand All @@ -19,35 +17,6 @@
*/
final class QueryBuilder extends AbstractQueryBuilder
{
/**
* @psalm-var string[] $typeMap Mapping from abstract column types (keys) to physical column types (values).
*/
protected array $typeMap = [
PseudoType::PK => 'NUMBER(10) GENERATED BY DEFAULT AS IDENTITY NOT NULL PRIMARY KEY',
PseudoType::UPK => 'NUMBER(10) GENERATED BY DEFAULT AS IDENTITY UNSIGNED NOT NULL PRIMARY KEY',
PseudoType::BIGPK => 'NUMBER(20) GENERATED BY DEFAULT AS IDENTITY NOT NULL PRIMARY KEY',
PseudoType::UBIGPK => 'NUMBER(20) GENERATED BY DEFAULT AS IDENTITY UNSIGNED NOT NULL PRIMARY KEY',
ColumnType::CHAR => 'CHAR(1)',
ColumnType::STRING => 'VARCHAR2(255)',
ColumnType::TEXT => 'CLOB',
ColumnType::TINYINT => 'NUMBER(3)',
ColumnType::SMALLINT => 'NUMBER(5)',
ColumnType::INTEGER => 'NUMBER(10)',
ColumnType::BIGINT => 'NUMBER(20)',
ColumnType::FLOAT => 'BINARY_FLOAT',
ColumnType::DOUBLE => 'BINARY_DOUBLE',
ColumnType::DECIMAL => 'NUMBER(10,0)',
ColumnType::DATETIME => 'TIMESTAMP(0)',
ColumnType::TIMESTAMP => 'TIMESTAMP(0)',
ColumnType::TIME => 'INTERVAL DAY(0) TO SECOND(0)',
ColumnType::DATE => 'DATE',
ColumnType::BINARY => 'BLOB',
ColumnType::BOOLEAN => 'NUMBER(1)',
ColumnType::MONEY => 'NUMBER(19,4)',
ColumnType::UUID => 'RAW(16)',
PseudoType::UUID_PK => 'RAW(16) DEFAULT SYS_GUID() PRIMARY KEY',
];

public function __construct(QuoterInterface $quoter, SchemaInterface $schema, ServerInfoInterface $serverInfo)
{
parent::__construct(
Expand Down
8 changes: 0 additions & 8 deletions src/Schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use Yiisoft\Db\Exception\NotSupportedException;
use Yiisoft\Db\Helper\DbArrayHelper;
use Yiisoft\Db\Oracle\Column\ColumnFactory;
use Yiisoft\Db\Schema\Builder\ColumnInterface;
use Yiisoft\Db\Schema\Column\ColumnFactoryInterface;
use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
use Yiisoft\Db\Schema\TableSchemaInterface;
Expand Down Expand Up @@ -70,13 +69,6 @@ public function __construct(protected ConnectionInterface $db, SchemaCache $sche
parent::__construct($db, $schemaCache);
}

/** @deprecated Use {@see ColumnBuilder} instead. Will be removed in 2.0. */
public function createColumn(string $type, array|int|string $length = null): ColumnInterface
{
/** @psalm-suppress DeprecatedClass */
return new Column($type, $length);
}

public function getColumnFactory(): ColumnFactoryInterface
{
return new ColumnFactory();
Expand Down
26 changes: 0 additions & 26 deletions tests/ColumnSchemaBuilderTest.php

This file was deleted.

25 changes: 0 additions & 25 deletions tests/Provider/ColumnSchemaBuilderProvider.php

This file was deleted.

0 comments on commit e375640

Please sign in to comment.