issue 2979 fix schema version tracking regression

Signed-off-by: Robin Arnold <robin.arnold@ibm.com>

Author: punktilious

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/Main.java

@@ -459,37 +459,38 @@ protected void updateFhirSchema() {
                 buildFhirDataSchemaModel(pdm);
                 boolean isNewDb = updateSchema(pdm);
 
-                // If the db is multi-tenant, we populate the resource types and parameter names in allocate-tenant.
-                // Otherwise, if its a new schema, populate the resource types and parameters names (codes) now
-                if (!MULTITENANT_FEATURE_ENABLED.contains(dbType) && isNewDb) {
-                    populateResourceTypeAndParameterNameTableEntries(null);
-                }
-
-                if (MULTITENANT_FEATURE_ENABLED.contains(dbType)) {
-                    logger.info("Refreshing tenant partitions");
-                    refreshTenants();
-                }
-
-                // backfill the resource_change_log table if needed
-                backfillResourceChangeLog();
-
-                // perform any updates we need related to the V0010 schema change (IS_DELETED flag)
-                applyDataMigrationForV0010();
-
-                // V0014 IS_DELETED and LAST_UPDATED added to whole-system LOGICAL_RESOURCES
-                applyDataMigrationForV0014();
-
-                // V0021 removes Abstract Type tables which are unused.
-                applyTableRemovalForV0021();
-
-                // Apply privileges if asked
-                if (grantTo != null) {
-                    grantPrivilegesForFhirData();
+                if (this.exitStatus == EXIT_OK) {
+                    // If the db is multi-tenant, we populate the resource types and parameter names in allocate-tenant.
+                    // Otherwise, if its a new schema, populate the resource types and parameters names (codes) now
+                    if (!MULTITENANT_FEATURE_ENABLED.contains(dbType) && isNewDb) {
+                        populateResourceTypeAndParameterNameTableEntries(null);
+                    }
+    
+                    if (MULTITENANT_FEATURE_ENABLED.contains(dbType)) {
+                        logger.info("Refreshing tenant partitions");
+                        refreshTenants();
+                    }
+    
+                    // backfill the resource_change_log table if needed
+                    backfillResourceChangeLog();
+    
+                    // perform any updates we need related to the V0010 schema change (IS_DELETED flag)
+                    applyDataMigrationForV0010();
+    
+                    // V0014 IS_DELETED and LAST_UPDATED added to whole-system LOGICAL_RESOURCES
+                    applyDataMigrationForV0014();
+    
+                    // V0021 removes Abstract Type tables which are unused.
+                    applyTableRemovalForV0021();
+    
+                    // Apply privileges if asked
+                    if (grantTo != null) {
+                        grantPrivilegesForFhirData();
+                    }
+    
+                    // Finally, update the whole schema version
+                    svm.updateSchemaVersion();
                 }
-
-                // Finally, update the whole schema version
-                svm.updateSchemaVersion();
-
             }
         } finally {
             leaseManager.cancelLease();
@@ -523,13 +524,15 @@ protected void updateOauthSchema() {
                 buildOAuthSchemaModel(pdm);
                 updateSchema(pdm);
 
-                // Apply privileges if asked
-                if (grantTo != null) {
-                    grantPrivilegesForOAuth();
+                if (this.exitStatus == EXIT_OK) {
+                    // Apply privileges if asked
+                    if (grantTo != null) {
+                        grantPrivilegesForOAuth();
+                    }
+    
+                    // Mark the schema as up-to-date
+                    svm.updateSchemaVersion();
                 }
-
-                // Mark the schema as up-to-date
-                svm.updateSchemaVersion();
             }
         } finally {
             leaseManager.cancelLease();
@@ -562,14 +565,16 @@ protected void updateJavaBatchSchema() {
                 PhysicalDataModel pdm = new PhysicalDataModel();
                 buildJavaBatchSchemaModel(pdm);
                 updateSchema(pdm);
-
-                // Apply privileges if asked
-                if (grantTo != null) {
-                    grantPrivilegesForBatch();
+                
+                if (this.exitStatus == EXIT_OK) {
+                    // Apply privileges if asked
+                    if (grantTo != null) {
+                        grantPrivilegesForBatch();
+                    }
+    
+                    // Mark the schema as up-to-date
+                    svm.updateSchemaVersion();
                 }
-
-                // Mark the schema as up-to-date
-                svm.updateSchemaVersion();
             }
         } finally {
             leaseManager.cancelLease();

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/control/FhirSchemaVersion.java

@@ -40,6 +40,7 @@ public enum FhirSchemaVersion {
     ,V0019(19, "issue-1822 changes per the IBM Cloud Database Team", true)
     ,V0020(20, "issue-1834 Set PostgreSQL fillfactor", true)
     ,V0021(21, "issue-713 remove Resource_LOGICAL_RESOURCES, DomainResource_LOGICAL_RESOURCES tables", false)
+    ,V0022(22, "issue-2979 stored procedure update for 2050 ifNoneMatch", false)
     ;
 
     // The version number recorded in the VERSION_HISTORY

fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/control/MigrateV0021AbstractTypeRemoval.java

@@ -118,9 +118,10 @@ private void cleanupHistory(IDatabaseTranslator translator, Connection c) {
         // Clean up the Tables and Views and Index for the DomainResource and Resource Table Group.
         final String sql =
                 "DELETE FROM FHIR_ADMIN.VERSION_HISTORY"
-                + " WHERE (OBJECT_NAME LIKE 'DOMAINRESOURCE_%'"
-                + "   OR OBJECT_NAME LIKE 'RESOURCE_%')"
-                + "   AND SCHEMA_NAME = ?";
+                + "    WHERE (OBJECT_NAME LIKE 'DOMAINRESOURCE_%'"
+                + "       OR OBJECT_NAME LIKE 'RESOURCE_%')"
+                + "      AND SCHEMA_NAME = ? "
+                + "      AND OBJECT_NAME NOT IN ('RESOURCE_TYPES', 'RESOURCE_CHANGE_LOG', 'RESOURCE_TOKEN_REFS')";
         try (PreparedStatement ps = c.prepareStatement(sql)) {
             ps.setString(1, schemaName);
             int vhsChanged = ps.executeUpdate();

fhir-persistence-schema/src/test/java/com/ibm/fhir/schema/derby/DerbySchemaVersionsTest.java

@@ -51,7 +51,7 @@ public void test() throws Exception {
 
             // Make sure we can correctly determine the latest schema version value
             svm.updateSchemaVersion();
-            assertEquals(svm.getVersionForSchema(), FhirSchemaVersion.V0021.vid());
+            assertEquals(svm.getVersionForSchema(), FhirSchemaVersion.V0022.vid());
 
             assertTrue(svm.isLatestSchema());
        }