Merge pull request #717 from sheiksalahudeen/develop

Generated the sql for merged code.
openlibraryenvironment · May 13, 2016 · 6c68807 · 6c68807
2 parents d79e17b + 578b4f4
commit 6c68807
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/...e-db/ole-sql/ole-liquibase-upgrade-sql/src/main/resources/org/kuali/ole/sql/mysql/2.1.sql b/...e-db/ole-sql/ole-liquibase-upgrade-sql/src/main/resources/org/kuali/ole/sql/mysql/2.1.sql
@@ -410,7 +410,7 @@ INSERT INTO KRIM_PERM_T (PERM_ID, OBJ_ID, VER_NBR, PERM_TMPL_ID, NMSPC_CD, NM, D
 INSERT INTO KRIM_PERM_T (PERM_ID, OBJ_ID, VER_NBR, PERM_TMPL_ID, NMSPC_CD, NM, DESC_TXT, ACTV_IND) VALUES ('OLE10507', 'OLE10507', '1', '62', 'OLE-PTRN', 'Perform Credit Transfer', 'The posted amount will be credited from the bill amount or refund from the bill amount.', 'Y')
 /
 
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_PERM_T_mysql', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', NOW(), 36, '7:7c7b4dff2420a81fd50d54a1a35fe088', 'sql, loadData', '', 'EXECUTED', '3.2.0')
+INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_PERM_T_mysql', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', NOW(), 36, '7:4a47529ef099321ef60f8526ada3a7b9', 'sql, loadData', '', 'EXECUTED', '3.2.0')
 /
 
 --  Changeset org/kuali/ole/2.1/db.changelog-20151123.xml::OLE_KRIM_PERM_ATTR_DATA_T_mysql::ole
@@ -447,7 +447,7 @@ INSERT INTO KRIM_PERM_ATTR_DATA_T (ATTR_DATA_ID, OBJ_ID, VER_NBR, PERM_ID, KIM_T
 INSERT INTO KRIM_PERM_ATTR_DATA_T (ATTR_DATA_ID, OBJ_ID, VER_NBR, PERM_ID, KIM_TYP_ID, KIM_ATTR_DEFN_ID, ATTR_VAL) VALUES ('OLE10709', 'OLE10709', '1', 'OLE10506', '73', '47', 'BillView')
 /
 
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_PERM_ATTR_DATA_T_mysql', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', NOW(), 37, '7:b09caa339f6e952ef0010c50ac830664', 'sql, loadData', '', 'EXECUTED', '3.2.0')
+INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_PERM_ATTR_DATA_T_mysql', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', NOW(), 37, '7:671311d214952a3b8d3dca244ed803d5', 'sql, loadData', '', 'EXECUTED', '3.2.0')
 /
 
 --  Changeset org/kuali/ole/2.1/db.changelog-20151123.xml::OLE_KRIM_ROLE_PERM_T_mysql::ole
@@ -481,7 +481,7 @@ INSERT INTO KRIM_ROLE_PERM_T (ROLE_PERM_ID, OBJ_ID, ROLE_ID, PERM_ID, ACTV_IND)
 INSERT INTO KRIM_ROLE_PERM_T (ROLE_PERM_ID, OBJ_ID, ROLE_ID, PERM_ID, ACTV_IND) VALUES ('OLE10808', 'OLE10808', 'OLE10073', 'OLE10506', 'Y')
 /
 
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_ROLE_PERM_T_mysql', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', NOW(), 38, '7:407f48462df3d149fe6498a302b2acbd', 'sql, loadData', '', 'EXECUTED', '3.2.0')
+INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_ROLE_PERM_T_mysql', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', NOW(), 38, '7:f26160d18e316726dbb496953950bbba', 'sql, loadData', '', 'EXECUTED', '3.2.0')
 /
 
 --  Changeset org/kuali/ole/2.1/db.changelog-20151123.xml::OLE_CRCL_DSK_FEE_TYPE_T::ole
