fixed pg typos
This commit is contained in:
parent
573cbf193d
commit
f9c7af2e0f
@ -17,7 +17,6 @@ class SYS_SAIMOD_TODO_LIST_FREE extends \SYSTEM\DB\QP {
|
|||||||
' WHERE todo.'.\SYSTEM\SQL\system_todo::FIELD_STATE.' = $1'.
|
' WHERE todo.'.\SYSTEM\SQL\system_todo::FIELD_STATE.' = $1'.
|
||||||
' AND assign.'.\SYSTEM\SQL\system_todo_assign::FIELD_USER.' IS NULL'.
|
' 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)'.
|
' 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';
|
') 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';
|
//' 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!
|
//sorry postgres but ur rly bad!
|
||||||
|
|||||||
@ -17,7 +17,6 @@ class SYS_SAIMOD_TODO_LIST_OTHERS extends \SYSTEM\DB\QP {
|
|||||||
' WHERE todo.'.\SYSTEM\SQL\system_todo::FIELD_STATE.' = $1'.
|
' WHERE todo.'.\SYSTEM\SQL\system_todo::FIELD_STATE.' = $1'.
|
||||||
' AND NOT assign.'.\SYSTEM\SQL\system_todo_assign::FIELD_USER.' = $2'.
|
' 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)'.
|
' 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';
|
') 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';
|
//' 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!
|
//sorry postgres but ur rly bad!
|
||||||
|
|||||||
@ -12,7 +12,7 @@ class SYS_SAIMOD_TODO_LIST_TYPE extends \SYSTEM\DB\QP {
|
|||||||
' assignee.'.\SYSTEM\SQL\system_user::FIELD_ID.' as assignee_id'.
|
' assignee.'.\SYSTEM\SQL\system_user::FIELD_ID.' as assignee_id'.
|
||||||
' FROM '.\SYSTEM\SQL\system_todo::NAME_PG.' as todo'.
|
' 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_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.
|
' 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'.
|
' WHERE todo.'.\SYSTEM\SQL\system_todo::FIELD_STATE.' = $1'.
|
||||||
' AND todo.'.\SYSTEM\SQL\system_todo::FIELD_TYPE.' = $2'.
|
' AND todo.'.\SYSTEM\SQL\system_todo::FIELD_TYPE.' = $2'.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user