Refactor OC\DB\QueryBuilder::execute
#40157
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
summersab
requested review from
ChristophWurst,
miaulalala,
nickvergessen and
st3iny
as code owners
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| $sql = $this->adapter->fixupStatement($sql); | ||
| $this->queriesExecuted++; | ||
| $this->logQueryToFile($sql); | ||
| return parent::executeUpdate($sql, $params, $types); | ||
| return parent::executeStatement($sql, $params, $types); |
Check failure
Code scanning / Psalm
InvalidReturnStatement Error
|
CI is failing 🟥 and there are conflicts ⚔️ |
Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com> Fix CI errors
summersab
force-pushed
the
refactor/OC-DB-QueryBuilder_execute
branch
from
f488610 to
ba25b00
Compare
| @@ -277,7 +277,12 @@ public function execute() { | |||
| ]); | |||
| } | |||
|
|
|||
| $result = $this->queryBuilder->execute(); | |||
| if ($this->queryBuilder->getType() === $this->queryBuilder::SELECT) { | |||
There was a problem hiding this comment.
Suggested change
| if ($this->queryBuilder->getType() === $this->queryBuilder::SELECT) { | |
| if ($this->getType() !== \Doctrine\DBAL\Query\QueryBuilder::SELECT) { |
As per lines below
Merged
|
conflicts |
skjnldsv
added
2. developing
This was referenced Mar 12, 2024
Merged
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR refactors the deprecated method
OC\DB\QueryBuilder::executeand replaces it with eitherOC\DB\QueryBuilder::executeQuery(when actual results are desired) orOC\DB\QueryBuilder::executeStatement(when a count of rows is desired or the operation is an insert / update / delete)throughout the entire NC codebase (excluding
./appsand./3rdparty).Care was taken to not change
executemethods that are NOT deprecated such as:OC\Files\Cache\CacheQueryBuilder::executeOC\DB\QueryBuilder\QueryBuilder::executeOCP\DB\IPreparedStatement::executeHowever, please be advised that since this PR is rather extensive, it is possible that a
querymethod NOT part of theOC\DB\QueryBuildercould have been updated.