From f9c7af2e0f73e3bb72ac5487ea608fd5181c7d30 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 15 Feb 2016 04:47:04 +0100 Subject: [PATCH] fixed pg typos --- sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_FREE.php | 1 - sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_OTHERS.php | 1 - sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_TYPE.php | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_FREE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_FREE.php index a7cb1df..81bd921 100644 --- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_FREE.php +++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_FREE.php @@ -17,7 +17,6 @@ class SYS_SAIMOD_TODO_LIST_FREE extends \SYSTEM\DB\QP { ' WHERE todo.'.\SYSTEM\SQL\system_todo::FIELD_STATE.' = $1'. ' AND assign.'.\SYSTEM\SQL\system_todo_assign::FIELD_USER.' IS NULL'. ' AND (todo.'.\SYSTEM\SQL\system_todo::FIELD_MESSAGE.' LIKE $2 OR creator.'.\SYSTEM\SQL\system_user::FIELD_USERNAME.' LIKE $3 OR assignee.'.\SYSTEM\SQL\system_user::FIELD_USERNAME.' LIKE $4)'. - ' ORDER BY case when assign.'.\SYSTEM\SQL\system_todo_assign::FIELD_USER.' = $5 then 1 else 2 end'. ') as a'; //' ORDER BY a.'.\SYSTEM\SQL\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\SQL\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\SQL\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\SQL\system_todo::FIELD_TIME.' DESC'; //sorry postgres but ur rly bad! diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_OTHERS.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_OTHERS.php index 8d1ce07..9c3e084 100644 --- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_OTHERS.php +++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_OTHERS.php @@ -17,7 +17,6 @@ class SYS_SAIMOD_TODO_LIST_OTHERS extends \SYSTEM\DB\QP { ' WHERE todo.'.\SYSTEM\SQL\system_todo::FIELD_STATE.' = $1'. ' AND NOT assign.'.\SYSTEM\SQL\system_todo_assign::FIELD_USER.' = $2'. ' AND (todo.'.\SYSTEM\SQL\system_todo::FIELD_MESSAGE.' LIKE $3 OR creator.'.\SYSTEM\SQL\system_user::FIELD_USERNAME.' LIKE $4 OR assignee.'.\SYSTEM\SQL\system_user::FIELD_USERNAME.' LIKE $5)'. - ' ORDER BY case when assign.'.\SYSTEM\SQL\system_todo_assign::FIELD_USER.' = $6 then 1 else 2 end'. ') as a'; //' ORDER BY a.'.\SYSTEM\SQL\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\SQL\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\SQL\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\SQL\system_todo::FIELD_TIME.' DESC'; //sorry postgres but ur rly bad! diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_TYPE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_TYPE.php index 59e258c..08ea28c 100644 --- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_TYPE.php +++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_TYPE.php @@ -12,7 +12,7 @@ class SYS_SAIMOD_TODO_LIST_TYPE extends \SYSTEM\DB\QP { ' assignee.'.\SYSTEM\SQL\system_user::FIELD_ID.' as assignee_id'. ' FROM '.\SYSTEM\SQL\system_todo::NAME_PG.' as todo'. ' LEFT JOIN '.\SYSTEM\SQL\system_todo_assign::NAME_PG.' as assign ON todo."'.\SYSTEM\SQL\system_todo::FIELD_ID.'"=assign.'.\SYSTEM\SQL\system_todo_assign::FIELD_TODO. - ' LEFT JOIN '.\SYSTEM\SQL\system_user::NAME_PG.' as creator ON todo.'.\SYSTEM\SQL\system_todo::FIELD_USE.'=creator.'.\SYSTEM\SQL\system_user::FIELD_ID. + ' LEFT JOIN '.\SYSTEM\SQL\system_user::NAME_PG.' as creator ON todo.'.\SYSTEM\SQL\system_todo::FIELD_USER.'=creator.'.\SYSTEM\SQL\system_user::FIELD_ID. ' LEFT JOIN '.\SYSTEM\SQL\system_user::NAME_PG.' as assignee ON assign.'.\SYSTEM\SQL\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\SQL\system_user::FIELD_ID. ' WHERE todo.'.\SYSTEM\SQL\system_todo::FIELD_STATE.' = $1'. ' AND todo.'.\SYSTEM\SQL\system_todo::FIELD_TYPE.' = $2'.