Skip to content

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

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

Merged
nickvergessen merged 14 commits into from
Jul 19, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5c02303
ci(oracle): Test against Oracle 11, 18, 21 and 23
nickvergessen Jul 18, 2024
f92352e
fix(db): Deprecate `getQueryPart()` and `resetQueryPart()` methods th…
nickvergessen Jul 18, 2024
a4c1d72
fix(db): Use `createSchemaManager()` method as `getSchemaManager()` i…
nickvergessen Jun 28, 2024
11e84b8
fix(db): Fix internal calls to doctrine's `fetch()` methods
nickvergessen Jun 28, 2024
c84580d
fix(db): `Doctrine\DBAL\Connection::executeUpdate()` is deprecated
nickvergessen Jul 1, 2024
e9bfaf3
fix(db): Don't use deprecated 3rdparty constant: `Doctrine\DBAL\Conne…
nickvergessen Jul 1, 2024
bd38362
fix(db): Deprecate using table alias for DELETE and UPDATE
nickvergessen Jul 1, 2024
829f2b9
fix(db): Promote the use of `getDatabaseProvider` to reduce the impag…
nickvergessen Jul 1, 2024
e454657
fix(db): Deprecate `getState()` as per upstream
nickvergessen Jul 1, 2024
eeb6ddb
fix(db): Deprecate `IExpressionBuilder::or()` and `IExpressionBuilder…
nickvergessen Jul 4, 2024
e1e4ee4
fix(db): Manually track if `where()` is called when not empty to avoi…
nickvergessen Jul 18, 2024
f6238d3
fix(test): Make the test less flaky
nickvergessen Jul 19, 2024
817ca00
ci: Run all Oracle versions all the time
nickvergessen Jul 19, 2024
b656edc
fix(db): Fix md5 for oracle >= 20
nickvergessen Jul 19, 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
fix(db): Manually track if where() is called when not empty to avoi… 
…d recursion

Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Jul 19, 2024
commit e1e4ee4d677ac8a491c6afb150b9f7b46473d196
43 changes: 24 additions & 19 deletions lib/private/DB/QueryBuilder/QueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class QueryBuilder implements IQueryBuilder {

/** @var bool */
private $automaticTablePrefix = true;
private bool $nonEmptyWhere = false;

/** @var string */
protected $lastInsertedTable;
Expand Down Expand Up @@ -185,24 +186,24 @@ private function prepareForExecute() {
}
}

if (!empty($this->getQueryPart('select'))) {
$select = $this->getQueryPart('select');
$hasSelectAll = array_filter($select, static function ($s) {
return $s === '*';
});
$hasSelectSpecific = array_filter($select, static function ($s) {
return $s !== '*';
});

if (empty($hasSelectAll) === empty($hasSelectSpecific)) {
$exception = new QueryException('Query is selecting * and specific values in the same query. This is not supported in Oracle.');
$this->logger->error($exception->getMessage(), [
'query' => $this->getSQL(),
'app' => 'core',
'exception' => $exception,
]);
}
}
// if (!empty($this->getQueryPart('select'))) {
// $select = $this->getQueryPart('select');
// $hasSelectAll = array_filter($select, static function ($s) {
// return $s === '*';
// });
// $hasSelectSpecific = array_filter($select, static function ($s) {
// return $s !== '*';
// });

// if (empty($hasSelectAll) === empty($hasSelectSpecific)) {
// $exception = new QueryException('Query is selecting * and specific values in the same query. This is not supported in Oracle.');
// $this->logger->error($exception->getMessage(), [
// 'query' => $this->getSQL(),
// 'app' => 'core',
// 'exception' => $exception,
// ]);
// }
// }

$numberOfParameters = 0;
$hasTooLargeArrayParameter = false;
Expand Down Expand Up @@ -830,12 +831,14 @@ public function set($key, $value) {
* @return $this This QueryBuilder instance.
*/
public function where(...$predicates) {
if ($this->getQueryPart('where') !== null && $this->systemConfig->getValue('debug', false)) {
if ($this->nonEmptyWhere && $this->systemConfig->getValue('debug', false)) {
// Only logging a warning, not throwing for now.
$e = new QueryException('Using where() on non-empty WHERE part, please verify it is intentional to not call andWhere() or orWhere() instead. Otherwise consider creating a new query builder object or call resetQueryPart(\'where\') first.');
$this->logger->warning($e->getMessage(), ['exception' => $e]);
}

$this->nonEmptyWhere = true;

call_user_func_array(
[$this->queryBuilder, 'where'],
$predicates
Expand Down Expand Up @@ -863,6 +866,7 @@ public function where(...$predicates) {
* @see where()
*/
public function andWhere(...$where) {
$this->nonEmptyWhere = true;
call_user_func_array(
[$this->queryBuilder, 'andWhere'],
$where
Expand Down Expand Up @@ -890,6 +894,7 @@ public function andWhere(...$where) {
* @see where()
*/
public function orWhere(...$where) {
$this->nonEmptyWhere = true;
call_user_func_array(
[$this->queryBuilder, 'orWhere'],
$where
Expand Down