Catch and throw MigrationException

Author: rbygrave

ebean-migration/src/main/java/io/ebean/migration/runner/MigrationEngine.java

@@ -56,6 +56,9 @@ public List<MigrationResource> run(Connection connection) {
           }
         }
         return result;
+      } catch (MigrationException e) {
+        rollback(connection);
+        throw e;
       } catch (Exception e) {
         log.log(ERROR, "Perform rollback due to DB migration error", e);
         rollback(connection);
@@ -143,7 +146,7 @@ private void close(Connection connection) {
   /**
    * Rollback the connection logging if an error occurs.
    */
-  private void rollback(Connection connection) {
+  static void rollback(Connection connection) {
     try {
       if (connection != null) {
         connection.rollback();

ebean-migration/src/main/java/io/ebean/migration/runner/MigrationPlatform.java

@@ -12,6 +12,7 @@
 /**
  * Handle database platform specific locking on db migration table.
  */
+@SuppressWarnings({"SqlDialectInspection", "SqlSourceToSinkFlow"})
 class MigrationPlatform {
 
   private static final System.Logger log = MigrationTable.log;
@@ -124,7 +125,7 @@ void unlockMigrationTable(String sqlTable, Connection connection) {
         releaseLogicalLock(sqlTable, connection);
         connection.commit();
       } catch (SQLException e) {
-        rollback(connection);
+        MigrationEngine.rollback(connection);
         throw new MigrationException("Error releasing logical lock for ebean migrations");
       }
     }
@@ -196,7 +197,6 @@ private boolean obtainNamedLock(Connection connection) throws SQLException {
       return false;
     }
 
-    @SuppressWarnings("all")
     @Override
     void unlockMigrationTable(String sqlTable, Connection connection) {
       try {