From 37d5ca468a7115a59272212ac8a031314f546557 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 04:10:39 +0200
Subject: [PATCH] started qq->qq2 conversion

---
 db/qq/QP.php                                  | 48 ++++++++++---------
 db/qq/QQ.php                                  | 46 ++++++++++--------
 db/qq/QQuery.php                              | 16 -------
 dbd/qq/SYS_API_TREE.php                       | 16 +++----
 dbd/qq/SYS_CRON_GET.php                       | 16 +++----
 dbd/qq/SYS_CRON_LAST_VISIT.php                | 16 +++----
 dbd/qq/SYS_PAGE_GROUP.php                     | 16 +++----
 dbd/qq/SYS_SECURITY_CHECK.php                 | 15 +++---
 dbd/qq/SYS_TEXT_GET_TAG.php                   | 13 ++---
 .../saimod_sys_cron/qq/SYS_SAIMOD_CRON.php    | 16 +++----
 .../qq/SYS_SAIMOD_LOG_ANALYTICS.php           | 13 ++---
 .../qq/SYS_SAIMOD_LOG_FILTER.php              | 16 +++----
 .../qq/SYS_SAIMOD_LOG_FILTERS.php             | 17 ++++---
 .../qq/SYS_SAIMOD_LOG_FILTER_COUNT.php        | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_ASSIGN.php             | 14 ++----
 .../qq/SYS_SAIMOD_TODO_ASSIGNEES.php          | 13 ++---
 .../qq/SYS_SAIMOD_TODO_CLOSE.php              | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_CLOSE_ALL.php          | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_COUNT.php              | 13 ++---
 .../qq/SYS_SAIMOD_TODO_COUNT_FREE.php         | 13 ++---
 .../qq/SYS_SAIMOD_TODO_COUNT_MINE.php         | 13 ++---
 .../qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php       | 13 ++---
 .../qq/SYS_SAIMOD_TODO_COUNT_TYPE.php         | 13 ++---
 .../qq/SYS_SAIMOD_TODO_DEASSIGN.php           | 14 ++----
 .../qq/SYS_SAIMOD_TODO_EDIT.php               | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php   | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST.php               | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST_FREE.php          | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST_MINE.php          | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST_OTHERS.php        | 13 ++---
 .../qq/SYS_SAIMOD_TODO_LIST_TYPE.php          | 13 ++---
 .../qq/SYS_SAIMOD_TODO_OPEN.php               | 17 ++++---
 .../qq/SYS_SAIMOD_TODO_PRIORITY.php           | 13 ++---
 .../SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php  | 16 +++----
 .../SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php | 16 +++----
 ..._SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php | 13 ++---
 .../SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php  | 16 +++----
 .../SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php | 16 +++----
 .../qq/SYS_SAIMOD_TODO_STATS_USERS.php        | 13 ++---
 .../qq/SYS_SAIMOD_TODO_TODO.php               | 14 ++----
 40 files changed, 287 insertions(+), 363 deletions(-)
 delete mode 100644 db/qq/QQuery.php

diff --git a/db/qq/QP.php b/db/qq/QP.php
index 534b5d7..f152998 100644
--- a/db/qq/QP.php
+++ b/db/qq/QP.php
@@ -1,35 +1,39 @@
 <?php
 namespace SYSTEM\DB;
 
