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

Merge branch 'master' into issue-3017-remove-loincxml-file-from-application-used-as-fallback-when-loading-loinc-terminology

This commit is contained in:
jmarchionatto 2021-09-24 12:58:44 -04:00 committed by GitHub
parent 4ab60e2f9b 8c2747f903
commit a40a27bd46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_6_0/3031-index-migration-npe.yaml Normal file
View File

@ -0,0 +1,5 @@
---
type: fix
issue: 3031
jira: SMILE-3178
title: "Fixes a bug that was causing a null pointer exception to be thrown during database migrations that add or drop indexes."

10
hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/JdbcUtils.java
View File

@ -61,6 +61,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
public class JdbcUtils {
private static final Logger ourLog = LoggerFactory.getLogger(JdbcUtils.class);
@ -86,7 +87,6 @@ public class JdbcUtils {
while (indexes.next()) {
ourLog.debug("*** Next index: {}", new ColumnMapRowMapper().mapRow(indexes, 0));
String indexName = indexes.getString("INDEX_NAME");
indexName = indexName.toUpperCase(Locale.US);
indexNames.add(indexName);
}
@ -94,11 +94,15 @@ public class JdbcUtils {
while (indexes.next()) {
ourLog.debug("*** Next index: {}", new ColumnMapRowMapper().mapRow(indexes, 0));
String indexName = indexes.getString("INDEX_NAME");
indexName = indexName.toUpperCase(Locale.US);
indexNames.add(indexName);
}
indexNames.removeIf(i -> i == null);
indexNames = indexNames
.stream()
.filter(Objects::nonNull) // filter out the nulls first
.map(s -> s.toUpperCase(Locale.US)) // then convert the non-null entries to upper case
.collect(Collectors.toSet());
return indexNames;
} catch (SQLException e) {

45
hapi-fhir-sql-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/JdbcUtilsTest.java
View File

@ -10,10 +10,14 @@ import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Types;
import java.util.Set;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@ -64,4 +68,45 @@ public class JdbcUtilsTest {
assertEquals(theExpectedColumnType, testColumnType.getColumnTypeEnum());
}
@Test
public void testGetIndexNames_verifyNullHandling() throws SQLException {
// setup
ResultSet mockTableResultSet = mock(ResultSet.class);
when(mockTableResultSet.next()).thenReturn(true, false);
when(mockTableResultSet.getString("TABLE_NAME")).thenReturn("TEST_TABLE");
when(mockTableResultSet.getString("TABLE_TYPE")).thenReturn("USER TABLE");
ResultSetMetaData mockResultSetMetaData = mock(ResultSetMetaData.class);
when(mockResultSetMetaData.getColumnCount()).thenReturn(0);
ResultSet mockIndicesResultSet = mock(ResultSet.class);
when(mockIndicesResultSet.next()).thenReturn(true, true, true, false);
when(mockIndicesResultSet.getString("INDEX_NAME")).thenReturn("IDX_1", null, "idx_2");
when(mockIndicesResultSet.getMetaData()).thenReturn(mockResultSetMetaData);
ResultSet mockUniqueIndicesResultSet = mock(ResultSet.class);
when(mockUniqueIndicesResultSet.next()).thenReturn(true, true, false);
when(mockUniqueIndicesResultSet.getString("INDEX_NAME")).thenReturn(null, "Idx_3");
when(mockUniqueIndicesResultSet.getMetaData()).thenReturn(mockResultSetMetaData);
when(myDatabaseMetaData.getTables("Catalog", "Schema", null, null)).thenReturn(mockTableResultSet);
when(myDatabaseMetaData.getIndexInfo("Catalog", "Schema", "TEST_TABLE", false, true)).thenReturn(mockIndicesResultSet);
when(myDatabaseMetaData.getIndexInfo("Catalog", "Schema", "TEST_TABLE", true, true)).thenReturn(mockUniqueIndicesResultSet);
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);
//execute
Set<String> indexNames = JdbcUtils.getIndexNames(myConnectionProperties, "TEST_TABLE");
// verify
assertEquals(3, indexNames.size());
assertTrue(indexNames.contains("IDX_1"));
assertTrue(indexNames.contains("IDX_2"));
assertTrue(indexNames.contains("IDX_3"));
}
}