Skip to content

Commit 09d248d

Browse files
morozovmorozov
committed
Merge branch '4.3.x' into 5.0.x
2 parents 64aa62d + 79a0f17 commit 09d248d

File tree

82 files changed

+6424
-4207
lines changed

Some content is hidden

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

82 files changed

+6424
-4207
lines changed

‎tests/Functional/AutoIncrementColumnTest.php

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,25 @@ class AutoIncrementColumnTest extends FunctionalTestCase
1919

2020
protected function setUp(): void
2121
{
22-
$table = new Table('auto_increment_table', [
23-
Column::editor()
24-
->setUnquotedName('id')
25-
->setTypeName(Types::INTEGER)
26-
->setAutoincrement(true)
27-
->create(),
28-
Column::editor()
29-
->setUnquotedName('val')
30-
->setTypeName(Types::INTEGER)
31-
->create(),
32-
]);
33-
$table->addPrimaryKeyConstraint(
34-
PrimaryKeyConstraint::editor()
35-
->setUnquotedColumnNames('id')
36-
->create(),
37-
);
22+
$table = Table::editor()
23+
->setUnquotedName('auto_increment_table')
24+
->setColumns(
25+
Column::editor()
26+
->setUnquotedName('id')
27+
->setTypeName(Types::INTEGER)
28+
->setAutoincrement(true)
29+
->create(),
30+
Column::editor()
31+
->setUnquotedName('val')
32+
->setTypeName(Types::INTEGER)
33+
->create(),
34+
)
35+
->setPrimaryKeyConstraint(
36+
PrimaryKeyConstraint::editor()
37+
->setUnquotedColumnNames('id')
38+
->create(),
39+
)
40+
->create();
3841

3942
$this->dropAndCreateTable($table);
4043
}

‎tests/Functional/BinaryDataAccessTest.php

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,26 @@ protected function setUp(): void
3030
self::markTestSkipped("PDO_OCI doesn't support binding binary values");
3131
}
3232

33-
$table = new Table('binary_fetch_table', [
34-
Column::editor()
35-
->setUnquotedName('test_int')
36-
->setTypeName(Types::INTEGER)
37-
->create(),
38-
Column::editor()
39-
->setUnquotedName('test_binary')
40-
->setTypeName(Types::BINARY)
41-
->setNotNull(false)
42-
->setLength(4)
43-
->create(),
44-
]);
45-
$table->addPrimaryKeyConstraint(
46-
PrimaryKeyConstraint::editor()
47-
->setUnquotedColumnNames('test_int')
48-
->create(),
49-
);
33+
$table = Table::editor()
34+
->setUnquotedName('binary_fetch_table')
35+
->setColumns(
36+
Column::editor()
37+
->setUnquotedName('test_int')
38+
->setTypeName(Types::INTEGER)
39+
->create(),
40+
Column::editor()
41+
->setUnquotedName('test_binary')
42+
->setTypeName(Types::BINARY)
43+
->setNotNull(false)
44+
->setLength(4)
45+
->create(),
46+
)
47+
->setPrimaryKeyConstraint(
48+
PrimaryKeyConstraint::editor()
49+
->setUnquotedColumnNames('test_int')
50+
->create(),
51+
)
52+
->create();
5053

5154
$this->dropAndCreateTable($table);
5255

‎tests/Functional/BlobTest.php

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,30 @@ protected function setUp(): void
2727
self::markTestSkipped("DBAL doesn't support storing LOBs represented as streams using PDO_OCI");
2828
}
2929

30-
$table = new Table('blob_table', [
31-
Column::editor()
32-
->setUnquotedName('id')
33-
->setTypeName(Types::INTEGER)
34-
->create(),
35-
Column::editor()
36-
->setUnquotedName('clobcolumn')
37-
->setTypeName(Types::TEXT)
38-
->setNotNull(false)
39-
->create(),
40-
Column::editor()
41-
->setUnquotedName('blobcolumn')
42-
->setTypeName(Types::BLOB)
43-
->setNotNull(false)
44-
->create(),
45-
]);
46-
$table->addPrimaryKeyConstraint(
47-
PrimaryKeyConstraint::editor()
48-
->setUnquotedColumnNames('id')
49-
->create(),
50-
);
30+
$table = Table::editor()
31+
->setUnquotedName('blob_table')
32+
->setColumns(
33+
Column::editor()
34+
->setUnquotedName('id')
35+
->setTypeName(Types::INTEGER)
36+
->create(),
37+
Column::editor()
38+
->setUnquotedName('clobcolumn')
39+
->setTypeName(Types::TEXT)
40+
->setNotNull(false)
41+
->create(),
42+
Column::editor()
43+
->setUnquotedName('blobcolumn')
44+
->setTypeName(Types::BLOB)
45+
->setNotNull(false)
46+
->create(),
47+
)
48+
->setPrimaryKeyConstraint(
49+
PrimaryKeyConstraint::editor()
50+
->setUnquotedColumnNames('id')
51+
->create(),
52+
)
53+
->create();
5154

