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

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


The following commit(s) were added to refs/heads/develop by this push:
     new cc6c23e  AIRAVATA-2938 Adding experiment_catalog migration
cc6c23e is described below

commit cc6c23e67b5a17124d9191fc8fbbb347405b6c4e
Author: Marcus Christie <[email protected]>
AuthorDate: Tue Feb 5 13:47:59 2019 -0500

    AIRAVATA-2938 Adding experiment_catalog migration
---
 .../src/main/resources/expcatalog-derby.sql        | 21 ++++++------
 .../src/main/resources/expcatalog-mysql.sql        | 25 ++++++++-------
 .../next/DeltaScripts/appCatalog_schema_delta.sql  | 37 +++++++++++++++++++++-
 .../DeltaScripts/credential_store_schema_delta.sql |  6 ++--
 .../experimentCatalog_schema_delta.sql             | 30 +++++++++++++++++-
 .../DeltaScripts/profile_service_schema_delta.sql  | 22 +++++++++++++
 .../DeltaScripts/replicaCatalog_schema_delta.sql   |  2 ++
 .../DeltaScripts/sharingCatalog_schema_delta.sql   |  2 ++
 8 files changed, 119 insertions(+), 26 deletions(-)

diff --git 
a/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql 
b/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql
index b6a33cc..06217be 100644
--- a/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry-refactoring/src/main/resources/expcatalog-derby.sql
@@ -46,25 +46,26 @@ CREATE TABLE GATEWAY
 
 CREATE TABLE NOTIFICATION
 (
-        NOTIFICATION_ID VARCHAR(255),
+        NOTIFICATION_ID VARCHAR(255) NOT NULL,
         GATEWAY_ID VARCHAR(255),
         TITLE VARCHAR(255),
         PRIORITY VARCHAR(255),
-             NOTIFICATION_MESSAGE VARCHAR(4096),
-             PUBLISHED_DATE TIMESTAMP,
-             EXPIRATION_DATE TIMESTAMP,
-             CREATION_DATE TIMESTAMP,
+        NOTIFICATION_MESSAGE VARCHAR(4096) NOT NULL,
+        PUBLISHED_DATE TIMESTAMP,
+        EXPIRATION_DATE TIMESTAMP,
+        CREATION_DATE TIMESTAMP,
         PRIMARY KEY (NOTIFICATION_ID)
 );
 
 CREATE TABLE USERS
 (
-        AIRAVATA_INTERNAL_USER_ID VARCHAR(255),
+        AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
         USER_NAME VARCHAR(255),
         PASSWORD VARCHAR(255),
         GATEWAY_ID VARCHAR(255) NOT NULL,
         PRIMARY KEY (GATEWAY_ID, USER_NAME),
-        FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE 
CASCADE
+        FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE 
CASCADE,
+        UNIQUE KEY (AIRAVATA_INTERNAL_USER_ID)
 );
 
 CREATE TABLE GATEWAY_WORKER
@@ -379,9 +380,9 @@ CREATE TABLE JOB_STATUS (
 );
 
 CREATE TABLE QUEUE_STATUS(
-        HOST_NAME VARCHAR(255),
-        QUEUE_NAME VARCHAR(255),
-        CREATED_TIME BIGINT,
+        HOST_NAME VARCHAR(255) NOT NULL,
+        QUEUE_NAME VARCHAR(255) NOT NULL,
+        CREATED_TIME BIGINT NOT NULL,
         QUEUE_UP SMALLINT,
         RUNNING_JOBS INT,
         QUEUED_JOBS INT,
diff --git 
a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql 
b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
index 45e9a04..fa9c5ba 100644
--- a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
@@ -46,25 +46,26 @@ CREATE TABLE GATEWAY
 
 CREATE TABLE NOTIFICATION
 (
-        NOTIFICATION_ID VARCHAR(255),
+        NOTIFICATION_ID VARCHAR(255) NOT NULL,
         GATEWAY_ID VARCHAR(255),
         TITLE VARCHAR(255),
         PRIORITY VARCHAR(255),
-             NOTIFICATION_MESSAGE VARCHAR(4096),
-             PUBLISHED_DATE TIMESTAMP,
-             EXPIRATION_DATE TIMESTAMP,
-             CREATION_DATE TIMESTAMP,
+        NOTIFICATION_MESSAGE VARCHAR(4096) NOT NULL,
+        PUBLISHED_DATE TIMESTAMP,
+        EXPIRATION_DATE TIMESTAMP,
+        CREATION_DATE TIMESTAMP,
         PRIMARY KEY (NOTIFICATION_ID)
 )ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE USERS
 (
-        AIRAVATA_INTERNAL_USER_ID VARCHAR(255),
+        AIRAVATA_INTERNAL_USER_ID VARCHAR(255) NOT NULL,
         USER_NAME VARCHAR(255),
         PASSWORD VARCHAR(255),
         GATEWAY_ID VARCHAR(255) NOT NULL,
         PRIMARY KEY (GATEWAY_ID, USER_NAME),
-        FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE 
CASCADE
+        FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE 
CASCADE,
+        UNIQUE KEY (AIRAVATA_INTERNAL_USER_ID)
 )ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GATEWAY_WORKER
@@ -129,7 +130,7 @@ CREATE TABLE EXPERIMENT_INPUT
         REQUIRED_TO_ADDED_TO_CMD tinyint(1),
         DATA_STAGED tinyint(1),
         STORAGE_RESOURCE_ID varchar(255),
-        IS_READ_ONLY SMALLINT,
+        IS_READ_ONLY tinyint(1),
         PRIMARY KEY(EXPERIMENT_ID,INPUT_NAME),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON 
DELETE CASCADE
 )ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -257,7 +258,7 @@ CREATE TABLE PROCESS_INPUT
         REQUIRED_TO_ADDED_TO_CMD tinyint(1),
         DATA_STAGED tinyint(1),
         STORAGE_RESOURCE_ID varchar(255),
