🏗️ chore(deps): Bump doctrine/dbal from 3.8.3 to 4.0.4 #46192

nickvergessen · 2024-06-28T12:57:05Z

Ref chore(deps): Bump doctrine/dbal from 3.8.3 to 4.0.4 3rdparty#1877

🔴 Platform requirements

Removed support for Oracle 12c (12.2.0.1) and older
Removed support for MariaDB 10.4.2 and older
Removed support for MySQL 5.6 and older
Removed active support for Postgres 9

⛑️ Need Help

Oracle: lastInserId is no longer supported: 🚧 Test oracle #46304
PostgreSQL: Last insert ID things need a migration on update: https://www.doctrine-project.org/projects/doctrine-dbal/en/4.0/how-to/postgresql-identity-migration.html

⚠️ Breaking API changes

Doctrine\DBAL\Platforms\SqlitePlatform was renamed, use \OCP\IDBConnection::getDatabaseProvider() instead
Doctrine\DBAL\Platforms\PostgreSQL94Platform was removed, use \OCP\IDBConnection::getDatabaseProvider() instead
\OCP\DB\IQueryBuilder::getQueryParts() and \OCP\DB\IQueryBuilder::getQueryPart() were removed
\OCP\DB\IQueryBuilder::resetQueryParts() and \OCP\DB\IQueryBuilder::resetQueryPart() can only reset 'where'|'having'|'orderBy'|'groupBy'. For all other cases a new querybuilder has to be created.
Doctrine\DBAL\Types\Type::getName() aka. $column->getType()->getName() was removed is removed, use newly added \OCP\DB\Types::getType($column->getType())
Doctrine\DBAL\Schema\Table::changeColumn() was removed, use Table::modifyColumn() instead
Doctrine\DBAL\Schema\Table::hasPrimaryKey() was removed, use Table::getPrimaryKey() instead
Doctrine\DBAL\Schema\Schema::getTableNames() was removed, use OCP\DB\ISchemaWrapper::getTableNames() instead
Doctrine\DBAL\Connection::getSchemaManager() was removed, use Connection::createSchemaManager() instead
Doctrine\DBAL\FetchMode was removed, please use the dedicated fetch methods instead
\OCP\DB\IQueryBuilder::delete() and \OCP\DB\IQueryBuilder::update() no longer support table alias
Doctrine\DBAL\Platforms\MySQL80Platform requires the length of a VARCHAR column to be specified - 255 was added
OCP\DB\IPreparedStatement::bindParam() is deprecated and calls bindValue() internally
OCP\Diagnostics\IQueryLogger no longer extends \Doctrine\DBAL\Logging\SQLLogger
OCP\Diagnostics\IQuery data structure is now typed and the structure of the data can have changed depending on the type of the query due to upstream changes
OCP\DB\QueryBuilder\IExpressionBuilder::orX() and OCP\DB\QueryBuilder\IExpressionBuilder::andX() can no longer be called without arguments. Create an array outside and only create the composition once you know your entries.
Affected row counts are limited to PHP_INT_MAX

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php

apps/files_sharing/lib/Migration/Version11300Date20201120141438.php

lib/private/DB/ConnectionFactory.php

lib/private/DB/Middlewares/SQLiteCaseSensitiveLike.php

apps/user_ldap/lib/Mapping/AbstractMapping.php

core/Command/Db/ConvertFilecacheBigInt.php

lib/private/DB/MigrationService.php

lib/private/DB/Migrator.php

come-nc

Sorry for the bit of bikeshedding 🙂

apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php

core/Command/Db/ConvertType.php

core/Migrations/Version13000Date20170718121200.php

lib/private/DB/Connection.php

come-nc · 2024-07-04T10:23:49Z

lib/private/DB/QueryBuilder/QueryBuilder.php

