From e0647dd9904fbee3d4c1f6ad76d3b601c5cf6619 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Thu, 11 Jul 2024 11:00:25 +0800 Subject: [PATCH] (improvement)(launcher)Opt schema-mysql sql declaration. --- .../resources/config.update/sql-update.sql | 11 +- .../src/main/resources/db/schema-mysql.sql | 527 +++++++++--------- 2 files changed, 269 insertions(+), 269 deletions(-) diff --git a/launchers/standalone/src/main/resources/config.update/sql-update.sql b/launchers/standalone/src/main/resources/config.update/sql-update.sql index 6ca264fa6..e417c2ad1 100644 --- a/launchers/standalone/src/main/resources/config.update/sql-update.sql +++ b/launchers/standalone/src/main/resources/config.update/sql-update.sql @@ -332,8 +332,8 @@ alter table s2_term add column `related_dimensions` varchar(1000) DEFAULT NULL --20240627 CREATE TABLE IF NOT EXISTS `s2_chat_memory` ( - `id` INT NOT NULL AUTO_INCREMENT, - `question` varchar(655) , + `id` INT NOT NULL AUTO_INCREMENT, + `question` varchar(655), `agent_id` INT , `db_schema` TEXT , `s2_sql` TEXT , @@ -350,11 +350,10 @@ CREATE TABLE IF NOT EXISTS `s2_chat_memory` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; --20240705 -alter table s2_agent add column `prompt_config` varchar(6000) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '提示词配置'; +alter table s2_agent add column `prompt_config` text COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '提示词配置'; --20240707 -alter table s2_agent add model_config varchar(6000) null; -alter table s2_agent add `prompt_config` varchar(5000) COLLATE utf8_unicode_ci DEFAULT NULL; +alter table s2_agent add `model_config` text null; --20240710 -alter table s2_agent add enable_memory_review tinyint DEFAULT 0; \ No newline at end of file +alter table s2_agent add `enable_memory_review` tinyint DEFAULT 0; \ No newline at end of file diff --git a/launchers/standalone/src/main/resources/db/schema-mysql.sql b/launchers/standalone/src/main/resources/db/schema-mysql.sql index 6c41023e2..5f1dfcf9f 100644 --- a/launchers/standalone/src/main/resources/db/schema-mysql.sql +++ b/launchers/standalone/src/main/resources/db/schema-mysql.sql @@ -1,15 +1,15 @@ -CREATE TABLE `s2_user_department` ( +CREATE TABLE IF NOT EXISTS `s2_user_department` ( `user_name` varchar(200) NOT NULL, `department` varchar(200) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `s2_pv_uv_statis` ( +CREATE TABLE IF NOT EXISTS `s2_pv_uv_statis` ( `imp_date` varchar(200) NOT NULL, `user_name` varchar(200) NOT NULL, `page` varchar(200) NOT NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `s2_stay_time_statis` ( +CREATE TABLE IF NOT EXISTS `s2_stay_time_statis` ( `imp_date` varchar(200) NOT NULL, `user_name` varchar(200) NOT NULL, `stay_hours` DOUBLE NOT NULL, @@ -64,78 +64,79 @@ CREATE TABLE IF NOT EXISTS `song` ( `resolution` bigINT NOT NULL )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `s2_agent` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, - `description` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, - `examples` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, - `status` int(11) DEFAULT NULL, - `model` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, - `config` varchar(6000) COLLATE utf8_unicode_ci DEFAULT NULL, - `llm_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL, - `model_config` varchar(6000) COLLATE utf8_unicode_ci DEFAULT NULL, - `prompt_config` varchar(5000) COLLATE utf8_unicode_ci DEFAULT NULL, - `multi_turn_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL, - `visual_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL, - `created_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, - `created_at` datetime DEFAULT NULL, - `updated_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, - `updated_at` datetime DEFAULT NULL, - `enable_search` int(11) DEFAULT NULL, - PRIMARY KEY (`id`) +CREATE TABLE IF NOT EXISTS `s2_agent` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, + `description` TEXT COLLATE utf8_unicode_ci DEFAULT NULL, + `examples` TEXT COLLATE utf8_unicode_ci DEFAULT NULL, + `status` tinyint DEFAULT NULL, + `model` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, + `config` varchar(6000) COLLATE utf8_unicode_ci DEFAULT NULL, + `llm_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL, + `model_config` text COLLATE utf8_unicode_ci DEFAULT NULL, + `prompt_config` text COLLATE utf8_unicode_ci DEFAULT NULL, + `multi_turn_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL, + `visual_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL, + `enable_search` tinyint DEFAULT 1, + `enable_memory_review` tinyint DEFAULT 0, + `created_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, + `created_at` datetime DEFAULT NULL, + `updated_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, + `updated_at` datetime DEFAULT NULL, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -CREATE TABLE `s2_auth_groups` ( +CREATE TABLE IF NOT EXISTS `s2_auth_groups` ( `group_id` int(11) NOT NULL, `config` varchar(2048) COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`group_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `s2_available_date_info` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `item_id` int(11) NOT NULL, - `type` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `date_format` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - `date_period` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `start_date` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `end_date` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `unavailable_date` text COLLATE utf8mb4_unicode_ci, - `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `created_by` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, - `updated_at` timestamp NULL, - `updated_by` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, - `status` int(11) DEFAULT '0', - PRIMARY KEY (`id`) +CREATE TABLE IF NOT EXISTS `s2_available_date_info` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `item_id` int(11) NOT NULL, + `type` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, + `date_format` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, + `date_period` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `start_date` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `end_date` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `unavailable_date` text COLLATE utf8mb4_unicode_ci, + `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `created_by` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, + `updated_at` timestamp NULL, + `updated_by` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL, + `status` tinyint DEFAULT 0, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `s2_chat` ( - `chat_id` bigint(8) NOT NULL AUTO_INCREMENT, - `agent_id` int(11) DEFAULT NULL, - `chat_name` varchar(300) DEFAULT NULL, - `create_time` datetime DEFAULT NULL, - `last_time` datetime DEFAULT NULL, - `creator` varchar(30) DEFAULT NULL, - `last_question` varchar(200) DEFAULT NULL, - `is_delete` int(2) DEFAULT '0' COMMENT 'is deleted', - `is_top` int(2) DEFAULT '0' COMMENT 'is top', - PRIMARY KEY (`chat_id`) +CREATE TABLE IF NOT EXISTS `s2_chat` ( + `chat_id` bigint(8) NOT NULL AUTO_INCREMENT, + `agent_id` int(11) DEFAULT NULL, + `chat_name` varchar(300) DEFAULT NULL, + `create_time` datetime DEFAULT NULL, + `last_time` datetime DEFAULT NULL, + `creator` varchar(30) DEFAULT NULL, + `last_question` varchar(200) DEFAULT NULL, + `is_delete` tinyint DEFAULT '0' COMMENT 'is deleted', + `is_top` tinyint DEFAULT '0' COMMENT 'is top', + PRIMARY KEY (`chat_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE `s2_chat_config` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `model_id` bigint(20) DEFAULT NULL, - `chat_detail_config` mediumtext COMMENT '明细模式配置信息', - `chat_agg_config` mediumtext COMMENT '指标模式配置信息', - `recommended_questions` mediumtext COMMENT '推荐问题配置', - `created_at` datetime NOT NULL COMMENT '创建时间', - `updated_at` datetime NOT NULL COMMENT '更新时间', - `created_by` varchar(100) NOT NULL COMMENT '创建人', - `updated_by` varchar(100) NOT NULL COMMENT '更新人', - `status` int(10) NOT NULL COMMENT '主题域扩展信息状态, 0-删除，1-生效', - `llm_examples` text COMMENT 'llm examples', - PRIMARY KEY (`id`) +CREATE TABLE IF NOT EXISTS `s2_chat_config` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `model_id` bigint(20) DEFAULT NULL, + `chat_detail_config` mediumtext COMMENT '明细模式配置信息', + `chat_agg_config` mediumtext COMMENT '指标模式配置信息', + `recommended_questions` mediumtext COMMENT '推荐问题配置', + `created_at` datetime NOT NULL COMMENT '创建时间', + `updated_at` datetime NOT NULL COMMENT '更新时间', + `created_by` varchar(100) NOT NULL COMMENT '创建人', + `updated_by` varchar(100) NOT NULL COMMENT '更新人', + `status` tinyint NOT NULL COMMENT '主题域扩展信息状态, 0-删除，1-生效', + `llm_examples` text COMMENT 'llm examples', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='主题域扩展信息表'; CREATE TABLE IF NOT EXISTS `s2_chat_memory` ( @@ -156,30 +157,30 @@ CREATE TABLE IF NOT EXISTS `s2_chat_memory` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE `s2_chat_context` ( - `chat_id` bigint(20) NOT NULL COMMENT 'context chat id', - `modified_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'row modify time', - `user` varchar(64) DEFAULT NULL COMMENT 'row modify user', - `query_text` text COMMENT 'query text', - `semantic_parse` text COMMENT 'parse data', - `ext_data` text COMMENT 'extend data', - PRIMARY KEY (`chat_id`) +CREATE TABLE IF NOT EXISTS `s2_chat_context` ( + `chat_id` bigint(20) NOT NULL COMMENT 'context chat id', + `modified_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'row modify time', + `user` varchar(64) DEFAULT NULL COMMENT 'row modify user', + `query_text` text COMMENT 'query text', + `semantic_parse` text COMMENT 'parse data', + `ext_data` text COMMENT 'extend data', + PRIMARY KEY (`chat_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE `s2_chat_parse` ( - `question_id` bigint(20) NOT NULL, - `chat_id` bigint(20) NOT NULL, - `parse_id` int(11) NOT NULL, - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `query_text` varchar(500) DEFAULT NULL, - `user_name` varchar(150) DEFAULT NULL, - `parse_info` mediumtext NOT NULL, - `is_candidate` int(11) DEFAULT '1' COMMENT '1是candidate,0是selected', - KEY `commonIndex` (`question_id`) +CREATE TABLE IF NOT EXISTS `s2_chat_parse` ( + `question_id` bigint(20) NOT NULL, + `chat_id` bigint(20) NOT NULL, + `parse_id` int(11) NOT NULL, + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `query_text` varchar(500) DEFAULT NULL, + `user_name` varchar(150) DEFAULT NULL, + `parse_info` mediumtext NOT NULL, + `is_candidate` int(11) DEFAULT '1' COMMENT '1是candidate,0是selected', + KEY `commonIndex` (`question_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -CREATE TABLE `s2_chat_query` +CREATE TABLE IF NOT EXISTS `s2_chat_query` ( `question_id` bigint(20) NOT NULL AUTO_INCREMENT, `agent_id` int(11) DEFAULT NULL, @@ -197,32 +198,32 @@ CREATE TABLE `s2_chat_query` ) ENGINE = InnoDB DEFAULT CHARSET = utf8; -CREATE TABLE `s2_chat_statistics` ( - `question_id` bigint(20) NOT NULL, - `chat_id` bigint(20) NOT NULL, - `user_name` varchar(150) DEFAULT NULL, - `query_text` varchar(200) DEFAULT NULL, - `interface_name` varchar(100) DEFAULT NULL, - `cost` int(6) DEFAULT '0', - `type` int(11) DEFAULT NULL, - `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - KEY `commonIndex` (`question_id`) +CREATE TABLE IF NOT EXISTS `s2_chat_statistics` ( + `question_id` bigint(20) NOT NULL, + `chat_id` bigint(20) NOT NULL, + `user_name` varchar(150) DEFAULT NULL, + `query_text` varchar(200) DEFAULT NULL, + `interface_name` varchar(100) DEFAULT NULL, + `cost` int(6) DEFAULT '0', + `type` int(11) DEFAULT NULL, + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + KEY `commonIndex` (`question_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -CREATE TABLE `s2_database` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL COMMENT '名称', - `description` varchar(500) DEFAULT NULL COMMENT '描述', - `version` varchar(64) DEFAULT NULL, - `type` varchar(20) NOT NULL COMMENT '类型 mysql,clickhouse,tdw', - `config` text NOT NULL COMMENT '配置信息', - `created_at` datetime NOT NULL COMMENT '创建时间', - `created_by` varchar(100) NOT NULL COMMENT '创建人', - `updated_at` datetime NOT NULL COMMENT '更新时间', - `updated_by` varchar(100) NOT NULL COMMENT '更新人', - `admin` varchar(500) DEFAULT NULL, - `viewer` varchar(500) DEFAULT NULL, - PRIMARY KEY (`id`) +CREATE TABLE IF NOT EXISTS `s2_database` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL COMMENT '名称', + `description` varchar(500) DEFAULT NULL COMMENT '描述', + `version` varchar(64) DEFAULT NULL, + `type` varchar(20) NOT NULL COMMENT '类型 mysql,clickhouse,tdw', + `config` text NOT NULL COMMENT '配置信息', + `created_at` datetime NOT NULL COMMENT '创建时间', + `created_by` varchar(100) NOT NULL COMMENT '创建人', + `updated_at` datetime NOT NULL COMMENT '更新时间', + `updated_by` varchar(100) NOT NULL COMMENT '更新人', + `admin` varchar(500) DEFAULT NULL, + `viewer` varchar(500) DEFAULT NULL, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='数据库实例表'; CREATE TABLE IF NOT EXISTS `s2_dictionary_conf` ( @@ -253,60 +254,60 @@ CREATE TABLE IF NOT EXISTS `s2_dictionary_task` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='字典运行任务表'; -CREATE TABLE `s2_dimension` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '维度ID', - `model_id` bigint(20) DEFAULT NULL, - `name` varchar(255) NOT NULL COMMENT '维度名称', - `biz_name` varchar(255) NOT NULL COMMENT '字段名称', - `description` varchar(500) NOT NULL COMMENT '描述', - `status` int(10) NOT NULL COMMENT '维度状态,0正常,1下架', - `sensitive_level` int(10) DEFAULT NULL COMMENT '敏感级别', - `type` varchar(50) NOT NULL COMMENT '维度类型 categorical,time', - `type_params` text COMMENT '类型参数', - `data_type` varchar(50) DEFAULT null comment '维度数据类型 varchar、array', - `expr` text NOT NULL COMMENT '表达式', - `created_at` datetime NOT NULL COMMENT '创建时间', - `created_by` varchar(100) NOT NULL COMMENT '创建人', - `updated_at` datetime NOT NULL COMMENT '更新时间', - `updated_by` varchar(100) NOT NULL COMMENT '更新人', - `semantic_type` varchar(20) NOT NULL COMMENT '语义类型DATE, ID, CATEGORY', - `alias` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, - `default_values` varchar(500) DEFAULT NULL, - `dim_value_maps` varchar(5000) DEFAULT NULL, - `is_tag` int(10) DEFAULT NULL, - `ext` varchar(1000) DEFAULT NULL, - PRIMARY KEY (`id`) +CREATE TABLE IF NOT EXISTS `s2_dimension` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '维度ID', + `model_id` bigint(20) DEFAULT NULL, + `name` varchar(255) NOT NULL COMMENT '维度名称', + `biz_name` varchar(255) NOT NULL COMMENT '字段名称', + `description` varchar(500) NOT NULL COMMENT '描述', + `status` tinyint NOT NULL COMMENT '维度状态,0正常,1下架', + `sensitive_level` int(10) DEFAULT NULL COMMENT '敏感级别', + `type` varchar(50) NOT NULL COMMENT '维度类型 categorical,time', + `type_params` text COMMENT '类型参数', + `data_type` varchar(50) DEFAULT null comment '维度数据类型 varchar、array', + `expr` text NOT NULL COMMENT '表达式', + `created_at` datetime NOT NULL COMMENT '创建时间', + `created_by` varchar(100) NOT NULL COMMENT '创建人', + `updated_at` datetime NOT NULL COMMENT '更新时间', + `updated_by` varchar(100) NOT NULL COMMENT '更新人', + `semantic_type` varchar(20) NOT NULL COMMENT '语义类型DATE, ID, CATEGORY', + `alias` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, + `default_values` varchar(500) DEFAULT NULL, + `dim_value_maps` varchar(5000) DEFAULT NULL, + `is_tag` tinyint DEFAULT NULL, + `ext` varchar(1000) DEFAULT NULL, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='维度表'; -CREATE TABLE `s2_domain` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增ID', - `name` varchar(255) DEFAULT NULL COMMENT '主题域名称', - `biz_name` varchar(255) DEFAULT NULL COMMENT '内部名称', - `parent_id` bigint(20) DEFAULT '0' COMMENT '父主题域ID', - `status` int(10) NOT NULL COMMENT '主题域状态', - `created_at` datetime DEFAULT NULL COMMENT '创建时间', - `created_by` varchar(100) DEFAULT NULL COMMENT '创建人', - `updated_at` datetime DEFAULT NULL COMMENT '更新时间', - `updated_by` varchar(100) DEFAULT NULL COMMENT '更新人', - `admin` varchar(3000) DEFAULT NULL COMMENT '主题域管理员', - `admin_org` varchar(3000) DEFAULT NULL COMMENT '主题域管理员组织', - `is_open` int(11) DEFAULT NULL COMMENT '主题域是否公开', - `viewer` varchar(3000) DEFAULT NULL COMMENT '主题域可用用户', - `view_org` varchar(3000) DEFAULT NULL COMMENT '主题域可用组织', - `entity` varchar(500) DEFAULT NULL COMMENT '主题域实体信息', - PRIMARY KEY (`id`) +CREATE TABLE IF NOT EXISTS `s2_domain` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增ID', + `name` varchar(255) DEFAULT NULL COMMENT '主题域名称', + `biz_name` varchar(255) DEFAULT NULL COMMENT '内部名称', + `parent_id` bigint(20) DEFAULT '0' COMMENT '父主题域ID', + `status` tinyint NOT NULL COMMENT '主题域状态', + `created_at` datetime DEFAULT NULL COMMENT '创建时间', + `created_by` varchar(100) DEFAULT NULL COMMENT '创建人', + `updated_at` datetime DEFAULT NULL COMMENT '更新时间', + `updated_by` varchar(100) DEFAULT NULL COMMENT '更新人', + `admin` varchar(3000) DEFAULT NULL COMMENT '主题域管理员', + `admin_org` varchar(3000) DEFAULT NULL COMMENT '主题域管理员组织', + `is_open` tinyint DEFAULT NULL COMMENT '主题域是否公开', + `viewer` varchar(3000) DEFAULT NULL COMMENT '主题域可用用户', + `view_org` varchar(3000) DEFAULT NULL COMMENT '主题域可用组织', + `entity` varchar(500) DEFAULT NULL COMMENT '主题域实体信息', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='主题域基础信息表'; -CREATE TABLE `s2_metric` +CREATE TABLE IF NOT EXISTS `s2_metric` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `model_id` bigint(20) DEFAULT NULL, `name` varchar(255) NOT NULL COMMENT '指标名称', `biz_name` varchar(255) NOT NULL COMMENT '字段名称', `description` varchar(500) DEFAULT NULL COMMENT '描述', - `status` int(10) NOT NULL COMMENT '指标状态', - `sensitive_level` int(10) NOT NULL COMMENT '敏感级别', + `status` tinyint NOT NULL COMMENT '指标状态', + `sensitive_level` tinyint NOT NULL COMMENT '敏感级别', `type` varchar(50) NOT NULL COMMENT '指标类型', `type_params` text NOT NULL COMMENT '类型参数', `created_at` datetime NOT NULL COMMENT '创建时间', @@ -320,116 +321,116 @@ CREATE TABLE `s2_metric` `relate_dimensions` varchar(500) DEFAULT NULL COMMENT '指标相关维度', `ext` text DEFAULT NULL, `define_type` varchar(50) DEFAULT NULL, -- MEASURE, FIELD, METRIC - `is_publish` int(10) DEFAULT NULL COMMENT '是否发布', + `is_publish` tinyint DEFAULT NULL COMMENT '是否发布', PRIMARY KEY (`id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8 COMMENT ='指标表'; -CREATE TABLE `s2_model` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `name` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, - `biz_name` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, - `domain_id` bigint(20) DEFAULT NULL, - `alias` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL, - `status` int(11) DEFAULT NULL, - `description` varchar(500) DEFAULT NULL, - `viewer` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, - `view_org` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, - `admin` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, - `admin_org` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, - `is_open` int(11) DEFAULT NULL, - `created_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, - `created_at` datetime DEFAULT NULL, - `updated_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, - `updated_at` datetime DEFAULT NULL, - `entity` text COLLATE utf8_unicode_ci, - `drill_down_dimensions` varchar(500) DEFAULT NULL, - `database_id` INT NOT NULL , - `model_detail` text NOT NULL , - `source_type` varchar(128) DEFAULT NULL , - `depends` varchar(500) DEFAULT NULL , - `filter_sql` varchar(1000) DEFAULT NULL , - `tag_object_id` int(11) DEFAULT '0', - `ext` varchar(1000) DEFAULT NULL, - PRIMARY KEY (`id`) +CREATE TABLE IF NOT EXISTS `s2_model` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, + `biz_name` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, + `domain_id` bigint(20) DEFAULT NULL, + `alias` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL, + `status` tinyint DEFAULT NULL, + `description` varchar(500) DEFAULT NULL, + `viewer` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, + `view_org` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, + `admin` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, + `admin_org` varchar(500) COLLATE utf8_unicode_ci DEFAULT NULL, + `is_open` tinyint DEFAULT NULL, + `created_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, + `created_at` datetime DEFAULT NULL, + `updated_by` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL, + `updated_at` datetime DEFAULT NULL, + `entity` text COLLATE utf8_unicode_ci, + `drill_down_dimensions` varchar(500) DEFAULT NULL, + `database_id` INT NOT NULL , + `model_detail` text NOT NULL , + `source_type` varchar(128) DEFAULT NULL , + `depends` varchar(500) DEFAULT NULL , + `filter_sql` varchar(1000) DEFAULT NULL , + `tag_object_id` int(11) DEFAULT '0', + `ext` varchar(1000) DEFAULT NULL, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; -CREATE TABLE `s2_plugin` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'DASHBOARD,WIDGET,URL', - `data_set` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `pattern` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, - `parse_mode` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `parse_mode_config` text COLLATE utf8mb4_unicode_ci, - `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, - `created_at` datetime DEFAULT NULL, - `created_by` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, - `updated_at` datetime DEFAULT NULL, - `updated_by` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, - `config` text CHARACTER SET utf8 COLLATE utf8_unicode_ci, - `comment` text COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`id`) +CREATE TABLE IF NOT EXISTS `s2_plugin` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'DASHBOARD,WIDGET,URL', + `data_set` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `pattern` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, + `parse_mode` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `parse_mode_config` text COLLATE utf8mb4_unicode_ci, + `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, + `created_at` datetime DEFAULT NULL, + `created_by` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, + `updated_at` datetime DEFAULT NULL, + `updated_by` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL, + `config` text CHARACTER SET utf8 COLLATE utf8_unicode_ci, + `comment` text COLLATE utf8mb4_unicode_ci, + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `s2_query_stat_info` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `trace_id` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '查询标识', - `model_id` bigint(20) DEFAULT NULL, - `data_set_id` bigint(20) DEFAULT NULL, - `user` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执行sql的用户', - `created_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `query_type` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '查询对应的场景', - `query_type_back` int(10) DEFAULT '0' COMMENT '查询类型, 0-正常查询, 1-预刷类型', - `query_sql_cmd` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '对应查询的struct', - `sql_cmd_md5` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql md5值', - `query_struct_cmd` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '对应查询的struct', - `struct_cmd_md5` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql md5值', - `sql` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '对应查询的sql', - `sql_md5` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql md5值', - `query_engine` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '查询引擎', - `elapsed_ms` bigint(10) DEFAULT NULL COMMENT '查询耗时', - `query_state` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '查询最终状态', - `native_query` int(10) DEFAULT NULL COMMENT '1-明细查询,0-聚合查询', - `start_date` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql开始日期', - `end_date` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql结束日期', - `dimensions` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql 涉及的维度', - `metrics` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql 涉及的指标', - `select_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql select部分涉及的标签', - `agg_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql agg部分涉及的标签', - `filter_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql where部分涉及的标签', - `group_by_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql grouy by部分涉及的标签', - `order_by_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql order by部分涉及的标签', - `use_result_cache` tinyint(1) DEFAULT '-1' COMMENT '是否命中sql缓存', - `use_sql_cache` tinyint(1) DEFAULT '-1' COMMENT '是否命中sql缓存', - `sql_cache_key` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '缓存的key', - `result_cache_key` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '缓存的key', - `query_opt_mode` varchar(20) null comment '优化模式', - PRIMARY KEY (`id`), - KEY `domain_index` (`model_id`) +CREATE TABLE IF NOT EXISTS `s2_query_stat_info` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `trace_id` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '查询标识', + `model_id` bigint(20) DEFAULT NULL, + `data_set_id` bigint(20) DEFAULT NULL, + `user` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执行sql的用户', + `created_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `query_type` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '查询对应的场景', + `query_type_back` int(10) DEFAULT '0' COMMENT '查询类型, 0-正常查询, 1-预刷类型', + `query_sql_cmd` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '对应查询的struct', + `sql_cmd_md5` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql md5值', + `query_struct_cmd` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '对应查询的struct', + `struct_cmd_md5` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql md5值', + `sql` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '对应查询的sql', + `sql_md5` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql md5值', + `query_engine` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '查询引擎', + `elapsed_ms` bigint(10) DEFAULT NULL COMMENT '查询耗时', + `query_state` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '查询最终状态', + `native_query` int(10) DEFAULT NULL COMMENT '1-明细查询,0-聚合查询', + `start_date` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql开始日期', + `end_date` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'sql结束日期', + `dimensions` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql 涉及的维度', + `metrics` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql 涉及的指标', + `select_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql select部分涉及的标签', + `agg_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql agg部分涉及的标签', + `filter_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql where部分涉及的标签', + `group_by_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql grouy by部分涉及的标签', + `order_by_cols` mediumtext COLLATE utf8mb4_unicode_ci COMMENT 'sql order by部分涉及的标签', + `use_result_cache` tinyint(1) DEFAULT '-1' COMMENT '是否命中sql缓存', + `use_sql_cache` tinyint(1) DEFAULT '-1' COMMENT '是否命中sql缓存', + `sql_cache_key` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '缓存的key', + `result_cache_key` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '缓存的key', + `query_opt_mode` varchar(20) null comment '优化模式', + PRIMARY KEY (`id`), + KEY `domain_index` (`model_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='查询统计信息表'; -CREATE TABLE `s2_semantic_pasre_info` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, - `trace_id` varchar(200) NOT NULL COMMENT '查询标识', - `domain_id` bigint(20) NOT NULL COMMENT '主体域ID', - `dimensions` mediumtext COMMENT '查询相关的维度信息', - `metrics` mediumtext COMMENT '查询相关的指标信息', - `orders` mediumtext COMMENT '查询相关的排序信息', - `filters` mediumtext COMMENT '查询相关的过滤信息', - `date_info` mediumtext COMMENT '查询相关的日期信息', - `limit` bigint(20) NOT NULL COMMENT '查询相关的limit信息', - `native_query` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1-明细查询,0-聚合查询', - `sql` mediumtext COMMENT '解析后的sql', - `created_at` datetime NOT NULL COMMENT '创建时间', - `created_by` varchar(100) NOT NULL COMMENT '创建人', - `status` int(10) NOT NULL COMMENT '运行状态', - `elapsed_ms` bigint(10) DEFAULT NULL COMMENT 'sql解析耗时', - PRIMARY KEY (`id`) +CREATE TABLE IF NOT EXISTS `s2_semantic_pasre_info` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `trace_id` varchar(200) NOT NULL COMMENT '查询标识', + `domain_id` bigint(20) NOT NULL COMMENT '主体域ID', + `dimensions` mediumtext COMMENT '查询相关的维度信息', + `metrics` mediumtext COMMENT '查询相关的指标信息', + `orders` mediumtext COMMENT '查询相关的排序信息', + `filters` mediumtext COMMENT '查询相关的过滤信息', + `date_info` mediumtext COMMENT '查询相关的日期信息', + `limit` bigint(20) NOT NULL COMMENT '查询相关的limit信息', + `native_query` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1-明细查询,0-聚合查询', + `sql` mediumtext COMMENT '解析后的sql', + `created_at` datetime NOT NULL COMMENT '创建时间', + `created_by` varchar(100) NOT NULL COMMENT '创建人', + `status` tinyint NOT NULL COMMENT '运行状态', + `elapsed_ms` bigint(10) DEFAULT NULL COMMENT 'sql解析耗时', + PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='语义层sql解析信息表'; -CREATE TABLE `s2_canvas` +CREATE TABLE IF NOT EXISTS `s2_canvas` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `domain_id` bigint(20) DEFAULT NULL, @@ -442,7 +443,7 @@ CREATE TABLE `s2_canvas` PRIMARY KEY (`id`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8; -create table s2_user +CREATE TABLE IF NOT EXISTS s2_user ( id int(11) NOT NULL AUTO_INCREMENT, name varchar(100) not null, @@ -450,18 +451,18 @@ create table s2_user password varchar(256) null, salt varchar(256) DEFAULT NULL COMMENT 'md5密码盐', email varchar(100) null, - is_admin int(11) null, + is_admin tinyint null, PRIMARY KEY (`id`) ); -CREATE TABLE s2_system_config +CREATE TABLE IF NOT EXISTS s2_system_config ( id int primary key AUTO_INCREMENT COMMENT '主键id', admin varchar(500) COMMENT '系统管理员', parameters text null COMMENT '配置项' )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE s2_model_rela +CREATE TABLE IF NOT EXISTS s2_model_rela ( id bigint primary key AUTO_INCREMENT, domain_id bigint, @@ -471,7 +472,7 @@ CREATE TABLE s2_model_rela join_condition VARCHAR(255) )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `s2_collect` ( +CREATE TABLE IF NOT EXISTS `s2_collect` ( `id` bigint NOT NULL primary key AUTO_INCREMENT, `type` varchar(20) NOT NULL, `username` varchar(20) NOT NULL, @@ -480,7 +481,7 @@ CREATE TABLE `s2_collect` ( `update_time` datetime )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `s2_metric_query_default_config` ( +CREATE TABLE IF NOT EXISTS `s2_metric_query_default_config` ( `id` bigint NOT NULL PRIMARY KEY AUTO_INCREMENT, `metric_id` bigint, `user_name` varchar(255) NOT NULL, @@ -491,7 +492,7 @@ CREATE TABLE `s2_metric_query_default_config` ( `updated_by` varchar(100) null )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE `s2_app` +CREATE TABLE IF NOT EXISTS `s2_app` ( id bigint PRIMARY KEY AUTO_INCREMENT, name VARCHAR(255), @@ -508,7 +509,7 @@ CREATE TABLE `s2_app` `updated_by` varchar(255) null )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -CREATE TABLE s2_data_set +CREATE TABLE IF NOT EXISTS s2_data_set ( id BIGINT AUTO_INCREMENT PRIMARY KEY, domain_id BIGINT, @@ -528,15 +529,15 @@ CREATE TABLE s2_data_set )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; CREATE TABLE IF NOT EXISTS s2_tag( - `id` INT NOT NULL AUTO_INCREMENT, - `item_id` INT NOT NULL , - `type` varchar(255) NOT NULL , - `created_at` datetime NOT NULL , - `created_by` varchar(100) NOT NULL , - `updated_at` datetime DEFAULT NULL , - `updated_by` varchar(100) DEFAULT NULL , - `ext` text DEFAULT NULL , - PRIMARY KEY (`id`) + `id` INT NOT NULL AUTO_INCREMENT, + `item_id` INT NOT NULL , + `type` varchar(255) NOT NULL , + `created_at` datetime NOT NULL , + `created_by` varchar(100) NOT NULL , + `updated_at` datetime DEFAULT NULL , + `updated_by` varchar(100) DEFAULT NULL , + `ext` text DEFAULT NULL , + PRIMARY KEY (`id`) )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; CREATE TABLE IF NOT EXISTS `s2_tag_object` @@ -546,8 +547,8 @@ CREATE TABLE IF NOT EXISTS `s2_tag_object` `name` varchar(255) NOT NULL COMMENT '名称', `biz_name` varchar(255) NOT NULL COMMENT '英文名称', `description` varchar(500) DEFAULT NULL COMMENT '描述', - `status` int(10) NOT NULL DEFAULT '1' COMMENT '状态', - `sensitive_level` int(10) NOT NULL DEFAULT '0' COMMENT '敏感级别', + `status` tinyint NOT NULL DEFAULT '1' COMMENT '状态', + `sensitive_level` tinyint NOT NULL DEFAULT '0' COMMENT '敏感级别', `created_at` datetime NOT NULL COMMENT '创建时间', `created_by` varchar(100) NOT NULL COMMENT '创建人', `updated_at` datetime NULL COMMENT '更新时间',