Merge pull request #2791 from IBM/issue-2742-smallfix

lmsurpre · web-flow · commit 33740d449bc3 · 2021-09-21T16:48:28.000-04:00
Update Main
diff --git a/fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/Main.java b/fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/Main.java
@@ -280,10 +280,8 @@ protected void buildCommonModel(PhysicalDataModel pdm, boolean fhirSchema, boole
             default:
                 throw new IllegalStateException("Unsupported db type: " + dbType);
             }
-        }
-
-        // Add the tenant and tenant_keys tables and any other admin schema stuff
-        if (dropAdmin) {
+        } else if (dropAdmin) {
+            // Add the tenant and tenant_keys tables and any other admin schema stuff
             FhirSchemaGenerator gen = new FhirSchemaGenerator(schema.getAdminSchemaName(), schema.getSchemaName(), isMultitenant());
             gen.buildAdminSchema(pdm);
         }

Original file line number	Diff line number	Diff line change
`@@ -280,10 +280,8 @@ protected void buildCommonModel(PhysicalDataModel pdm, boolean fhirSchema, boole`
`280`	`280`	`default:`
`281`	`281`	`throw new IllegalStateException("Unsupported db type: " + dbType);`
`282`	`282`	`}`
`283`		`- }`
`284`		`-`
`285`		`- // Add the tenant and tenant_keys tables and any other admin schema stuff`
`286`		`- if (dropAdmin) {`
	`283`	`+ } else if (dropAdmin) {`
	`284`	`+ // Add the tenant and tenant_keys tables and any other admin schema stuff`
`287`	`285`	`FhirSchemaGenerator gen = new FhirSchemaGenerator(schema.getAdminSchemaName(), schema.getSchemaName(), isMultitenant());`
`288`	`286`	`gen.buildAdminSchema(pdm);`
`289`	`287`	`}`