Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking β€œSign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11.x] Remove Doctrine DBAL #48864

Merged
merged 61 commits into from
Jan 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
f6538ad
remove doctrine dbal from grammar
hafezdivandari Oct 31, 2023
8d882eb
remove unused imports
hafezdivandari Oct 31, 2023
c37884d
fix tests
hafezdivandari Oct 31, 2023
0346940
fix tests
hafezdivandari Oct 31, 2023
ba31106
remove mysql 5.7 tests
hafezdivandari Oct 31, 2023
ca78589
fix facade doctype
hafezdivandari Oct 31, 2023
f55b31e
use native column modifying by default
hafezdivandari Oct 31, 2023
90d1f8a
fix tests
hafezdivandari Oct 31, 2023
a5f4957
Merge branch 'master' into master-patch-2
hafezdivandari Nov 8, 2023
8c39f63
fix tests
hafezdivandari Nov 8, 2023
45310fd
wip
hafezdivandari Nov 8, 2023
19d5f92
Revert "remove mysql 5.7 tests"
hafezdivandari Nov 21, 2023
61208ea
support native column renaming on MySQL 5.7
hafezdivandari Nov 21, 2023
41837ca
fix style
hafezdivandari Nov 21, 2023
f612a13
wip
hafezdivandari Nov 21, 2023
019a868
Merge branch 'master' into master-patch-2
hafezdivandari Nov 28, 2023
fc2f9af
wip
hafezdivandari Nov 28, 2023
274fe12
remove doctrine usage on DatabaseTruncation
hafezdivandari Nov 28, 2023
a30d550
Merge branch 'master' into master-patch-2
hafezdivandari Dec 10, 2023
73754a4
wip
hafezdivandari Dec 10, 2023
f082214
rename index on sqlite
hafezdivandari Dec 10, 2023
254e099
remove doctrine/dbal from db commands
hafezdivandari Dec 10, 2023
49a0c3f
fix styles
hafezdivandari Dec 10, 2023
ba0d8ea
wip
hafezdivandari Dec 10, 2023
bd1bceb
wip
hafezdivandari Dec 11, 2023
ba4978e
support renaming columns on legacy MariaDB
hafezdivandari Dec 11, 2023
eae02d9
remove redundant non-standard tests
hafezdivandari Dec 11, 2023
a99792e
Merge branch 'master' into master-patch-2
hafezdivandari Dec 13, 2023
b5c3862
Merge branch 'master' into master-patch-2
hafezdivandari Dec 16, 2023
92d0ec9
add collation modifier to sqlite
hafezdivandari Dec 17, 2023
8b6c226
support native column modifying on sqlite
hafezdivandari Dec 17, 2023
402830d
fix styles
hafezdivandari Dec 17, 2023
9a7be0c
add user-defined types to db:show
hafezdivandari Dec 17, 2023
686ec27
wip
hafezdivandari Dec 17, 2023
d44e2c6
fix styles
hafezdivandari Dec 17, 2023
ebd9bee
fix dropForeign exception on SQLite
hafezdivandari Dec 17, 2023
46562fb
fix styles
hafezdivandari Dec 17, 2023
1cc64af
include generated and hidden columns on sqlite
hafezdivandari Dec 18, 2023
1d8510f
remove custom doctrine types
hafezdivandari Dec 18, 2023
86058a8
remove doctrine change column
hafezdivandari Dec 18, 2023
88c2752
styling
hafezdivandari Dec 18, 2023
298b43f
remove support for registering custom doctrine types
hafezdivandari Dec 18, 2023
b60b221
remove unused config methods and property
hafezdivandari Dec 18, 2023
35666b3
remove redundant semicolon
hafezdivandari Dec 19, 2023
8102add
Merge branch 'master' into master-patch-2
hafezdivandari Dec 21, 2023
3a8acd2
force re-run tests
hafezdivandari Dec 21, 2023
29cfb81
remove doctrine related conflicts
hafezdivandari Dec 22, 2023
fc4dd91
remove doctrine/dbal from require-dev
hafezdivandari Dec 22, 2023
fa197e0
Revert "remove doctrine/dbal from require-dev"
hafezdivandari Dec 22, 2023
2fb96c4
revert unrelated changes
hafezdivandari Dec 25, 2023
d7e1ddf
disable foreign key constraints when altering table on SQLite
hafezdivandari Dec 25, 2023
0aa3207
fix styling
hafezdivandari Dec 25, 2023
606663d
consider backticks when parsing collate on SQLite
hafezdivandari Dec 25, 2023
02eef27
update facade docblocks
hafezdivandari Dec 27, 2023
5e99d96
remove doctrine connection
hafezdivandari Dec 27, 2023
20f80bb
Merge branch 'master' into master-patch-2
hafezdivandari Jan 3, 2024
7110c42
formatting
hafezdivandari Jan 3, 2024
b88f803
Merge branch 'master' into master-patch-2
hafezdivandari Jan 5, 2024
f5a2c8a
Merge branch 'master' into master-patch-2
hafezdivandari Jan 9, 2024
055e1cd
fix conflicts
hafezdivandari Jan 9, 2024
63ea4d6
formatting
taylorotwell Jan 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
consider backticks when parsing collate on SQLite
hafezdivandari committed Dec 25, 2023
commit 606663d5a70f98e7b07b0518c0eae20a686c20c8
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ public function processColumns($results, $sql = '')
$type = strtolower($result->type);

$collation = preg_match('/\b'.preg_quote($result->name)
.'\b[^,(]+(?:\([^()]+\)[^,]*)?(?:(?:default|check|as)\s*(?:\(.*?\))?[^,]*)*collate\s+["\']?(\w+)/i',
.'\b[^,(]+(?:\([^()]+\)[^,]*)?(?:(?:default|check|as)\s*(?:\(.*?\))?[^,]*)*collate\s+["\'`]?(\w+)/i',
$sql, $matches) === 1 ? strtolower($matches[1]) : null;

return [