Skip to content

Commit b856dc5

Browse files
driesvintsdriesvints
authored
[10.x] Drop DBAL v2 and bump v3 (#44733)
* Drop DBAL v2 and bump v3 * Revert old tests
1 parent 4fa9356 commit b856dc5

File tree

3 files changed

+3
-88
lines changed

3 files changed

+3
-88
lines changed

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"require-dev": {
8585
"ably/ably-php": "^1.0",
8686
"aws/aws-sdk-php": "^3.235.5",
87-
"doctrine/dbal": "^2.13.3|^3.1.4",
87+
"doctrine/dbal": "^3.5.1",
8888
"fakerphp/faker": "^1.9.2",
8989
"guzzlehttp/guzzle": "^7.5",
9090
"league/flysystem-aws-s3-v3": "^3.0",
@@ -147,7 +147,7 @@
147147
"ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
148148
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
149149
"brianium/paratest": "Required to run tests in parallel (^6.0).",
150-
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).",
150+
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
151151
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
152152
"filp/whoops": "Required for friendly error pages in development (^2.14.3).",
153153
"guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",

‎src/Illuminate/Database/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}
3636
},
3737
"suggest": {
38-
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).",
38+
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
3939
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
4040
"illuminate/console": "Required to use the database commands (^10.0).",
4141
"illuminate/events": "Required to use the observers with Eloquent (^10.0).",

‎tests/Database/DatabaseSchemaBlueprintIntegrationTest.php

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -60,30 +60,6 @@ public function testRenamingAndChangingColumnsWork()
6060

