diff --git a/cache/cache.php b/cache/cache.php index 097a659..eaab588 100644 --- a/cache/cache.php +++ b/cache/cache.php @@ -17,7 +17,7 @@ class cache { public static function put($cache, $ident, $type, $data, $fail_on_exist = false){ if(($fail_on_exist && self::get($cache,$ident) != NULL)){ return false;} - + $result = \SYSTEM\SQL\SYS_CACHE_PUT::Q1(array($cache,$ident, $type, $data)); return $result ? $data : NULL; } diff --git a/cache/qq/SYS_CACHE_CHECK.php b/cache/qq/SYS_CACHE_CHECK.php index 836b16b..c7d68c8 100644 --- a/cache/qq/SYS_CACHE_CHECK.php +++ b/cache/qq/SYS_CACHE_CHECK.php @@ -2,10 +2,9 @@ namespace SYSTEM\SQL; class SYS_CACHE_CHECK extends \SYSTEM\DB\QP { public static function get_class(){return \get_class();} - public static function pTsql(){return -'SELECT "data" FROM system.cache'. -' WHERE "CacheID" = $1 AND'. -' "Ident" = $2;'; + public static function pgsql(){return +'SELECT * FROM system.cache'. +' WHERE cache = $1 AND ident = $2;'; } public static function mysql(){return 'SELECT * FROM system_cache'. diff --git a/cache/qq/SYS_CACHE_PUT.php b/cache/qq/SYS_CACHE_PUT.php index 394ea58..5d7683c 100644 --- a/cache/qq/SYS_CACHE_PUT.php +++ b/cache/qq/SYS_CACHE_PUT.php @@ -2,9 +2,10 @@ namespace SYSTEM\SQL; class SYS_CACHE_PUT extends \SYSTEM\DB\QP { public static function get_class(){return \get_class();} - public static function pTsql(){return -'INSERT INTO system.cache ("CacheID", "Ident", "data")'. -' VALUES ($1,$2,$3);'; + public static function pgsql(){return +'WITH upsert AS (UPDATE system.cache SET type=$3, data=$4 WHERE cache = $1 AND ident = $2 RETURNING *) '. +' INSERT INTO system.cache ("cache", "ident", "type", "data")'. +' SELECT $1,$2,$3,$4 WHERE NOT EXISTS (SELECT * FROM upsert);'; } public static function mysql(){return 'REPLACE INTO system_cache (cache, ident, type, data)'. diff --git a/sql/qt/pgsql/data/sai_api.sql b/sql/qt/pgsql/data/sai_api.sql deleted file mode 100644 index c04f787..0000000 --- a/sql/qt/pgsql/data/sai_api.sql +++ /dev/null @@ -1,148 +0,0 @@ -DELETE FROM system.api WHERE "group" = 42; - --- basic -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (0, 42, 0, -1, NULL, 'sai_mod', NULL); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1, 42, 1, 0, NULL, 'js', NULL); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (2, 42, 1, 0, NULL, 'css', NULL); --- INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (3, 42, 0, 0, NULL, 'page', NULL); - --- system_api -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (10, 42, 0, -1, NULL, 'call', NULL); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (11, 42, 0, 10, NULL, 'action', NULL); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (20, 42, 2, 11, 'login', 'username', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (21, 42, 2, 11, 'login', 'password_sha', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (22, 42, 2, 11, 'login', 'password_md5', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (23, 42, 2, 11, 'check', 'rightid', 'UINT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (24, 42, 2, 11, 'create', 'username', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (25, 42, 2, 11, 'create', 'password_sha', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (26, 42, 2, 11, 'create', 'email', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (27, 42, 2, 11, 'create', 'locale', 'LANG'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (30, 42, 2, 10, 'files', 'cat', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (31, 42, 3, 30, 'files', 'id', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (50, 42, 2, 10, 'pagestates', 'group', 'UINT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (51, 42, 1, 50, NULL, 'js', NULL); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (52, 42, 2, 51, NULL, 'group', 'UINT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (55, 42, 1, 50, NULL, 'css', NULL); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (56, 42, 2, 55, NULL, 'group', 'UINT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (40, 42, 4, -1, NULL, '_lang', 'LANG'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (41, 42, 4, -1, NULL, '_result', 'RESULT'); - --- specific stuff for mods -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (100, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_login', 'action', NULL); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (101, 42, 2, 100, 'login', 'username', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (102, 42, 2, 100, 'login', 'password_sha', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (103, 42, 2, 100, 'login', 'password_md5', 'ALL'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (110, 42, 2, 100, 'register', 'username', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (111, 42, 2, 100, 'register', 'password', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (112, 42, 2, 100, 'register', 'email', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (113, 42, 3, 100, 'register', 'locale', 'ALL'); - - -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (200, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_log', 'action', NULL); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (201, 42, 3, 200, 'filter', 'filter', 'STRING'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (210, 42, 3, 200, 'error', 'error', 'INT'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (220, 42, 0, 200, 'stats', 'name', null); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (221, 42, 3, 220, null, 'filter', 'UINT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (222, 42, 3, 220, null, 'db', 'STRING'); - - -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (300, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_security', 'action', NULL); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (301, 42, 2, 300, 'user', 'username', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (302, 42, 3, 300, 'users', 'search', 'STRING'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (310, 42, 2, 300, 'addright', 'id', 'UINT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (311, 42, 2, 300, 'addright', 'name', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (312, 42, 2, 300, 'addright', 'description', 'STRING'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (320, 42, 2, 300, 'deleteright', 'id', 'UINT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (321, 42, 2, 300, 'deleterightconfirm', 'id', 'UINT'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (330, 42, 2, 300, 'addrightuser', 'rightid', 'UINT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (331, 42, 2, 300, 'addrightuser', 'userid', 'UINT'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (340, 42, 2, 300, 'deleterightuser', 'rightid', 'UINT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (341, 42, 2, 300, 'deleterightuser', 'userid', 'UINT'); - - --- INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (400, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_sai_mods', 'action', NULL); - - --- INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (500, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_config', 'action', NULL); - - -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (600, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_api', 'action', NULL); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (601, 42, 2, 600, 'addcall', 'ID', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (602, 42, 2, 600, 'addcall', 'group', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (603, 42, 2, 600, 'addcall', 'type', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (604, 42, 2, 600, 'addcall', 'parentID', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (605, 42, 2, 600, 'addcall', 'parentValue', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (606, 42, 2, 600, 'addcall', 'name', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (607, 42, 2, 600, 'addcall', 'verify', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (608, 42, 2, 600, 'deletecall', 'ID', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (609, 42, 2, 600, 'deletedialog', 'ID', 'INT'); - - -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (700, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_locale', 'action', NULL); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (701, 42, 2, 700, 'load', 'id', 'LANG'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (702, 42, 2, 700, 'load', 'group', 'INT'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (710, 42, 2, 700, 'singleload', 'id', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (711, 42, 2, 700, 'singleload', 'lang', 'ALL'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (720, 42, 2, 700, 'delete', 'id', 'ALL'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (730, 42, 2, 700, 'add', 'id', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (731, 42, 2, 700, 'add', 'category', 'INT'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (740, 42, 2, 700, 'edit', 'id', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (741, 42, 2, 700, 'edit', 'lang', 'LANG'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (742, 42, 2, 700, 'edit', 'category', 'ALL'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (743, 42, 2, 700, 'edit', 'newtext', 'ALL'); - - -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (800, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_files', 'action', NULL); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (801, 42, 2, 800, 'upload', 'cat', 'STRING'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (810, 42, 2, 800, 'del', 'cat', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (811, 42, 2, 800, 'del', 'id', 'STRING'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (820, 42, 2, 800, 'rn', 'cat', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (821, 42, 2, 800, 'rn', 'id', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (822, 42, 2, 800, 'rn', 'newid', 'STRING'); --- -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (830, 42, 2, 800, 'tab', 'name', 'STRING'); - - --- INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (900, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_cache', 'action', NULL); - - -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1000, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_todo', 'action', NULL); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1001, 42, 2, 1000, 'todo', 'todo', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1002, 42, 2, 1000, 'open', 'todo', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1003, 42, 2, 1000, 'close', 'todo', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1004, 42, 2, 1000, 'add', 'todo', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1010, 42, 2, 1000, 'edit', 'todo', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1011, 42, 2, 1000, 'edit', 'message', 'STRING'); - - --- INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1100, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_docu', 'action', NULL); - -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1200, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_cron', 'action', NULL); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1201, 42, 2, 1200, 'add', 'cls', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1202, 42, 2, 1200, 'add', 'min', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1203, 42, 2, 1200, 'add', 'hour', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1204, 42, 2, 1200, 'add', 'day', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1205, 42, 2, 1200, 'add', 'day_week', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1206, 42, 2, 1200, 'add', 'month', 'INT'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1208, 42, 2, 1200, 'del', 'cls', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1209, 42, 2, 1200, 'deldialog', 'cls', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1210, 42, 2, 1200, 'change', 'cls', 'STRING'); -INSERT INTO system.api ("ID", "group", type, "parentID", "parentValue", name, verify) VALUES (1211, 42, 2, 1200, 'change', 'status', 'INT'); \ No newline at end of file diff --git a/sql/qt/pgsql/data/system_api.sql b/sql/qt/pgsql/data/system_api.sql index 847e6a9..0bb1152 100644 --- a/sql/qt/pgsql/data/system_api.sql +++ b/sql/qt/pgsql/data/system_api.sql @@ -30,4 +30,42 @@ -- REPLACE INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (90, 0, 4, -1, NULL, '_lang', 'LANG'); -- REPLACE INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (91, 0, 4, -1, NULL, '_result', 'RESULT'); --- REPLACE INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (92, 0, 4, -1, NULL, '_escaped_fragment_', 'STRING'); \ No newline at end of file +-- REPLACE INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (92, 0, 4, -1, NULL, '_escaped_fragment_', 'STRING'); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (10, 0, 0, -1, NULL, 'call', NULL); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (11, 0, 0, 10, NULL, 'action', NULL); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (20, 0, 2, 11, 'login', 'username', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (21, 0, 2, 11, 'login', 'password_sha', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (22, 0, 2, 11, 'login', 'password_md5', 'STRING'); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (23, 0, 2, 11, 'check', 'rightid', 'UINT'); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (24, 0, 2, 11, 'create', 'username', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (25, 0, 2, 11, 'create', 'password_sha', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (26, 0, 2, 11, 'create', 'email', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (27, 0, 2, 11, 'create', 'locale', 'LANG'); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (30, 0, 2, 10, 'files', 'cat', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (31, 0, 3, 10, 'files', 'id', 'STRING'); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (40, 0, 2, 10, 'text', 'request', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (41, 0, 2, 10, 'text', 'lang', 'LANG'); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (50, 0, 2, 10, 'pages', 'group', 'UINT'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (51, 0, 2, 10, 'pages', 'state', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (52, 0, 1, 50, NULL, 'js', NULL); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (53, 0, 2, 51, NULL, 'group', 'UINT'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (55, 0, 1, 50, NULL, 'css', NULL); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (56, 0, 2, 55, NULL, 'group', 'UINT'); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (60, 0, 2, 10, 'bug', 'message', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (61, 0, 2, 10, 'bug', 'data', 'JSON'); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (70, 0, 2, 10, 'cache', 'id', 'INT'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (71, 0, 2, 10, 'cache', 'ident', 'STRING'); + +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (90, 0, 4, -1, NULL, '_lang', 'LANG'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (91, 0, 4, -1, NULL, '_result', 'RESULT'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (92, 0, 4, -1, NULL, '_escaped_fragment_', 'STRING'); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (93, 0, 4, -1, NULL, '_', 'STRING'); \ No newline at end of file diff --git a/sql/qt/pgsql/schema/system_cache.sql b/sql/qt/pgsql/schema/system_cache.sql index b2e6fd7..c88a89a 100644 --- a/sql/qt/pgsql/schema/system_cache.sql +++ b/sql/qt/pgsql/schema/system_cache.sql @@ -1,32 +1,11 @@ CREATE TABLE system.cache ( - "ID" integer NOT NULL DEFAULT nextval('system."cache_ID_seq"'::regclass), - "CacheID" integer NOT NULL, - "Ident" character varying NOT NULL, - data bytea, - CONSTRAINT pk_system_cache_id PRIMARY KEY ("ID"), - CONSTRAINT unique_system_cache_cid_ident UNIQUE ("CacheID", "Ident") + "cache" integer NOT NULL, + "ident" character varying NOT NULL, + "type" character varying NOT NULL, + "data" text, + CONSTRAINT pk_system_cache_cache_ident PRIMARY KEY ("cache", "ident") ) WITH ( OIDS=FALSE -); -ALTER TABLE system.cache - OWNER TO username; - --- Index: system."cache_CacheID_Ident_idx" - --- DROP INDEX system."cache_CacheID_Ident_idx"; - -CREATE INDEX "cache_CacheID_Ident_idx" - ON system.cache - USING btree - ("CacheID", "Ident" COLLATE pg_catalog."default"); - --- Index: system."cache_Ident_idx" - --- DROP INDEX system."cache_Ident_idx"; - -CREATE INDEX "cache_Ident_idx" - ON system.cache - USING btree - ("Ident" COLLATE pg_catalog."default"); \ No newline at end of file +); \ No newline at end of file