Add aliases to queries
issue#83 Error when same column names
This commit is contained in:
@@ -102,65 +102,65 @@ class QueryProvider implements \ArrayAccess
|
|||||||
|
|
||||||
$this->queries = [
|
$this->queries = [
|
||||||
Query::BELONGS_TO_ADMIN =>
|
Query::BELONGS_TO_ADMIN =>
|
||||||
"SELECT COUNT($gGID) > 0 AS admin " .
|
"SELECT COUNT(g.$gGID) > 0 AS admin " .
|
||||||
"FROM $group, $userGroup " .
|
"FROM $group g, $userGroup ug " .
|
||||||
"WHERE $ugGID = $gGID " .
|
"WHERE ug.$ugGID = g.$gGID " .
|
||||||
"AND $ugUID = :$uidParam " .
|
"AND ug.$ugUID = :$uidParam " .
|
||||||
"AND $gAdmin",
|
"AND g.$gAdmin",
|
||||||
|
|
||||||
Query::COUNT_GROUPS =>
|
Query::COUNT_GROUPS =>
|
||||||
"SELECT COUNT($ugGID) " .
|
"SELECT COUNT(ug.$ugGID) " .
|
||||||
"FROM $userGroup " .
|
"FROM $userGroup ug " .
|
||||||
"WHERE $ugGID = :$gidParam " .
|
"WHERE ug.$ugGID = :$gidParam " .
|
||||||
"AND $ugUID " .
|
"AND ug.$ugUID " .
|
||||||
"LIKE :$searchParam",
|
"LIKE :$searchParam",
|
||||||
|
|
||||||
Query::COUNT_USERS =>
|
Query::COUNT_USERS =>
|
||||||
"SELECT COUNT($uUID) AS count " .
|
"SELECT COUNT(u.$uUID) AS count " .
|
||||||
"FROM $user " .
|
"FROM $user u " .
|
||||||
"WHERE $uUID LIKE :$searchParam",
|
"WHERE u.$uUID LIKE :$searchParam",
|
||||||
|
|
||||||
Query::FIND_GROUP =>
|
Query::FIND_GROUP =>
|
||||||
"SELECT $groupColumns " .
|
"SELECT g.$groupColumns " .
|
||||||
"FROM $group " .
|
"FROM $group g " .
|
||||||
"WHERE $gGID = :$gidParam",
|
"WHERE g.$gGID = :$gidParam",
|
||||||
|
|
||||||
Query::FIND_GROUP_USERS =>
|
Query::FIND_GROUP_USERS =>
|
||||||
"SELECT $ugUID AS uid " .
|
"SELECT ug.$ugUID AS uid " .
|
||||||
"FROM $userGroup " .
|
"FROM ug.$userGroup " .
|
||||||
"WHERE $ugGID = :$gidParam " .
|
"WHERE ug.$ugGID = :$gidParam " .
|
||||||
"AND $ugUID " .
|
"AND ug.$ugUID " .
|
||||||
"LIKE :$searchParam " .
|
"LIKE :$searchParam " .
|
||||||
"ORDER BY $ugUID",
|
"ORDER BY ug.$ugUID",
|
||||||
|
|
||||||
Query::FIND_GROUPS =>
|
Query::FIND_GROUPS =>
|
||||||
"SELECT $groupColumns " .
|
"SELECT g.$groupColumns " .
|
||||||
"FROM $group " .
|
"FROM g.$group " .
|
||||||
"WHERE $gGID LIKE :$searchParam " .
|
"WHERE g.$gGID LIKE :$searchParam " .
|
||||||
"ORDER BY $gGID",
|
"ORDER BY g.$gGID",
|
||||||
|
|
||||||
Query::FIND_USER =>
|
Query::FIND_USER =>
|
||||||
"SELECT $userColumns, $uPassword AS password " .
|
"SELECT u.$userColumns, u.$uPassword AS password " .
|
||||||
"FROM $user " .
|
"FROM u.$user " .
|
||||||
"WHERE $uUID = :$uidParam",
|
"WHERE u.$uUID = :$uidParam",
|
||||||
|
|
||||||
Query::FIND_USER_CASE_INSENSITIVE =>
|
Query::FIND_USER_CASE_INSENSITIVE =>
|
||||||
"SELECT $userColumns, $uPassword AS password " .
|
"SELECT u.$userColumns, u.$uPassword AS password " .
|
||||||
"FROM $user " .
|
"FROM $user u " .
|
||||||
"WHERE lower($uUID) = lower(:$uidParam)",
|
"WHERE lower(u.$uUID) = lower(:$uidParam)",
|
||||||
|
|
||||||
Query::FIND_USER_GROUPS =>
|
Query::FIND_USER_GROUPS =>
|
||||||
"SELECT $groupColumns " .
|
"SELECT g.$groupColumns " .
|
||||||
"FROM $group, $userGroup " .
|
"FROM $group g, $userGroup ug " .
|
||||||
"WHERE $ugGID = $gGID " .
|
"WHERE ug.$ugGID = g.$gGID " .
|
||||||
"AND $ugUID = :$uidParam " .
|
"AND ug.$ugUID = :$uidParam " .
|
||||||
"ORDER BY $gGID",
|
"ORDER BY g.$gGID",
|
||||||
|
|
||||||
Query::FIND_USERS =>
|
Query::FIND_USERS =>
|
||||||
"SELECT $userColumns " .
|
"SELECT u.$userColumns " .
|
||||||
"FROM $user " .
|
"FROM $user u " .
|
||||||
"WHERE $uUID LIKE :$searchParam " .
|
"WHERE u.$uUID LIKE :$searchParam " .
|
||||||
"ORDER BY $uUID",
|
"ORDER BY u.$uUID",
|
||||||
|
|
||||||
Query::UPDATE_DISPLAY_NAME =>
|
Query::UPDATE_DISPLAY_NAME =>
|
||||||
"UPDATE $user " .
|
"UPDATE $user " .
|
||||||
|
|||||||
Reference in New Issue
Block a user