@@ -1096,18 +1135,20 @@ public function addOrderBy($sort, $order = null) {
 	 * @param string $queryPartName
 	 *
 	 * @return mixed


Suggested change

* @return mixed

* @return never

lib/private/DB/ResultAdapter.php

lib/private/DB/SchemaWrapper.php

lib/private/DB/TDoctrineParameterTypeMap.php

come-nc · 2024-07-04T10:32:13Z

lib/private/Setup/PostgreSQL.php

@@ -35,7 +35,7 @@ public function setupDatabase($username) {
 					->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser)));

 				try {
-					$result = $query->execute();
+					$result = $query->executeQuery();
 					$canCreateRoles = $result->rowCount() > 0;
 				} catch (DatabaseException $e) {


iirc execute and executeQuery do not throw the same class and this needs to be adapted, same for other similar changes.

server/lib/public/DB/QueryBuilder/IQueryBuilder.php

Lines 149 to 154 in 5fdc5d5

* @return IResult|int

* @throws Exception since 21.0.0

* @since 8.2.0

* @deprecated 22.0.0 Use executeQuery or executeStatement

*/

public function execute();

🆒 how the docs are lying then...

They are not, you do need to use executeQuery, but you also need to adapt catch to the wrapped Exception.
I checked and DatabaseException is not part of the wrapped ones, only the dbal exception get wrapped so you should be fine.

Signed-off-by: Joas Schilling <coding@schilljs.com>

…ote()` - saw 2 Signed-off-by: Joas Schilling <coding@schilljs.com>

…fierQuoteCharacter()` does not exist Signed-off-by: Joas Schilling <coding@schilljs.com>

…tBitAndComparisonExpression` expects string Signed-off-by: Joas Schilling <coding@schilljs.com>

…calls `bindValue()` internally Signed-off-by: Joas Schilling <coding@schilljs.com>

Signed-off-by: Joas Schilling <coding@schilljs.com>

…ELETE fails Signed-off-by: Joas Schilling <coding@schilljs.com>

…on\ExpressionBuilder::or()`, 0 passed and atleast 1 expected Signed-off-by: Joas Schilling <coding@schilljs.com>

lib/private/DB/ConnectionAdapter.php

@@ -230,18 +238,10 @@
 		return $this->inner;
 	}

