From 43c3a55ebcf16ab839e3e4d622400212ae2630d6 Mon Sep 17 00:00:00 2001 From: ZackYoung Date: Mon, 1 Apr 2024 11:20:09 +0800 Subject: [PATCH] [Optimize][Sql] Optimize git demo address (#3334) Co-authored-by: Zzm0809 <934230207@qq.com> --- dinky-admin/src/main/resources/db/db-h2-dml.sql | 6 +++--- script/sql/dinky-mysql.sql | 4 ++-- script/sql/dinky-pg.sql | 4 ++-- .../{1.1.0_schema => 1.0.2_schema}/mysql/dinky_dml.sql | 3 +++ .../{1.1.0_schema => 1.0.2_schema}/postgre/dinky_dml.sql | 3 +++ 5 files changed, 13 insertions(+), 7 deletions(-) rename script/sql/upgrade/{1.1.0_schema => 1.0.2_schema}/mysql/dinky_dml.sql (82%) rename script/sql/upgrade/{1.1.0_schema => 1.0.2_schema}/postgre/dinky_dml.sql (82%) diff --git a/dinky-admin/src/main/resources/db/db-h2-dml.sql b/dinky-admin/src/main/resources/db/db-h2-dml.sql index a7e9694a75..9c9ec0461a 100644 --- a/dinky-admin/src/main/resources/db/db-h2-dml.sql +++ b/dinky-admin/src/main/resources/db/db-h2-dml.sql @@ -21,7 +21,7 @@ INSERT INTO `dinky_git_project` ( `id`, `tenant_id`, `name`, `url`, `branch` , `username`, `password`, `private_key`, `pom`, `build_args` , `code_type`, `type`, `last_build`, `description`, `build_state` , `build_step`, `enabled`, `udf_class_map_list`, `order_line`) -VALUES ( 1, 1, 'java-udf', 'https://github.com/zackyoungh/dinky-quickstart-java.git', 'master' +VALUES ( 1, 1, 'java-udf', 'https://github.com/DataLinkDC/dinky-quickstart-java.git', 'master' , null, null, null, null, '-P flink-1.14' , 1, 1, null, null, 0 , 0, 1, '[]', 1); @@ -29,7 +29,7 @@ INSERT INTO `dinky_git_project` ( `id`, `tenant_id`, `name`, `url`, `branch` , `username`, `password`, `private_key`, `pom`, `build_args` , `code_type`, `type`, `last_build`, `description`, `build_state` , `build_step`, `enabled`, `udf_class_map_list`, `order_line`) -VALUES ( 2, 1, 'python-udf', 'https://github.com/zackyoungh/dinky-quickstart-python.git', 'master' +VALUES ( 2, 1, 'python-udf', 'https://github.com/DataLinkDC/dinky-quickstart-python.git', 'master' , null, null, null, null, '' , 2, 1, null, null, 0 , 0, 1, '[]', 2); @@ -2529,4 +2529,4 @@ from pyflink.table.udf import udf @udf(result_type=DataTypes.STRING()) def ${className}(variable1:str): return ''''' - , 1, '2022-10-25 09:25:13', '2022-10-25 09:34:47', null, null); \ No newline at end of file + , 1, '2022-10-25 09:25:13', '2022-10-25 09:34:47', null, null); diff --git a/script/sql/dinky-mysql.sql b/script/sql/dinky-mysql.sql index dd9c2e5358..c2cc5d0785 100644 --- a/script/sql/dinky-mysql.sql +++ b/script/sql/dinky-mysql.sql @@ -1658,8 +1658,8 @@ CREATE TABLE `dinky_git_project` ( -- ---------------------------- -- Records of dinky_git_project -- ---------------------------- -INSERT INTO `dinky_git_project` (`id`, `tenant_id`, `name`, `url`, `branch`, `username`, `password`, `private_key`, `pom`, `build_args`, `code_type`, `type`, `last_build`, `description`, `build_state`, `build_step`, `enabled`, `udf_class_map_list`, `order_line`) VALUES (1, 1, 'java-udf', 'https://github.com/zackyoungh/dinky-quickstart-java.git', 'master', NULL, NULL, NULL, NULL, '-P flink-1.14', 1, 1, NULL, NULL, 0, 0, 1, '[]', 1); -INSERT INTO `dinky_git_project` (`id`, `tenant_id`, `name`, `url`, `branch`, `username`, `password`, `private_key`, `pom`, `build_args`, `code_type`, `type`, `last_build`, `description`, `build_state`, `build_step`, `enabled`, `udf_class_map_list`, `order_line`) VALUES (2, 1, 'python-udf', 'https://github.com/zackyoungh/dinky-quickstart-python.git', 'master', NULL, NULL, NULL, NULL, '', 2, 1, NULL, NULL, 0, 0, 1, '[]',2); +INSERT INTO `dinky_git_project` (`id`, `tenant_id`, `name`, `url`, `branch`, `username`, `password`, `private_key`, `pom`, `build_args`, `code_type`, `type`, `last_build`, `description`, `build_state`, `build_step`, `enabled`, `udf_class_map_list`, `order_line`) VALUES (1, 1, 'java-udf', 'https://github.com/DataLinkDC/dinky-quickstart-java.git', 'master', NULL, NULL, NULL, NULL, '-P flink-1.14', 1, 1, NULL, NULL, 0, 0, 1, '[]', 1); +INSERT INTO `dinky_git_project` (`id`, `tenant_id`, `name`, `url`, `branch`, `username`, `password`, `private_key`, `pom`, `build_args`, `code_type`, `type`, `last_build`, `description`, `build_state`, `build_step`, `enabled`, `udf_class_map_list`, `order_line`) VALUES (2, 1, 'python-udf', 'https://github.com/DataLinkDC/dinky-quickstart-python.git', 'master', NULL, NULL, NULL, NULL, '', 2, 1, NULL, NULL, 0, 0, 1, '[]',2); diff --git a/script/sql/dinky-pg.sql b/script/sql/dinky-pg.sql index dce697f976..eae8ddcebc 100644 --- a/script/sql/dinky-pg.sql +++ b/script/sql/dinky-pg.sql @@ -3294,9 +3294,9 @@ EXECUTE FUNCTION trigger_set_timestamp(); INSERT INTO dinky_git_project (id, tenant_id, name, url, branch, username, password, private_key, pom, build_args, code_type, type, last_build, description, build_state, build_step, enabled, udf_class_map_list, order_line) -VALUES (1, 1, 'java-udf', 'https://github.com/zackyoungh/dinky-quickstart-java.git', 'master', NULL, NULL, NULL, NULL, +VALUES (1, 1, 'java-udf', 'https://github.com/DataLinkDC/dinky-quickstart-java.git', 'master', NULL, NULL, NULL, NULL, '-P flink-1.14', 1, 1, NULL, NULL, 0, 0, true, '[]', 1), - (2, 1, 'python-udf', 'https://github.com/zackyoungh/dinky-quickstart-python.git', 'master', NULL, NULL, NULL, + (2, 1, 'python-udf', 'https://github.com/DataLinkDC/dinky-quickstart-python.git', 'master', NULL, NULL, NULL, NULL, '', 2, 1, NULL, NULL, 0, 0, true, '[]', 2); diff --git a/script/sql/upgrade/1.1.0_schema/mysql/dinky_dml.sql b/script/sql/upgrade/1.0.2_schema/mysql/dinky_dml.sql similarity index 82% rename from script/sql/upgrade/1.1.0_schema/mysql/dinky_dml.sql rename to script/sql/upgrade/1.0.2_schema/mysql/dinky_dml.sql index 3abe038ed7..8abf750836 100644 --- a/script/sql/upgrade/1.1.0_schema/mysql/dinky_dml.sql +++ b/script/sql/upgrade/1.0.2_schema/mysql/dinky_dml.sql @@ -26,6 +26,9 @@ update dinky_sys_menu set `path`= '/datastudio/bottom/table-data' , `perms`= 'da delete from dinky_sys_menu where `id`= 26; +update dinky_git_project set `url`= 'https://github.com/DataLinkDC/dinky-quickstart-java.git' where `id`= 1; +update dinky_git_project set `url`= 'https://github.com/DataLinkDC/dinky-quickstart-python.git' where `id`= 2; + commit ; diff --git a/script/sql/upgrade/1.1.0_schema/postgre/dinky_dml.sql b/script/sql/upgrade/1.0.2_schema/postgre/dinky_dml.sql similarity index 82% rename from script/sql/upgrade/1.1.0_schema/postgre/dinky_dml.sql rename to script/sql/upgrade/1.0.2_schema/postgre/dinky_dml.sql index 7653041f39..8d170b13e5 100644 --- a/script/sql/upgrade/1.1.0_schema/postgre/dinky_dml.sql +++ b/script/sql/upgrade/1.0.2_schema/postgre/dinky_dml.sql @@ -26,5 +26,8 @@ update dinky_sys_menu set "path"= '/datastudio/bottom/table-data' , "perms"= 'da delete from dinky_sys_menu where "id"= 26; +update dinky_git_project set "url"= 'https://github.com/DataLinkDC/dinky-quickstart-java.git' where "id"= 1; +update dinky_git_project set "url"= 'https://github.com/DataLinkDC/dinky-quickstart-python.git' where "id"= 2; + commit ;