Merge pull request #161 from harawata/version-without-changelog

Version command should not require changelog table

Author: harawata

src/main/java/org/apache/ibatis/migration/operations/VersionOperation.java

@@ -19,6 +19,7 @@
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.ibatis.migration.Change;
@@ -50,7 +51,7 @@ public VersionOperation operate(ConnectionProvider connectionProvider, Migration
       option = new DatabaseOperationOption();
     }
     try (Connection con = connectionProvider.getConnection()) {
-      List<Change> changesInDb = getChangelog(con, option);
+      List<Change> changesInDb = changelogExists(con, option) ? getChangelog(con, option) : Collections.emptyList();
       List<Change> migrations = migrationsLoader.getMigrations();
       Change specified = new Change(version);
       if (!migrations.contains(specified)) {
@@ -61,7 +62,7 @@ public VersionOperation operate(ConnectionProvider connectionProvider, Migration
         println(printStream, "Upgrading to: " + version);
         int steps = 0;
         for (Change change : migrations) {
-          if (change.compareTo(lastChangeInDb) > 0 && change.compareTo(specified) < 1) {
+          if ((lastChangeInDb == null || change.compareTo(lastChangeInDb) > 0) && change.compareTo(specified) < 1) {
             steps++;
           }
         }

src/test/java/it/version_without_changelog/VersionWithoutChangeLogTest.java

@@ -0,0 +1,44 @@
+/**
+ *    Copyright 2010-2020 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package it.version_without_changelog;
+
+import static org.junit.Assert.*;
+
+import java.io.File;
+
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.migration.Migrator;
+import org.apache.ibatis.migration.utils.TestUtil;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.SystemOutRule;
+
+public class VersionWithoutChangeLogTest {
+  @Rule
+  public final SystemOutRule out = new SystemOutRule().enableLog();
+
+  @Test
+  public void shouldUpToVersionEvenWithoutChangelog() throws Exception {
+    // gh-160
+    File dir = Resources.getResourceAsFile("it/version_without_changelog");
+    Migrator.main(TestUtil.args("--path=" + dir.getAbsolutePath(), "version", "20000101000001"));
+    String output = out.getLog();
+    assertFalse(output.contains("FAILURE"));
+    assertTrue(output.contains("20000101000000"));
+    assertTrue(output.contains("20000101000001"));
+    assertFalse(output.contains("20000101000002"));
+  }
+}

src/test/java/it/version_without_changelog/environments/development.properties

@@ -0,0 +1,21 @@
+#
+#    Copyright 2010-2020 the original author or authors.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+driver=org.hsqldb.jdbcDriver
+url=jdbc:hsqldb:mem:version_without_changelog
+username=sa
+password=
+changelog=CHANGELOG

src/test/java/it/version_without_changelog/scripts/20000101000000_create_changelog.sql

@@ -0,0 +1,29 @@
+--
+--    Copyright 2010-2020 the original author or authors.
+--
+--    Licensed under the Apache License, Version 2.0 (the "License");
+--    you may not use this file except in compliance with the License.
+--    You may obtain a copy of the License at
+--
+--       http://www.apache.org/licenses/LICENSE-2.0
+--
+--    Unless required by applicable law or agreed to in writing, software
+--    distributed under the License is distributed on an "AS IS" BASIS,
+--    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--    See the License for the specific language governing permissions and
+--    limitations under the License.
+--
+
+CREATE TABLE ${changelog} (
+ID NUMERIC(20,0) NOT NULL,
+APPLIED_AT VARCHAR(25) NOT NULL,
+DESCRIPTION VARCHAR(255) NOT NULL
+);
+
+ALTER TABLE ${changelog}
+ADD CONSTRAINT PK_${changelog}
+PRIMARY KEY (id);
+
+-- //@UNDO
+
+DROP TABLE ${changelog};

src/test/java/it/version_without_changelog/scripts/20000101000001_first_migration.sql

@@ -0,0 +1,25 @@
+--
+--    Copyright 2010-2020 the original author or authors.
+--
+--    Licensed under the Apache License, Version 2.0 (the "License");
+--    you may not use this file except in compliance with the License.
+--    You may obtain a copy of the License at
+--
+--       http://www.apache.org/licenses/LICENSE-2.0
+--
+--    Unless required by applicable law or agreed to in writing, software
+--    distributed under the License is distributed on an "AS IS" BASIS,
+--    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--    See the License for the specific language governing permissions and
+--    limitations under the License.
+--
+
+create table test1 (
+id int primary key,
+name varchar(10)
+);
+
+-- //@UNDO
+
+drop table test1;
+

src/test/java/it/version_without_changelog/scripts/20000101000002_second_migration.sql

@@ -0,0 +1,25 @@
+--
+--    Copyright 2010-2020 the original author or authors.
+--
+--    Licensed under the Apache License, Version 2.0 (the "License");
+--    you may not use this file except in compliance with the License.
+--    You may obtain a copy of the License at
+--
+--       http://www.apache.org/licenses/LICENSE-2.0
+--
+--    Unless required by applicable law or agreed to in writing, software
+--    distributed under the License is distributed on an "AS IS" BASIS,
+--    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--    See the License for the specific language governing permissions and
+--    limitations under the License.
+--
+
+create table test2 (
+id int primary key,
+name varchar(10)
+);
+
+-- //@UNDO
+
+drop table test2;
+