Skip to content

Commit e375640

Browse files
TigrovTigrov
authored
Remove ColumnInterface (#296)
1 parent a43382d commit e375640

7 files changed

Lines changed: 2 additions & 147 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
- New #292: Override `QueryBuilder::prepareBinary()` method (@Tigrov)
2525
- Chg #294: Update `QueryBuilder` constructor (@Tigrov)
2626
- Enh #293: Use `ColumnDefinitionBuilder` to generate table column SQL representation (@Tigrov)
27+
- Enh #296: Remove `ColumnInterface` (@Tigrov)
2728

2829
## 1.3.0 March 21, 2024
2930

‎src/Column.php‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/DDLQueryBuilder.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Yiisoft\Db\Exception\Exception;
88
use Yiisoft\Db\Exception\NotSupportedException;
99
use Yiisoft\Db\QueryBuilder\AbstractDDLQueryBuilder;
10-
use Yiisoft\Db\Schema\Builder\ColumnInterface;
1110
use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
1211

1312
/**
@@ -46,7 +45,7 @@ public function addForeignKey(
4645
return $sql;
4746
}
4847

49-
public function alterColumn(string $table, string $column, ColumnInterface|ColumnSchemaInterface|string $type): string
48+
public function alterColumn(string $table, string $column, ColumnSchemaInterface|string $type): string
5049
{
5150
return 'ALTER TABLE '
5251
. $this->quoter->quoteTableName($table)

‎src/QueryBuilder.php‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
namespace Yiisoft\Db\Oracle;
66

77
use Yiisoft\Db\Connection\ServerInfoInterface;
8-
use Yiisoft\Db\Constant\ColumnType;
9-
use Yiisoft\Db\Constant\PseudoType;
108
use Yiisoft\Db\Oracle\Column\ColumnDefinitionBuilder;
119
use Yiisoft\Db\QueryBuilder\AbstractQueryBuilder;
1210
use Yiisoft\Db\Schema\QuoterInterface;
@@ -19,35 +17,6 @@
1917
*/
2018
final class QueryBuilder extends AbstractQueryBuilder
2119
{
22-
/**
23-
* @psalm-var string[] $typeMap Mapping from abstract column types (keys) to physical column types (values).
24-
*/
25-
protected array $typeMap = [
26-
PseudoType::PK => 'NUMBER(10) GENERATED BY DEFAULT AS IDENTITY NOT NULL PRIMARY KEY',
27-
PseudoType::UPK => 'NUMBER(10) GENERATED BY DEFAULT AS IDENTITY UNSIGNED NOT NULL PRIMARY KEY',
28-
PseudoType::BIGPK => 'NUMBER(20) GENERATED BY DEFAULT AS IDENTITY NOT NULL PRIMARY KEY',
29-
PseudoType::UBIGPK => 'NUMBER(20) GENERATED BY DEFAULT AS IDENTITY UNSIGNED NOT NULL PRIMARY KEY',
30-
ColumnType::CHAR => 'CHAR(1)',
31-
ColumnType::STRING => 'VARCHAR2(255)',
32-
ColumnType::TEXT => 'CLOB',
33-
ColumnType::TINYINT => 'NUMBER(3)',
34-
ColumnType::SMALLINT => 'NUMBER(5)',
35-
ColumnType::INTEGER => 'NUMBER(10)',
36-
ColumnType::BIGINT => 'NUMBER(20)',
37-
ColumnType::FLOAT => 'BINARY_FLOAT',
38-
ColumnType::DOUBLE => 'BINARY_DOUBLE',
39-
ColumnType::DECIMAL => 'NUMBER(10,0)',
40-
ColumnType::DATETIME => 'TIMESTAMP(0)',
41-
ColumnType::TIMESTAMP => 'TIMESTAMP(0)',
42-
ColumnType::TIME => 'INTERVAL DAY(0) TO SECOND(0)',
43-
ColumnType::DATE => 'DATE',
44-
ColumnType::BINARY => 'BLOB',
45-
ColumnType::BOOLEAN => 'NUMBER(1)',
46-
ColumnType::MONEY => 'NUMBER(19,4)',
47-
ColumnType::UUID => 'RAW(16)',
48-
PseudoType::UUID_PK => 'RAW(16) DEFAULT SYS_GUID() PRIMARY KEY',
49-
];
50-
5120
public function __construct(QuoterInterface $quoter, SchemaInterface $schema, ServerInfoInterface $serverInfo)
5221
{
5322
parent::__construct(

‎src/Schema.php‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Yiisoft\Db\Exception\NotSupportedException;
1818
use Yiisoft\Db\Helper\DbArrayHelper;
1919
use Yiisoft\Db\Oracle\Column\ColumnFactory;
20-
use Yiisoft\Db\Schema\Builder\ColumnInterface;
2120
use Yiisoft\Db\Schema\Column\ColumnFactoryInterface;
2221
use Yiisoft\Db\Schema\Column\ColumnSchemaInterface;
2322
use Yiisoft\Db\Schema\TableSchemaInterface;
@@ -70,13 +69,6 @@ public function __construct(protected ConnectionInterface $db, SchemaCache $sche
7069
parent::__construct($db, $schemaCache);
7170
}
7271

73-
/** @deprecated Use {@see ColumnBuilder} instead. Will be removed in 2.0. */
74-
public function createColumn(string $type, array|int|string $length = null): ColumnInterface
75-
{
76-
/** @psalm-suppress DeprecatedClass */
77-
return new Column($type, $length);
78-
}
79-
8072
public function getColumnFactory(): ColumnFactoryInterface
8173
{
8274
return new ColumnFactory();

‎tests/ColumnSchemaBuilderTest.php‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎tests/Provider/ColumnSchemaBuilderProvider.php‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)