airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch master updated: Reorganizing migration scripts for 0.17-0.18
Date Fri, 03 May 2019 15:54:12 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f84f16  Reorganizing migration scripts for 0.17-0.18
3f84f16 is described below

commit 3f84f165e4e6818ca4950c0eb402674a6eb543af
Author: Marcus Christie <machrist@iu.edu>
AuthorDate: Fri May 3 11:53:58 2019 -0400

    Reorganizing migration scripts for 0.17-0.18
---
 .../DeltaScripts/expCatalog_schema_delta.sql       | 13 ---------
 .../DeltaScripts/profile_service_schema_delta.sql  | 32 +-------------------
 .../DeltaScripts/sharingCatalog_schema_delta.sql   |  7 -----
 .../DeltaScripts/expCatalog_schema_delta.sql       | 34 ++++++++++++++++++++++
 .../DeltaScripts/profile_service_schema_delta.sql  |  6 ++--
 .../DeltaScripts/sharingCatalog_schema_delta.sql   | 28 ++++++++++++++++++
 .../DeltaScripts/profile_service_schema_delta.sql  |  1 -
 7 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
index a802e8d..3c122f9 100644
--- a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/expCatalog_schema_delta.sql
@@ -44,16 +44,3 @@ ALTER TABLE `EXPERIMENT_STATUS` CHANGE `TIME_OF_STATE_CHANGE` `TIME_OF_STATE_CHA
 ALTER TABLE `NOTIFICATION` CHANGE `NOTIFICATION_MESSAGE` `NOTIFICATION_MESSAGE` varchar(4096)
NOT NULL;
 ALTER TABLE `JOB_STATUS` CHANGE `TIME_OF_STATE_CHANGE` `TIME_OF_STATE_CHANGE` timestamp NOT
NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE `USERS` ADD UNIQUE KEY `AIRAVATA_INTERNAL_USER_ID` (`AIRAVATA_INTERNAL_USER_ID`);
-
-CREATE TABLE PROCESS_WORKFLOW
-(
-  PROCESS_ID varchar(255) NOT NULL,
-  WORKFLOW_ID varchar(255) NOT NULL,
-  TYPE varchar(255) DEFAULT NULL,
-  CREATION_TIME timestamp DEFAULT NOW(),
-  PRIMARY KEY (PROCESS_ID, WORKFLOW_ID),
-  FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-ALTER TABLE `TASK` ADD `MAX_RETRY` int(11) NOT NULL DEFAULT '3';
-ALTER TABLE `TASK` ADD `CURRENT_RETRY` int(11) NOT NULL DEFAULT '0';
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
index 1d407bc..94ea038 100644
--- a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
@@ -18,34 +18,4 @@
 -- under the License.
 --
 
--- NOTE: the following is only needed if you previously installed Airavata from
--- the master branch and have a profile service database
-CREATE TABLE IF NOT EXISTS `CUSTOMIZED_DASHBOARD` (
- `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL,
- `ENABLED_APPLICATION` varchar(255) DEFAULT NULL,
- `ENABLED_COMPUTE_RESOURCE` varchar(255) DEFAULT NULL,
- `ENABLED_CPU_COUNT` varchar(255) DEFAULT NULL,
- `ENABLED_CREATION_TIME` varchar(255) DEFAULT NULL,
- `ENABLED_DESCRIPTION` varchar(255) DEFAULT NULL,
- `ENABLED_ERRORS` varchar(255) DEFAULT NULL,
- `ENABLED_EXPERIMENT_ID` varchar(255) DEFAULT NULL,
- `ENABLED_INPUTS` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_CREATION_TIME` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_DESCRIPTION` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_ID` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_NAME` varchar(255) DEFAULT NULL,
- `ENABLED_JOB_STATUS` varchar(255) DEFAULT NULL,
- `ENABLED_LAST_MODIFIED_TIME` varchar(255) DEFAULT NULL,
- `ENABLED_NAME` varchar(255) DEFAULT NULL,
- `ENABLED_NODE_COUNT` varchar(255) DEFAULT NULL,
- `ENABLED_NOTIFICATIONS_TO` varchar(255) DEFAULT NULL,
- `ENABLED_OUTPUTS` varchar(255) DEFAULT NULL,
- `ENABLED_OWNER` varchar(255) DEFAULT NULL,
- `ENABLED_PROJECT` varchar(255) DEFAULT NULL,
- `ENABLED_QUEUE` varchar(255) DEFAULT NULL,
- `ENABLED_STORAGE_DIR` varchar(255) DEFAULT NULL,
- `ENABLED_WALL_TIME` varchar(255) DEFAULT NULL,
- `ENABLED_WORKING_DIR` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`AIRAVATA_INTERNAL_USER_ID`),
- CONSTRAINT `CUSTOMIZED_DASHBOARD_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES
`USER_PROFILE` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+-- no differences
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/sharingCatalog_schema_delta.sql
b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/sharingCatalog_schema_delta.sql
index 8012989..b8b9838 100644
--- a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/sharingCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/sharingCatalog_schema_delta.sql
@@ -29,10 +29,3 @@ ALTER TABLE `SHARING` ADD CONSTRAINT `SHARING_PERMISSION_TYPE_ID_DOMAIN_ID_FK`
F
 ALTER TABLE `SHARING` ADD CONSTRAINT `SHARING_ENTITY_ID_DOMAIN_ID_FK` FOREIGN KEY (ENTITY_ID,
DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION;
 ALTER TABLE `SHARING` ADD CONSTRAINT `SHARING_INHERITED_PARENT_ID_DOMAIN_ID_FK` FOREIGN KEY
(INHERITED_PARENT_ID, DOMAIN_ID) REFERENCES ENTITY(ENTITY_ID, DOMAIN_ID) ON DELETE CASCADE
ON UPDATE NO ACTION;
 ALTER TABLE `SHARING` ADD CONSTRAINT `SHARING_GROUP_ID_DOMAIN_ID_FK` FOREIGN KEY (GROUP_ID,
DOMAIN_ID) REFERENCES USER_GROUP(GROUP_ID, DOMAIN_ID) ON DELETE CASCADE ON UPDATE NO ACTION;
-
-CREATE TABLE IF NOT EXISTS `GROUP_ADMIN` (
- `ADMIN_ID` varchar(255) NOT NULL,
- `DOMAIN_ID` varchar(255) NOT NULL,
- `GROUP_ID` varchar(255) NOT NULL,
- PRIMARY KEY (`ADMIN_ID`,`DOMAIN_ID`,`GROUP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
diff --git a/modules/registry/release-migration-scripts/0.17-0.18/DeltaScripts/expCatalog_schema_delta.sql
b/modules/registry/release-migration-scripts/0.17-0.18/DeltaScripts/expCatalog_schema_delta.sql
new file mode 100644
index 0000000..f950a97
--- /dev/null
+++ b/modules/registry/release-migration-scripts/0.17-0.18/DeltaScripts/expCatalog_schema_delta.sql
@@ -0,0 +1,34 @@
+--
+--
+-- 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.
+--
+
+use experiment_catalog;
+
+CREATE TABLE PROCESS_WORKFLOW
+(
+  PROCESS_ID varchar(255) NOT NULL,
+  WORKFLOW_ID varchar(255) NOT NULL,
+  TYPE varchar(255) DEFAULT NULL,
+  CREATION_TIME timestamp DEFAULT NOW(),
+  PRIMARY KEY (PROCESS_ID, WORKFLOW_ID),
+  FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE `TASK` ADD `MAX_RETRY` int(11) NOT NULL DEFAULT '3';
+ALTER TABLE `TASK` ADD `CURRENT_RETRY` int(11) NOT NULL DEFAULT '0';
diff --git a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
b/modules/registry/release-migration-scripts/0.17-0.18/DeltaScripts/profile_service_schema_delta.sql
similarity index 94%
copy from modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
copy to modules/registry/release-migration-scripts/0.17-0.18/DeltaScripts/profile_service_schema_delta.sql
index 1d407bc..86b0438 100644
--- a/modules/registry/release-migration-scripts/0.16-0.17/DeltaScripts/profile_service_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.17-0.18/DeltaScripts/profile_service_schema_delta.sql
@@ -18,8 +18,8 @@
 -- under the License.
 --
 
--- NOTE: the following is only needed if you previously installed Airavata from
--- the master branch and have a profile service database
+use profile_service;
+
 CREATE TABLE IF NOT EXISTS `CUSTOMIZED_DASHBOARD` (
  `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL,
  `ENABLED_APPLICATION` varchar(255) DEFAULT NULL,
@@ -49,3 +49,5 @@ CREATE TABLE IF NOT EXISTS `CUSTOMIZED_DASHBOARD` (
  PRIMARY KEY (`AIRAVATA_INTERNAL_USER_ID`),
  CONSTRAINT `CUSTOMIZED_DASHBOARD_ibfk_1` FOREIGN KEY (`AIRAVATA_INTERNAL_USER_ID`) REFERENCES
`USER_PROFILE` (`AIRAVATA_INTERNAL_USER_ID`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+alter database profile_service character set = 'latin1';
diff --git a/modules/registry/release-migration-scripts/0.17-0.18/DeltaScripts/sharingCatalog_schema_delta.sql
b/modules/registry/release-migration-scripts/0.17-0.18/DeltaScripts/sharingCatalog_schema_delta.sql
new file mode 100644
index 0000000..59b010a
--- /dev/null
+++ b/modules/registry/release-migration-scripts/0.17-0.18/DeltaScripts/sharingCatalog_schema_delta.sql
@@ -0,0 +1,28 @@
+--
+--
+-- 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.
+--
+
+use sharing_catalog;
+
+CREATE TABLE IF NOT EXISTS `GROUP_ADMIN` (
+ `ADMIN_ID` varchar(255) NOT NULL,
+ `DOMAIN_ID` varchar(255) NOT NULL,
+ `GROUP_ID` varchar(255) NOT NULL,
+ PRIMARY KEY (`ADMIN_ID`,`DOMAIN_ID`,`GROUP_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql
b/modules/registry/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql
index 9e63f29..e69de29 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql
@@ -1 +0,0 @@
-alter database profile_service character set = 'latin1';


Mime
View raw message