Properly quote column name in "createFunction" call #11870
Merged
Conversation
This file contains hidden or 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
| public function countFiles($numericId, OutputInterface $output) { | ||
| $queryBuilder = $this->connection->getQueryBuilder(); | ||
| $queryBuilder->select($queryBuilder->createFunction('count(fileid)')) | ||
| $queryBuilder->select($queryBuilder->createFunction('count(' . $queryBuilder->getColumnName('fileid') . ')')) |
Member
There was a problem hiding this comment.
uppercase the function name?
lib/private/Group/Database.php
Outdated
| $query->select($query->createFunction('COUNT(Distinct ' . $query->getColumnName('uid') . ')')) | ||
| ->from('preferences', 'p') | ||
| ->innerJoin('p', 'group_user', 'g', 'p.userid = g.uid') | ||
| ->innerJoin('p', 'group_user', 'g', 'p.`userid` = g.`uid`') |
Member
There was a problem hiding this comment.
$query->expr()->eq('p.userid', 'g.uid')
lib/private/Group/Database.php
Outdated
|
|
||
| $query = $this->dbConn->getQueryBuilder(); | ||
| $query->select($query->createFunction('COUNT(Distinct uid)')) | ||
| $query->select($query->createFunction('COUNT(Distinct ' . $query->getColumnName('uid') . ')')) |
lib/private/User/Manager.php
Outdated
| public function countDisabledUsersOfGroups(array $groups): int { | ||
| $queryBuilder = \OC::$server->getDatabaseConnection()->getQueryBuilder(); | ||
| $queryBuilder->select($queryBuilder->createFunction('COUNT(Distinct uid)')) | ||
| $queryBuilder->select($queryBuilder->createFunction('COUNT(Distinct ' . $queryBuilder->getColumnName('uid') . ')')) |
lib/private/User/Manager.php
Outdated
| $queryBuilder->select($queryBuilder->createFunction('COUNT(Distinct uid)')) | ||
| $queryBuilder->select($queryBuilder->createFunction('COUNT(Distinct ' . $queryBuilder->getColumnName('uid') . ')')) | ||
| ->from('preferences', 'p') | ||
| ->innerJoin('p', 'group_user', 'g', 'p.userid = g.uid') |
Member
There was a problem hiding this comment.
$query->expr()->eq('p.userid', 'g.uid')
Signed-off-by: Morris Jobke <[email protected]>
MorrisJobke
force-pushed
the
fix/noid/proper-column-name-escaping
branch
from
f48fc25 to
b458ed9
Compare
Member
Author
|
@nickvergessen Addressed your comments. |
nickvergessen
approved these changes
Oct 16, 2018
nickvergessen
requested review from
ChristophWurst and
georgehrke
and removed request for
ChristophWurst
ChristophWurst
approved these changes
Oct 16, 2018
nickvergessen
added
bug
4. to release
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.
On Oracle the unquoted identifiers are upper cased: