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

Migrator

This commit is contained in:
James Agnew 2018-09-17 12:53:44 -04:00
parent 2dc6159af5
commit 44dccb8e3f
3 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java
View File

@ -25,7 +25,6 @@ import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.ColumnMapRowMapper;
import org.thymeleaf.util.StringUtils;
import javax.sql.DataSource;
import java.sql.*;
@ -34,6 +33,8 @@ import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import static org.thymeleaf.util.StringUtils.toUpperCase;
public class JdbcUtils {
private static final Logger ourLog = LoggerFactory.getLogger(JdbcUtils.class);
@ -55,7 +56,7 @@ public class JdbcUtils {
ourLog.debug("*** Next index: {}", new ColumnMapRowMapper().mapRow(indexes, 0));
String indexName = indexes.getString("INDEX_NAME");
indexName = StringUtils.toUpperCase(indexName, Locale.US);
indexName = toUpperCase(indexName, Locale.US);
indexNames.add(indexName);
}
@ -104,21 +105,34 @@ public class JdbcUtils {
DatabaseMetaData metadata;
try {
metadata = connection.getMetaData();
ResultSet indexes = metadata.getColumns(null, null, theTableName, theColumnName);
ResultSet indexes = metadata.getColumns(null, null, null, null);
indexes.next();
while (indexes.next()) {
String tableName = toUpperCase(indexes.getString("TABLE_NAME"), Locale.US);
if (!theTableName.equalsIgnoreCase(tableName)) {
continue;
}
String columnName = toUpperCase(indexes.getString("COLUMN_NAME"), Locale.US);
if (!theColumnName.equalsIgnoreCase(columnName)) {
continue;
}
int dataType = indexes.getInt("DATA_TYPE");
Long length = indexes.getLong("COLUMN_SIZE");
switch (dataType) {
case Types.VARCHAR:
return BaseTableColumnTypeTask.ColumnTypeEnum.STRING.getDescriptor(length);
case Types.BIGINT:
return BaseTableColumnTypeTask.ColumnTypeEnum.LONG.getDescriptor(null);
default:
throw new IllegalArgumentException("Don't know how to handle datatype: " + dataType);
}
int dataType = indexes.getInt("DATA_TYPE");
Long length = indexes.getLong("COLUMN_SIZE");
switch (dataType) {
case Types.VARCHAR:
return BaseTableColumnTypeTask.ColumnTypeEnum.STRING.getDescriptor(length);
case Types.BIGINT:
return BaseTableColumnTypeTask.ColumnTypeEnum.LONG.getDescriptor(null);
default:
throw new IllegalArgumentException("Don't know how to handle datatype: " + dataType);
}
return null;
} catch (SQLException e) {
throw new InternalErrorException(e);
}
@ -141,8 +155,17 @@ public class JdbcUtils {
Set<String> columnNames = new HashSet<>();
while (indexes.next()) {
String tableName = toUpperCase(indexes.getString("PKTABLE_NAME"), Locale.US);
if (!theTableName.equalsIgnoreCase(tableName)) {
continue;
}
tableName = toUpperCase(indexes.getString("FKTABLE_NAME"), Locale.US);
if (!theForeignTable.equalsIgnoreCase(tableName)) {
continue;
}
String fkName = indexes.getString("FK_NAME");
fkName = StringUtils.toUpperCase(fkName, Locale.US);
fkName = toUpperCase(fkName, Locale.US);
columnNames.add(fkName);
}
@ -163,12 +186,17 @@ public class JdbcUtils {
DatabaseMetaData metadata;
try {
metadata = connection.getMetaData();
ResultSet indexes = metadata.getColumns(null, null, theTableName, null);
ResultSet indexes = metadata.getColumns(null, null, null, null);
Set<String> columnNames = new HashSet<>();
while (indexes.next()) {
String tableName = toUpperCase(indexes.getString("TABLE_NAME"), Locale.US);
if (!theTableName.equalsIgnoreCase(tableName)) {
continue;
}
String columnName = indexes.getString("COLUMN_NAME");
columnName = StringUtils.toUpperCase(columnName, Locale.US);
columnName = toUpperCase(columnName, Locale.US);
columnNames.add(columnName);
}
@ -192,7 +220,7 @@ public class JdbcUtils {
Set<String> columnNames = new HashSet<>();
while (tables.next()) {
String tableName = tables.getString("TABLE_NAME");
tableName = StringUtils.toUpperCase(tableName, Locale.US);
tableName = toUpperCase(tableName, Locale.US);
String tableType = tables.getString("TABLE_TYPE");
if ("SYSTEM TABLE".equalsIgnoreCase(tableType)) {
@ -217,14 +245,19 @@ public class JdbcUtils {
DatabaseMetaData metadata;
try {
metadata = connection.getMetaData();
ResultSet tables = metadata.getColumns(null, null, theTableName, theColumnName);
ResultSet tables = metadata.getColumns(null, null, null, null);
while (tables.next()) {
if (theColumnName.equals(tables.getString("COLUMN_NAME"))) {
String tableName = toUpperCase(tables.getString("TABLE_NAME"), Locale.US);
if (!theTableName.equalsIgnoreCase(tableName)) {
continue;
}
if (theColumnName.equalsIgnoreCase(tables.getString("COLUMN_NAME"))) {
String nullable = tables.getString("IS_NULLABLE");
if ("YES".equals(nullable)) {
if ("YES".equalsIgnoreCase(nullable)) {
return true;
} else if ("NO".equals(nullable)) {
} else if ("NO".equalsIgnoreCase(nullable)) {
return false;
} else {
throw new IllegalStateException("Unknown nullable: " + nullable);

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

@ -42,6 +42,10 @@ public class AddColumnTask extends BaseTableColumnTypeTask<AddColumnTask> {
String type = getSqlType();
String nullable = getSqlNotNull();
if (isNullable()) {
nullable = "";
}
String sql = "alter table " + getTableName() + " add column " + getColumnName() + " " + type + " " + nullable;
ourLog.info("Adding column {} of type {} to table {}", getColumnName(), type, getTableName());
executeSql(sql);

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

@ -113,7 +113,7 @@ public abstract class BaseTableColumnTypeTask<T extends BaseTableTask> extends B
}
protected String getSqlNotNull() {
return isNullable() ? " null" : " not null";
return isNullable() ? " null " : " not null";
}
public Long getColumnLength() {