-class QP {                       
-    public static function QQ($params,$params_mys = null){
-        $query = static::query();        
-        $con = new \SYSTEM\DB\Connection($query->dbinfo);                
-        $is_pg = \SYSTEM\system::isSystemDbInfoPG();
-        if($query->dbinfo){
-            $is_pg = $query->dbinfo instanceof \SYSTEM\DB\DBInfoPG;}            
-        if($is_pg){
-            return $con->prepare($query->name,$query->sql_pg,$params);
-        } else {
-            return $con->prepare($query->name,$query->sql_mys,$params_mys ? $params_mys : $params);}
+class QP {
+    public static function QQ($params,$dbinfo = null){
+        if(!$dbinfo){
+            $dbinfo = \SYSTEM\system::getSystemDBInfo();}
+        $con = new \SYSTEM\DB\Connection($dbinfo);
+        
+        try{
+            if($dbinfo instanceof \SYSTEM\DB\DBInfoPG){
+                return $con->prepare(static::get_class(),static::pgsql(),$params);
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoMYS){
+                return $con->prepare(static::get_class(),static::mysql(),$params);
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoAMQP){
+                return $con->prepare(static::get_class(),static::amqp(),$params);
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoSQLite){
+                return $con->prepare(static::get_class(),static::sqlite(),$params);
+            }
+        } catch (\Exception $e){
+            throw new \SYSTEM\LOG\ERROR(static::get_class().' failed causing: '.$e->getMessage(),$e->getCode(),$e);}
+        throw new \Exception('Could not understand Database Settings. Check ur Database Settings');
     }
     
-    public static function QA($params,$params_mys = null){
-        $res = self::QQ($params,$params_mys);
+    public static function QA($params,$dbinfo = null){
+        $res = self::QQ($params,$dbinfo);
         $result = array();
         while($row = $res->next()){
             $result[] = $row;}
         return $result;
     }
     
-    public static function Q1($params,$params_mys = null){
-        return self::QQ($params,$params_mys)->next();}
+    public static function Q1($params,$dbinfo = null){
+        return self::QQ($params,$dbinfo)->next();}
     
-    public static function QI($params,$params_mys = null){
-        $qq = self::QQ($params,$params_mys);
-        return $qq->affectedRows() != (0||null);}  
-    //override this
-    protected static function query(){
-        throw new \SYSTEM\LOG\ERROR('query function of your QP Class not overwritten!');}
-        //return new QQuery();}    
+    public static function QI($params,$dbinfo = null){
+        $qq = self::QQ($params,$dbinfo);
+        return $qq->affectedRows() != (0||null);}
 }
\ No newline at end of file
diff --git a/db/qq/QQ.php b/db/qq/QQ.php
index ab86314..d8b3de7 100644
--- a/db/qq/QQ.php
+++ b/db/qq/QQ.php
@@ -2,33 +2,37 @@
 namespace SYSTEM\DB;
 
 class QQ {                       
-    public static function QQ(){
-        $query = static::query();        
-        $con = new \SYSTEM\DB\Connection($query->dbinfo);                
-        $is_pg = \SYSTEM\system::isSystemDbInfoPG();
-        if($query->dbinfo){
-            $is_pg = $query->dbinfo instanceof \SYSTEM\DB\DBInfoPG;}            
-        if($is_pg){
-            return $con->query($query->sql_pg);
-        } else {
-            return $con->query($query->sql_mys);}
+    public static function QQ($dbinfo = null){
+        if(!$dbinfo){
+            $dbinfo = \SYSTEM\system::getSystemDBInfo();}
+        $con = new \SYSTEM\DB\Connection($dbinfo);
+        
+        try{
+            if($dbinfo instanceof \SYSTEM\DB\DBInfoPG){
+                return $con->query(static::pgsql());
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoMYS){
+                return $con->query(static::mysql());
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoAMQP){
+                return $con->query(static::amqp());
+            } else if ($dbinfo instanceof \SYSTEM\DB\DBInfoSQLite){
+                return $con->query(static::sqlite());
+            }
+        } catch (\Exception $e){
+            throw new \SYSTEM\LOG\ERROR(static::get_class().' failed causing: '.$e->getMessage(),$e->getCode(),$e);}
+        
+        throw new \Exception('Could not understand Database Settings. Check ur Database Settings');
     }
     
-    public static function QA(){
-        $res = self::QQ();
+    public static function QA($dbinfo = null){
+        $res = self::QQ($dbinfo);
         $result = array();
         while($row = $res->next()){
             $result[] = $row;}
         return $result;
     }
     
-    public static function Q1(){
-        return self::QQ()->next();}
-    public static function QI(){
-        $qq = self::QQ();
-        return $qq;}
-    //override this
-    protected static function query(){
-        throw new \SYSTEM\LOG\ERROR('query function of your QQ Class not overwritten!');}
-        //return new QQuery();}    
+    public static function Q1($dbinfo = null){
+        return self::QQ($dbinfo)->next();}
+    public static function QI($dbinfo = null){
+        return self::QQ($dbinfo);}
 }
\ No newline at end of file
diff --git a/db/qq/QQuery.php b/db/qq/QQuery.php
deleted file mode 100644
index 3b7a306..0000000
--- a/db/qq/QQuery.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace SYSTEM\DB;
-
-class QQuery{
-    public $name = null;
-    public $sql_pg = null;
-    public $sql_mys = null;
-    public $dbinfo = null;
-    
-    public function __construct($name,$sql_pg=null,$sql_mys=null,$dbinfo = null){
-        $this->name = $name;
-        $this->sql_pg = $sql_pg;
-        $this->sql_mys = $sql_mys;
-        $this->dbinfo = $dbinfo;
-    }
-}
diff --git a/dbd/qq/SYS_API_TREE.php b/dbd/qq/SYS_API_TREE.php
index e77d418..f0aa452 100644
--- a/dbd/qq/SYS_API_TREE.php
+++ b/dbd/qq/SYS_API_TREE.php
@@ -1,15 +1,15 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_API_TREE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_PG
 .' WHERE "'.\SYSTEM\DBD\system_api::FIELD_GROUP.'" = $1'
-.' ORDER BY "'.\SYSTEM\DBD\system_api::FIELD_ID.'"',
-//mys
+.' ORDER BY "'.\SYSTEM\DBD\system_api::FIELD_ID.'"';
+    }
+    public static function mysql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_api::NAME_MYS
 .' WHERE `'.\SYSTEM\DBD\system_api::FIELD_GROUP.'` = ?'
-.' ORDER BY '.\SYSTEM\DBD\system_api::FIELD_ID
-);}}
\ No newline at end of file
+.' ORDER BY '.\SYSTEM\DBD\system_api::FIELD_ID;
+    }    
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_CRON_GET.php b/dbd/qq/SYS_CRON_GET.php
index 5c5810f..ba846c6 100644
--- a/dbd/qq/SYS_CRON_GET.php
+++ b/dbd/qq/SYS_CRON_GET.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CRON_GET extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' WHERE class = $1;',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return          
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' WHERE class = $1;';
+    }
+    public static function mysql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' WHERE class = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_CRON_LAST_VISIT.php b/dbd/qq/SYS_CRON_LAST_VISIT.php
index c87e994..9c3b580 100644
--- a/dbd/qq/SYS_CRON_LAST_VISIT.php
+++ b/dbd/qq/SYS_CRON_LAST_VISIT.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_CRON_LAST_VISIT extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE class =  \'SYSTEM\LOG\WARNING\' ORDER BY time DESC LIMIT 1;',
-//mys
-'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE class = "SYSTEM\\\\LOG\\\\CRON" ORDER BY time DESC LIMIT 1'
-);}}
\ No newline at end of file
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_PG.' WHERE class =  \'SYSTEM\LOG\WARNING\' ORDER BY time DESC LIMIT 1;';
+    }
+    public static function mysql(){return
+'SELECT time FROM '.\SYSTEM\DBD\system_log::NAME_MYS.' WHERE class = "SYSTEM\\\\LOG\\\\CRON" ORDER BY time DESC LIMIT 1';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_PAGE_GROUP.php b/dbd/qq/SYS_PAGE_GROUP.php
index b0b8325..b441e7e 100644
--- a/dbd/qq/SYS_PAGE_GROUP.php
+++ b/dbd/qq/SYS_PAGE_GROUP.php
@@ -1,17 +1,17 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_PAGE_GROUP extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_PG
 .' WHERE "'.\SYSTEM\DBD\system_page::FIELD_GROUP.'" = $1'
 .' AND "'.\SYSTEM\DBD\system_page::FIELD_STATE.'" = $2'
-.' ORDER BY "'.\SYSTEM\DBD\system_page::FIELD_ID.'" ASC;',
-//mys
+.' ORDER BY "'.\SYSTEM\DBD\system_page::FIELD_ID.'" ASC;';
+    }
+    public static function mysql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_page::NAME_MYS
 .' WHERE `'.\SYSTEM\DBD\system_page::FIELD_GROUP.'` = ?'
 .' AND `'.\SYSTEM\DBD\system_page::FIELD_STATE.'` = ?'
