Merge pull request #56 from Ignas/master

Do not do any queries if there were no migrations before.
hhandoko · Mar 29, 2018 · b42778d · b42778d
2 parents 999b8b1 + 0aa24b5
commit b42778d
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/src/main/java/com/builtamont/cassandra/migration/internal/dbsupport/SchemaVersionDAO.kt b/src/main/java/com/builtamont/cassandra/migration/internal/dbsupport/SchemaVersionDAO.kt
@@ -309,26 +309,18 @@ open class SchemaVersionDAO(private val session: Session, val keyspaceConfig: Ke
             )
         }
 
-        Collections.sort(migrationVersions)
+        if (migrationVersions.size == 0) {
+            return 1;
+        }
 
-        val batchStatement = BatchStatement()
+        Collections.sort(migrationVersions)
 
         // TODO: Refactor for loop with idiomatic Kotlin collection methods
         for (i in migrationVersions.indices) {
             if (version.compareTo(migrationVersions[i]) < 0) {
-                for (z in i..migrationVersions.size - 1) {
-                    val migrationVersionStr = migrationVersions[z].version
-                    batchStatement.add(
-                            boundUpdateVersionRankStmt(
-                                    migrationMetaHolders[migrationVersionStr]!!.versionRank + 1,
-                                    migrationVersionStr
-                            )
-                    )
-                }
                 return i + 1
             }
         }
-        session.execute(batchStatement)
 
         return migrationVersions.size + 1
     }