@@ -775,5 +775,12 @@ ALTER TABLE OLE_PUR_POBA_T MODIFY UPLD_FILE_NM varchar(120)
 INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('ALERT_OLE_PUR_POBA_T_MYSQL', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', NOW(), 61, '7:b4013a468b9bfefdd66f79cc0cf1a10d', 'sql', '', 'EXECUTED', '3.2.0')
 /
 
+--  Changeset org/kuali/ole/2.1/db.changelog-20151123.xml::OLE_NG_BAT_JOB_DETAILS_T-dropForeignKey::bootstrap
+ALTER TABLE OLE_NG_BAT_JOB_DETAILS_T DROP FOREIGN KEY OLE_NG_BAT_PRCS_ID_FK
+/
+
+INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_NG_BAT_JOB_DETAILS_T-dropForeignKey', 'bootstrap', 'org/kuali/ole/2.1/db.changelog-20151123.xml', NOW(), 62, '7:a47b74f971f88e2a3cdc973d2ec1077f', 'dropForeignKeyConstraint', '', 'EXECUTED', '3.2.0')
+/
+
 --  Release Database Lock
 --  Release Database Lock
diff --git a/...-db/ole-sql/ole-liquibase-upgrade-sql/src/main/resources/org/kuali/ole/sql/oracle/2.1.sql b/...-db/ole-sql/ole-liquibase-upgrade-sql/src/main/resources/org/kuali/ole/sql/oracle/2.1.sql
@@ -368,7 +368,7 @@ INSERT INTO KRIM_PERM_T (PERM_ID, OBJ_ID, VER_NBR, PERM_TMPL_ID, NMSPC_CD, NM, D
 INSERT INTO KRIM_PERM_T (PERM_ID, OBJ_ID, VER_NBR, PERM_TMPL_ID, NMSPC_CD, NM, DESC_TXT, ACTV_IND) VALUES ('OLE10507', 'OLE10507', '1', '62', 'OLE-PTRN', 'Perform Credit Transfer', 'The posted amount will be credited from the bill amount or refund from the bill amount.', 'Y')
 /
 
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_PERM_T_oracle', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', SYSTIMESTAMP, 36, '7:9d71c6d080a560e1ec303255e298c5a7', 'loadData', '', 'EXECUTED', '3.2.0')
+INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_PERM_T_oracle', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', SYSTIMESTAMP, 36, '7:fe82355d470ee42ddbf8aeac60043deb', 'loadData', '', 'EXECUTED', '3.2.0')
 /
 
 -- Changeset org/kuali/ole/2.1/db.changelog-20151123.xml::OLE_KRIM_PERM_ATTR_DATA_T_oracle::ole
@@ -402,7 +402,7 @@ INSERT INTO KRIM_PERM_ATTR_DATA_T (ATTR_DATA_ID, OBJ_ID, VER_NBR, PERM_ID, KIM_T
 INSERT INTO KRIM_PERM_ATTR_DATA_T (ATTR_DATA_ID, OBJ_ID, VER_NBR, PERM_ID, KIM_TYP_ID, KIM_ATTR_DEFN_ID, ATTR_VAL) VALUES ('OLE10709', 'OLE10709', '1', 'OLE10506', '73', '47', 'BillView')
 /
 
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_PERM_ATTR_DATA_T_oracle', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', SYSTIMESTAMP, 37, '7:2fcdf0be3b613c39757a9c8f5047f15a', 'loadData', '', 'EXECUTED', '3.2.0')
+INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_PERM_ATTR_DATA_T_oracle', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', SYSTIMESTAMP, 37, '7:94e2da2e910b3102afe681c4303c3470', 'loadData', '', 'EXECUTED', '3.2.0')
 /
 
 -- Changeset org/kuali/ole/2.1/db.changelog-20151123.xml::OLE_KRIM_ROLE_PERM_T_oracle::ole
@@ -433,7 +433,7 @@ INSERT INTO KRIM_ROLE_PERM_T (ROLE_PERM_ID, OBJ_ID, ROLE_ID, PERM_ID, ACTV_IND)
 INSERT INTO KRIM_ROLE_PERM_T (ROLE_PERM_ID, OBJ_ID, ROLE_ID, PERM_ID, ACTV_IND) VALUES ('OLE10808', 'OLE10808', 'OLE10073', 'OLE10506', 'Y')
 /
 
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_ROLE_PERM_T_oracle', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', SYSTIMESTAMP, 38, '7:d0f1c8c9afb3bed42978c05ff808235b', 'loadData', '', 'EXECUTED', '3.2.0')
+INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_KRIM_ROLE_PERM_T_oracle', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', SYSTIMESTAMP, 38, '7:178db1008d54c6bf5d568ee1ed76d421', 'loadData', '', 'EXECUTED', '3.2.0')
 /
 
 -- Changeset org/kuali/ole/2.1/db.changelog-20151123.xml::OLE_CRCL_DSK_FEE_TYPE_T::ole
@@ -740,5 +740,12 @@ ALTER TABLE OLE_PUR_POBA_T MODIFY UPLD_FILE_NM varchar2(120)
 INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('ALERT_OLE_PUR_POBA_T_ORACLE', 'ole', 'org/kuali/ole/2.1/db.changelog-20151123.xml', SYSTIMESTAMP, 59, '7:1ed9edd50adf36556f6b8346b1053e79', 'sql', '', 'EXECUTED', '3.2.0')
 /
 
+-- Changeset org/kuali/ole/2.1/db.changelog-20151123.xml::OLE_NG_BAT_JOB_DETAILS_T-dropForeignKey::bootstrap
+ALTER TABLE OLE_NG_BAT_JOB_DETAILS_T DROP CONSTRAINT OLE_NG_BAT_PRCS_ID_FK
+/
+
+INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_NG_BAT_JOB_DETAILS_T-dropForeignKey', 'bootstrap', 'org/kuali/ole/2.1/db.changelog-20151123.xml', SYSTIMESTAMP, 60, '7:a47b74f971f88e2a3cdc973d2ec1077f', 'dropForeignKeyConstraint', '', 'EXECUTED', '3.2.0')
+/
+
 -- Release Database Lock
 -- Release Database Lock