6161
// Expect one of the following two query sequences to be present...
6262
$expected = [
63-
[
64-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name, age FROM users',
65-
'DROP TABLE users',
66-
'CREATE TABLE users (name VARCHAR(255) NOT NULL COLLATE BINARY, age INTEGER NOT NULL)',
67-
'INSERT INTO users (name, age) SELECT name, age FROM __temp__users',
68-
'DROP TABLE __temp__users',
69-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name, age FROM users',
70-
'DROP TABLE users',
71-
'CREATE TABLE users (age VARCHAR(255) NOT NULL COLLATE BINARY, first_name VARCHAR(255) NOT NULL)',
72-
'INSERT INTO users (first_name, age) SELECT name, age FROM __temp__users',
73-
'DROP TABLE __temp__users',
74-
],
75-
[
76-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name, age FROM users',
77-
'DROP TABLE users',
78-
'CREATE TABLE users (name VARCHAR(255) NOT NULL COLLATE BINARY, age INTEGER NOT NULL)',
79-
'INSERT INTO users (name, age) SELECT name, age FROM __temp__users',
80-
'DROP TABLE __temp__users',
81-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name, age FROM users',
82-
'DROP TABLE users',
83-
'CREATE TABLE users (first_name VARCHAR(255) NOT NULL, age VARCHAR(255) NOT NULL COLLATE BINARY)',
84-
'INSERT INTO users (first_name, age) SELECT name, age FROM __temp__users',
85-
'DROP TABLE __temp__users',
86-
],
8763
[
8864
'CREATE TEMPORARY TABLE __temp__users AS SELECT name, age FROM users',
8965
'DROP TABLE users',
@@ -118,13 +94,6 @@ public function testChangingColumnWithCollationWorks()
11894
$queries = $blueprint->toSql($this->db->connection(), new SQLiteGrammar);
11995

12096
$expected = [
121-
[
122-
'CREATE TEMPORARY TABLE __temp__users AS SELECT age FROM users',
123-
'DROP TABLE users',
124-
'CREATE TABLE users (age INTEGER NOT NULL COLLATE RTRIM)',
125-
'INSERT INTO users (age) SELECT age FROM __temp__users',
126-
'DROP TABLE __temp__users',
127-
],
12897
[
12998
'CREATE TEMPORARY TABLE __temp__users AS SELECT age FROM users',
13099
'DROP TABLE users',
@@ -139,13 +108,6 @@ public function testChangingColumnWithCollationWorks()
139108
$queries = $blueprint2->toSql($this->db->connection(), new SQLiteGrammar);
140109

141110
$expected = [
142-
[
143-
'CREATE TEMPORARY TABLE __temp__users AS SELECT age FROM users',
144-
'DROP TABLE users',
145-
'CREATE TABLE users (age INTEGER NOT NULL COLLATE NOCASE)',
146-
'INSERT INTO users (age) SELECT age FROM __temp__users',
147-
'DROP TABLE __temp__users',
148-
],
149111
[
150112
'CREATE TEMPORARY TABLE __temp__users AS SELECT age FROM users',
151113
'DROP TABLE users',
@@ -171,13 +133,6 @@ public function testChangingCharColumnsWork()
171133
$queries = $blueprint->toSql($this->db->connection(), new SQLiteGrammar);
172134

173135
$expected = [
174-
[
175-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
176-
'DROP TABLE users',
177-
'CREATE TABLE users (name CHAR(50) NOT NULL COLLATE BINARY)',
178-
'INSERT INTO users (name) SELECT name FROM __temp__users',
179-
'DROP TABLE __temp__users',
180-
],
181136
[
182137
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
183138
'DROP TABLE users',
@@ -275,14 +230,6 @@ public function testAddUniqueIndexWithoutNameWorks()
275230
$queries = $blueprintMySql->toSql($this->db->connection(), new MySqlGrammar);
276231

277232
$expected = [
278-
[
279-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
280-
'DROP TABLE users',
281-
'CREATE TABLE users (name VARCHAR(255) DEFAULT NULL COLLATE BINARY)',
282-
'INSERT INTO users (name) SELECT name FROM __temp__users',
283-
'DROP TABLE __temp__users',
284-
'alter table `users` add unique `users_name_unique`(`name`)',
285-
],
286233
[
287234
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
288235
'DROP TABLE users',
@@ -302,14 +249,6 @@ public function testAddUniqueIndexWithoutNameWorks()
302249
$queries = $blueprintPostgres->toSql($this->db->connection(), new PostgresGrammar);
303250

304251
$expected = [
305-
[
306-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
307-
'DROP TABLE users',
308-
'CREATE TABLE users (name VARCHAR(255) DEFAULT NULL COLLATE BINARY)',
309-
'INSERT INTO users (name) SELECT name FROM __temp__users',
310-
'DROP TABLE __temp__users',
311-
'alter table "users" add constraint "users_name_unique" unique ("name")',
312-
],
313252
[
314253
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
315254
'DROP TABLE users',
@@ -329,14 +268,6 @@ public function testAddUniqueIndexWithoutNameWorks()
329268
$queries = $blueprintSQLite->toSql($this->db->connection(), new SQLiteGrammar);
330269

331270
$expected = [
332-
[
333-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
334-
'DROP TABLE users',
335-
'CREATE TABLE users (name VARCHAR(255) DEFAULT NULL COLLATE BINARY)',
336-
'INSERT INTO users (name) SELECT name FROM __temp__users',
337-
'DROP TABLE __temp__users',
338-
'create unique index "users_name_unique" on "users" ("name")',
339-
],
340271
[
341272
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
342273
'DROP TABLE users',
@@ -356,14 +287,6 @@ public function testAddUniqueIndexWithoutNameWorks()
356287
$queries = $blueprintSqlServer->toSql($this->db->connection(), new SqlServerGrammar);
357288

358289
$expected = [
359-
[
360-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
361-
'DROP TABLE users',
362-
'CREATE TABLE users (name VARCHAR(255) DEFAULT NULL COLLATE BINARY)',
363-
'INSERT INTO users (name) SELECT name FROM __temp__users',
364-
'DROP TABLE __temp__users',
365-
'create unique index "users_name_unique" on "users" ("name")',
366-
],
367290
[
368291
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
369292
'DROP TABLE users',
@@ -390,14 +313,6 @@ public function testAddUniqueIndexWithNameWorks()
390313
$queries = $blueprintMySql->toSql($this->db->connection(), new MySqlGrammar);
391314

392315
$expected = [
393-
[
394-
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
395-
'DROP TABLE users',
396-
'CREATE TABLE users (name VARCHAR(255) DEFAULT NULL COLLATE BINARY)',
397-
'INSERT INTO users (name) SELECT name FROM __temp__users',
398-
'DROP TABLE __temp__users',
399-
'alter table `users` add unique `index1`(`name`)',
400-
],
401316
[
402317
'CREATE TEMPORARY TABLE __temp__users AS SELECT name FROM users',
403318
'DROP TABLE users',

0 commit comments

Comments
 (0)