Merge pull request #1082 from metabase/prevent-migration-hanging-locks

Prevent Liquibase migrations from leaving unreleased locks

src/java/com/metabase/corvus/migrations/LiquibaseMigrations.java

-package com.metabase.corvus.migrations;
-
-import java.io.FileWriter;
-import java.io.StringWriter;
-import java.sql.SQLException;
-import liquibase.Liquibase;
-import liquibase.database.DatabaseFactory;
-import liquibase.database.Database;
-import liquibase.database.jvm.JdbcConnection;
-import liquibase.exception.DatabaseException;
-import liquibase.resource.ClassLoaderResourceAccessor;
-
-
-public class LiquibaseMigrations {
-
-  private static final String LIQUIBASE_CHANGELOG = "migrations/liquibase.json";
-
-
-  public static final void setupDatabase(java.sql.Connection dbConnection) throws Exception {
-    try {
-      Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(dbConnection));
-      Liquibase liquibase = new Liquibase(LIQUIBASE_CHANGELOG, new ClassLoaderResourceAccessor(), database);
-      liquibase.update("");
-    } catch (Exception e) {
-      throw new DatabaseException(e);
-    } finally {
-      if (dbConnection != null) {
-        try {
-          dbConnection.rollback();
-          dbConnection.close();
-        } catch (SQLException e){
-          //nothing to do
-        }
-      }
-    }
-  }
-
-  public static final void teardownDatabase(java.sql.Connection dbConnection) throws Exception {
-    try {
-      Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(dbConnection));
-      Liquibase liquibase = new Liquibase(LIQUIBASE_CHANGELOG, new ClassLoaderResourceAccessor(), database);
-      liquibase.rollback(10000, "");
-    } catch (Exception e) {
-      throw new DatabaseException(e);
-    } finally {
-      if (dbConnection != null) {
-        try {
-          dbConnection.rollback();
-          dbConnection.close();
-        } catch (SQLException e){
-          //nothing to do
-        }
-      }
-    }
-  }
-
-  public static final String genSqlDatabase(java.sql.Connection dbConnection) throws Exception {
-    try {
-      StringWriter strw = new StringWriter();
-      Database database = DatabaseFactory.getInstance().findCorrectDatabaseImplementation(new JdbcConnection(dbConnection));
-      Liquibase liquibase = new Liquibase(LIQUIBASE_CHANGELOG, new ClassLoaderResourceAccessor(), database);
-      liquibase.update("", strw);
-      return strw.toString();
-    } catch (Exception e) {
-      throw new DatabaseException(e);
-    } finally {
-      if (dbConnection != null) {
-        try {
-          dbConnection.rollback();
-          dbConnection.close();
-        } catch (SQLException e){
-          //nothing to do
-        }
-      }
-    }
-  }
-
-}

src/metabase/db.clj

@@ -12,7 +12,13 @@
             [metabase.db.internal :as i]
             [metabase.models.interface :as models]
             [metabase.util :as u])
-  (:import com.metabase.corvus.migrations.LiquibaseMigrations))
+  (:import java.io.StringWriter
+           java.sql.Connection
+           liquibase.Liquibase
+           (liquibase.database DatabaseFactory Database)
+           liquibase.database.jvm.JdbcConnection
+           liquibase.exception.DatabaseException
+           liquibase.resource.ClassLoaderResourceAccessor))
 
 ;; ## DB FILE, JDBC/KORMA DEFINITONS
 
@@ -54,14 +60,25 @@
 
 ;; ## MIGRATE
 
+(def ^:private ^:const changelog-file
+  "migrations/liquibase.json")
+
 (defn migrate
   "Migrate the database `:up`, `:down`, or `:print`."
   [jdbc-connection-details direction]
-  (let [conn (jdbc/get-connection jdbc-connection-details)]
-    (case direction
-      :up    (LiquibaseMigrations/setupDatabase conn)
-      :down  (LiquibaseMigrations/teardownDatabase conn)
-      :print (LiquibaseMigrations/genSqlDatabase conn))))
+  (try
+    (jdbc/with-db-transaction [conn jdbc-connection-details]
+      (let [^Database  database  (-> (DatabaseFactory/getInstance)
+                                     (.findCorrectDatabaseImplementation (JdbcConnection. (jdbc/get-connection conn))))
+            ^Liquibase liquibase (Liquibase. changelog-file (ClassLoaderResourceAccessor.) database)]
+        (case direction
+          :up    (.update liquibase "")
+          :down  (.rollback liquibase 10000 "")
+          :print (let [writer (StringWriter.)]
+                   (.update liquibase "" writer)
+                   (.toString writer)))))
+    (catch Throwable e
+      (throw (DatabaseException. e)))))
 
 
 ;; ## SETUP-DB