Generated the sql for merged code.

ole-app/ole-db/ole-sql/ole-ds-sql/src/main/resources/sql/mysql/ole-ds-sql.sql

@@ -626,11 +626,11 @@ CREATE TABLE OLE_DS_ITEM_T
 
 
 
-
+
 
 , INDEX OLE_DS_ITEM_TI1 (BARCODE )
 
-
+
 
 , INDEX OLE_DS_ITEM_TI2 (HOLDINGS_ID )
 

ole-app/ole-db/ole-sql/ole-liquibase-sql/src/main/resources/org/kuali/ole/sql/oracle/bootstrap_krcr_data.sql

@@ -2870,7 +2870,10 @@ INSERT INTO KRCR_PARM_T (NMSPC_CD, CMPNT_CD, PARM_NM, OBJ_ID, VER_NBR, PARM_TYP_
 INSERT INTO KRCR_PARM_T (NMSPC_CD, CMPNT_CD, PARM_NM, OBJ_ID, VER_NBR, PARM_TYP_CD, VAL, PARM_DESC_TXT, EVAL_OPRTR_CD, APPL_ID) VALUES ('OLE-SYS', 'Batch', 'FUND_ACCOUNTING_LINE_RECORD_CSV_NAME', '151', '1', 'CONFG', 'FundCodeAccountingLines', 'The Name of the csv file ingested for FundCode Accounting Lines record import document name should ends with the value specified in this parameter ', 'A', 'OLE')
 /
 
-INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_LOAD_KRCR_PARM_T_oracle', 'ole', 'bootstrap_krcr_data.xml', SYSTIMESTAMP, 3, '7:f5232c84f1a623f010f34dd7b2ef5c70', 'loadData', '', 'EXECUTED', '3.2.0')
+INSERT INTO KRCR_PARM_T (NMSPC_CD, CMPNT_CD, PARM_NM, OBJ_ID, VER_NBR, PARM_TYP_CD, VAL, PARM_DESC_TXT, EVAL_OPRTR_CD, APPL_ID) VALUES ('OLE-DESC', 'Describe', 'PROCESS_SOLR_IND', 'OLE7006', '1', 'CONFG', 'true', 'This parameter is added for docstore API process for solr indexing', 'A', 'OLE')
+/
+
+INSERT INTO DATABASECHANGELOG (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, LIQUIBASE) VALUES ('OLE_LOAD_KRCR_PARM_T_oracle', 'ole', 'bootstrap_krcr_data.xml', SYSTIMESTAMP, 3, '7:1b68e2fe94c36b0cf4bd7727a6d2a725', 'loadData', '', 'EXECUTED', '3.2.0')
 /
 
 -- Changeset bootstrap_krcr_data.xml::OLE_LOAD_KRLC_POSTAL_CODE_T::ole

ole-app/ole-db/ole-sql/ole-ls-sql/src/main/resources/sql/mysql/ole-ls-sql-constraints.sql

@@ -622,9 +622,3 @@ ALTER TABLE OLE_NG_BAT_PRCS_JOB_T
     REFERENCES OLE_NG_BAT_PRF_T (PRF_ID)
 /
 
-ALTER TABLE OLE_NG_BAT_JOB_DETAILS_T
-    ADD CONSTRAINT OLE_NG_BAT_PRCS_ID_FK
-    FOREIGN KEY (JOB_ID)
-    REFERENCES OLE_NG_BAT_PRCS_JOB_T (JOB_ID)
-/
-

ole-app/ole-db/ole-sql/ole-ls-sql/src/main/resources/sql/mysql/ole-ls-sql.sql

@@ -1,3 +1,4 @@
+
 # -----------------------------------------------------------------------
 # OLE_ACC_LOC_T
 # -----------------------------------------------------------------------

ole-app/ole-db/ole-sql/ole-ls-sql/src/main/resources/sql/oracle/ole-ls-sql-constraints.sql

@@ -722,9 +722,4 @@ ALTER TABLE OLE_NG_BAT_PRCS_JOB_T
 /
 
 
-ALTER TABLE OLE_NG_BAT_JOB_DETAILS_T
-    ADD CONSTRAINT OLE_NG_BAT_PRCS_ID_FK FOREIGN KEY (JOB_ID)
-    REFERENCES OLE_NG_BAT_PRCS_JOB_T (JOB_ID)
-/
-
 

ole-app/ole-db/ole-sql/ole-master-sql/src/main/resources/sql/mysql/ole-master-sql.sql

@@ -1,3 +1,4 @@
+
 # -----------------------------------------------------------------------
 # AP_AUTO_APRV_EXCL_T
 # -----------------------------------------------------------------------

ole-app/ole-db/ole-sql/ole-master-sql/src/main/resources/sql/oracle/ole-master-sql-constraints.sql

@@ -2575,6 +2575,7 @@ ALTER TABLE GL_ACCT_BALANCES_T
     REFERENCES FS_OPTION_T (UNIV_FISCAL_YR)
 /
 
+
 ALTER TABLE GL_BALANCE_HIST_T
     ADD CONSTRAINT GL_BALANCE_HIST_TR1 FOREIGN KEY (UNIV_FISCAL_YR, FIN_COA_CD, FIN_OBJECT_CD)
     REFERENCES CA_OBJECT_CODE_T (UNIV_FISCAL_YR, FIN_COA_CD, FIN_OBJECT_CD)

ole-app/ole-db/ole-sql/ole-master-sql/src/main/resources/sql/oracle/ole-master-sql.sql

@@ -1,3 +1,4 @@
+
 -----------------------------------------------------------------------------
 -- AP_AUTO_APRV_EXCL_T
 -----------------------------------------------------------------------------

ole-app/olefs/src/main/java/org/kuali/ole/oleng/dao/impl/SelectDAOImpl.java

@@ -495,9 +495,9 @@ public OLEDonor getOLEDonorByCode(String donorCode) {
 
     @Override
     public OleCurrencyType getCurrencyType(String currencyType) {
-        Map<String, String> donorCodeMap = new HashMap<>();
-        donorCodeMap.put(OLEConstants.CURRENCY_TYPE, currencyType);
-        List<OleCurrencyType> oleCurrencyTypes = (List) getBusinessObjectService().findMatching(OleCurrencyType.class, donorCodeMap);
+        Map<String, String> parameterMap = new HashMap<>();
+        parameterMap.put("currencyType", currencyType);
+        List<OleCurrencyType> oleCurrencyTypes = (List) getBusinessObjectService().findMatching(OleCurrencyType.class, parameterMap);
         if (CollectionUtils.isNotEmpty(oleCurrencyTypes)){
             return oleCurrencyTypes.get(0);
         }