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

cleaned up cleanup

This commit is contained in:
Ken Stevens 2019-11-27 21:54:13 -05:00
parent 9693b1736e
commit bf003f0d16
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,10 +32,13 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static org.apache.commons.lang3.StringUtils.isBlank;
public class SchemaInitializationProvider implements ISchemaInitializationProvider {
private static final Pattern ourTrailingCommaPattern = Pattern.compile(",(\\s+)\\)");
private final String mySchemaFileClassPath;
private final String mySchemaExistsIndicatorTable;
@ -72,22 +75,11 @@ public class SchemaInitializationProvider implements ISchemaInitializationProvid
return retval;
}
private String clean(String theStatement) {
String[] lines = theStatement.split("\\n");
String retval = "";
for (String fullLine : lines) {
String line = fullLine.trim();
if (isBlank(line) ||
line.startsWith("--")) {
continue;
}
// FIXME KHS hack to fix bug in Quartz SQL
if ("BOOL_PROP_2 BOOLEAN NULL,".equals(line)) {
line = "BOOL_PROP_2 BOOLEAN NULL";
}
retval += line + "\n";
}
return retval;
static String clean(String theStatement) {
// Remove commas before brackets. Some databases don't like this and
// some schemas shipped with Quartz include them
Matcher matcher = ourTrailingCommaPattern.matcher(theStatement);
return matcher.replaceAll("$1\\)");
}
@Nonnull

14
hapi-fhir-jpaserver-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProviderTest.java Normal file
View File

@ -0,0 +1,14 @@
package ca.uhn.fhir.jpa.migrate.tasks;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class SchemaInitializationProviderTest {
@Test
public void testClean() {
assertEquals("foo\n)", SchemaInitializationProvider.clean("foo,\n)"));
assertEquals("foo\n )", SchemaInitializationProvider.clean("foo,\n )"));
assertEquals("foo,bar\n )", SchemaInitializationProvider.clean("foo,bar\n )"));
}
}