This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch 2.0.9-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.9-prepare by this push:
new 7c73e3f903 fix: Missing ddl in 2.0.x
7c73e3f903 is described below
commit 7c73e3f903f085b9062aa43c33750390831646b2
Author: Jay Chung <[email protected]>
AuthorDate: Tue Apr 25 11:14:52 2023 +0800
fix: Missing ddl in 2.0.x
related: https://github.com/apache/dolphinscheduler/pull/13901
---
.../2.0.9_schema/mysql/dolphinscheduler_ddl.sql | 71 ++++++++++++++++++++++
.../2.0.9_schema/mysql/dolphinscheduler_dml.sql | 16 +++++
.../postgresql/dolphinscheduler_ddl.sql | 44 ++++++++++++++
.../postgresql/dolphinscheduler_dml.sql | 16 +++++
4 files changed, 147 insertions(+)
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/mysql/dolphinscheduler_ddl.sql
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/mysql/dolphinscheduler_ddl.sql
new file mode 100644
index 0000000000..cf451ddd75
--- /dev/null
+++
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/mysql/dolphinscheduler_ddl.sql
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+
+drop PROCEDURE if EXISTS t_ds_process_definition_add_column;
+delimiter d//
+CREATE PROCEDURE t_ds_process_definition_add_column()
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_process_definition'
+ AND TABLE_SCHEMA=(SELECT DATABASE())
+ AND COLUMN_NAME='execution_type')
+ THEN
+ALTER TABLE t_ds_process_definition ADD COLUMN `execution_type` tinyint(4)
DEFAULT '0' COMMENT 'execution_type 0:parallel,1:serial wait,2:serial
discard,3:serial priority';
+END IF;
+END;
+ d//
+ delimiter ;
+CALL t_ds_process_definition_add_column;
+DROP PROCEDURE t_ds_process_definition_add_column;
+
+
+-- t_ds_process_definition_log_add_column
+drop PROCEDURE if EXISTS t_ds_process_definition_log_add_column;
+delimiter d//
+CREATE PROCEDURE t_ds_process_definition_log_add_column()
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_process_definition_log'
+ AND TABLE_SCHEMA=(SELECT DATABASE())
+ AND COLUMN_NAME='execution_type')
+ THEN
+ALTER TABLE t_ds_process_definition_log ADD COLUMN `execution_type` tinyint(4)
DEFAULT '0' COMMENT 'execution_type 0:parallel,1:serial wait,2:serial
discard,3:serial priority';
+END IF;
+END;
+ d//
+ delimiter ;
+CALL t_ds_process_definition_log_add_column;
+DROP PROCEDURE t_ds_process_definition_log_add_column;
+
+
+-- t_ds_process_instance_add_column
+drop PROCEDURE if EXISTS t_ds_process_instance_add_column;
+delimiter d//
+CREATE PROCEDURE t_ds_process_instance_add_column()
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_process_instance'
+ AND TABLE_SCHEMA=(SELECT DATABASE())
+ AND COLUMN_NAME='next_process_instance_id')
+ THEN
+ALTER TABLE t_ds_process_instance ADD COLUMN `next_process_instance_id`
int(11) DEFAULT '0' COMMENT 'serial queue next processInstanceId';
+END IF;
+END;
+ d//
+ delimiter ;
+CALL t_ds_process_instance_add_column;
+DROP PROCEDURE t_ds_process_instance_add_column;
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/mysql/dolphinscheduler_dml.sql
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/mysql/dolphinscheduler_dml.sql
new file mode 100644
index 0000000000..4a14f326b9
--- /dev/null
+++
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/mysql/dolphinscheduler_dml.sql
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/postgresql/dolphinscheduler_ddl.sql
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/postgresql/dolphinscheduler_ddl.sql
new file mode 100644
index 0000000000..82bd54e9a0
--- /dev/null
+++
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/postgresql/dolphinscheduler_ddl.sql
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
+delimiter d//
+CREATE OR REPLACE FUNCTION public.dolphin_update_metadata(
+ )
+ RETURNS character varying
+ LANGUAGE 'plpgsql'
+ COST 100
+ VOLATILE PARALLEL UNSAFE
+AS $BODY$
+DECLARE
+v_schema varchar;
+BEGIN
+ ---get schema name
+ v_schema =current_schema();
+
+ --- add missing columns,
https://github.com/apache/dolphinscheduler/pull/13901
+ EXECUTE 'ALTER TABLE ' || quote_ident(v_schema)
||'.t_ds_process_definition ADD COLUMN IF NOT EXISTS "execution_type" int
DEFAULT 0';
+ EXECUTE 'ALTER TABLE ' || quote_ident(v_schema) ||'.t_ds_process_instance
ADD COLUMN IF NOT EXISTS "next_process_instance_id" int DEFAULT 0';
+
+return 'Success!';
+exception when others then
+ ---Raise EXCEPTION '(%)',SQLERRM;
+ return SQLERRM;
+END;
+$BODY$;
+
+select dolphin_update_metadata();
+
+d//
\ No newline at end of file
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/postgresql/dolphinscheduler_dml.sql
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/postgresql/dolphinscheduler_dml.sql
new file mode 100644
index 0000000000..4a14f326b9
--- /dev/null
+++
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/2.0.9_schema/postgresql/dolphinscheduler_dml.sql
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+*/
