honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

back out schema initialize naming. there may be migrated schemas in the wild this would interfere with.

This commit is contained in:
Ken Stevens 2019-12-02 18:48:40 -05:00
parent f29118fa9c
commit c27dfdff51
5 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/InitializeSchemaTask.java
View File

@ -39,7 +39,7 @@ public class InitializeSchemaTask extends BaseTask<InitializeSchemaTask> {
public InitializeSchemaTask(String theProductVersion, String theSchemaVersion, ISchemaInitializationProvider theSchemaInitializationProvider) { public InitializeSchemaTask(String theProductVersion, String theSchemaVersion, ISchemaInitializationProvider theSchemaInitializationProvider) {
super(theProductVersion, theSchemaVersion); super(theProductVersion, theSchemaVersion);
mySchemaInitializationProvider = theSchemaInitializationProvider; mySchemaInitializationProvider = theSchemaInitializationProvider;
setDescription("Initialize schema for " + theSchemaInitializationProvider.getDescription()); setDescription("Initialize schema");
} }
@Override @Override

2
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java
View File

@ -885,7 +885,7 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks<VersionEnum> {
private void init330() { // 20180114 - 20180329 private void init330() { // 20180114 - 20180329
Builder version = forVersion(VersionEnum.V3_3_0); Builder version = forVersion(VersionEnum.V3_3_0);
version.initializeSchema("20180115.0", new SchemaInitializationProvider("HAPI-FHIR", "/ca/uhn/hapi/fhir/jpa/docs/database", "HFJ_RESOURCE")); version.initializeSchema("20180115.0", new SchemaInitializationProvider("/ca/uhn/hapi/fhir/jpa/docs/database", "HFJ_RESOURCE"));
Builder.BuilderWithTableName hfjResource = version.onTable("HFJ_RESOURCE"); Builder.BuilderWithTableName hfjResource = version.onTable("HFJ_RESOURCE");
version.startSectionWithMessage("Starting work on table: " + hfjResource.getTableName()); version.startSectionWithMessage("Starting work on table: " + hfjResource.getTableName());

10
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProvider.java
View File

@ -38,17 +38,14 @@ import java.util.regex.Pattern;
import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isBlank;
public class SchemaInitializationProvider implements ISchemaInitializationProvider { public class SchemaInitializationProvider implements ISchemaInitializationProvider {
private final String mySchemaDescription;
private final String mySchemaFileClassPath; private final String mySchemaFileClassPath;
private final String mySchemaExistsIndicatorTable; private final String mySchemaExistsIndicatorTable;
/** /**
* @param theSchemaDescription description of the schema being updated (for logging)
* @param theSchemaFileClassPath pathname to script used to initialize schema * @param theSchemaFileClassPath pathname to script used to initialize schema
* @param theSchemaExistsIndicatorTable a table name we can use to determine if this schema has already been initialized * @param theSchemaExistsIndicatorTable a table name we can use to determine if this schema has already been initialized
*/ */
public SchemaInitializationProvider(String theSchemaDescription, String theSchemaFileClassPath, String theSchemaExistsIndicatorTable) { public SchemaInitializationProvider(String theSchemaFileClassPath, String theSchemaExistsIndicatorTable) {
mySchemaDescription = theSchemaDescription;
mySchemaFileClassPath = theSchemaFileClassPath; mySchemaFileClassPath = theSchemaFileClassPath;
mySchemaExistsIndicatorTable = theSchemaExistsIndicatorTable; mySchemaExistsIndicatorTable = theSchemaExistsIndicatorTable;
} }
@ -85,11 +82,6 @@ public class SchemaInitializationProvider implements ISchemaInitializationProvid
return matcher.replaceAll("$1\\)"); return matcher.replaceAll("$1\\)");
} }
@Override
public String getDescription() {
return mySchemaDescription;
}
@Nonnull @Nonnull
protected String getInitScript(DriverTypeEnum theDriverType) { protected String getInitScript(DriverTypeEnum theDriverType) {
return theDriverType.getSchemaFilename(); return theDriverType.getSchemaFilename();

2
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/api/ISchemaInitializationProvider.java
View File

@ -28,6 +28,4 @@ public interface ISchemaInitializationProvider {
List<String> getSqlStatements(DriverTypeEnum theDriverType); List<String> getSqlStatements(DriverTypeEnum theDriverType);
String getSchemaExistsIndicatorTable(); String getSchemaExistsIndicatorTable();
String getDescription();
} }

5
hapi-fhir-jpaserver-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/InitializeSchemaTaskTest.java
View File

@ -40,11 +40,6 @@ public class InitializeSchemaTaskTest extends BaseTest {
return "DONT_MATCH_ME"; return "DONT_MATCH_ME";
} }
@Override
public String getDescription() {
return "test";
}
@Override @Override
public boolean equals(Object theO) { public boolean equals(Object theO) {
if (this == theO) return true; if (this == theO) return true;