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

Merge pull request #2342 from hapifhir/im_20210201_oracle_migration_fixes 

Address migration issues affecting Oracle DB when flyway is disabled
This commit is contained in:
IanMMarshall 2021-02-02 09:18:05 -05:00 committed by GitHub
parent c46330f54b 40bc754051
commit 54fac48cc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 82 additions and 8 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/JdbcUtils.java
View File

@ -258,6 +258,8 @@ public class JdbcUtils {
return new ColumnType(ColumnTypeEnum.CLOB, length);
case Types.DOUBLE:
return new ColumnType(ColumnTypeEnum.DOUBLE, length);
case Types.FLOAT:
return new ColumnType(ColumnTypeEnum.FLOAT, length);
default:
throw new IllegalArgumentException("Don't know how to handle datatype " + dataType + " for column " + theColumnName + " on table " + theTableName);
}

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

@ -667,10 +667,12 @@ public class HapiFhirJpaMigrationTasks extends BaseMigrationTasks<VersionEnum> {
version.startSectionWithMessage("Processing table: TRM_VALUESET_CONCEPT, swapping index for unique constraint");
termValueSetConceptTable.dropIndex("20190801.1", "IDX_VALUESET_CONCEPT_CS_CD");
// This index has been renamed in later versions. As such, allowing failure here as some DBs disallow
// multiple indexes referencing the same set of columns.
termValueSetConceptTable
.addIndex("20190801.2", "IDX_VS_CONCEPT_CS_CD")
.unique(true)
.withColumns("VALUESET_PID", "SYSTEM_URL", "CODEVAL");
.withColumns("VALUESET_PID", "SYSTEM_URL", "CODEVAL").failureAllowed();
// TermValueSetConceptDesignation
version.startSectionWithMessage("Processing table: TRM_VALUESET_C_DESIGNATION");

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

@ -402,7 +402,7 @@ public class Builder {
super(theVersion, theColumnName);
}
public void references(String theForeignTable, String theForeignColumn) {
public BuilderCompleteTask references(String theForeignTable, String theForeignColumn) {
AddForeignKeyTask task = new AddForeignKeyTask(myRelease, myVersion);
task.setTableName(myTableName);
task.setConstraintName(myForeignKeyName);
@ -410,6 +410,7 @@ public class Builder {
task.setForeignTableName(theForeignTable);
task.setForeignColumnName(theForeignColumn);
addTask(task);
return new BuilderCompleteTask(task);
}
}
}

67
hapi-fhir-jpaserver-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/JdbcUtilsTest.java Normal file
View File

@ -0,0 +1,67 @@
package ca.uhn.fhir.jpa.migrate;
import ca.uhn.fhir.jpa.migrate.taskdef.ColumnTypeEnum;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
import static org.mockito.Mockito.when;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ExtendWith(MockitoExtension.class)
public class JdbcUtilsTest {
@Mock
DataSource myDataSource;
@Mock
Connection myConnection;
@Mock
DatabaseMetaData myDatabaseMetaData;
@Mock
ResultSet myResultSet;
@Test
public void testGetColumnType_verifyTypeMappings() throws SQLException {
testGetColumnType_verifyTypeMapping(Types.BIT, ColumnTypeEnum.BOOLEAN);
testGetColumnType_verifyTypeMapping(Types.BOOLEAN, ColumnTypeEnum.BOOLEAN);
testGetColumnType_verifyTypeMapping(Types.VARCHAR, ColumnTypeEnum.STRING);
testGetColumnType_verifyTypeMapping(Types.NUMERIC, ColumnTypeEnum.LONG);
testGetColumnType_verifyTypeMapping(Types.BIGINT, ColumnTypeEnum.LONG);
testGetColumnType_verifyTypeMapping(Types.DECIMAL, ColumnTypeEnum.LONG);
testGetColumnType_verifyTypeMapping(Types.INTEGER, ColumnTypeEnum.INT);
testGetColumnType_verifyTypeMapping(Types.TIMESTAMP, ColumnTypeEnum.DATE_TIMESTAMP);
testGetColumnType_verifyTypeMapping(Types.TIMESTAMP_WITH_TIMEZONE, ColumnTypeEnum.DATE_TIMESTAMP);
testGetColumnType_verifyTypeMapping(Types.BLOB, ColumnTypeEnum.BLOB);
testGetColumnType_verifyTypeMapping(Types.CLOB, ColumnTypeEnum.CLOB);
testGetColumnType_verifyTypeMapping(Types.DOUBLE, ColumnTypeEnum.DOUBLE);
testGetColumnType_verifyTypeMapping(Types.FLOAT, ColumnTypeEnum.FLOAT);
}
private void testGetColumnType_verifyTypeMapping(int theExistingDataType, ColumnTypeEnum theExpectedColumnType) throws SQLException {
when(myResultSet.next()).thenReturn(true).thenReturn(false);
when(myResultSet.getString("TABLE_NAME")).thenReturn("TEST_TABLE");
when(myResultSet.getString("COLUMN_NAME")).thenReturn("TEST_COLUMN");
when(myResultSet.getInt("DATA_TYPE")).thenReturn(theExistingDataType);
when(myResultSet.getLong("COLUMN_SIZE")).thenReturn(17L);
when(myDatabaseMetaData.getColumns("Catalog", "Schema", "TEST_TABLE", null)).thenReturn(myResultSet);
when(myConnection.getMetaData()).thenReturn(myDatabaseMetaData);
when(myConnection.getCatalog()).thenReturn("Catalog");
when(myConnection.getSchema()).thenReturn("Schema");
when(myDataSource.getConnection()).thenReturn(myConnection);
DriverTypeEnum.ConnectionProperties myConnectionProperties = DriverTypeEnum.H2_EMBEDDED.newConnectionProperties(myDataSource);
JdbcUtils.ColumnType testColumnType = JdbcUtils.getColumnType(myConnectionProperties, "TEST_TABLE", "TEST_COLUMN");
assertEquals(theExpectedColumnType, testColumnType.getColumnTypeEnum());
}
}

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

@ -49,19 +49,21 @@ public class AddTableByColumnTaskTest extends BaseTest {
Builder.BuilderWithTableName targetTable = v.addTableByColumns("1", "TGT_TABLE", "PID");
targetTable.addColumn("2", "PID").nonNullable().type(ColumnTypeEnum.LONG);
targetTable.addColumn("3", "PID2").nonNullable().type(ColumnTypeEnum.LONG);
Builder.BuilderAddTableByColumns fooTable = v.addTableByColumns("3", "FOO_TABLE", "PID");
Builder.BuilderAddTableByColumns fooTable = v.addTableByColumns("4", "FOO_TABLE", "PID");
fooTable.addColumn("PID").nonNullable().type(ColumnTypeEnum.LONG);
fooTable.addColumn("HELLO").nullable().type(ColumnTypeEnum.STRING, 200);
fooTable.addColumn("GOODBYE").nullable().type(ColumnTypeEnum.STRING, 200);
fooTable.addColumn("COL_REF").nullable().type(ColumnTypeEnum.LONG);
fooTable.addIndex("4", "IDX_HELLO").unique(true).withColumns("HELLO");
fooTable.addIndex("5", "IDX_GOODBYE").unique(true).withColumnsStub("GOODBYE");
fooTable.dropIndexStub("6", "IDX_HELLO");
fooTable.addForeignKey("7", "FK_REF").toColumn("COL_REF").references("TGT_TABLE", "PID");
fooTable.addIndex("5", "IDX_HELLO").unique(true).withColumns("HELLO");
fooTable.addIndex("6", "IDX_GOODBYE").unique(true).withColumnsStub("GOODBYE");
fooTable.dropIndexStub("7", "IDX_HELLO");
fooTable.addForeignKey("8", "FK_REF").toColumn("COL_REF").references("TGT_TABLE", "PID");
fooTable.addForeignKey("9", "FK_REF_INVALID").toColumn("COL_REF_INVALID").references("TGT_TABLE", "PID2").failureAllowed();
Builder.BuilderWithTableName renameIndexTable = v.onTable("FOO_TABLE");
renameIndexTable.renameIndex("8", "IDX_HELLO", "IDX_BONJOUR");
renameIndexTable.renameIndex("10", "IDX_HELLO", "IDX_BONJOUR");
}
}
}