Browse Source
Properly escape column name in "createFunction" call
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
pull/11870/head
Morris Jobke
8 years ago
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
6 changed files with
8 additions and
8 deletions
-
apps/dav/lib/Migration/BuildCalendarSearchIndex.php
-
apps/files_sharing/lib/Command/CleanupRemoteStorages.php
-
apps/user_ldap/lib/Mapping/AbstractMapping.php
-
lib/private/Comments/Manager.php
-
lib/private/Group/Database.php
-
lib/private/User/Manager.php
|
|
|
@ -70,7 +70,7 @@ class BuildCalendarSearchIndex implements IRepairStep { |
|
|
|
} |
|
|
|
|
|
|
|
$query = $this->db->getQueryBuilder(); |
|
|
|
$query->select($query->createFunction('MAX(id)')) |
|
|
|
$query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')')) |
|
|
|
->from('calendarobjects'); |
|
|
|
$maxId = (int)$query->execute()->fetchColumn(); |
|
|
|
|
|
|
|
|
|
|
|
@ -98,7 +98,7 @@ class CleanupRemoteStorages extends Command { |
|
|
|
|
|
|
|
public function countFiles($numericId, OutputInterface $output) { |
|
|
|
$queryBuilder = $this->connection->getQueryBuilder(); |
|
|
|
$queryBuilder->select($queryBuilder->createFunction('count(fileid)')) |
|
|
|
$queryBuilder->select($queryBuilder->createFunction('COUNT(' . $queryBuilder->getColumnName('fileid') . ')')) |
|
|
|
->from('filecache') |
|
|
|
->where($queryBuilder->expr()->eq( |
|
|
|
'storage', |
|
|
|
|
|
|
|
@ -311,7 +311,7 @@ abstract class AbstractMapping { |
|
|
|
*/ |
|
|
|
public function count() { |
|
|
|
$qb = $this->dbc->getQueryBuilder(); |
|
|
|
$query = $qb->select($qb->createFunction('COUNT(`ldap_dn`)')) |
|
|
|
$query = $qb->select($qb->createFunction('COUNT(' . $qb->getColumnName('ldap_dn') . ')')) |
|
|
|
->from($this->getTableName()); |
|
|
|
$res = $query->execute(); |
|
|
|
$count = $res->fetchColumn(); |
|
|
|
|
|
|
|
@ -163,7 +163,7 @@ class Manager implements ICommentsManager { |
|
|
|
*/ |
|
|
|
protected function updateChildrenInformation($id, \DateTime $cDateTime) { |
|
|
|
$qb = $this->dbConn->getQueryBuilder(); |
|
|
|
$query = $qb->select($qb->createFunction('COUNT(`id`)')) |
|
|
|
$query = $qb->select($qb->createFunction('COUNT(' . $qb->getColumnName('id') . ')')) |
|
|
|
->from('comments') |
|
|
|
->where($qb->expr()->eq('parent_id', $qb->createParameter('id'))) |
|
|
|
->setParameter('id', $id); |
|
|
|
|
|
|
|
@ -387,9 +387,9 @@ class Database extends ABackend |
|
|
|
$this->fixDI(); |
|
|
|
|
|
|
|
$query = $this->dbConn->getQueryBuilder(); |
|
|
|
$query->select($query->createFunction('COUNT(Distinct uid)')) |
|
|
|
$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', $query->expr()->eq('p.userid', 'g.uid')) |
|
|
|
->where($query->expr()->eq('appid', $query->createNamedParameter('core'))) |
|
|
|
->andWhere($query->expr()->eq('configkey', $query->createNamedParameter('enabled'))) |
|
|
|
->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter('false'), IQueryBuilder::PARAM_STR)) |
|
|
|
|
|
|
|
@ -475,9 +475,9 @@ class Manager extends PublicEmitter implements IUserManager { |
|
|
|
*/ |
|
|
|
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') . ')')) |
|
|
|
->from('preferences', 'p') |
|
|
|
->innerJoin('p', 'group_user', 'g', 'p.userid = g.uid') |
|
|
|
->innerJoin('p', 'group_user', 'g', $queryBuilder->expr()->eq('p.userid', 'g.uid')) |
|
|
|
->where($queryBuilder->expr()->eq('appid', $queryBuilder->createNamedParameter('core'))) |
|
|
|
->andWhere($queryBuilder->expr()->eq('configkey', $queryBuilder->createNamedParameter('enabled'))) |
|
|
|
->andWhere($queryBuilder->expr()->eq('configvalue', $queryBuilder->createNamedParameter('false'), IQueryBuilder::PARAM_STR)) |
|
|
|
|