fix incorrect order of the application of additional flyway migrations in some rare cases

Author: tomix26

embedded-database-spring-test-core/src/main/java/io/zonky/test/db/flyway/OptimizedFlywayTestExecutionListener.java

@@ -154,7 +154,7 @@ private static boolean isAppendable(Flyway flyway, FlywayTest annotation) {
             return true;
         }
 
-        MigrationVersion testVersion = findLastVersion(flyway, annotation.locationsForMigrate());
+        MigrationVersion testVersion = findFirstVersion(flyway, annotation.locationsForMigrate());
         if (testVersion == MigrationVersion.EMPTY) {
             return true;
         }
@@ -163,6 +163,17 @@ private static boolean isAppendable(Flyway flyway, FlywayTest annotation) {
         return coreVersion.compareTo(testVersion) < 0;
     }
 
+    private static MigrationVersion findFirstVersion(Flyway flyway, String... locations) {
+        CompositeMigrationResolver resolver = createMigrationResolver(flyway, locations);
+        List<ResolvedMigration> migrations = resolver.resolveMigrations();
+
+        if (CollectionUtils.isEmpty(migrations)) {
+            return MigrationVersion.EMPTY;
+        } else {
+            return migrations.get(0).getVersion();
+        }
+    }
+
     private static MigrationVersion findLastVersion(Flyway flyway, String... locations) {
         CompositeMigrationResolver resolver = createMigrationResolver(flyway, locations);
         List<ResolvedMigration> migrations = resolver.resolveMigrations();

embedded-database-spring-test-core/src/test/java/io/zonky/test/db/postgres/FlywayMigrationIntegrationTest.java

@@ -100,14 +100,11 @@ public void loadDependentTestMigrations() throws Exception {
         assertThat(dataSource).isNotNull();
 
         List<Map<String, Object>> persons = jdbcTemplate.queryForList(SQL_SELECT_PERSONS);
-        assertThat(persons).isNotNull().hasSize(1);
+        assertThat(persons).isNotNull().hasSize(2);
 
-        Map<String, Object> person = persons.get(0);
-        assertThat(person).containsExactly(
-                entry("id", 1L),
-                entry("first_name", "Dave"),
-                entry("last_name", "Syer"),
-                entry("full_name", "Dave Syer"));
+        assertThat(persons).extracting("id", "first_name", "last_name", "full_name").containsExactlyInAnyOrder(
+                tuple(1L, "Dave", "Syer", "Dave Syer"),
+                tuple(3L, "Will", "Smith", "Will Smith"));
     }
 
     @Test

embedded-database-spring-test-core/src/test/java/io/zonky/test/db/postgres/MultipleFlywayBeansIntegrationTest.java

@@ -92,14 +92,11 @@ public void databaseShouldBeLoadedByFlyway1() throws Exception {
         assertThat(dataSource).isNotNull();
 
         List<Map<String, Object>> persons = jdbcTemplate.queryForList(SQL_SELECT_PERSONS);
-        assertThat(persons).isNotNull().hasSize(1);
+        assertThat(persons).isNotNull().hasSize(2);
 
-        Map<String, Object> person = persons.get(0);
-        assertThat(person).containsExactly(
-                entry("id", 1L),
-                entry("first_name", "Dave"),
-                entry("last_name", "Syer"),
-                entry("full_name", "Dave Syer"));
+        assertThat(persons).extracting("id", "first_name", "last_name", "full_name").containsExactlyInAnyOrder(
+                tuple(1L, "Dave", "Syer", "Dave Syer"),
+                tuple(3L, "Will", "Smith", "Will Smith"));
     }
 
     @Test
@@ -140,10 +137,11 @@ public void databaseShouldBeLoadedByFlyway1AndAppendedByFlyway3() throws Excepti
         assertThat(dataSource).isNotNull();
 
         List<Map<String, Object>> persons = jdbcTemplate.queryForList(SQL_SELECT_PERSONS);
-        assertThat(persons).isNotNull().hasSize(2);
+        assertThat(persons).isNotNull().hasSize(3);
 
         assertThat(persons).extracting("id", "first_name", "last_name").containsExactlyInAnyOrder(
                 tuple(1L, "Dave", "Syer"),
-                tuple(2L, "Tom", "Hanks"));
+                tuple(2L, "Tom", "Hanks"),
+                tuple(3L, "Will", "Smith"));
     }
 }

embedded-database-spring-test-core/src/test/resources/db/test_migration/dependent/V0999_1__create_test_data.sql

@@ -0,0 +1 @@
+insert into test.person (id, first_name, last_name, full_name) values (3, 'Will', 'Smith', 'Will Smith');