Merge pull request #1782 from IBM/fix-sp-fun

Signed-off-by: Lee Surprenant <[email protected]>

Author: lmsurpre

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/version/GetLatestVersionDAO.java

@@ -50,7 +50,7 @@ public Map<String,Integer> run(IDatabaseTranslator translator, Connection c) {
         final String cols = DataDefinitionUtil.join(SchemaConstants.SCHEMA_NAME, SchemaConstants.OBJECT_TYPE, SchemaConstants.OBJECT_NAME);
         final String sql = "SELECT " + cols
                 + ", max(" + SchemaConstants.VERSION + ") FROM " + tbl
-                + " WHERE " + SchemaConstants.SCHEMA_NAME + " IN (?, ?) "
+                + " WHERE UPPER(" + SchemaConstants.SCHEMA_NAME + ") IN (?, ?) "
                 + " GROUP BY " + cols;
 
         // Fetch the current version history information for both the admin and specified data schemas
@@ -59,7 +59,7 @@ public Map<String,Integer> run(IDatabaseTranslator translator, Connection c) {
             ps.setString(2, schemaName);
             ResultSet rs = ps.executeQuery();
             while (rs.next()) {
-                String schema = rs.getString(1);
+                String schema = rs.getString(1).toUpperCase();
                 String type = rs.getString(2);
                 String name = rs.getString(3);
                 int version = rs.getInt(4);

fhir-database-utils/src/main/java/com/ibm/fhir/database/utils/version/VersionHistoryService.java

@@ -44,7 +44,7 @@ public VersionHistoryService(String adminSchemaName, String... schemaNames) {
 
     /**
      * For injection of the {@link IConnectionProvider}
-     * 
+     *
      * @param tp
      */
     public void setTransactionProvider(ITransactionProvider tp) {
@@ -53,7 +53,7 @@ public void setTransactionProvider(ITransactionProvider tp) {
 
     /**
      * For injection of the {@link IDatabaseTarget}
-     * 
+     *
      * @param tgt
      */
     public void setTarget(IDatabaseAdapter tgt) {
@@ -108,7 +108,7 @@ private void getLatestVersionHistoryForSchema() {
     /**
      * Insert all the entries in the versionHistoryMap. This must be called in the
      * context of an existing transaction
-     * 
+     *
      * @param versionHistories
      */
     public void insertVersionHistoriesInTx(Collection<TypeNameVersion> versionHistories) {
@@ -133,7 +133,7 @@ public void insertVersionHistoryInTx(String objectSchema, String objectType, Str
     /**
      * Insert all the entries in the versionHistoryMap in a new transaction (useful
      * for testing).
-     * 
+     *
      * @param versionHistories
      */
     public void insertVersionHistory(Collection<TypeNameVersion> versionHistories) {
@@ -208,4 +208,4 @@ public boolean applies(String objectSchema, String objectType, String objectName
         Integer currentVersion = this.versionHistoryMap.get(key);
         return currentVersion == null || currentVersion < changeVersion;
     }
-}
+}