-.' ORDER BY '.\SYSTEM\DBD\system_page::FIELD_ID.' ASC;'
-);}}
\ No newline at end of file
+.' ORDER BY '.\SYSTEM\DBD\system_page::FIELD_ID.' ASC;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_SECURITY_CHECK.php b/dbd/qq/SYS_SECURITY_CHECK.php
index 7ea3e31..7f32612 100644
--- a/dbd/qq/SYS_SECURITY_CHECK.php
+++ b/dbd/qq/SYS_SECURITY_CHECK.php
@@ -2,14 +2,15 @@
 namespace SYSTEM\DBD;
 
 class SYS_SECURITY_CHECK extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\UserRightsTable::NAME_PG.
 ' WHERE "'.\SYSTEM\DBD\UserRightsTable::FIELD_USERID.'" = $1'.
-' AND "'.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.'" = $2;',
-//mys
+' AND "'.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.'" = $2;';
+    }
+    public static function mysql(){return
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\UserRightsTable::NAME_MYS.
 ' WHERE '.\SYSTEM\DBD\UserRightsTable::FIELD_USERID.' = ?'.
-' AND '.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.' = ?;'
-);}}
\ No newline at end of file
+' AND '.\SYSTEM\DBD\UserRightsTable::FIELD_RIGHTID.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/dbd/qq/SYS_TEXT_GET_TAG.php b/dbd/qq/SYS_TEXT_GET_TAG.php
index bc8d9d9..483037c 100644
--- a/dbd/qq/SYS_TEXT_GET_TAG.php
+++ b/dbd/qq/SYS_TEXT_GET_TAG.php
@@ -1,13 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_TEXT_GET_TAG extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT system_text.id,text FROM system_text
  LEFT JOIN system_text_tag ON system_text.id = system_text_tag.id
