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

FIXME cleanup

This commit is contained in:
Ken Stevens 2019-11-02 21:32:42 -04:00
parent 8887d41283
commit 4cdde60917
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/FlywayMigrator.java
View File

@ -42,24 +42,17 @@ public class FlywayMigrator {
private String myConnectionUrl;
private String myUsername;
private String myPassword;
// FIXME KHS
// private String myDefaultSchema;
private List<FlywayMigration> myTasks = new ArrayList<>();
private boolean myDryRun;
private boolean myNoColumnShrink;
public FlywayMigrator() {}
// FIXME KHS test with nonexistent database
public FlywayMigrator(BasicDataSource theDataSource) {
myConnectionUrl = theDataSource.getUrl();
myUsername = theDataSource.getUsername();
myPassword = theDataSource.getPassword();
// myDefaultSchema = theDataSource.getDefaultSchema();
// FIXME KHS
// if (myDefaultSchema == null) {
// myDefaultSchema = "kentest";
// }
String driverClassName = theDataSource.getDriverClassName();
if (driverClassName == null) {
ourLog.error(this.getClass().getSimpleName() + " constructed without a database driver");
@ -105,12 +98,8 @@ public class FlywayMigrator {
}
private Flyway initFlyway(DriverTypeEnum.ConnectionProperties theConnectionProperties) {
// FIXME KHS instantiate from database, not this other stuff
// FIXME KHS ensure we have a default schema
// FIXME KHS succeeds from zero. But then second time fails with error. It's as though the flyway db isn't persisting.... or maybe a checksum issue...?
// FIXME KHS Try creating from datasource
Flyway flyway = Flyway.configure()
// FIXME KHS required?
// .schemas(myDefaultSchema)
.dataSource(myConnectionUrl, myUsername, myPassword)
.baselineOnMigrate(true)
.javaMigrations(myTasks.toArray(new JavaMigration[0]))

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

@ -38,7 +38,6 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.function.Function;
// FIXME KHS special case this task
public class CalculateHashesTask extends BaseTableColumnTask<CalculateHashesTask> {
private static final Logger ourLog = LoggerFactory.getLogger(CalculateHashesTask.class);