Filter info output by date

flyway · Oct 27, 2020 · c3c9c2f · c3c9c2f
1 parent 39197c3
commit c3c9c2f
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 13 deletions.
diff --git a/flyway-commandline/src/main/java/org/flywaydb/commandline/CommandLineArguments.java b/flyway-commandline/src/main/java/org/flywaydb/commandline/CommandLineArguments.java
@@ -17,8 +17,11 @@
 
 import org.flywaydb.commandline.ConsoleLog.Level;
 import org.flywaydb.core.api.FlywayException;
+import org.flywaydb.core.api.MigrationVersion;
 import org.flywaydb.core.internal.util.StringUtils;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 class CommandLineArguments {
@@ -73,6 +76,12 @@ public static boolean isValid(String value) {
     private static String CONFIG_FILES = "configFiles";
     private static String COLOR = "color";
     private static String WORKING_DIRECTORY = "workingDirectory";
+    private static String INFO_SINCE_DATE = "infoSinceDate";
+    private static String INFO_UNTIL_DATE = "infoUntilDate";
+    private static String INFO_SINCE_VERSION = "infoSinceVersion";
+    private static String INFO_UNTIL_VERSION = "infoUntilVersion";
+
+    private static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy HH:mm");
 
     private static List<String> VALID_OPERATIONS_AND_FLAGS = Arrays.asList(
             DEBUG_FLAG,
@@ -166,7 +175,11 @@ private static boolean isConfigurationOptionIgnored(String configurationOptionNa
         return OUTPUT_FILE.equals(configurationOptionName) ||
                 OUTPUT_TYPE.equals(configurationOptionName) ||
                 COLOR.equals(configurationOptionName) ||
-                WORKING_DIRECTORY.equals(configurationOptionName);
+                WORKING_DIRECTORY.equals(configurationOptionName) ||
+                INFO_SINCE_DATE.equals(configurationOptionName) ||
+                INFO_UNTIL_DATE.equals(configurationOptionName) ||
+                INFO_SINCE_VERSION.equals(configurationOptionName) ||
+                INFO_UNTIL_VERSION.equals(configurationOptionName);
     }
 
     private static String getConfigurationOptionNameFromArg(String arg) {
@@ -251,6 +264,48 @@ String getWorkingDirectory() {
         return getArgumentValue(WORKING_DIRECTORY, args);
     }
 
+    Date getInfoSinceDate() {
+        return parseDate(INFO_SINCE_DATE);
+    }
+
+    Date getInfoUntilDate() {
+        return parseDate(INFO_UNTIL_DATE);
+    }
+
+    MigrationVersion getInfoSinceVersion() {
+        return parseVersion(INFO_SINCE_VERSION);
+    }
+
+    MigrationVersion getInfoUntilVersion() {
+        return parseVersion(INFO_UNTIL_VERSION);
+    }
+
+    private MigrationVersion parseVersion(String argument) {
+        String versionStr = getArgumentValue(argument, args);
+
+        if (versionStr.isEmpty()) {
+            return null;
+        }
+
+        return MigrationVersion.fromVersion(versionStr);
+    }
+
+    private Date parseDate(String argument) {
+        String dateStr = getArgumentValue(argument, args);
+
+        if (dateStr.isEmpty()) {
+            return null;
+        }
+
+        try {
+            return DATE_FORMAT.parse(dateStr);
+        } catch (ParseException e) {
+            throw new FlywayException("'" + dateStr + "' is an invalid value for the " + argument + " option. " +
+                    "The expected format is 'dd/mm/yyyy hh:mm', like '13/10/2020 16:30'. " +
+                    "See the Flyway documentation for help: https://flywaydb.org/documentation/usage/commandline/info#filtering-output");
+        }
+    }
+
     boolean isOutputFileSet() {
         return !getOutputFile().isEmpty();
     }

diff --git a/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java b/flyway-commandline/src/main/java/org/flywaydb/commandline/Main.java
@@ -20,18 +20,17 @@
 import org.flywaydb.commandline.ConsoleLog.Level;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.*;
+
+
 import org.flywaydb.core.api.logging.Log;
 import org.flywaydb.core.api.logging.LogCreator;
 import org.flywaydb.core.api.logging.LogFactory;
-import org.flywaydb.core.api.output.CompositeResult;
+import org.flywaydb.core.api.output.*;
 import org.flywaydb.core.internal.configuration.ConfigUtils;
 import org.flywaydb.core.internal.database.DatabaseTypeRegister;
 import org.flywaydb.core.internal.database.base.DatabaseType;
 import org.flywaydb.core.internal.info.MigrationInfoDumper;
 import org.flywaydb.core.internal.license.VersionPrinter;
-import org.flywaydb.core.api.output.ErrorOutput;
-import org.flywaydb.core.api.output.OperationResult;
-import org.flywaydb.core.api.output.OperationResultBase;
 import org.flywaydb.core.internal.util.ClassUtils;
 import org.flywaydb.core.internal.util.StringUtils;
 
@@ -247,14 +246,24 @@ private static OperationResultBase executeOperation(Flyway flyway, String operat
             }
         } else if ("info".equals(operation)) {
             MigrationInfoService info = flyway.info();
-            result = info.getInfoResult();
             MigrationInfo current = info.current();
             MigrationVersion currentSchemaVersion = current == null ? MigrationVersion.EMPTY : current.getVersion();
 
             MigrationVersion schemaVersionToOutput = currentSchemaVersion == null ? MigrationVersion.EMPTY : currentSchemaVersion;
             LOG.info("Schema version: " + schemaVersionToOutput);
             LOG.info("");
-            LOG.info(MigrationInfoDumper.dumpToAsciiTable(info.all()));
+
+
+
+
+
+
+
+             result = info.getInfoResult();
+             MigrationInfo[] infos = info.all();
+
+
+            LOG.info(MigrationInfoDumper.dumpToAsciiTable(infos));
         } else if ("repair".equals(operation)) {
             result = flyway.repair();
         } else {
@@ -266,6 +275,16 @@ private static OperationResultBase executeOperation(Flyway flyway, String operat
         return result;
     }
 
+
+
+
+
+
+
+
+
+
+
     private static void printJson(CommandLineArguments commandLineArguments, OperationResult object) {
         String json = convertObjectToJsonString(object);
 

diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/InfoOutputProvider.java b/flyway-core/src/main/java/org/flywaydb/core/api/InfoOutputProvider.java
@@ -15,8 +15,13 @@
  */
 package org.flywaydb.core.api;
 
+
 import org.flywaydb.core.api.output.InfoResult;
 
 interface InfoOutputProvider {
     InfoResult getInfoResult();
+
+
+
+
 }
diff --git a/flyway-core/src/main/java/org/flywaydb/core/api/MigrationInfoService.java b/flyway-core/src/main/java/org/flywaydb/core/api/MigrationInfoService.java
@@ -15,6 +15,8 @@
  */
 package org.flywaydb.core.api;
 
+
+
 /**
  * Info about all migrations, including applied, current and pending with details and status.
  */
@@ -26,6 +28,16 @@ public interface MigrationInfoService extends InfoOutputProvider {
      */
     MigrationInfo[] all();
 
+
+
+
+
+
+
+
+
+
+
     /**
      * Retrieves the information of the current applied migration, if any.
      *

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/info/MigrationInfoDumper.java b/flyway-core/src/main/java/org/flywaydb/core/internal/info/MigrationInfoDumper.java
@@ -22,11 +22,7 @@
 import org.flywaydb.core.internal.util.AsciiTable;
 import org.flywaydb.core.internal.util.DateUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Dumps migrations in an ascii-art table in the logs and the console.

diff --git a/flyway-core/src/main/java/org/flywaydb/core/internal/info/MigrationInfoServiceImpl.java b/flyway-core/src/main/java/org/flywaydb/core/internal/info/MigrationInfoServiceImpl.java
@@ -18,6 +18,7 @@
 import org.flywaydb.core.api.*;
 import org.flywaydb.core.api.configuration.Configuration;
 import org.flywaydb.core.api.output.ValidateOutput;
+
 import org.flywaydb.core.api.resolver.Context;
 import org.flywaydb.core.api.resolver.MigrationResolver;
 import org.flywaydb.core.api.resolver.ResolvedMigration;
@@ -434,6 +435,18 @@ public MigrationInfo[] all() {
         return migrationInfos.toArray(new MigrationInfo[0]);
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
     @Override
     public MigrationInfo current() {
         MigrationInfo current = null;
@@ -605,7 +618,18 @@ public List<ValidateOutput> validate() {
 
     @Override
     public InfoResult getInfoResult() {
+        return getInfoResult(this.all());
+    }
+
+    public InfoResult getInfoResult(MigrationInfo[] infos) {
         CommandResultFactory commandResultFactory = new CommandResultFactory();
-        return commandResultFactory.createInfoResult(this.context.getConfiguration(), this.database, this.all(), this.current(), this.allSchemasEmpty);
+        return commandResultFactory.createInfoResult(this.context.getConfiguration(), this.database, infos, this.current(), this.allSchemasEmpty);
     }
+
+
+
+
+
+
+
 }