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

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

Merged
merged 14 commits into from
Jul 19, 2024
Merged

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

merged 14 commits into from
Jul 19, 2024

Conversation

nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Jul 18, 2024 •
edited
Loading

Summary

Checklist

@nickvergessen nickvergessen added this to the Nextcloud 30 milestone Jul 18, 2024
@nickvergessen nickvergessen self-assigned this Jul 18, 2024
github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 18, 2024
View reviewed changes
lib/private/DB/ConnectionAdapter.php
@@ -230,18 +230,10 @@
return $this->inner;
}

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

Check failure

Code scanning / Psalm

MoreSpecificReturnType Error

The declared return type ''mysql'|'oracle'|'postgres'|'sqlite'' for OC\DB\ConnectionAdapter::getDatabaseProvider is more specific than the inferred return type 'string'
lib/private/DB/ConnectionAdapter.php
} else {
throw new \Exception('Database ' . $platform::class . ' not supported');
}
return $this->inner->getDatabaseProvider();

Check failure

Code scanning / Psalm

LessSpecificReturnStatement Error

The type 'string' is more general than the declared return type ''mysql'|'oracle'|'postgres'|'sqlite'' for OC\DB\ConnectionAdapter::getDatabaseProvider
lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
$this->connection = $connection;
$this->logger = $logger;

Check failure

Code scanning / Psalm

InvalidPropertyAssignmentValue Error

$this->logger with declared type 'OC\DB\QueryBuilder\FunctionBuilder\FunctionBuilder' cannot be assigned type 'Psr\Log\LoggerInterface'
lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
@@ -63,6 +62,9 @@
* @return \OCP\DB\QueryBuilder\ICompositeExpression
*/
public function andX(...$x): ICompositeExpression {
if (empty($x)) {
$this->logger->debug('Calling ' . IQueryBuilder::class . '::' . __FUNCTION__ . ' without parameters is deprecated and will throw soon.', ['exception' => new \Exception('No parameters in call to ' . __METHOD__)]);

Check failure

Code scanning / Psalm

UndefinedMethod Error

Method OC\DB\QueryBuilder\FunctionBuilder\FunctionBuilder::debug does not exist
lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
@@ -81,6 +83,9 @@
* @return \OCP\DB\QueryBuilder\ICompositeExpression
*/
public function orX(...$x): ICompositeExpression {
if (empty($x)) {
$this->logger->debug('Calling ' . IQueryBuilder::class . '::' . __FUNCTION__ . ' without parameters is deprecated and will throw soon.', ['exception' => new \Exception('No parameters in call to ' . __METHOD__)]);

Check failure

Code scanning / Psalm

UndefinedMethod Error

Method OC\DB\QueryBuilder\FunctionBuilder\FunctionBuilder::debug does not exist
@nickvergessen nickvergessen mentioned this pull request Jul 18, 2024
Merged
@nickvergessen nickvergessen force-pushed the bugfix/noid/test-more-oracle-versions branch from b11564f to 796d641 Compare July 18, 2024 09:41
@nickvergessen
ci(oracle): Test against Oracle 11, 18, 21 and 23
5c02303 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Deprecate getQueryPart() and resetQueryPart() methods th…
f92352e 
…at will be removed with Doctrine/DBAL 4

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Use createSchemaManager() method as getSchemaManager() i…
a4c1d72 
…s deprecated

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Fix internal calls to doctrine's fetch() methods
11e84b8 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Doctrine\DBAL\Connection::executeUpdate() is deprecated
c84580d 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Don't use deprecated 3rdparty constant: `Doctrine\DBAL\Conne…
e9bfaf3 
…ction::PARAM_STR_ARRAY`

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Deprecate using table alias for DELETE and UPDATE
bd38362 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Promote the use of getDatabaseProvider to reduce the impag…
829f2b9 
…e of removed upstream platforms

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Deprecate getState() as per upstream
e454657 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Deprecate IExpressionBuilder::or() and `IExpressionBuilder…
eeb6ddb 
…::and()` without parameters

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(db): Manually track if where() is called when not empty to avoi…
e1e4ee4 
…d recursion

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
fix(test): Make the test less flaky
f6238d3 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
ci: Run all Oracle versions all the time
817ca00 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the bugfix/noid/test-more-oracle-versions branch from 7d34c84 to 817ca00 Compare July 19, 2024 09:27
ChristophWurst
ChristophWurst approved these changes Jul 19, 2024
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

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

👍 for the carddav/caldav changes

github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 19, 2024
View reviewed changes
lib/private/DB/Connection.php
* All apps and API code should not need this and instead use provided functionality from the above.
*/
public function getServerVersion(): string {
return $this->_conn->getServerVersion();

Check failure

Code scanning / Psalm

UndefinedInterfaceMethod Error

Method Doctrine\DBAL\Driver\Connection::getServerVersion does not exist
lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
@@ -12,6 +12,9 @@

class OCIFunctionBuilder extends FunctionBuilder {
public function md5($input): IQueryFunction {
if (version_compare($this->connection->getServerVersion(), '20', '>=')) {

Check failure

Code scanning / Psalm

UndefinedInterfaceMethod Error

Method OCP\IDBConnection::getServerVersion does not exist
@nickvergessen nickvergessen force-pushed the bugfix/noid/test-more-oracle-versions branch from 2ecf40f to b79d87c Compare July 19, 2024 11:30
@nickvergessen
fix(db): Fix md5 for oracle >= 20
b656edc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the bugfix/noid/test-more-oracle-versions branch from b79d87c to b656edc Compare July 19, 2024 12:14
@nickvergessen nickvergessen merged commit 7395211 into master Jul 19, 2024
167 of 169 checks passed
@nickvergessen nickvergessen deleted the bugfix/noid/test-more-oracle-versions branch July 19, 2024 14:40
@blizzz blizzz mentioned this pull request Jul 24, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@miaulalala miaulalala Awaiting requested review from miaulalala miaulalala is a code owner

@tcitworld tcitworld Awaiting requested review from tcitworld tcitworld is a code owner

Assignees

@nickvergessen nickvergessen

Labels
3. to review Waiting for reviews technical debt
Projects
None yet
Milestone
Nextcloud 30
Development

Successfully merging this pull request may close these issues.
3 participants
@nickvergessen @AndyScherzinger @ChristophWurst