Skip to content

Commit ac36c28

Browse files
morozovmorozov
committed
Rework calls to Table::addColumns() in tests
1 parent 1a09c3d commit ac36c28

File tree

70 files changed

+2833
-959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2833
-959
lines changed

‎tests/Functional/AutoIncrementColumnTest.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Doctrine\DBAL\Platforms\DB2Platform;
99
use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
1010
use Doctrine\DBAL\Platforms\SQLServerPlatform;
11+
use Doctrine\DBAL\Schema\Column;
1112
use Doctrine\DBAL\Schema\Table;
1213
use Doctrine\DBAL\Tests\FunctionalTestCase;
1314
use Doctrine\DBAL\Types\Types;
@@ -19,9 +20,17 @@ class AutoIncrementColumnTest extends FunctionalTestCase
1920
/** @throws Exception */
2021
protected function setUp(): void
2122
{
22-
$table = new Table('auto_increment_table');
23-
$table->addColumn('id', Types::INTEGER, ['autoincrement' => true]);
24-
$table->addColumn('val', Types::INTEGER);
23+
$table = new Table('auto_increment_table', [
24+
Column::editor()
25+
->setUnquotedName('id')
26+
->setTypeName(Types::INTEGER)
27+
->setAutoincrement(true)
28+
->create(),
29+
Column::editor()
30+
->setUnquotedName('val')
31+
->setTypeName(Types::INTEGER)
32+
->create(),
33+
]);
2534
$table->setPrimaryKey(['id']);
2635

2736
$this->dropAndCreateTable($table);

‎tests/Functional/BinaryDataAccessTest.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use Doctrine\DBAL\ArrayParameterType;
88
use Doctrine\DBAL\ParameterType;
9+
use Doctrine\DBAL\Schema\Column;
910
use Doctrine\DBAL\Schema\Table;
1011
use Doctrine\DBAL\Tests\FunctionalTestCase;
1112
use Doctrine\DBAL\Tests\TestUtil;
@@ -28,9 +29,18 @@ protected function setUp(): void
2829
self::markTestSkipped("PDO_OCI doesn't support binding binary values");
2930
}
3031

31-
$table = new Table('binary_fetch_table');
32-
$table->addColumn('test_int', 'integer');
33-
$table->addColumn('test_binary', 'binary', ['notnull' => false, 'length' => 4]);
32+
$table = new Table('binary_fetch_table', [
33+
Column::editor()
34+
->setUnquotedName('test_int')
35+
->setTypeName(Types::INTEGER)
36+
->create(),
37+
Column::editor()
38+
->setUnquotedName('test_binary')
39+
->setTypeName(Types::BINARY)
40+
->setNotNull(false)
41+
->setLength(4)
42+
->create(),
43+
]);
3444
$table->setPrimaryKey(['test_int']);
3545

3646
$this->dropAndCreateTable($table);

‎tests/Functional/BlobTest.php

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Doctrine\DBAL\Tests\Functional;
66

77
use Doctrine\DBAL\ParameterType;
8+
use Doctrine\DBAL\Schema\Column;
89
use Doctrine\DBAL\Schema\Table;
910
use Doctrine\DBAL\Tests\FunctionalTestCase;
1011
use Doctrine\DBAL\Tests\TestUtil;
@@ -25,10 +26,22 @@ protected function setUp(): void
2526
self::markTestSkipped("DBAL doesn't support storing LOBs represented as streams using PDO_OCI");
2627
}
2728

28-
$table = new Table('blob_table');
29-
$table->addColumn('id', Types::INTEGER);
30-
$table->addColumn('clobcolumn', Types::TEXT, ['notnull' => false]);
31-
$table->addColumn('blobcolumn', Types::BLOB, ['notnull' => false]);
29+
$table = new Table('blob_table', [
30+
Column::editor()
31+
->setUnquotedName('id')
32+
->setTypeName(Types::INTEGER)
33+
->create(),
34+
Column::editor()
35+
->setUnquotedName('clobcolumn')
36+
->setTypeName(Types::TEXT)
37+
->setNotNull(false)
38+
->create(),
39+
Column::editor()
40+
->setUnquotedName('blobcolumn')
41+
->setTypeName(Types::BLOB)
42+
->setNotNull(false)
43+
->create(),
44+
]);
3245
$table->setPrimaryKey(['id']);
3346

