This is an automated email from the ASF dual-hosted git repository.

zhongjiajie pushed a commit to branch 3.1.6-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/3.1.6-prepare by this push:
     new ca10898c53 fix: Missing ddl in 3.1.x
ca10898c53 is described below

commit ca10898c53f1e7ae78806ac20a6cc078a3cf2f1a
Author: Jay Chung <[email protected]>
AuthorDate: Tue Apr 25 11:36:26 2023 +0800

    fix: Missing ddl in 3.1.x
    
    related: https://github.com/apache/dolphinscheduler/pull/13901
---
 .../3.1.6_schema/mysql/dolphinscheduler_ddl.sql    | 71 ++++++++++++++++++++++
 .../3.1.6_schema/mysql/dolphinscheduler_dml.sql    | 16 +++++
 .../postgresql/dolphinscheduler_ddl.sql            | 16 +++++
 .../postgresql/dolphinscheduler_dml.sql            | 16 +++++
 4 files changed, 119 insertions(+)

diff --git 
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.6_schema/mysql/dolphinscheduler_ddl.sql
 
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.6_schema/mysql/dolphinscheduler_ddl.sql
new file mode 100644
index 0000000000..cf451ddd75
--- /dev/null
+++ 
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.6_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/3.1.6_schema/mysql/dolphinscheduler_dml.sql
 
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.6_schema/mysql/dolphinscheduler_dml.sql
new file mode 100644
index 0000000000..4a14f326b9
--- /dev/null
+++ 
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.6_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/3.1.6_schema/postgresql/dolphinscheduler_ddl.sql
 
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.6_schema/postgresql/dolphinscheduler_ddl.sql
new file mode 100644
index 0000000000..4a14f326b9
--- /dev/null
+++ 
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.6_schema/postgresql/dolphinscheduler_ddl.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/3.1.6_schema/postgresql/dolphinscheduler_dml.sql
 
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.6_schema/postgresql/dolphinscheduler_dml.sql
new file mode 100644
index 0000000000..4a14f326b9
--- /dev/null
+++ 
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.6_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.
+*/

Reply via email to