Added support for zipped files

openmrs · Nov 30, 2016 · d1d5697 · d1d5697
1 parent 892ed11
commit d1d5697
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 561 deletions.
diff --git a/liquibase1/src/main/java/org/openmrs/contrib/liquibaserunner/LiquibaseRunner.java b/liquibase1/src/main/java/org/openmrs/contrib/liquibaserunner/LiquibaseRunner.java
@@ -25,6 +25,8 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import liquibase.ClassLoaderFileOpener;
 import liquibase.FileSystemFileOpener;
@@ -95,8 +97,15 @@ private String createTempChangeLogFile(final String changeLogFile) throws IOExce
 			input = ClassLoader.getSystemResourceAsStream("sqlfile-changeset.xml");
 			String changeset = IOUtils.toString(input, "UTF-8");
 			input.close();
-
-			changeset = changeset.replace("${sqlfile}", changeLogFile);
+
+			File file = new File(changeLogFile);
+			if (file.getName().endsWith(".zip")) {
+				File unzippedFile = extractSqlFromZip(file);
+
+				changeset = changeset.replace("${sqlfile}", unzippedFile.getAbsolutePath());
+			} else {
+				changeset = changeset.replace("${sqlfile}", file.getAbsolutePath());
+			}
 
 			tempFile = File.createTempFile("liquibaserunner", ".xml");
 
@@ -114,6 +123,45 @@ private String createTempChangeLogFile(final String changeLogFile) throws IOExce
 			IOUtils.closeQuietly(output);
 		}
 	}
+
+	private File extractSqlFromZip(File file) throws IOException {
+		ZipFile zipFile = null;
+		FileOutputStream unzippedFileOut = null;
+		try {
+			zipFile = new ZipFile(file);
+			ZipEntry zipEntry = null;
+			while (zipFile.entries().hasMoreElements()) {
+				zipEntry = zipFile.entries().nextElement();
+				if (zipEntry.getName().endsWith(".sql")) {
+					break;
+				} else {
+					zipEntry = null;
+				}
+			}
+			if (zipEntry == null) {
+				throw new IllegalArgumentException(file.getName() + " does not contain any .sql file");
+			}
+
+			File unzippedFile = File.createTempFile(StringUtils.stripEnd(file.getName(), ".zip"), ".sql");
+			unzippedFileOut = new FileOutputStream(unzippedFile);
+
+			IOUtils.copy(zipFile.getInputStream(zipEntry), unzippedFileOut);
+
+			zipFile.close();
+			unzippedFileOut.close();
+
+			return unzippedFile;
+		} finally {
+			if (zipFile != null) {
+				try {
+					zipFile.close();
+				} catch (Exception e) {
+					//close quietly
+				}
+			}
+			IOUtils.closeQuietly(unzippedFileOut);
+		}
+	}
 
 	public void update() throws LiquibaseRunnerException {
 		try {

diff --git a/liquibase2/src/main/java/org/openmrs/contrib/liquibaserunner/LiquibaseRunner.java b/liquibase2/src/main/java/org/openmrs/contrib/liquibaserunner/LiquibaseRunner.java
@@ -25,6 +25,8 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 import liquibase.Liquibase;
 import liquibase.database.Database;
@@ -97,8 +99,15 @@ private String createTempChangeLogFile(final String changeLogFile) throws IOExce
 			input = ClassLoader.getSystemResourceAsStream("sqlfile-changeset.xml");
 			String changeset = IOUtils.toString(input, "UTF-8");
 			input.close();
-
-			changeset = changeset.replace("${sqlfile}", changeLogFile);
+
+			File file = new File(changeLogFile);
+			if (file.getName().endsWith(".zip")) {
+				File unzippedFile = extractSqlFromZip(file);
+
+				changeset = changeset.replace("${sqlfile}", unzippedFile.getAbsolutePath());
+			} else {
+				changeset = changeset.replace("${sqlfile}", file.getAbsolutePath());
+			}
 
 			tempFile = File.createTempFile("liquibaserunner", ".xml");
 
@@ -116,6 +125,45 @@ private String createTempChangeLogFile(final String changeLogFile) throws IOExce
 			IOUtils.closeQuietly(output);
 		}
 	}
+
+	private File extractSqlFromZip(File file) throws IOException {
+		ZipFile zipFile = null;
+		FileOutputStream unzippedFileOut = null;
+		try {
+			zipFile = new ZipFile(file);
+			ZipEntry zipEntry = null;
+			while (zipFile.entries().hasMoreElements()) {
+				zipEntry = zipFile.entries().nextElement();
+				if (zipEntry.getName().endsWith(".sql")) {
+					break;
+				} else {
+					zipEntry = null;
+				}
+			}
+			if (zipEntry == null) {
+				throw new IllegalArgumentException(file.getName() + " does not contain any .sql file");
+			}
+
+			File unzippedFile = File.createTempFile(StringUtils.stripEnd(file.getName(), ".zip"), ".sql");
+			unzippedFileOut = new FileOutputStream(unzippedFile);
+
+			IOUtils.copy(zipFile.getInputStream(zipEntry), unzippedFileOut);
+
+			zipFile.close();
+			unzippedFileOut.close();
+
+			return unzippedFile;
+		} finally {
+			if (zipFile != null) {
+				try {
+					zipFile.close();
+				} catch (Exception e) {
+					//close quietly
+				}
+			}
+			IOUtils.closeQuietly(unzippedFileOut);
+		}
+	}
 
 	public void update() throws LiquibaseRunnerException {
 		try {

diff --git a/openmrs_concepts_1_6.sql b/openmrs_concepts_1_6.sql
diff --git a/openmrs_concepts_1_6.zip b/openmrs_concepts_1_6.zip