- WHERE tag = ? and lang = ?;'
-);}}
\ No newline at end of file
+ WHERE tag = ? and lang = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON.php b/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON.php
index 5fa8721..a49cd66 100644
--- a/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON.php
+++ b/sai/modules/saimod_sys_cron/qq/SYS_SAIMOD_CRON.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_CRON extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' ORDER BY class;',
-//mys
-'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' ORDER BY class;'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_PG.' ORDER BY class;';
+    }
+    public static function mysql(){return
+'SELECT * FROM '.\SYSTEM\DBD\system_cron::NAME_MYS.' ORDER BY class;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ANALYTICS.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ANALYTICS.php
index da49f4d..c2ba637 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ANALYTICS.php
+++ b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_ANALYTICS.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_ANALYTICS extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT DATE_FORMAT(FROM_UNIXTIME(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.') - MOD(UNIX_TIMESTAMP('.\SYSTEM\DBD\system_log::FIELD_TIME.'),?)),"%Y/%m/%d %H:%i:%s") as day,'
     .'count(*) as count,'
     .'count(distinct '.\SYSTEM\DBD\system_log::FIELD_USER.') as user_unique,'                                        
@@ -14,5 +10,6 @@ class SYS_SAIMOD_LOG_ANALYTICS extends \SYSTEM\DB\QP {
 .' FROM '.\SYSTEM\DBD\system_log::NAME_MYS
 .' GROUP BY day'
 .' ORDER BY day DESC'
-.' LIMIT 1;'
-);}}
+.' LIMIT 1;';
+    }
+}
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php
index e75ca91..1bc6c0a 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php
+++ b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php
@@ -1,22 +1,22 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_FILTER extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_PG.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_PG.
 ' ON '.\SYSTEM\DBD\system_log::NAME_PG.'.'.\SYSTEM\DBD\system_log::FIELD_USER.
 ' = '.\SYSTEM\DBD\system_user::NAME_PG.'.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.' LIKE $1'.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" DESC;',
-//mys
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" DESC;';
+    }
+    public static function mysql(){return
 'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.
 ' ON '.\SYSTEM\DBD\system_log::NAME_MYS.'.'.\SYSTEM\DBD\system_log::FIELD_USER.
 ' = '.\SYSTEM\DBD\system_user::NAME_MYS.'.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.' LIKE ?'.
 ' AND ('.\SYSTEM\DBD\system_log::FIELD_MESSAGE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_FILE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_IP.' LIKE ?)'.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_MYS.'.'.\SYSTEM\DBD\system_log::FIELD_ID.' DESC;'
-);}}
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_MYS.'.'.\SYSTEM\DBD\system_log::FIELD_ID.' DESC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTERS.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTERS.php
index 6f45092..cdca35e 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTERS.php
+++ b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTERS.php
@@ -1,18 +1,17 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_FILTERS extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'SELECT '.\SYSTEM\DBD\system_log::FIELD_CLASS.
 ' FROM '.\SYSTEM\DBD\system_log::NAME_PG.
 ' GROUP BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.';',
