From 83106c92c13d0bb5dc8d645ea8a9249b10113e26 Mon Sep 17 00:00:00 2001
From: Ken Stevens <khstevens@gmail.com>
Date: Wed, 11 Dec 2019 17:00:31 -0500
Subject: [PATCH] move quartz stuff out

---
 .../tasks/SchemaInitializationProvider.java   | 27 +++---------
 .../SchemaInitializationProviderTest.java     | 41 -------------------
 2 files changed, 6 insertions(+), 62 deletions(-)
 delete mode 100644 hapi-fhir-jpaserver-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProviderTest.java

diff --git a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProvider.java b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProvider.java
index 4f481d20ae9..30db7c29569 100644
--- a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProvider.java
+++ b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProvider.java
@@ -32,17 +32,11 @@ 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 ourSqlCommentPattern = Pattern.compile("(?m)^\\s*--.*$");
-	private static final Pattern ourQuartzDeletePattern = Pattern.compile("(?m)^delete from qrtz_\\w+;$");
-	private static final Pattern ourQuartzDropPattern = Pattern.compile("(?m)^drop table qrtz_\\w+;$");
 
-	private static final Pattern ourTrailingCommaPattern = Pattern.compile(",(\\s+)\\)");
 	private final String mySchemaFileClassPath;
 	private final String mySchemaExistsIndicatorTable;
 
@@ -67,10 +61,10 @@ public class SchemaInitializationProvider implements ISchemaInitializationProvid
 			}
 			// Assumes no escaped semicolons...
 			String sqlString = IOUtils.toString(sqlFileInputStream, Charsets.UTF_8);
-			String sqlStringNoComments = preProcessLines(sqlString);
+			String sqlStringNoComments = preProcessSqlString(theDriverType, sqlString);
 			String[] statements = sqlStringNoComments.split("\\;");
 			for (String statement : statements) {
-				String cleanedStatement = clean(statement);
+				String cleanedStatement = preProcessSqlStatement(theDriverType, statement);
 				if (!isBlank(cleanedStatement)) {
 					retval.add(cleanedStatement);
 				}
@@ -81,21 +75,12 @@ public class SchemaInitializationProvider implements ISchemaInitializationProvid
 		return retval;
 	}
 
-	static String preProcessLines(String theSqlString) {
-		String pass1 = strip(ourSqlCommentPattern, theSqlString);
-		String pass2 = strip(ourQuartzDeletePattern, pass1);
-		String pass3 = strip(ourQuartzDropPattern, pass2);
-		return pass3.replaceAll("\\n+", "\n");
+	protected String preProcessSqlString(DriverTypeEnum theDriverType, String sqlString) {
+		return sqlString;
 	}
 
-	private static String strip(Pattern theStripPattern, String theSqlString) {
-		return theStripPattern.matcher(theSqlString).replaceAll("");
-	}
-
-	static String clean(String theStatement) {
-		// Remove commas before brackets.  The Quartz h2 schema has a comma before a closing bracket that fails to execute...
-		Matcher matcher = ourTrailingCommaPattern.matcher(theStatement);
-		return matcher.replaceAll("$1\\)");
+	protected String preProcessSqlStatement(DriverTypeEnum theDriverType, String sqlStatement) {
+		return sqlStatement;
 	}
 
 	@Nonnull
diff --git a/hapi-fhir-jpaserver-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProviderTest.java b/hapi-fhir-jpaserver-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProviderTest.java
deleted file mode 100644
index 21b154183c4..00000000000
--- a/hapi-fhir-jpaserver-migrate/src/test/java/ca/uhn/fhir/jpa/migrate/tasks/SchemaInitializationProviderTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-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  )"));
-	}
-
-	@Test
-	public void testStripComments() {
-		String input = "no comment\n" +
-			" --spacecomment \n" +
-			"so like definitely no comment\n" +
-			"-- nospace comment\n";
-
-		String expectedOutput = "no comment\n" +
-			"so like definitely no comment\n";
-
-		assertEquals(expectedOutput, SchemaInitializationProvider.preProcessLines(input));
-	}
-
-	@Test
-	public void testStripQuartzDelete() {
-		String input = "delete from qrtz_paused_trigger_grps;\n" +
-			"delete from qrtz_locks;\n" +
-			"delete from qrtz_scheduler_state;\n" +
-			"\n" +
-			"drop table qrtz_calendars;\n" +
-			"drop table qrtz_fired_triggers;\n";
-
-		String expectedOutput = "\n";
-
-		assertEquals(expectedOutput, SchemaInitializationProvider.preProcessLines(input));
-	}
-}