+	/**
+	 * @return self::PLATFORM_MYSQL|self::PLATFORM_ORACLE|self::PLATFORM_POSTGRES|self::PLATFORM_SQLITE


lib/private/DB/ConnectionAdapter.php

-		} else {
-			throw new \Exception('Database ' . $platform::class . ' not supported');
-		}
+		return $this->inner->getDatabaseProvider();


lib/private/DB/TDoctrineParameterTypeMap.php

+use OCP\DB\QueryBuilder\IQueryBuilder;
+
+trait TDoctrineParameterTypeMap {
+	protected function convertParameterTypeToDoctrine(ArrayParameterType|ParameterType|string|int|null $type): ArrayParameterType|ParameterType|string {


nickvergessen added the 2. developing Work in progress label Jun 28, 2024

nickvergessen added this to the Nextcloud 30 milestone Jun 28, 2024

nickvergessen mentioned this pull request Jun 28, 2024

ci: Adjust database versions to current LTS / supported versions #46121

Merged

4 tasks

This comment was marked as outdated.

Sign in to view

nickvergessen force-pushed the dependabot/composer/doctrine/dbal-4.0.4 branch from f305046 to 3b4d652 Compare July 1, 2024 09:34

nickvergessen requested review from ChristophWurst, miaulalala and st3iny as code owners July 1, 2024 09:34

github-advanced-security bot found potential problems Jul 1, 2024

View reviewed changes

apps/federatedfilesharing/lib/Migration/Version1011Date20201120125158.php Fixed Show fixed Hide fixed

apps/files_sharing/lib/Migration/Version11300Date20201120141438.php Fixed Show fixed Hide fixed

This comment was marked as outdated.

Sign in to view

github-advanced-security bot found potential problems Jul 1, 2024

View reviewed changes

lib/private/DB/ConnectionFactory.php Fixed Show fixed Hide fixed

lib/private/DB/Middlewares/SQLiteCaseSensitiveLike.php Fixed Show fixed Hide fixed

juliusknorr mentioned this pull request Jul 2, 2024

fix: Remove bindParam usage with simpler query nextcloud/deck#6065

Merged

nickvergessen force-pushed the dependabot/composer/doctrine/dbal-4.0.4 branch from c0d7ab3 to 7868c3c Compare July 2, 2024 12:50

nickvergessen added the technical debt label Jul 2, 2024

github-advanced-security bot found potential problems Jul 2, 2024

View reviewed changes

apps/user_ldap/lib/Mapping/AbstractMapping.php Fixed Show fixed Hide fixed

nickvergessen force-pushed the dependabot/composer/doctrine/dbal-4.0.4 branch from fee1143 to f4809bb Compare July 3, 2024 09:01

nickvergessen mentioned this pull request Jul 3, 2024

test(doctrinedbal4): "chore(deps): Bump doctrine/dbal from 3.8.3 to 4.0.4" nextcloud/spreed#12634

Closed

nickvergessen force-pushed the dependabot/composer/doctrine/dbal-4.0.4 branch from f4809bb to bbb78e0 Compare July 3, 2024 09:18

github-advanced-security bot found potential problems Jul 4, 2024

View reviewed changes

nickvergessen force-pushed the dependabot/composer/doctrine/dbal-4.0.4 branch from ab5e08c to a42453f Compare July 4, 2024 09:33

nickvergessen requested a review from tcitworld as a code owner July 4, 2024 09:33

come-nc reviewed Jul 4, 2024

View reviewed changes

nickvergessen added 6 commits July 4, 2024 14:19

chore(deps): Bump doctrine/dbal from 3.8.3 to 4.0.4

c239495

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db)!: Fix casing of doctrine's SQLitePlatform

015a3e8

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Adjust Connection signature to updated doctrine one

a5432e3

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db)!: Empty and adjust query-part related methods

de0141d

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Make sure setComment() is only called with strings

72886c0

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Use new function name to get the schema

6d0e8e4

Signed-off-by: Joas Schilling <coding@schilljs.com>

nickvergessen added 19 commits July 4, 2024 14:19

fix(db)!: Deprecate getDatabasePlatform which leaks 3rdparty

df7d088

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): No longer return result of Connection::connect()

60217aa

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Too many arguments for method `\Doctrine\DBAL\Connection::qu…

926f2ab

…ote()` - saw 2 Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Method `\Doctrine\DBAL\Platforms\AbstractPlatform::getIdenti…

bae31bf

…fierQuoteCharacter()` does not exist Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Argument 2 of `\Doctrine\DBAL\Platforms\AbstractPlatform::ge…

7156569

…tBitAndComparisonExpression` expects string Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db)!: OCP\DB\IPreparedStatement::bindParam() is deprecated and …

66aac18

…calls `bindValue()` internally Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Add a hint that we return PHP_INT_MAX

98b6c7c

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Map parameter types to doctrine's enums

6b2f136

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Remove usage of Platforms

1370693

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db)!: Reimplement the query logger with a doctrine middleware

de5a7c3

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Don't set null as type

8153c38

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(tests): Adjust the migrator test

fc383a3

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Adjust unit tests of query builder

4c80fdd

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(tests): Fix changes in doctrine's Exception handling

5718e8f

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db): Replace more Platform usages

f0348be

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(tests): Add length to test columns that bypass the migration service

b2cf45c

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(tests): Adjust postgres schema diffing

72c8c3a

Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(tests): Also handle the case where the schema is cached and the D…

8b7f8e1

…ELETE fails Signed-off-by: Joas Schilling <coding@schilljs.com>

fix(db)!: Too few arguments to function `Doctrine\DBAL\Query\Expressi…

5fdc5d5

…on\ExpressionBuilder::or()`, 0 passed and atleast 1 expected Signed-off-by: Joas Schilling <coding@schilljs.com>

nickvergessen force-pushed the dependabot/composer/doctrine/dbal-4.0.4 branch from a42453f to 5fdc5d5 Compare July 4, 2024 12:23

github-advanced-security bot found potential problems Jul 4, 2024

View reviewed changes

nickvergessen mentioned this pull request Jul 4, 2024

🚧 Test oracle #46304

Draft

nickvergessen mentioned this pull request Jul 18, 2024

fix(deps): Deprecate functionality deprecated by doctrine and test on more oracle versions #46605

Merged

4 tasks

This was referenced Jul 30, 2024

30.0.0 beta 2 #46870

Merged

30.0.0 beta 3 #46946

Merged

nickvergessen modified the milestones: Nextcloud 30, Nextcloud 31 Aug 1, 2024

skjnldsv marked this pull request as draft November 15, 2024 13:07

blizzz modified the milestones: Nextcloud 31, Nextcloud 32 Jan 29, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🏗️ chore(deps): Bump doctrine/dbal from 3.8.3 to 4.0.4 #46192

🏗️ chore(deps): Bump doctrine/dbal from 3.8.3 to 4.0.4 #46192

nickvergessen commented Jun 28, 2024 •

edited

Loading

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

come-nc left a comment

come-nc Jul 4, 2024

come-nc Jul 4, 2024

nickvergessen Jul 4, 2024

come-nc Jul 8, 2024

	* @return IResult\|int
	* @throws Exception since 21.0.0
	* @since 8.2.0
	* @deprecated 22.0.0 Use executeQuery or executeStatement
	*/
	public function execute();

🏗️ chore(deps): Bump doctrine/dbal from 3.8.3 to 4.0.4 #46192

Are you sure you want to change the base?

🏗️ chore(deps): Bump doctrine/dbal from 3.8.3 to 4.0.4 #46192

Conversation

nickvergessen commented Jun 28, 2024 • edited Loading

🔴 Platform requirements

⛑️ Need Help

⚠️ Breaking API changes

Checklist

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

come-nc left a comment

Choose a reason for hiding this comment

come-nc Jul 4, 2024

Choose a reason for hiding this comment

come-nc Jul 4, 2024

Choose a reason for hiding this comment

nickvergessen Jul 4, 2024

Choose a reason for hiding this comment

come-nc Jul 8, 2024

Choose a reason for hiding this comment

nickvergessen commented Jun 28, 2024 •

edited

Loading