-//mys
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.';';
+    }
+    public static function mysql(){return
 'SELECT '.\SYSTEM\DBD\system_log::FIELD_CLASS.
 ' FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
 ' GROUP BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.';'
-);}}
-
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_CLASS.';';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php
index 3d24f35..f664ae8 100644
--- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php
+++ b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php
@@ -1,17 +1,16 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_LOG_FILTER_COUNT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_log::NAME_PG.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.
-' LIKE $1;',
-//mys
+' LIKE $1;';
+    }
+    public static function mysql(){return
 'SELECT COUNT(*) as count'.
 ' FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.' LIKE ?'.
-' AND ('.\SYSTEM\DBD\system_log::FIELD_MESSAGE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_FILE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_IP.' LIKE ?);'
-);}}
-
+' AND ('.\SYSTEM\DBD\system_log::FIELD_MESSAGE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_FILE.' LIKE ? OR '.\SYSTEM\DBD\system_log::FIELD_IP.' LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGN.php
index d86e049..61fc14e 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGN.php
@@ -1,14 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_ASSIGN extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'INSERT INTO '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.
 ' ('.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.','.\SYSTEM\DBD\system_todo_assign::FIELD_USER.','.\SYSTEM\DBD\system_todo_assign::FIELD_TIME.')'.
-' VALUES(?,?, NOW());'
-);}}
-
+' VALUES(?,?, NOW());';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGNEES.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGNEES.php
index 6237d36..8bcb5bd 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGNEES.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_ASSIGNEES.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_ASSIGNEES extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 ' SELECT assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.' as todo_id,'.
     ' assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' as assignee,'.
     ' assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.' as assignee_id'.
@@ -14,5 +10,6 @@ class SYS_SAIMOD_TODO_ASSIGNEES extends \SYSTEM\DB\QP {
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.' = ?'.
 ' ORDER BY case when assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ? then 1 else 2 end'.
-' LIMIT 10'
-);}}
\ No newline at end of file
+' LIMIT 10';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE.php
index 7f2a4ea..d02dc6d 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE.php
@@ -1,14 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_CLOSE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_PG.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_CLOSED.
-' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $1;',
-//mys
+' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $1;';
+    }
+    public static function mysql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_CLOSED.', '.\SYSTEM\DBD\system_todo::FIELD_TIME_CLOSED.'=NOW()'.
-' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;'
-);}}
-
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE_ALL.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE_ALL.php
index 9ce76a0..d7cd1cc 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE_ALL.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_CLOSE_ALL.php
@@ -1,14 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_CLOSE_ALL extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_PG.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_CLOSED.
-' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_TYPE.'"='.\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION.';',
-//mys
+' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_TYPE.'"='.\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION.';';
+    }
+    public static function mysql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_CLOSED.', '.\SYSTEM\DBD\system_todo::FIELD_TIME_CLOSED.'=NOW()'.
-' WHERE `'.\SYSTEM\DBD\system_todo::FIELD_TYPE.'`='.\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION.';'
-);}}
-
+' WHERE `'.\SYSTEM\DBD\system_todo::FIELD_TYPE.'`='.\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION.';';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
index db4e15a..a356bcb 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
@@ -1,16 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_COUNT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
 ' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as creator ON todo.'.\SYSTEM\DBD\system_todo::FIELD_USER.'=creator.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
-' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);'
-);}}
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
index 8064264..d9899e6 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_COUNT_FREE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT COUNT(*) as count'.
 ' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
 ' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
@@ -14,5 +10,6 @@ class SYS_SAIMOD_TODO_COUNT_FREE extends \SYSTEM\DB\QP {
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
 ' AND assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' IS NULL'.
-' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);'
-);}}
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
index 723f8bd..2876a44 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_COUNT_MINE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT COUNT(*) as count'.
 ' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
 ' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