-        IS_READ_ONLY SMALLINT,
+        IS_READ_ONLY tinyint(1),
         PRIMARY KEY(PROCESS_ID,INPUT_NAME),
         FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE 
CASCADE
 )ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -380,9 +381,9 @@ CREATE TABLE JOB_STATUS (
 )ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE QUEUE_STATUS(
-        HOST_NAME VARCHAR(255),
-        QUEUE_NAME VARCHAR(255),
-        CREATED_TIME BIGINT(20),
+        HOST_NAME VARCHAR(255) NOT NULL,
+        QUEUE_NAME VARCHAR(255) NOT NULL,
+        CREATED_TIME BIGINT(20) NOT NULL,
         QUEUE_UP     TINYINT(1),
         RUNNING_JOBS INT(11),
         QUEUED_JOBS INT(11),
diff --git 
a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
 
b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
index 43e8957..8c149b9 100644
--- 
a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
+++ 
b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
@@ -18,6 +18,8 @@
 -- under the License.
 --
 
+use app_catalog;
+
 -- AIRAVATA-2768
 alter table APPLICATION_INPUT modify METADATA VARCHAR(4096);
 
@@ -216,13 +218,44 @@ ALTER TABLE `SSH_ACCOUNT_PROVISIONER_CONFIG` ADD PRIMARY 
KEY IF NOT EXISTS (`GAT
 ALTER TABLE `SSH_ACCOUNT_PROVISIONER_CONFIG` DROP INDEX IF EXISTS 
`CONFIG_NAME`;
 ALTER TABLE `STORAGE_INTERFACE` ADD PRIMARY KEY IF NOT EXISTS 
(`STORAGE_RESOURCE_ID`,`DATA_MOVEMENT_INTERFACE_ID`);
 ALTER TABLE `STORAGE_INTERFACE` DROP INDEX IF EXISTS 
`DATA_MOVEMENT_INTERFACE_ID`;
+
+-- Some of these FKs refer to non-existent data. Rather than cleaning up the 
orphaned data, we'll just turn off FK checks.
+set FOREIGN_KEY_CHECKS=0;
+-- create table delete_ids as select DEPLOYMENT_ID from APP_ENVIRONMENT a 
where NOT EXISTS (select 1 from APPLICATION_DEPLOYMENT where DEPLOYMENT_ID = 
ae.DEPLOYMENT_ID);
+-- delete from APP_ENVIRONMENT where DEPLOYMENT_ID in (select DEPLOYMENT_ID 
from delete_ids);
 ALTER TABLE `APP_ENVIRONMENT` ADD CONSTRAINT `APP_ENVIRONMENT_ibfk_1` FOREIGN 
KEY IF NOT EXISTS (`DEPLOYMENT_ID`) REFERENCES `APPLICATION_DEPLOYMENT` 
(`DEPLOYMENT_ID`) ON DELETE CASCADE;
+-- drop table delete_ids;
+
+-- create table delete_ids as select INTERFACE_ID from APP_MODULE_MAPPING a 
where NOT EXISTS (select 1 from APPLICATION_INTERFACE where INTERFACE_ID = 
a.INTERFACE_ID);
+-- delete from APP_MODULE_MAPPING where INTERFACE_ID in (select INTERFACE_ID 
from delete_ids);
 ALTER TABLE `APP_MODULE_MAPPING` ADD CONSTRAINT `APP_MODULE_MAPPING_ibfk_1` 
FOREIGN KEY IF NOT EXISTS (`INTERFACE_ID`) REFERENCES `APPLICATION_INTERFACE` 
(`INTERFACE_ID`) ON DELETE CASCADE;
+-- drop table delete_ids;
+
+-- create table delete_ids as select MODULE_ID from APP_MODULE_MAPPING a where 
NOT EXISTS (select 1 from APPLICATION_MODULE where MODULE_ID = a.MODULE_ID);
+-- delete from APP_MODULE_MAPPING where MODULE_ID in (select MODULE_ID from 
delete_ids);
 ALTER TABLE `APP_MODULE_MAPPING` ADD CONSTRAINT `APP_MODULE_MAPPING_ibfk_2` 
FOREIGN KEY IF NOT EXISTS (`MODULE_ID`) REFERENCES `APPLICATION_MODULE` 
(`MODULE_ID`) ON DELETE CASCADE;
+-- drop table delete_ids;
+
+-- create table delete_ids as select COMPUTE_HOSTID from 
APPLICATION_DEPLOYMENT a where NOT EXISTS (select 1 from COMPUTE_RESOURCE where 
RESOURCE_ID = a.COMPUTE_HOSTID);
+-- delete from APPLICATION_DEPLOYMENT where COMPUTE_HOSTID in (select 
COMPUTE_HOSTID from delete_ids);
 ALTER TABLE `APPLICATION_DEPLOYMENT` ADD CONSTRAINT 
`APPLICATION_DEPLOYMENT_ibfk_1` FOREIGN KEY IF NOT EXISTS (`COMPUTE_HOSTID`) 
REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE;
+-- drop table delete_ids;
+
+-- create table delete_ids as select APP_MODULE_ID from APPLICATION_DEPLOYMENT 
a where NOT EXISTS (select 1 from APPLICATION_MODULE where MODULE_ID = 
a.APP_MODULE_ID);
+-- delete from APPLICATION_DEPLOYMENT where APP_MODULE_ID in (select 
APP_MODULE_ID from delete_ids);
 ALTER TABLE `APPLICATION_DEPLOYMENT` ADD CONSTRAINT 
`APPLICATION_DEPLOYMENT_ibfk_2` FOREIGN KEY IF NOT EXISTS (`APP_MODULE_ID`) 
REFERENCES `APPLICATION_MODULE` (`MODULE_ID`) ON DELETE CASCADE;
+-- drop table delete_ids;
+
+-- create table delete_ids as select INTERFACE_ID from APPLICATION_INPUT a 
where NOT EXISTS (select 1 from APPLICATION_INTERFACE where INTERFACE_ID = 
a.INTERFACE_ID);
+-- delete from APPLICATION_INPUT where INTERFACE_ID in (select INTERFACE_ID 
from delete_ids);
 ALTER TABLE `APPLICATION_INPUT` ADD CONSTRAINT `APPLICATION_INPUT_ibfk_1` 
FOREIGN KEY IF NOT EXISTS(`INTERFACE_ID`) REFERENCES `APPLICATION_INTERFACE` 
(`INTERFACE_ID`) ON DELETE CASCADE;
+-- drop table delete_ids;
+
+-- create table delete_ids as select INTERFACE_ID from APPLICATION_OUTPUT a 
where NOT EXISTS (select 1 from APPLICATION_INTERFACE where INTERFACE_ID = 
a.INTERFACE_ID);
+-- delete from APPLICATION_OUTPUT where INTERFACE_ID in (select INTERFACE_ID 
from delete_ids);
 ALTER TABLE `APPLICATION_OUTPUT` ADD CONSTRAINT `APPLICATION_OUTPUT_ibfk_1` 
FOREIGN KEY IF NOT EXISTS(`INTERFACE_ID`) REFERENCES `APPLICATION_INTERFACE` 
(`INTERFACE_ID`) ON DELETE CASCADE;
+-- drop table delete_ids;
+
 ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` ADD CONSTRAINT 
`BATCH_QUEUE_RESOURCE_POLICY_ibfk_1` FOREIGN KEY IF NOT 
EXISTS(`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON 
DELETE CASCADE;
 ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` ADD CONSTRAINT 
`BATCH_QUEUE_RESOURCE_POLICY_ibfk_2` FOREIGN KEY IF NOT 
EXISTS(`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` 
(`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE;
 ALTER TABLE `BATCH_QUEUE` ADD CONSTRAINT `BATCH_QUEUE_ibfk_1` FOREIGN KEY IF 
NOT EXISTS(`COMPUTE_RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) 
ON DELETE CASCADE;
@@ -258,11 +291,13 @@ ALTER TABLE `SSH_JOB_SUBMISSION` ADD CONSTRAINT 
`SSH_JOB_SUBMISSION_ibfk_1` FORE
 -- MariaDB [app_catalog]> create table temp1 as select STORAGE_RESOURCE_ID 
from STORAGE_INTERFACE si where not exists (select 1 from STORAGE_RESOURCE sr 
where sr.STORAGE_RESOURCE_ID = si.STORAGE_RESOURCE_ID);
 -- MariaDB [app_catalog]> delete from STORAGE_INTERFACE where 
STORAGE_RESOURCE_ID in (select STORAGE_RESOURCE_ID from temp1);
 ALTER TABLE `STORAGE_INTERFACE` ADD CONSTRAINT `STORAGE_INTERFACE_ibfk_1` 
FOREIGN KEY IF NOT EXISTS (`STORAGE_RESOURCE_ID`) REFERENCES `STORAGE_RESOURCE` 
(`STORAGE_RESOURCE_ID`) ON DELETE CASCADE;
+set FOREIGN_KEY_CHECKS=1;
 
 -- Older tables that no longer exist, or don't exist with those names
 DROP TABLE IF EXISTS `DATA_STORAGE_INTERFACE`;
 DROP TABLE IF EXISTS `GATEWAY_CLIENT_CREDENTIAL`;
 
--- misnamed column
+-- misnamed column. This migration will only be needed if the code that had 
created the old names had been deployed.
+UPDATE PARSER_CONNECTOR_INPUT set PARSER_OUTPUT_ID = PARENT_OUTPUT_ID;
 ALTER TABLE `PARSER_CONNECTOR_INPUT` DROP IF EXISTS `PARENT_OUTPUT_ID`;
 ALTER TABLE `PARSING_TEMPLATE_INPUT` DROP IF EXISTS `PARSER_INPUT_ID`;
diff --git 
a/modules/registry/release-migration-scripts/next/DeltaScripts/credential_store_schema_delta.sql
 
b/modules/registry/release-migration-scripts/next/DeltaScripts/credential_store_schema_delta.sql
index cf53a4e..87f9792 100644
--- 
a/modules/registry/release-migration-scripts/next/DeltaScripts/credential_store_schema_delta.sql
+++ 
b/modules/registry/release-migration-scripts/next/DeltaScripts/credential_store_schema_delta.sql
@@ -19,7 +19,9 @@
 --
 
 -- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB 
init scripts
-set FOREIGN_KEYS=0;
+use credential_store;
+
+set FOREIGN_KEY_CHECKS=0;
 ALTER TABLE `CREDENTIALS` CHANGE `TIME_PERSISTED` `TIME_PERSISTED` timestamp 
NOT NULL DEFAULT CURRENT_TIMESTAMP;
 ALTER TABLE `CREDENTIALS` CHANGE `DESCRIPTION` `DESCRIPTION` varchar(500) 
DEFAULT NULL;
 ALTER TABLE `CREDENTIALS` CHANGE `TOKEN_ID` `TOKEN_ID` varchar(100) NOT NULL;
@@ -27,4 +29,4 @@ ALTER TABLE `COMMUNITY_USER` CHANGE `TOKEN_ID` `TOKEN_ID` 
varchar(100) NOT NULL;
 ALTER TABLE `COMMUNITY_USER` CHANGE `GATEWAY_ID` `GATEWAY_ID` varchar(100) NOT 
NULL;
 ALTER TABLE `COMMUNITY_USER` CHANGE `COMMUNITY_USER_NAME` 
`COMMUNITY_USER_NAME` varchar(100) NOT NULL;
 ALTER TABLE `CREDENTIALS` CHANGE `GATEWAY_ID` `GATEWAY_ID` varchar(100) NOT 
NULL;
-set FOREIGN_KEYS=1;
+set FOREIGN_KEY_CHECKS=1;
diff --git 
a/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
 
b/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
index cc908ed..b6ce8e6 100644
--- 
a/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
+++ 
b/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
@@ -18,6 +18,8 @@
 -- under the License.
 --
 
+use experiment_catalog;
+
 -- AIRAVATA-2768
 alter table EXPERIMENT_INPUT modify METADATA VARCHAR(4096);
 
@@ -62,4 +64,30 @@ alter table JOB_STATUS modify column JOB_ID VARCHAR(255) NOT 
NULL;
 set FOREIGN_KEY_CHECKS=1;
 
 -- AIRAVATA-2953
-alter table PROCESS_INPUT modify column METADATA VARCHAR(4096);
\ No newline at end of file
+alter table PROCESS_INPUT modify column METADATA VARCHAR(4096);
+
+-- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB 
init scripts
+DROP TABLE IF EXISTS `COMMUNITY_USER`;
+DROP TABLE IF EXISTS `CREDENTIALS`;
+
+ALTER TABLE `EXPERIMENT_INPUT` CHANGE `IS_READ_ONLY` `IS_READ_ONLY` tinyint(1) 
DEFAULT NULL;
+ALTER TABLE `GATEWAY` CHANGE `REQUEST_CREATION_TIME` `REQUEST_CREATION_TIME` 
timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
+ALTER TABLE `NOTIFICATION` CHANGE `CREATION_DATE` `CREATION_DATE` timestamp 
NOT NULL DEFAULT '0000-00-00 00:00:00';
+ALTER TABLE `NOTIFICATION` CHANGE `EXPIRATION_DATE` `EXPIRATION_DATE` 
timestamp NOT NULL DEFAULT '0000-00-00 00:00:00';
+ALTER TABLE `NOTIFICATION` CHANGE `PUBLISHED_DATE` `PUBLISHED_DATE` timestamp 
NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE `PROCESS_INPUT` CHANGE `IS_READ_ONLY` `IS_READ_ONLY` tinyint(1) 
DEFAULT NULL;
+ALTER TABLE `EXPERIMENT` DROP IF EXISTS `ARCHIVE`;
+ALTER TABLE `GATEWAY` DROP IF EXISTS `GATEWAY_DOMAIN`;
+ALTER TABLE `PROCESS` DROP IF EXISTS `ARCHIVE`;
+
+set FOREIGN_KEY_CHECKS=0;
+ALTER TABLE `GATEWAY_WORKER` DROP FOREIGN KEY IF EXISTS 
`GATEWAY_WORKER_ibfk_2`;
+ALTER TABLE `GATEWAY_WORKER` DROP INDEX IF EXISTS `USER_NAME`;
+ALTER TABLE `PROJECT_USER` DROP FOREIGN KEY IF EXISTS `PROJECT_USER_ibfk_2`;
+ALTER TABLE `PROJECT_USER` DROP INDEX IF EXISTS `USER_NAME`;
+ALTER TABLE `PROJECT` DROP FOREIGN KEY IF EXISTS `PROJECT_ibfk_2`;
+ALTER TABLE `PROJECT` DROP INDEX IF EXISTS `USER_NAME`;
+ALTER TABLE `USERS` ADD CONSTRAINT `USERS_ibfk_1` FOREIGN KEY IF NOT EXISTS 
(`GATEWAY_ID`) REFERENCES `GATEWAY` (`GATEWAY_ID`) ON DELETE CASCADE;
+ALTER TABLE `USERS` ADD PRIMARY KEY IF NOT EXISTS (`GATEWAY_ID`,`USER_NAME`);
+ALTER TABLE `USERS` DROP INDEX IF EXISTS `USER_NAME`;
+set FOREIGN_KEY_CHECKS=1;
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 9ccaeac..8ce340b 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,3 +1,25 @@
+--
+--
+-- 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 profile_service;
+
 alter database profile_service character set = 'latin1';
 
 -- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB 
init scripts
diff --git 
a/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
 
b/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
index 1dd8aa6..d943ffc 100644
--- 
a/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
+++ 
b/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
@@ -18,6 +18,8 @@
 -- under the License.
 --
 
+use replica_catalog;
+
 -- AIRAVATA-2872: NOT NULL foreign key columsn
 set FOREIGN_KEY_CHECKS=0;
 alter table DATA_PRODUCT_METADATA modify column PRODUCT_URI VARCHAR(255) NOT 
NULL;
diff --git 
a/modules/registry/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql
 
b/modules/registry/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql
index fcc22df..1dc8aef 100644
--- 
a/modules/registry/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql
+++ 
b/modules/registry/release-migration-scripts/next/DeltaScripts/sharingCatalog_schema_delta.sql
@@ -18,6 +18,8 @@
 -- under the License.
 --
 
+use sharing_catalog;
+
 -- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB 
init scripts
 CREATE TABLE IF NOT EXISTS GROUP_ADMIN (
   ADMIN_ID VARCHAR(255) NOT NULL,

Reply via email to