3447
$this->dropAndCreateTable($table);
@@ -174,10 +187,22 @@ public function testBindParamProcessesStream(): void
174187

175188
public function testBlobBindingDoesNotOverwritePrevious(): void
176189
{
177-
$table = new Table('blob_table');
178-
$table->addColumn('id', 'integer');
179-
$table->addColumn('blobcolumn1', 'blob', ['notnull' => false]);
180-
$table->addColumn('blobcolumn2', 'blob', ['notnull' => false]);
190+
$table = new Table('blob_table', [
191+
Column::editor()
192+
->setUnquotedName('id')
193+
->setTypeName(Types::INTEGER)
194+
->create(),
195+
Column::editor()
196+
->setUnquotedName('blobcolumn1')
197+
->setTypeName(Types::BLOB)
198+
->setNotNull(false)
199+
->create(),
200+
Column::editor()
201+
->setUnquotedName('blobcolumn2')
202+
->setTypeName(Types::BLOB)
203+
->setNotNull(false)
204+
->create(),
205+
]);
181206
$table->setPrimaryKey(['id']);
182207
$this->dropAndCreateTable($table);
183208

‎tests/Functional/ConnectionTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Doctrine\DBAL\Platforms\OraclePlatform;
1414
use Doctrine\DBAL\Platforms\SQLitePlatform;
1515
use Doctrine\DBAL\Platforms\SQLServerPlatform;
16+
use Doctrine\DBAL\Schema\Column;
1617
use Doctrine\DBAL\Schema\Table;
1718
use Doctrine\DBAL\Tests\FunctionalTestCase;
1819
use Doctrine\DBAL\Tests\TestUtil;
@@ -364,8 +365,12 @@ public function testExceptionOnPrepareAndExecute(): void
364365

365366
private function createTestTable(): void
366367
{
367-
$table = new Table(self::TABLE);
368-
$table->addColumn('id', Types::INTEGER);
368+
$table = new Table(self::TABLE, [
369+
Column::editor()
370+
->setUnquotedName('id')
371+
->setTypeName(Types::INTEGER)
372+
->create(),
373+
]);
369374
$table->setPrimaryKey(['id']);
370375

371376
$this->dropAndCreateTable($table);

‎tests/Functional/DataAccessTest.php

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Doctrine\DBAL\Platforms\AbstractPlatform;
1111
use Doctrine\DBAL\Platforms\SQLitePlatform;
1212
use Doctrine\DBAL\Platforms\TrimMode;
13+
use Doctrine\DBAL\Schema\Column;
1314
use Doctrine\DBAL\Schema\Table;
1415
use Doctrine\DBAL\Statement;
1516
use Doctrine\DBAL\Tests\FunctionalTestCase;
@@ -27,10 +28,22 @@ class DataAccessTest extends FunctionalTestCase
2728
{
2829
protected function setUp(): void
2930
{
30-
$table = new Table('fetch_table');
31-
$table->addColumn('test_int', Types::INTEGER);
32-
$table->addColumn('test_string', Types::STRING, ['length' => 32]);
33-
$table->addColumn('test_datetime', Types::DATETIME_MUTABLE, ['notnull' => false]);
31+
$table = new Table('fetch_table', [
32+
Column::editor()
33+
->setUnquotedName('test_int')
34+
->setTypeName(Types::INTEGER)
35+
->create(),
36+
Column::editor()
37+
->setUnquotedName('test_string')
38+
->setTypeName(Types::STRING)
39+
->setLength(32)
40+
->create(),
41+
Column::editor()
42+
->setUnquotedName('test_datetime')
43+
->setTypeName(Types::DATETIME_MUTABLE)
44+
->setNotNull(false)
45+
->create(),
46+
]);
3447
$table->setPrimaryKey(['test_int']);
3548

3649
$this->dropAndCreateTable($table);
@@ -639,9 +652,16 @@ public function testSqliteDateArithmeticWithDynamicInterval(): void
639652
self::markTestSkipped('test is for sqlite only');
640653
}
641654

642-
$table = new Table('fetch_table_date_math');
643-
$table->addColumn('test_date', Types::DATE_MUTABLE);
644-
$table->addColumn('test_days', Types::INTEGER);
655+
$table = new Table('fetch_table_date_math', [
656+
Column::editor()
657+
->setUnquotedName('test_date')
658+
->setTypeName(Types::DATE_MUTABLE)
659+
->create(),
660+
Column::editor()
661+
->setUnquotedName('test_days')
662+
->setTypeName(Types::INTEGER)
663+
->create(),
664+
]);
645665
$table->setPrimaryKey(['test_date']);
646666

647667
$sm = $this->connection->createSchemaManager();

‎tests/Functional/Driver/DBAL6024Test.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
namespace Doctrine\DBAL\Tests\Functional\Driver;
66

7+
use Doctrine\DBAL\Schema\Column;
78
use Doctrine\DBAL\Schema\Table;
89
use Doctrine\DBAL\Tests\FunctionalTestCase;
910
use Doctrine\DBAL\Tests\TestUtil;
11+
use Doctrine\DBAL\Types\Types;
1012

1113
class DBAL6024Test extends FunctionalTestCase
1214
{
@@ -21,8 +23,12 @@ protected function setUp(): void
2123

2224
public function testDropPrimaryKey(): void
2325
{
24-
$table = new Table('mytable');
25-
$table->addColumn('id', 'integer');
26+
$table = new Table('mytable', [
27+
Column::editor()
28+
->setUnquotedName('id')
29+
->setTypeName(Types::INTEGER)
30+
->create(),
31+
]);
2632
$table->setPrimaryKey(['id']);
2733
$this->dropAndCreateTable($table);
2834

‎tests/Functional/Driver/DBAL6044Test.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
namespace Doctrine\DBAL\Tests\Functional\Driver;
66

7+
use Doctrine\DBAL\Schema\Column;
78
use Doctrine\DBAL\Schema\Table;
89
use Doctrine\DBAL\Tests\FunctionalTestCase;
910
use Doctrine\DBAL\Tests\TestUtil;
11+
use Doctrine\DBAL\Types\Types;
1012

1113
class DBAL6044Test extends FunctionalTestCase
1214
{
@@ -23,13 +25,21 @@ protected function setUp(): void
2325

2426
public function testUnloggedTables(): void
2527
{
26-
$unloggedTable = new Table('my_unlogged');
28+
$unloggedTable = new Table('my_unlogged', [
29+
Column::editor()
30+
->setUnquotedName('foo')
31+
->setTypeName(Types::STRING)
32+
->create(),
33+
]);
2734
$unloggedTable->addOption('unlogged', true);
28-
$unloggedTable->addColumn('foo', 'string');
2935
$this->dropAndCreateTable($unloggedTable);
3036

31-
$loggedTable = new Table('my_logged');
32-
$loggedTable->addColumn('foo', 'string');
37+
$loggedTable = new Table('my_logged', [
38+
Column::editor()
39+
->setUnquotedName('foo')
40+
->setTypeName(Types::STRING)
41+
->create(),
42+
]);
3343
$this->dropAndCreateTable($loggedTable);
3444

3545
$schemaManager = $this->connection->createSchemaManager();

‎tests/Functional/Driver/Mysqli/ResultTest.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
namespace Doctrine\DBAL\Tests\Functional\Driver\Mysqli;
66

77
use Doctrine\DBAL\Driver\Mysqli\Result;
8+
use Doctrine\DBAL\Schema\Column;
89
use Doctrine\DBAL\Schema\Table;
910
use Doctrine\DBAL\Tests\FunctionalTestCase;
1011
use Doctrine\DBAL\Tests\TestUtil;
12+
use Doctrine\DBAL\Types\Types;
1113
use mysqli;
1214
use mysqli_driver;
1315
use mysqli_sql_exception;
@@ -38,8 +40,12 @@ protected function setUp(): void
3840

3941
$this->nativeConnection = $nativeConnection;
4042

41-
$table = new Table(self::TABLE_NAME);
42-
$table->addColumn('my_col_1', 'integer', ['notnull' => true]);
43+
$table = new Table(self::TABLE_NAME, [
44+
Column::editor()
45+
->setUnquotedName('my_col_1')
46+
->setTypeName(Types::INTEGER)
47+
->create(),
48+
]);
4349

4450
$this->dropAndCreateTable($table);
4551
}

0 commit comments

Comments
 (0)