From a483fdbacb41f917468623ac5fdbcf6036226a53 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 8 Jun 2017 22:56:31 +0200 Subject: [PATCH] added default sql install + ordered sql folder(a bit) --- sql/DATA_DEFAULT.php | 40 ++++++++++++ sql/{qt => }/DATA_SYSTEM_API.php | 12 ++-- sql/{qt => }/DATA_SYSTEM_CRON.php | 4 +- sql/{qt => }/DATA_SYSTEM_PAGE.php | 4 +- sql/{qt => }/DATA_SYSTEM_RIGHTS.php | 4 +- sql/{qt => }/DATA_SYSTEM_TEXT.php | 4 +- sql/SCHEMA_SYSTEM.php | 65 +++++++++++++++++++ sql/autoload.inc | 4 +- .../mysql/convert_locale_string_2_text.sql | 0 sql/mysql/data/default.sql | 7 ++ sql/{qt => }/mysql/data/system_api.sql | 0 .../mysql/data/system_api_default.sql | 0 sql/{qt => }/mysql/data/system_cron.sql | 0 sql/{qt => }/mysql/data/system_page.sql | 0 sql/{qt => }/mysql/data/system_rights.sql | 0 sql/{qt => }/mysql/data/system_sai_api.sql | 0 sql/{qt => }/mysql/data/system_text.sql | 0 sql/{qt => }/mysql/schema/system_api.sql | 0 sql/{qt => }/mysql/schema/system_cache.sql | 0 sql/{qt => }/mysql/schema/system_cron.sql | 0 sql/{qt => }/mysql/schema/system_log.sql | 0 sql/{qt => }/mysql/schema/system_page.sql | 0 sql/{qt => }/mysql/schema/system_rights.sql | 0 sql/{qt => }/mysql/schema/system_text.sql | 0 sql/{qt => }/mysql/schema/system_text_tag.sql | 0 sql/{qt => }/mysql/schema/system_todo.sql | 0 .../mysql/schema/system_todo_assign.sql | 0 sql/{qt => }/mysql/schema/system_token.sql | 0 sql/{qt => }/mysql/schema/system_user.sql | 0 .../mysql/schema/system_user_to_rights.sql | 0 .../pgsql/convert_locale_string_2_text.sql | 0 .../pgsql/data/basic_locale_string.sql | 0 .../pgsql/data/sai_error_locale_string.sql | 0 sql/{qt => }/pgsql/data/sai_locale_string.sql | 0 sql/{qt => }/pgsql/data/system_api.sql | 0 .../pgsql/data/system_api_default.sql | 0 sql/{qt => }/pgsql/data/system_cron.sql | 0 sql/{qt => }/pgsql/data/system_page.sql | 0 sql/{qt => }/pgsql/data/system_rights.sql | 0 sql/{qt => }/pgsql/data/system_sai_api.sql | 0 sql/{qt => }/pgsql/data/system_text.sql | 0 sql/{qt => }/pgsql/extension_pgcrypto.sql | 0 sql/{qt => }/pgsql/schema/schema.sql | 0 sql/{qt => }/pgsql/schema/system_api.sql | 0 sql/{qt => }/pgsql/schema/system_cache.sql | 0 sql/{qt => }/pgsql/schema/system_cron.sql | 0 .../pgsql/schema/system_locale_string.sql | 0 sql/{qt => }/pgsql/schema/system_log.sql | 0 sql/{qt => }/pgsql/schema/system_page.sql | 0 sql/{qt => }/pgsql/schema/system_rights.sql | 0 sql/{qt => }/pgsql/schema/system_text.sql | 0 sql/{qt => }/pgsql/schema/system_text_tag.sql | 0 sql/{qt => }/pgsql/schema/system_todo.sql | 0 .../pgsql/schema/system_todo_assign.sql | 0 sql/{qt => }/pgsql/schema/system_user.sql | 0 .../pgsql/schema/system_user_to_rights.sql | 0 .../pgsql/util_copy_api_table_by_group.sql | 0 sql/qt/SCHEMA_SYSTEM.php | 65 ------------------- 58 files changed, 128 insertions(+), 81 deletions(-) create mode 100644 sql/DATA_DEFAULT.php rename sql/{qt => }/DATA_SYSTEM_API.php (63%) rename sql/{qt => }/DATA_SYSTEM_CRON.php (83%) rename sql/{qt => }/DATA_SYSTEM_PAGE.php (83%) rename sql/{qt => }/DATA_SYSTEM_RIGHTS.php (83%) rename sql/{qt => }/DATA_SYSTEM_TEXT.php (84%) create mode 100644 sql/SCHEMA_SYSTEM.php rename sql/{qt => }/mysql/convert_locale_string_2_text.sql (100%) create mode 100644 sql/mysql/data/default.sql rename sql/{qt => }/mysql/data/system_api.sql (100%) rename sql/{qt => }/mysql/data/system_api_default.sql (100%) rename sql/{qt => }/mysql/data/system_cron.sql (100%) rename sql/{qt => }/mysql/data/system_page.sql (100%) rename sql/{qt => }/mysql/data/system_rights.sql (100%) rename sql/{qt => }/mysql/data/system_sai_api.sql (100%) rename sql/{qt => }/mysql/data/system_text.sql (100%) rename sql/{qt => }/mysql/schema/system_api.sql (100%) rename sql/{qt => }/mysql/schema/system_cache.sql (100%) rename sql/{qt => }/mysql/schema/system_cron.sql (100%) rename sql/{qt => }/mysql/schema/system_log.sql (100%) rename sql/{qt => }/mysql/schema/system_page.sql (100%) rename sql/{qt => }/mysql/schema/system_rights.sql (100%) rename sql/{qt => }/mysql/schema/system_text.sql (100%) rename sql/{qt => }/mysql/schema/system_text_tag.sql (100%) rename sql/{qt => }/mysql/schema/system_todo.sql (100%) rename sql/{qt => }/mysql/schema/system_todo_assign.sql (100%) rename sql/{qt => }/mysql/schema/system_token.sql (100%) rename sql/{qt => }/mysql/schema/system_user.sql (100%) rename sql/{qt => }/mysql/schema/system_user_to_rights.sql (100%) rename sql/{qt => }/pgsql/convert_locale_string_2_text.sql (100%) rename sql/{qt => }/pgsql/data/basic_locale_string.sql (100%) rename sql/{qt => }/pgsql/data/sai_error_locale_string.sql (100%) rename sql/{qt => }/pgsql/data/sai_locale_string.sql (100%) rename sql/{qt => }/pgsql/data/system_api.sql (100%) rename sql/{qt => }/pgsql/data/system_api_default.sql (100%) rename sql/{qt => }/pgsql/data/system_cron.sql (100%) rename sql/{qt => }/pgsql/data/system_page.sql (100%) rename sql/{qt => }/pgsql/data/system_rights.sql (100%) rename sql/{qt => }/pgsql/data/system_sai_api.sql (100%) rename sql/{qt => }/pgsql/data/system_text.sql (100%) rename sql/{qt => }/pgsql/extension_pgcrypto.sql (100%) rename sql/{qt => }/pgsql/schema/schema.sql (100%) rename sql/{qt => }/pgsql/schema/system_api.sql (100%) rename sql/{qt => }/pgsql/schema/system_cache.sql (100%) rename sql/{qt => }/pgsql/schema/system_cron.sql (100%) rename sql/{qt => }/pgsql/schema/system_locale_string.sql (100%) rename sql/{qt => }/pgsql/schema/system_log.sql (100%) rename sql/{qt => }/pgsql/schema/system_page.sql (100%) rename sql/{qt => }/pgsql/schema/system_rights.sql (100%) rename sql/{qt => }/pgsql/schema/system_text.sql (100%) rename sql/{qt => }/pgsql/schema/system_text_tag.sql (100%) rename sql/{qt => }/pgsql/schema/system_todo.sql (100%) rename sql/{qt => }/pgsql/schema/system_todo_assign.sql (100%) rename sql/{qt => }/pgsql/schema/system_user.sql (100%) rename sql/{qt => }/pgsql/schema/system_user_to_rights.sql (100%) rename sql/{qt => }/pgsql/util_copy_api_table_by_group.sql (100%) delete mode 100644 sql/qt/SCHEMA_SYSTEM.php diff --git a/sql/DATA_DEFAULT.php b/sql/DATA_DEFAULT.php new file mode 100644 index 0000000..582b3ad --- /dev/null +++ b/sql/DATA_DEFAULT.php @@ -0,0 +1,40 @@ +SERVERPATH());} + + /** + * Get paths of MYSQL compatible sql files + * + * @return array Returns paths of MYSQL compatible sql files + */ + public static function files_mysql(){ + return array( (new \SYSTEM\PSQL('/qt/mysql/data/default.sql'))->SERVERPATH());} +} \ No newline at end of file diff --git a/sql/qt/DATA_SYSTEM_API.php b/sql/DATA_SYSTEM_API.php similarity index 63% rename from sql/qt/DATA_SYSTEM_API.php rename to sql/DATA_SYSTEM_API.php index cbbc8a1..38c6dd3 100644 --- a/sql/qt/DATA_SYSTEM_API.php +++ b/sql/DATA_SYSTEM_API.php @@ -28,9 +28,9 @@ class DATA_SYSTEM_API extends \SYSTEM\DB\QI { * @return array Returns paths of PostgreSQL compatible sql files */ public static function files_pgsql(){ - return array( (new \SYSTEM\PSQL('/qt/pgsql/data/system_api.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/data/system_api_default.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/data/system_sai_api.sql'))->SERVERPATH()); + return array( (new \SYSTEM\PSQL('/pgsql/data/system_api.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/data/system_api_default.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/data/system_sai_api.sql'))->SERVERPATH()); } /** @@ -39,8 +39,8 @@ class DATA_SYSTEM_API extends \SYSTEM\DB\QI { * @return array Returns paths of MYSQL compatible sql files */ public static function files_mysql(){ - return array( (new \SYSTEM\PSQL('/qt/mysql/data/system_api.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/data/system_api_default.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/data/system_sai_api.sql'))->SERVERPATH()); + return array( (new \SYSTEM\PSQL('/mysql/data/system_api.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/data/system_api_default.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/data/system_sai_api.sql'))->SERVERPATH()); } } \ No newline at end of file diff --git a/sql/qt/DATA_SYSTEM_CRON.php b/sql/DATA_SYSTEM_CRON.php similarity index 83% rename from sql/qt/DATA_SYSTEM_CRON.php rename to sql/DATA_SYSTEM_CRON.php index 387d46c..4633473 100644 --- a/sql/qt/DATA_SYSTEM_CRON.php +++ b/sql/DATA_SYSTEM_CRON.php @@ -28,7 +28,7 @@ class DATA_SYSTEM_CRON extends \SYSTEM\DB\QI { * @return array Returns paths of PostgreSQL compatible sql files */ public static function files_pgsql(){ - return array( (new \SYSTEM\PSQL('/qt/pgsql/data/system_cron.sql'))->SERVERPATH());} + return array( (new \SYSTEM\PSQL('/pgsql/data/system_cron.sql'))->SERVERPATH());} /** * Get paths of MYSQL compatible sql files @@ -36,5 +36,5 @@ class DATA_SYSTEM_CRON extends \SYSTEM\DB\QI { * @return array Returns paths of MYSQL compatible sql files */ public static function files_mysql(){ - return array( (new \SYSTEM\PSQL('/qt/mysql/data/system_cron.sql'))->SERVERPATH());} + return array( (new \SYSTEM\PSQL('/mysql/data/system_cron.sql'))->SERVERPATH());} } \ No newline at end of file diff --git a/sql/qt/DATA_SYSTEM_PAGE.php b/sql/DATA_SYSTEM_PAGE.php similarity index 83% rename from sql/qt/DATA_SYSTEM_PAGE.php rename to sql/DATA_SYSTEM_PAGE.php index 6da4509..823835d 100644 --- a/sql/qt/DATA_SYSTEM_PAGE.php +++ b/sql/DATA_SYSTEM_PAGE.php @@ -28,7 +28,7 @@ class DATA_SYSTEM_PAGE extends \SYSTEM\DB\QI { * @return array Returns paths of PostgreSQL compatible sql files */ public static function files_pgsql(){ - return array( (new \SYSTEM\PSQL('/qt/pgsql/data/system_page.sql'))->SERVERPATH());} + return array( (new \SYSTEM\PSQL('/pgsql/data/system_page.sql'))->SERVERPATH());} /** * Get paths of MYSQL compatible sql files @@ -36,5 +36,5 @@ class DATA_SYSTEM_PAGE extends \SYSTEM\DB\QI { * @return array Returns paths of MYSQL compatible sql files */ public static function files_mysql(){ - return array( (new \SYSTEM\PSQL('/qt/mysql/data/system_page.sql'))->SERVERPATH());} + return array( (new \SYSTEM\PSQL('/mysql/data/system_page.sql'))->SERVERPATH());} } \ No newline at end of file diff --git a/sql/qt/DATA_SYSTEM_RIGHTS.php b/sql/DATA_SYSTEM_RIGHTS.php similarity index 83% rename from sql/qt/DATA_SYSTEM_RIGHTS.php rename to sql/DATA_SYSTEM_RIGHTS.php index efe7dde..38bfca3 100644 --- a/sql/qt/DATA_SYSTEM_RIGHTS.php +++ b/sql/DATA_SYSTEM_RIGHTS.php @@ -28,7 +28,7 @@ class DATA_SYSTEM_RIGHTS extends \SYSTEM\DB\QI { * @return array Returns paths of PostgreSQL compatible sql files */ public static function files_pgsql(){ - return array( (new \SYSTEM\PSQL('/qt/pgsql/data/system_rights.sql'))->SERVERPATH());} + return array( (new \SYSTEM\PSQL('/pgsql/data/system_rights.sql'))->SERVERPATH());} /** * Get paths of MYSQL compatible sql files @@ -36,5 +36,5 @@ class DATA_SYSTEM_RIGHTS extends \SYSTEM\DB\QI { * @return array Returns paths of MYSQL compatible sql files */ public static function files_mysql(){ - return array( (new \SYSTEM\PSQL('/qt/mysql/data/system_rights.sql'))->SERVERPATH());} + return array( (new \SYSTEM\PSQL('/mysql/data/system_rights.sql'))->SERVERPATH());} } \ No newline at end of file diff --git a/sql/qt/DATA_SYSTEM_TEXT.php b/sql/DATA_SYSTEM_TEXT.php similarity index 84% rename from sql/qt/DATA_SYSTEM_TEXT.php rename to sql/DATA_SYSTEM_TEXT.php index dd66000..adf8d49 100644 --- a/sql/qt/DATA_SYSTEM_TEXT.php +++ b/sql/DATA_SYSTEM_TEXT.php @@ -28,7 +28,7 @@ class DATA_SYSTEM_TEXT extends \SYSTEM\DB\QI { * @return array Returns paths of PostgreSQL compatible sql files */ public static function files_pgsql(){ - return array( (new \SYSTEM\PSQL('/qt/pgsql/data/system_text.sql'))->SERVERPATH());} + return array( (new \SYSTEM\PSQL('/pgsql/data/system_text.sql'))->SERVERPATH());} /** * Get paths of MYSQL compatible sql files @@ -36,5 +36,5 @@ class DATA_SYSTEM_TEXT extends \SYSTEM\DB\QI { * @return array Returns paths of MYSQL compatible sql files */ public static function files_mysql(){ - return array( (new \SYSTEM\PSQL('/qt/mysql/data/system_text.sql'))->SERVERPATH());} + return array( (new \SYSTEM\PSQL('/mysql/data/system_text.sql'))->SERVERPATH());} } \ No newline at end of file diff --git a/sql/SCHEMA_SYSTEM.php b/sql/SCHEMA_SYSTEM.php new file mode 100644 index 0000000..88cd2b8 --- /dev/null +++ b/sql/SCHEMA_SYSTEM.php @@ -0,0 +1,65 @@ +SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_cache.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_cron.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_log.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_page.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_rights.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_text.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_text_tag.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_todo.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_todo_assign.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_user.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/pgsql/schema/system_user_to_rights.sql'))->SERVERPATH()); + } + + /** + * Get paths of MYSQL compatible sql files + * + * @return array Returns paths of MYSQL compatible sql files + */ + public static function files_mysql(){ + return array( (new \SYSTEM\PSQL('/mysql/schema/system_api.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_cache.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_cron.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_log.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_page.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_rights.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_text.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_text_tag.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_todo.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_todo_assign.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_token.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_user.sql'))->SERVERPATH(), + (new \SYSTEM\PSQL('/mysql/schema/system_user_to_rights.sql'))->SERVERPATH()); + } +} \ No newline at end of file diff --git a/sql/autoload.inc b/sql/autoload.inc index 23a1550..175fbcc 100644 --- a/sql/autoload.inc +++ b/sql/autoload.inc @@ -1,7 +1,6 @@ SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_cache.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_cron.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_log.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_page.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_rights.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_text.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_text_tag.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_todo.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_todo_assign.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_user.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/pgsql/schema/system_user_to_rights.sql'))->SERVERPATH()); - } - - /** - * Get paths of MYSQL compatible sql files - * - * @return array Returns paths of MYSQL compatible sql files - */ - public static function files_mysql(){ - return array( (new \SYSTEM\PSQL('/qt/mysql/schema/system_api.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_cache.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_cron.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_log.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_page.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_rights.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_text.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_text_tag.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_todo.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_todo_assign.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_token.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_user.sql'))->SERVERPATH(), - (new \SYSTEM\PSQL('/qt/mysql/schema/system_user_to_rights.sql'))->SERVERPATH()); - } -} \ No newline at end of file