spacefreak/user_sql
1
0
Fork 0
Code Pull Requests Activity

Fix queries after tests

Browse Source
This commit is contained in:
Marcin Łojewski
2018-12-22 19:01:37 +01:00
parent 6f56e449a5
commit 1c1cd89bb2
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Query/QueryProvider.php
View File

@@ -87,18 +87,18 @@ class QueryProvider implements \ArrayAccess
$uidParam = Query::UID_PARAM; $uidParam = Query::UID_PARAM;
$groupColumns $groupColumns
= "$gGID AS gid, " . = "g.$gGID AS gid, " .
(empty($gName) ? $gGID : $gName) . " AS name, " . (empty($gName) ? "g." . $gGID : "g." . $gName) . " AS name, " .
(empty($gAdmin) ? "false" : $gAdmin) . " AS admin"; (empty($gAdmin) ? "false" : "g." . $gAdmin) . " AS admin";
$userColumns $userColumns
= "$uUID AS uid, " . = "u.$uUID AS uid, " .
(empty($uName) ? $uUID : $uName) . " AS name, " . (empty($uName) ? "u." . $uUID : "u." . $uName) . " AS name, " .
(empty($uEmail) ? "null" : $uEmail) . " AS email, " . (empty($uEmail) ? "null" : "u." . $uEmail) . " AS email, " .
(empty($uQuota) ? "null" : $uQuota) . " AS quota, " . (empty($uQuota) ? "null" : "u." . $uQuota) . " AS quota, " .
(empty($uHome) ? "null" : $uHome) . " AS home, " . (empty($uHome) ? "null" : "u." . $uHome) . " AS home, " .
(empty($uActive) ? "true" : $uActive) . " AS active, " . (empty($uActive) ? "true" : "u." . $uActive) . " AS active, " .
(empty($uAvatar) ? "false" : $uAvatar) . " AS avatar, " . (empty($uAvatar) ? "false" : "u." . $uAvatar) . " AS avatar, " .
(empty($uSalt) ? "null" : $uSalt) . " AS salt"; (empty($uSalt) ? "null" : "u." . $uSalt) . " AS salt";
$this->queries = [ $this->queries = [
Query::BELONGS_TO_ADMIN => Query::BELONGS_TO_ADMIN =>
@@ -121,43 +121,43 @@ class QueryProvider implements \ArrayAccess
"WHERE u.$uUID LIKE :$searchParam", "WHERE u.$uUID LIKE :$searchParam",
Query::FIND_GROUP => Query::FIND_GROUP =>
"SELECT g.$groupColumns " . "SELECT $groupColumns " .
"FROM $group g " . "FROM $group g " .
"WHERE g.$gGID = :$gidParam", "WHERE g.$gGID = :$gidParam",
Query::FIND_GROUP_USERS => Query::FIND_GROUP_USERS =>
"SELECT ug.$ugUID AS uid " . "SELECT ug.$ugUID AS uid " .
"FROM ug.$userGroup " . "FROM $userGroup ug " .
"WHERE ug.$ugGID = :$gidParam " . "WHERE ug.$ugGID = :$gidParam " .
"AND ug.$ugUID " . "AND ug.$ugUID " .
"LIKE :$searchParam " . "LIKE :$searchParam " .
"ORDER BY ug.$ugUID", "ORDER BY ug.$ugUID",
Query::FIND_GROUPS => Query::FIND_GROUPS =>
"SELECT g.$groupColumns " . "SELECT $groupColumns " .
"FROM g.$group " . "FROM $group g " .
"WHERE g.$gGID LIKE :$searchParam " . "WHERE g.$gGID LIKE :$searchParam " .
"ORDER BY g.$gGID", "ORDER BY g.$gGID",
Query::FIND_USER => Query::FIND_USER =>
"SELECT u.$userColumns, u.$uPassword AS password " . "SELECT $userColumns, u.$uPassword AS password " .
"FROM u.$user " . "FROM $user u " .
"WHERE u.$uUID = :$uidParam", "WHERE u.$uUID = :$uidParam",
Query::FIND_USER_CASE_INSENSITIVE => Query::FIND_USER_CASE_INSENSITIVE =>
"SELECT u.$userColumns, u.$uPassword AS password " . "SELECT $userColumns, u.$uPassword AS password " .
"FROM $user u " . "FROM $user u " .
"WHERE lower(u.$uUID) = lower(:$uidParam)", "WHERE lower(u.$uUID) = lower(:$uidParam)",
Query::FIND_USER_GROUPS => Query::FIND_USER_GROUPS =>
"SELECT g.$groupColumns " . "SELECT $groupColumns " .
"FROM $group g, $userGroup ug " . "FROM $group g, $userGroup ug " .
"WHERE ug.$ugGID = g.$gGID " . "WHERE ug.$ugGID = g.$gGID " .
"AND ug.$ugUID = :$uidParam " . "AND ug.$ugUID = :$uidParam " .
"ORDER BY g.$gGID", "ORDER BY g.$gGID",
Query::FIND_USERS => Query::FIND_USERS =>
"SELECT u.$userColumns " . "SELECT $userColumns " .
"FROM $user u " . "FROM $user u " .
"WHERE u.$uUID LIKE :$searchParam " . "WHERE u.$uUID LIKE :$searchParam " .
"ORDER BY u.$uUID", "ORDER BY u.$uUID",