5255
$this->dropAndCreateTable($table);
5356
}
@@ -192,27 +195,31 @@ public function testBindParamProcessesStream(): void
192195

193196
public function testBlobBindingDoesNotOverwritePrevious(): void
194197
{
195-
$table = new Table('blob_table', [
196-
Column::editor()
197-
->setUnquotedName('id')
198-
->setTypeName(Types::INTEGER)
199-
->create(),
200-
Column::editor()
201-
->setUnquotedName('blobcolumn1')
202-
->setTypeName(Types::BLOB)
203-
->setNotNull(false)
204-
->create(),
205-
Column::editor()
206-
->setUnquotedName('blobcolumn2')
207-
->setTypeName(Types::BLOB)
208-
->setNotNull(false)
209-
->create(),
210-
]);
211-
$table->addPrimaryKeyConstraint(
212-
PrimaryKeyConstraint::editor()
213-
->setUnquotedColumnNames('id')
214-
->create(),
215-
);
198+
$table = Table::editor()
199+
->setUnquotedName('blob_table')
200+
->setColumns(
201+
Column::editor()
202+
->setUnquotedName('id')
203+
->setTypeName(Types::INTEGER)
204+
->create(),
205+
Column::editor()
206+
->setUnquotedName('blobcolumn1')
207+
->setTypeName(Types::BLOB)
208+
->setNotNull(false)
209+
->create(),
210+
Column::editor()
211+
->setUnquotedName('blobcolumn2')
212+
->setTypeName(Types::BLOB)
213+
->setNotNull(false)
214+
->create(),
215+
)
216+
->setPrimaryKeyConstraint(
217+
PrimaryKeyConstraint::editor()
218+
->setUnquotedColumnNames('id')
219+
->create(),
220+
)
221+
->create();
222+
216223
$this->dropAndCreateTable($table);
217224

218225
$params = ['test1', 'test2'];

‎tests/Functional/BooleanBindingTest.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
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;
12+
use Doctrine\DBAL\Types\Types;
1113
use PHPUnit\Framework\Attributes\DataProvider;
1214

1315
class BooleanBindingTest extends FunctionalTestCase
@@ -18,8 +20,16 @@ protected function setUp(): void
1820
self::markTestSkipped('Boolean inserts do not work for PDO_OCI and OCI8 as of now');
1921
}
2022

21-
$table = new Table('boolean_test_table');
22-
$table->addColumn('val', 'boolean');
23+
$table = Table::editor()
24+
->setUnquotedName('boolean_test_table')
25+
->setColumns(
26+
Column::editor()
27+
->setUnquotedName('val')
28+
->setTypeName(Types::BOOLEAN)
29+
->create(),
30+
)
31+
->create();
32+
2333
$this->dropAndCreateTable($table);
2434
}
2535

‎tests/Functional/ConnectionTest.php

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -366,17 +366,20 @@ public function testExceptionOnPrepareAndExecute(): void
366366

