diff --git a/sql/1.5/1.5_increment.sql b/sql/1.5/1.5_increment.sql index 0dabda597d..3cb7e9215d 100644 --- a/sql/1.5/1.5_increment.sql +++ b/sql/1.5/1.5_increment.sql @@ -93,3 +93,8 @@ INSERT INTO task_param_template (task_type, task_name, task_version, params, gmt ## 开启spark推测行为，默认false # spark.speculation=false', now(), now(), 0); + +-- 2023-11-22 add by xjs1983boy OracleSQL to dict +insert into dict(dict_code,dict_name,dict_value,dict_desc,type,sort,data_type,depend_name,is_default,gmt_create,gmt_modified,is_deleted) +values('27','OracleSQL','{"actions":["SAVE_TASK","RUN_TASK","STOP_TASK","SUBMIT_TASK","OPERATOR_TASK"],"barItem":["task","dependency","task_params","env_params"],"formField":["datasource"],"renderKind":"editor","dataTypeCodes":[2]}','',30,0,'STRING','',0,'2023-11-06 13:35:00','2023-11-06 13:35:00',0); +COMMIT; diff --git a/sql/init.sql b/sql/init.sql index 5b4350e302..953e1a299d 100644 --- a/sql/init.sql +++ b/sql/init.sql @@ -2542,3 +2542,8 @@ INSERT INTO task_param_template (task_type, task_name, task_version, params, gmt ## 开启spark推测行为，默认false # spark.speculation=false', now(), now(), 0); COMMIT; + +-- 2023-11-22 add by xjs1983boy OracleSQL to dict +insert into dict(dict_code,dict_name,dict_value,dict_desc,type,sort,data_type,depend_name,is_default,gmt_create,gmt_modified,is_deleted) +values('27','OracleSQL','{"actions":["SAVE_TASK","RUN_TASK","STOP_TASK","SUBMIT_TASK","OPERATOR_TASK"],"barItem":["task","dependency","task_params","env_params"],"formField":["datasource"],"renderKind":"editor","dataTypeCodes":[2]}','',30,0,'STRING','',0,'2023-11-06 13:35:00','2023-11-06 13:35:00',0); +COMMIT; diff --git a/taier-common/src/main/java/com/dtstack/taier/common/enums/EScheduleJobType.java b/taier-common/src/main/java/com/dtstack/taier/common/enums/EScheduleJobType.java index 8e6646ef0e..dcd28c9e02 100644 --- a/taier-common/src/main/java/com/dtstack/taier/common/enums/EScheduleJobType.java +++ b/taier-common/src/main/java/com/dtstack/taier/common/enums/EScheduleJobType.java @@ -117,6 +117,8 @@ public enum EScheduleJobType { MAXCOMPUTE(24, "MaxCompute", EJobType.SQL.getType(), 4, null, EComputeType.BATCH, EJobClientType.DATASOURCE_PLUGIN), HADOOP_MR(25, "HadoopMR", EJobType.MR.getType(), 16, EComponentType.HDFS, EComputeType.BATCH, EJobClientType.WORKER_PLUGIN), DATAX(26,"DataX", EJobType.PYTHON.getType(),14, EComponentType.DATAX, EComputeType.BATCH, EJobClientType.WORKER_PLUGIN), + + ORACLE_SQL(27, "OracleSQL", EJobType.SQL.getType(), 4, null, EComputeType.BATCH, EJobClientType.DATASOURCE_PLUGIN), ; private final Integer type; @@ -216,4 +218,4 @@ public EComponentType getComponentType() { public EJobClientType getJobClientType() { return jobClientType; } -} \ No newline at end of file +} diff --git a/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/develop/runner/DefaultSQLTaskRunner.java b/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/develop/runner/DefaultSQLTaskRunner.java index 4f11814b04..4a7fec2dad 100644 --- a/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/develop/runner/DefaultSQLTaskRunner.java +++ b/taier-data-develop/src/main/java/com/dtstack/taier/develop/service/develop/runner/DefaultSQLTaskRunner.java @@ -36,6 +36,6 @@ public List support() { EScheduleJobType.DORIS_SQL, EScheduleJobType.CLICK_HOUSE_SQL, EScheduleJobType.MYSQL, EScheduleJobType.GREENPLUM, EScheduleJobType.GAUSS_DB, EScheduleJobType.POSTGRESQL, EScheduleJobType.SQLSERVER, EScheduleJobType.TIDB, EScheduleJobType.VERTICA, - EScheduleJobType.MAXCOMPUTE); + EScheduleJobType.MAXCOMPUTE,EScheduleJobType.ORACLE_SQL); } } diff --git a/taier-datasource/taier-datasource-plugin/taier-datasource-plugin-oracle/pom.xml b/taier-datasource/taier-datasource-plugin/taier-datasource-plugin-oracle/pom.xml index b5432fe1b9..ce891ea056 100644 --- a/taier-datasource/taier-datasource-plugin/taier-datasource-plugin-oracle/pom.xml +++ b/taier-datasource/taier-datasource-plugin/taier-datasource-plugin-oracle/pom.xml @@ -54,7 +54,6 @@ com.oracle.database.jdbc ojdbc8 ${ojdbc8.version} - provided @@ -135,4 +134,4 @@ - \ No newline at end of file + diff --git a/taier-ui/src/components/icon/index.tsx b/taier-ui/src/components/icon/index.tsx index 1d87bc40f6..0bedf2da95 100644 --- a/taier-ui/src/components/icon/index.tsx +++ b/taier-ui/src/components/icon/index.tsx @@ -718,3 +718,17 @@ export const DataxIcon = ({ style }: IConProps) => { ); }; + +export const OracleSQLIcon = ({ style }: IConProps) => { + return ( + + + + + + + ); +}; diff --git a/taier-ui/src/constant/index.ts b/taier-ui/src/constant/index.ts index 0540b0f362..1e53cf44dd 100644 --- a/taier-ui/src/constant/index.ts +++ b/taier-ui/src/constant/index.ts @@ -270,6 +270,7 @@ export enum TASK_TYPE_ENUM { MAX_COMPUTE = 24, HADOOP_MR = 25, DATAX, + ORACLE_SQL = 27, } /** diff --git a/taier-ui/src/services/taskRenderService.tsx b/taier-ui/src/services/taskRenderService.tsx index d68812ef3f..2c16f5986f 100644 --- a/taier-ui/src/services/taskRenderService.tsx +++ b/taier-ui/src/services/taskRenderService.tsx @@ -20,6 +20,7 @@ import { HiveSQLIcon, MysqlIcon, OceanBaseIcon, + OracleSQLIcon, PostgreSqlIcon, PythonIcon, ShellIcon, @@ -251,6 +252,8 @@ export default class TaskRenderService extends Component { return ; case TASK_TYPE_ENUM.MYSQL: return ; + case TASK_TYPE_ENUM.ORACLE_SQL: + return ; case TASK_TYPE_ENUM.GREENPLUM: return ; case TASK_TYPE_ENUM.POSTGRE_SQL: