Fixed #1897: Info should also print the current schema version

flyway · Jan 16, 2018 · 97a429f · 97a429f
1 parent d2d9f00
commit 97a429f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java b/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java
@@ -17,6 +17,9 @@
 
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.FlywayException;
+import org.flywaydb.core.api.MigrationInfo;
+import org.flywaydb.core.api.MigrationInfoService;
+import org.flywaydb.core.api.MigrationVersion;
 import org.flywaydb.core.api.logging.Log;
 import org.flywaydb.core.api.logging.LogFactory;
 import org.flywaydb.core.internal.configuration.ConfigUtils;
@@ -161,7 +164,12 @@ private static void executeOperation(Flyway flyway, String operation) {
         } else if ("validate".equals(operation)) {
             flyway.validate();
         } else if ("info".equals(operation)) {
-            LOG.info("\n" + MigrationInfoDumper.dumpToAsciiTable(flyway.info().all()));
+            MigrationInfoService info = flyway.info();
+            MigrationInfo current = info.current();
+            MigrationVersion currentSchemaVersion = current == null ? MigrationVersion.EMPTY : current.getVersion();
+            LOG.info("Schema version: " + currentSchemaVersion);
+            LOG.info("");
+            LOG.info(MigrationInfoDumper.dumpToAsciiTable(info.all()));
         } else if ("repair".equals(operation)) {
             flyway.repair();
         } else {

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/command/DbMigrate.java b/flyway-core/src/main/java/org/flywaydb/core/internal/command/DbMigrate.java
@@ -119,7 +119,7 @@ public int migrate() throws FlywayException {
             for (final FlywayCallback callback : effectiveCallbacks) {
                 new TransactionTemplate(connectionUserObjects.getJdbcConnection()).execute(new Callable<Object>() {
                     @Override
-                    public Object call() throws SQLException {
+                    public Object call() {
                         connectionUserObjects.changeCurrentSchemaTo(schema);
                         callback.beforeMigrate(connectionUserObjects.getJdbcConnection());
                         return null;
@@ -151,7 +151,7 @@ public Integer call() {
             for (final FlywayCallback callback : effectiveCallbacks) {
                 new TransactionTemplate(connectionUserObjects.getJdbcConnection()).execute(new Callable<Object>() {
                     @Override
-                    public Object call() throws SQLException {
+                    public Object call() {
                         connectionUserObjects.changeCurrentSchemaTo(schema);
                         callback.afterMigrate(connectionUserObjects.getJdbcConnection());
                         return null;
@@ -199,10 +199,8 @@ private Integer migrateGroup(boolean firstRun) {
                 new MigrationInfoServiceImpl(migrationResolver, schemaHistory, configuration.getTarget(), configuration.isOutOfOrder(), true, true, true);
         infoService.refresh();
 
-        MigrationVersion currentSchemaVersion = MigrationVersion.EMPTY;
-        if (infoService.current() != null) {
-            currentSchemaVersion = infoService.current().getVersion();
-        }
+        MigrationInfo current = infoService.current();
+        MigrationVersion currentSchemaVersion = current == null ? MigrationVersion.EMPTY : current.getVersion();
         if (firstRun) {
             LOG.info("Current version of schema " + schema + ": " + currentSchemaVersion);
 
@@ -295,7 +293,7 @@ private void applyMigrations(final LinkedHashMap<MigrationInfoImpl, Boolean> gro
             if (executeGroupInTransaction) {
                 new TransactionTemplate(connectionUserObjects.getJdbcConnection()).execute(new Callable<Object>() {
                     @Override
-                    public Object call() throws SQLException {
+                    public Object call() {
                         doMigrateGroup(group, stopWatch);
                         return null;
                     }

diff --git a/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayInfoTask.java b/flyway-gradle-plugin/src/main/java/org/flywaydb/gradle/task/FlywayInfoTask.java
@@ -16,6 +16,9 @@
 package org.flywaydb.gradle.task;
 
 import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.MigrationInfo;
+import org.flywaydb.core.api.MigrationInfoService;
+import org.flywaydb.core.api.MigrationVersion;
 import org.flywaydb.core.internal.info.MigrationInfoDumper;
 
 public class FlywayInfoTask extends AbstractFlywayTask {
@@ -26,7 +29,11 @@ public FlywayInfoTask() {
 
     @Override
     protected Object run(Flyway flyway) {
-        System.out.println(MigrationInfoDumper.dumpToAsciiTable(flyway.info().all()));
+        MigrationInfoService info = flyway.info();
+        MigrationInfo current = info.current();
+        MigrationVersion currentSchemaVersion = current == null ? MigrationVersion.EMPTY : current.getVersion();
+        System.out.println("Schema version: " + currentSchemaVersion);
+        System.out.println(MigrationInfoDumper.dumpToAsciiTable(info.all()));
         return null;
     }
 }
diff --git a/flyway-maven-plugin/src/main/java/org/flywaydb/maven/InfoMojo.java b/flyway-maven-plugin/src/main/java/org/flywaydb/maven/InfoMojo.java
@@ -19,6 +19,9 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.MigrationInfo;
+import org.flywaydb.core.api.MigrationInfoService;
+import org.flywaydb.core.api.MigrationVersion;
 import org.flywaydb.core.internal.info.MigrationInfoDumper;
 
 /**
@@ -32,7 +35,12 @@
         threadSafe = true)
 public class InfoMojo extends AbstractFlywayMojo {
     @Override
-    protected void doExecute(Flyway flyway) throws Exception {
-        log.info("\n" + MigrationInfoDumper.dumpToAsciiTable(flyway.info().all()));
+    protected void doExecute(Flyway flyway) {
+        MigrationInfoService info = flyway.info();
+        MigrationInfo current = info.current();
+        MigrationVersion currentSchemaVersion = current == null ? MigrationVersion.EMPTY : current.getVersion();
+        log.info("Schema version: " + currentSchemaVersion);
+        log.info("");
+        log.info(MigrationInfoDumper.dumpToAsciiTable(info.all()));
     }
 }