-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3812 from lgcareer/1.3.3-release-cherrypick
[Fix-#3487][api、dao] Cherry pick from dev to fix that create folder duplicate name under multithreading
- Loading branch information
Showing
5 changed files
with
85 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY','')); | ||
|
||
|
||
-- add t_ds_resources_un | ||
DROP PROCEDURE IF EXISTS uc_dolphin_T_t_ds_resources_un; | ||
delimiter d// | ||
CREATE PROCEDURE uc_dolphin_T_t_ds_resources_un() | ||
BEGIN | ||
IF NOT EXISTS ( | ||
SELECT * FROM information_schema.KEY_COLUMN_USAGE | ||
WHERE TABLE_NAME = 't_ds_resources' | ||
AND CONSTRAINT_NAME = 't_ds_resources_un' | ||
) | ||
THEN | ||
ALTER TABLE t_ds_resources ADD CONSTRAINT t_ds_resources_un UNIQUE KEY (full_name,`type`); | ||
END IF; | ||
END; | ||
|
||
d// | ||
|
||
delimiter ; | ||
CALL uc_dolphin_T_t_ds_resources_un(); | ||
DROP PROCEDURE IF EXISTS uc_dolphin_T_t_ds_resources_un; | ||
|
||
|
||
|
33 changes: 33 additions & 0 deletions
33
sql/upgrade/1.3.3_schema/postgresql/dolphinscheduler_ddl.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
-- add t_ds_resources_un | ||
CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_resources_un() RETURNS void AS $$ | ||
BEGIN | ||
IF NOT EXISTS ( | ||
SELECT 1 FROM information_schema.KEY_COLUMN_USAGE | ||
WHERE TABLE_NAME = 't_ds_resources' | ||
AND CONSTRAINT_NAME = 't_ds_resources_un' | ||
) | ||
THEN | ||
ALTER TABLE t_ds_resources ADD CONSTRAINT t_ds_resources_un UNIQUE (full_name,"type"); | ||
END IF; | ||
END; | ||
$$ LANGUAGE plpgsql; | ||
|
||
SELECT uc_dolphin_T_t_ds_resources_un(); | ||
DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_resources_un(); |