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.

Sign up for GitHub

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

Jump to bottom

chore(deps): Bump doctrine/dbal to 3.7.x #38556

Merged
merged 10 commits into from Oct 6, 2023
Merged

chore(deps): Bump doctrine/dbal to 3.7.x #38556

merged 10 commits into from Oct 6, 2023

Conversation

nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented May 31, 2023 •
edited

TODO

Checklist

@nickvergessen nickvergessen added the 2. developing Work in progress label May 31, 2023
@nickvergessen nickvergessen added this to the Nextcloud 28 milestone May 31, 2023
@nickvergessen nickvergessen self-assigned this May 31, 2023
@nickvergessen nickvergessen marked this pull request as draft May 31, 2023 14:27
@nickvergessen nickvergessen mentioned this pull request May 31, 2023
Closed
6 tasks
@nickvergessen nickvergessen added pending documentation This pull request needs an associated documentation update enhancement labels Jun 1, 2023
@nickvergessen nickvergessen mentioned this pull request Jul 5, 2023
Merged
@nickvergessen nickvergessen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jul 5, 2023
@nickvergessen nickvergessen force-pushed the techdebt/noid/doctrine/dbal-to-3.6.2 branch from ac82534 to 85ce06c Compare July 5, 2023 07:08
@nickvergessen nickvergessen marked this pull request as ready for review July 5, 2023 07:09
@nickvergessen nickvergessen mentioned this pull request Jul 5, 2023
Merged
@nickvergessen
Copy link
Member Author

Forgot the schema migration thingy. Back to draft.

@nickvergessen nickvergessen marked this pull request as draft July 5, 2023 07:40
@nickvergessen
Copy link
Member Author

  • OC\Repair\SqliteAutoincrement
    • I installed current master and exported the schema as SQL
    • Then I went to this branch, removed the content of the run() method (so made it no-op)
    • I installed again and exported the schema as SQL
    • The files are exactly the same, so whatever we tried to fix was fixed since 2015 in doctrine dbal :-O
      -> Removed

github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 5, 2023
View reviewed changes
lib/private/DB/Migrator.php Fixed Show fixed Hide fixed
@nickvergessen nickvergessen force-pushed the techdebt/noid/doctrine/dbal-to-3.6.2 branch from b7a05ef to 56aec0b Compare July 6, 2023 08:32
@nickvergessen

This comment was marked as resolved.

Sign in to view
This was referenced Aug 17, 2023
Closed
Merged
@nickvergessen nickvergessen changed the title chore(deps): Bump doctrine/dbal to supported 3.6.2 chore(deps): Bump doctrine/dbal to 3.7.x Sep 29, 2023
@nickvergessen nickvergessen force-pushed the techdebt/noid/doctrine/dbal-to-3.6.2 branch 2 times, most recently from aa9f1f7 to f2ef8e7 Compare September 29, 2023 12:47
github-advanced-security[bot]
github-advanced-security bot found potential problems Sep 29, 2023
View reviewed changes
lib/private/DB/OracleMigrator.php Fixed Show fixed Hide fixed
lib/private/DB/OracleMigrator.php Fixed Show fixed Hide fixed
lib/private/DB/OracleMigrator.php Fixed Show fixed Hide fixed
lib/private/DB/OracleMigrator.php Fixed Show fixed Hide fixed
lib/private/DB/OracleMigrator.php Fixed Show fixed Hide fixed
lib/private/DB/OracleMigrator.php Fixed Show fixed Hide fixed
@nickvergessen nickvergessen force-pushed the techdebt/noid/doctrine/dbal-to-3.6.2 branch from f2ef8e7 to 87e3d81 Compare September 29, 2023 13:07
github-advanced-security[bot]
github-advanced-security bot found potential problems Sep 29, 2023
View reviewed changes
lib/private/DB/OracleMigrator.php Fixed Show fixed Hide fixed
lib/private/DB/OracleMigrator.php Fixed Show fixed Hide fixed
@nickvergessen nickvergessen force-pushed the techdebt/noid/doctrine/dbal-to-3.6.2 branch 3 times, most recently from 2eb7267 to b59e769 Compare September 29, 2023 15:44
@nickvergessen nickvergessen marked this pull request as ready for review September 29, 2023 18:16
come-nc
come-nc reviewed Oct 2, 2023
View reviewed changes
lib/private/DB/Migrator.php Show resolved Hide resolved
lib/private/DB/Migrator.php Outdated Show resolved Hide resolved
lib/private/DB/OracleMigrator.php Show resolved Hide resolved
Altahrim
Altahrim approved these changes Oct 2, 2023
View reviewed changes
lib/private/DB/Migrator.php Show resolved Hide resolved
blizzz
blizzz approved these changes Oct 6, 2023
View reviewed changes
lib/private/DB/Migrator.php
@@ -178,7 +178,7 @@ protected function convertStatementToScript($statement) {
}

protected function getFilterExpression() {
return '/^' . preg_quote($this->config->getSystemValueString('dbtableprefix', 'oc_')) . '/';
return '/^' . preg_quote($this->config->getSystemValueString('dbtableprefix', 'oc_'), '/') . '/';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤷

@nickvergessen
chore(deps): Bump doctrine/dbal to supported 3.7.0
18d672c 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(dbal): Doctrine\DBAL\Connection::PARAM_* types are deprecated
c4ed7f9 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
feat(CI): Add a stub for SensitiveParameter, so Psalm is not failing …
00acf1b 
…on Doctrine/DBAL

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(sqlite): Remove no longer required autoincrement fix
ad839db 
- I installed current master and exported the schema as SQL
- Then I went to this branch, removed the content of the run() method (so made it no-op)
- I installed again and exported the schema as SQL
- The files are exactly the same, so whatever we tried to fix was fixed since 2015 in doctrine dbal

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(postgres): Remove old Postgres 9.4 workaround
b202b13 
Postgres 10 is the minimum in the meantime
and doctrine/dbal fixed this in 2.6.0 already
ref doctrine/dbal#2614

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(mysql): Remove custom MySQL workaround from 2015
160298c 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(dbal): Move migrator away from deprecated calls
9192078 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(oracle): Move away from internal and deprecated SchemaDiff API
f8ee6c4 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(sqlite): Remove some old SQLite cheats
ccb01b1 
- Doctrine correctly forces integer for autoincrement by now
- Doctrine correctly maintains integer types by now

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(DB): Update comment to state why we still use the max 4k limit
570159e 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the techdebt/noid/doctrine/dbal-to-3.6.2 branch from cf8e0bc to 570159e Compare October 6, 2023 13:29
@nickvergessen nickvergessen merged commit 71cd97c into master Oct 6, 2023
41 checks passed
@nickvergessen nickvergessen deleted the techdebt/noid/doctrine/dbal-to-3.6.2 branch October 6, 2023 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blizzz blizzz blizzz approved these changes

@Altahrim Altahrim Altahrim approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@kesselb kesselb Awaiting requested review from kesselb

@sorbaugh sorbaugh Awaiting requested review from sorbaugh

@come-nc come-nc Awaiting requested review from come-nc

Assignees

@nickvergessen nickvergessen

Labels
3. to review Waiting for reviews enhancement pending documentation This pull request needs an associated documentation update
Projects
None yet
Milestone
Nextcloud 28
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@nickvergessen @blizzz @Altahrim @come-nc