@@ -14,5 +10,6 @@ class SYS_SAIMOD_TODO_COUNT_MINE extends \SYSTEM\DB\QP {
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
 ' AND assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?'.
-' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);'
-);}}
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php
index 4719298..327c438 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_COUNT_OTHERS extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT COUNT(*) as count FROM ('.
 ' SELECT todo.id'.
 ' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
@@ -17,5 +13,6 @@ class SYS_SAIMOD_TODO_COUNT_OTHERS extends \SYSTEM\DB\QP {
 ' AND NOT assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?'.
 ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ' GROUP BY todo.id'.
-') as a;'
-);}}
+') as a;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php
index 617afbe..3f01686 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_COUNT_TYPE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT COUNT(*) as count FROM ('.
 ' SELECT todo.id'.
 ' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
@@ -17,5 +13,6 @@ class SYS_SAIMOD_TODO_COUNT_TYPE extends \SYSTEM\DB\QP {
 ' AND todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' = ?'.
 ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ' GROUP BY todo.id'.
-') as a;'
-);}}
+') as a;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_DEASSIGN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_DEASSIGN.php
index 10be81c..a841bbb 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_DEASSIGN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_DEASSIGN.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_DEASSIGN extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
-'DELETE FROM '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' WHERE '.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.' = ? AND '.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?;'
-);}}
-
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
+'DELETE FROM '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' WHERE '.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.' = ? AND '.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php
index a67b5ec..7490a8c 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EDIT.php
@@ -1,15 +1,14 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_EDIT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_PG.' SET '.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.'= $1'.
-' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $2;',
-//mys
+' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $2;';
+    }
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.'= ?, '
          .\SYSTEM\DBD\system_todo::FIELD_MESSAGE_HASH.'= SHA1(?)'.
-' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;'
-);}}
-
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php
index 54b2392..d3de2c4 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_EXCEPTION_INSERT extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'INSERT INTO '.\SYSTEM\DBD\system_todo::NAME_MYS.
 '('.\SYSTEM\DBD\system_todo::FIELD_CLASS.','.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.','.
     \SYSTEM\DBD\system_todo::FIELD_CODE.','.\SYSTEM\DBD\system_todo::FIELD_FILE.','.
@@ -35,5 +31,6 @@ class SYS_SAIMOD_TODO_EXCEPTION_INSERT extends \SYSTEM\DB\QP {
             \SYSTEM\DBD\system_todo::FIELD_HTTP_REFERER.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_HTTP_REFERER.'), '.
             \SYSTEM\DBD\system_todo::FIELD_HTTP_USER_AGENT.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_HTTP_USER_AGENT.'), '.
             \SYSTEM\DBD\system_todo::FIELD_USER.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_USER.'), '.
-            \SYSTEM\DBD\system_todo::FIELD_THROWN.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_THROWN.');'
-);}}
\ No newline at end of file
+            \SYSTEM\DBD\system_todo::FIELD_THROWN.'=VALUES('.\SYSTEM\DBD\system_todo::FIELD_THROWN.');';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST.php
index 11a655a..8282ba4 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -23,5 +19,6 @@ class SYS_SAIMOD_TODO_LIST extends \SYSTEM\DB\QP {
     ' ORDER BY case when assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ? then 1 else 2 end'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';
+    }
+}
\ No newline at end of file
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 885a8bc..6941814 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
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST_FREE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -23,5 +19,6 @@ class SYS_SAIMOD_TODO_LIST_FREE extends \SYSTEM\DB\QP {
     ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_MINE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_MINE.php
index b7500a7..1835a25 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_MINE.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_LIST_MINE.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST_MINE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -23,5 +19,6 @@ class SYS_SAIMOD_TODO_LIST_MINE extends \SYSTEM\DB\QP {
     ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';    
+    }
+}
\ No newline at end of file
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 8a8edff..f086109 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
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST_OTHERS extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -23,5 +19,6 @@ class SYS_SAIMOD_TODO_LIST_OTHERS extends \SYSTEM\DB\QP {
     ' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?)'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';
+    }
+}
\ No newline at end of file
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 eff9771..3f3f9d4 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
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_LIST_TYPE extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT * FROM('.
     ' SELECT todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' as todo_id,'.
         ' todo.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_CLASS.', todo.'.\SYSTEM\DBD\system_todo::FIELD_TIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_REQUEST_URI.', todo.'.\SYSTEM\DBD\system_todo::FIELD_FILE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_LINE.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_NAME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_SERVER_PORT.', todo.'.\SYSTEM\DBD\system_todo::FIELD_QUERYTIME.', todo.'.\SYSTEM\DBD\system_todo::FIELD_IP.', todo.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.','.
@@ -24,5 +20,6 @@ class SYS_SAIMOD_TODO_LIST_TYPE extends \SYSTEM\DB\QP {
     ' ORDER BY case when assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ? then 1 else 2 end'.
 ') as a'.
 ' GROUP BY a.todo_id'.
-' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC'
-);}}
\ No newline at end of file
+' ORDER BY a.'.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TYPE.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_COUNT.' DESC, a.'.\SYSTEM\DBD\system_todo::FIELD_TIME.' DESC';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_OPEN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_OPEN.php
index 736afe5..d579c93 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_OPEN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_OPEN.php
@@ -1,14 +1,13 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_OPEN extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_PG.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_OPEN.
-' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $1;',
-//mys
+' WHERE "'.\SYSTEM\DBD\system_todo::FIELD_ID.'"= $1;';
+    }
+    public static function pqsql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_STATE.'='.\SYSTEM\DBD\system_todo::FIELD_STATE_OPEN.
-' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;'
-);}}
-
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_PRIORITY.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_PRIORITY.php
index ca43eac..8ce5474 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_PRIORITY.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_PRIORITY.php
@@ -1,13 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_PRIORITY extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'todo',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'UPDATE '.\SYSTEM\DBD\system_todo::NAME_MYS.' SET '.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' = '.\SYSTEM\DBD\system_todo::FIELD_PRIORITY.' + ?'.
-' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;'
-);}}
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_ID.'= ?;';
+    }
+}
 
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php
index 3ef0f45..37c00e0 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_DOTO_GEN extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0',
-//mys
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0;';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 0;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php
index db14c33..c7cf3ff 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_DOTO_USER extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1',
-//mys
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 1 AND `type` = 1';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php
index 9eb035f..cb00a1b 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED.php
@@ -1,13 +1,10 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_TODO_ASSIGNED extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT COUNT(*) as `count` FROM system_todo'.
 ' LEFT JOIN system_todo_assign ON system_todo.id = system_todo_assign.todo'.