367367
private function createTestTable(): void
368368
{
369-
$table = new Table(self::TABLE, [
370-
Column::editor()
371-
->setUnquotedName('id')
372-
->setTypeName(Types::INTEGER)
373-
->create(),
374-
]);
375-
$table->addPrimaryKeyConstraint(
376-
PrimaryKeyConstraint::editor()
377-
->setUnquotedColumnNames('id')
378-
->create(),
379-
);
369+
$table = Table::editor()
370+
->setUnquotedName(self::TABLE)
371+
->setColumns(
372+
Column::editor()
373+
->setUnquotedName('id')
374+
->setTypeName(Types::INTEGER)
375+
->create(),
376+
)
377+
->setPrimaryKeyConstraint(
378+
PrimaryKeyConstraint::editor()
379+
->setUnquotedColumnNames('id')
380+
->create(),
381+
)
382+
->create();
380383

381384
$this->dropAndCreateTable($table);
382385

‎tests/Functional/DataAccessTest.php

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,30 @@ class DataAccessTest extends FunctionalTestCase
2929
{
3030
protected function setUp(): void
3131
{
32-
$table = new Table('fetch_table', [
33-
Column::editor()
34-
->setUnquotedName('test_int')
35-
->setTypeName(Types::INTEGER)
36-
->create(),
37-
Column::editor()
38-
->setUnquotedName('test_string')
39-
->setTypeName(Types::STRING)
40-
->setLength(32)
41-
->create(),
42-
Column::editor()
43-
->setUnquotedName('test_datetime')
44-
->setTypeName(Types::DATETIME_MUTABLE)
45-
->setNotNull(false)
46-
->create(),
47-
]);
48-
$table->addPrimaryKeyConstraint(
49-
PrimaryKeyConstraint::editor()
50-
->setUnquotedColumnNames('test_int')
51-
->create(),
52-
);
32+
$table = Table::editor()
33+
->setUnquotedName('fetch_table')
34+
->setColumns(
35+
Column::editor()
36+
->setUnquotedName('test_int')
37+
->setTypeName(Types::INTEGER)
38+
->create(),
39+
Column::editor()
40+
->setUnquotedName('test_string')
41+
->setTypeName(Types::STRING)
42+
->setLength(32)
43+
->create(),
44+
Column::editor()
45+
->setUnquotedName('test_datetime')
46+
->setTypeName(Types::DATETIME_MUTABLE)
47+
->setNotNull(false)
48+
->create(),
49+
)
50+
->setPrimaryKeyConstraint(
51+
PrimaryKeyConstraint::editor()
52+
->setUnquotedColumnNames('test_int')
53+
->create(),
54+
)
55+
->create();
5356

5457
$this->dropAndCreateTable($table);
5558

@@ -657,21 +660,24 @@ public function testSqliteDateArithmeticWithDynamicInterval(): void
657660
self::markTestSkipped('test is for sqlite only');
658661
}
659662

660-
$table = new Table('fetch_table_date_math', [
661-
Column::editor()
662-
->setUnquotedName('test_date')
663-
->setTypeName(Types::DATE_MUTABLE)
664-
->create(),
665-
Column::editor()
666-
->setUnquotedName('test_days')
667-
->setTypeName(Types::INTEGER)
668-
->create(),
669-
]);
670-
$table->addPrimaryKeyConstraint(
671-
PrimaryKeyConstraint::editor()
672-
->setUnquotedColumnNames('test_date')
673-
->create(),
674-
);
663+
$table = Table::editor()
664+
->setUnquotedName('fetch_table_date_math')
665+
->setColumns(
666+
Column::editor()
667+
->setUnquotedName('test_date')
668+
->setTypeName(Types::DATE_MUTABLE)
669+
->create(),
670+
Column::editor()
671+
->setUnquotedName('test_days')
672+
->setTypeName(Types::INTEGER)
673+
->create(),
674+
)
675+
->setPrimaryKeyConstraint(
676+
PrimaryKeyConstraint::editor()
677+
->setUnquotedColumnNames('test_date')
678+
->create(),
679+
)
680+
->create();
675681

676682
$sm = $this->connection->createSchemaManager();
677683
$sm->createTable($table);

‎tests/Functional/Driver/DBAL6024Test.php

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,30 @@ protected function setUp(): void
2424

2525
public function testDropPrimaryKey(): void
2626
{
27-
$table = new Table('mytable', [
28-
Column::editor()
29-
->setUnquotedName('id')
30-
->setTypeName(Types::INTEGER)
31-
->create(),
32-
]);
33-
$table->addPrimaryKeyConstraint(
34-
PrimaryKeyConstraint::editor()
35-
->setUnquotedColumnNames('id')
36-
->create(),
37-
);
27+
$table = Table::editor()
28+
->setUnquotedName('mytable')
29+
->setColumns(
30+
Column::editor()
31+
->setUnquotedName('id')
32+
->setTypeName(Types::INTEGER)
33+
->create(),
34+
)
35+
->setPrimaryKeyConstraint(
36+
PrimaryKeyConstraint::editor()
37+
->setUnquotedColumnNames('id')
38+
->create(),
39+
)
40+
->create();
41+
3842
$this->dropAndCreateTable($table);
3943

4044
$schemaManager = $this->connection->createSchemaManager();
4145

4246
$table = $schemaManager->introspectTable('mytable');
4347

44-
$newTable = clone $table;
45-
$newTable->dropPrimaryKey();
48+
$newTable = $table->edit()
49+
->dropPrimaryKeyConstraint()
50+
->create();
4651

4752
$diff = $schemaManager->createComparator()->compareTables($table, $newTable);
4853

0 commit comments

Comments
 (0)