BugFix: Do not run non-transactional migrations when checkStateOnly

Also refactor rename checkState -> checkStateOnly

Author: rob-bygrave

ebean-migration/src/main/java/io/ebean/migration/MigrationRunner.java

@@ -85,7 +85,7 @@ private Connection getConnection(DataSource dataSource) {
   /**
    * Run the migrations if there are any that need running.
    */
-  protected void run(Connection connection, boolean checkStateMode) {
+  protected void run(Connection connection, boolean checkStateOnly) {
     try {
       LocalMigrationResources resources = new LocalMigrationResources(migrationConfig);
       if (!resources.readResources() && !resources.readInitResources()) {
@@ -98,17 +98,17 @@ protected void run(Connection connection, boolean checkStateMode) {
       MigrationPlatform platform = derivePlatformName(migrationConfig, connection);
       new MigrationSchema(migrationConfig, connection).createAndSetIfNeeded();
 
-      MigrationTable table = new MigrationTable(migrationConfig, connection, checkStateMode, platform);
+      MigrationTable table = new MigrationTable(migrationConfig, connection, checkStateOnly, platform);
       table.createIfNeededAndLock();
       try {
         List<LocalMigrationResource> migrations = resources.getVersions();
-        runMigrations(migrations, table, checkStateMode);
+        runMigrations(migrations, table, checkStateOnly);
         connection.commit();
-        if (!checkStateMode) {
+        if (!checkStateOnly) {
           long exeMillis = System.currentTimeMillis() - start;
           log.log(INFO, "DB migrations completed in {0}ms - executed:{1} size:{2}", exeMillis, table.count(), migrations.size());
+          table.runNonTransactional();
         }
-        table.runNonTransactional();
       } finally {
         table.unlockMigrationTable();
       }

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

@@ -26,7 +26,7 @@ public final class MigrationTable {
   private static final String INIT_VER_0 = "0";
 
   private final Connection connection;
-  private final boolean checkState;
+  private final boolean checkStateOnly;
   private final MigrationPlatform platform;
   private final MigrationScriptRunner scriptRunner;
   private final String catalog;
@@ -72,11 +72,11 @@ public final class MigrationTable {
   /**
    * Construct with server, configuration and jdbc connection (DB admin user).
    */
-  public MigrationTable(MigrationConfig config, Connection connection, boolean checkState, MigrationPlatform platform) {
+  public MigrationTable(MigrationConfig config, Connection connection, boolean checkStateOnly, MigrationPlatform platform) {
     this.platform = platform;
     this.connection = connection;
     this.scriptRunner = new MigrationScriptRunner(connection, platform);
-    this.checkState = checkState;
+    this.checkStateOnly = checkStateOnly;
     this.migrations = new LinkedHashMap<>();
     this.catalog = null;
     this.allowErrorInRepeatable = config.isAllowErrorInRepeatable();
@@ -322,7 +322,7 @@ private boolean runMigration(LocalMigrationResource local, MigrationMetaRow exis
   private boolean patchInsertMigration(LocalMigrationResource local, int checksum) throws SQLException {
     if (patchInsertVersions != null && patchInsertVersions.contains(local.key())) {
       log.log(INFO, "Patch migration, insert into history {0}", local.getLocation());
-      if (!checkState) {
+      if (!checkStateOnly) {
         insertIntoHistory(local, checksum, 0);
       }
       return true;
@@ -356,7 +356,7 @@ boolean skipMigration(int checksum, LocalMigrationResource local, MigrationMetaR
    */
   private boolean patchResetChecksum(MigrationMetaRow existing, int newChecksum) throws SQLException {
     if (isResetOnVersion(existing.getVersion())) {
-      if (!checkState) {
+      if (!checkStateOnly) {
         existing.resetChecksum(newChecksum, connection, updateChecksumSql);
       }
       return true;
@@ -373,7 +373,7 @@ private boolean isResetOnVersion(String version) {
    * Run a migration script as new migration or update on existing repeatable migration.
    */
   private void executeMigration(LocalMigrationResource local, String script, int checksum, MigrationMetaRow existing) throws SQLException {
-    if (checkState) {
+    if (checkStateOnly) {
       checkMigrations.add(local);
       // simulate the migration being run such that following migrations also match
       addMigration(local.key(), createMetaRow(local, checksum, 1));