-' WHERE state = 0 AND `type` = 1 AND system_todo_assign.user IS NOT NULL;'
-);}}
+' WHERE state = 0 AND `type` = 1 AND system_todo_assign.user IS NOT NULL;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php
index 8d3b143..aa5cae7 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_TODO_GEN extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0',
-//mys
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 0';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php
index 038a106..e066556 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER.php
@@ -1,11 +1,11 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_COUNT_TODO_USER extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1',
-//mys
-'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1'
-);}}
+    public static function get_class(){return \get_class();}
+    public static function pqsql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1';
+    }
+    public static function mysql(){return
+'SELECT COUNT(*) as `count` FROM system_todo WHERE state = 0 AND `type` = 1';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_USERS.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_USERS.php
index 94fa9e0..11bce96 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_USERS.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_STATS_USERS.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_STATS_USERS extends \SYSTEM\DB\QQ {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT *, state_closed/(state_open+state_closed) as best '.
 'FROM ('.
     'SELECT username,'.
@@ -19,5 +15,6 @@ class SYS_SAIMOD_TODO_STATS_USERS extends \SYSTEM\DB\QQ {
     'GROUP BY system_todo_assign.user '.
     'ORDER BY count DESC'.
 ') a '.
-'ORDER BY best DESC;'
-);}}
+'ORDER BY best DESC;';
+    }
+}
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_TODO.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_TODO.php
index be7f715..0789fa1 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_TODO.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_TODO.php
@@ -1,12 +1,8 @@
 <?php
 namespace SYSTEM\DBD;
-
 class SYS_SAIMOD_TODO_TODO extends \SYSTEM\DB\QP {
-    protected static function query(){
-        return new \SYSTEM\DB\QQuery(get_class(),
-//pg            
-'TODO',
-//mys
+    public static function get_class(){return \get_class();}
+    public static function mysql(){return
 'SELECT * FROM('.
     ' SELECT todo.*, assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.' as assignee_id, assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' as assignee, creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' as username'.
     ' FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
@@ -16,6 +12,6 @@ class SYS_SAIMOD_TODO_TODO extends \SYSTEM\DB\QP {
     ' WHERE todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.' = ?'.
     ' ORDER BY case when assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ? then 1 else 2 end'.
 ') as a'.
-' GROUP BY '.\SYSTEM\DBD\system_todo::FIELD_ID.';'
-);}}
-
+' GROUP BY '.\SYSTEM\DBD\system_todo::FIELD_ID.';';
+    }
+}
\ No newline at end of file