fixes #3 The lower version of the script command should be exclusive.

Author: harawata

src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java

@@ -31,7 +31,11 @@ public void execute(String... sparams) {
       }
       BigDecimal v1 = new BigDecimal(parser.nextToken());
       BigDecimal v2 = new BigDecimal(parser.nextToken());
-      boolean undo = v1.compareTo(v2) > 0;
+      int comparison = v1.compareTo(v2);
+      if (comparison == 0) {
+        throw new MigrationException("The script command requires two different versions. Use 0 to include the first version.");
+      }
+      boolean undo = comparison > 0;
       Properties variables = environmentProperties();
       List<Change> migrations = getMigrations();
       Collections.sort(migrations);
@@ -77,9 +81,9 @@ private String generateVersionDelete(Change change) {
   private boolean shouldRun(Change change, BigDecimal v1, BigDecimal v2) {
     BigDecimal id = change.getId();
     if (v1.compareTo(v2) > 0) {
-      return (id.compareTo(v2) >= 0 && id.compareTo(v1) <= 0);
+      return (id.compareTo(v2) > 0 && id.compareTo(v1) <= 0);
     } else {
-      return (id.compareTo(v1) >= 0 && id.compareTo(v2) <= 0);
+      return (id.compareTo(v1) > 0 && id.compareTo(v2) <= 0);
     }
   }
 

src/site/xdoc/script.xml

@@ -40,7 +40,8 @@
       central development databases!).</p>
 
       <p>The script command is quite simple. It takes two version numbers as parameters. Think of it as generating a
-      script to apply all of the identified versions (inclusive) in the order specified.
+      script to apply all of the identified versions in the order specified (the lower version is exclusive and the
+      higher version is inclusive).
       For example, given the following:</p>
 
       <source>/home/cbegin/testdb$ migrate status
@@ -51,15 +52,22 @@ ID             Applied At          Description
 20090804225328 2009-08-05 24:55:23 create blog table
 20090804225333 2009-08-04 22:51:17 create post table</source>
 
-      <p>If we need to generate a “do” script to apply the two highlighted versions above, we’d run the following command:</p>
+      <p>If we need to generate a “do” script to apply the last two versions above, we’d run the following command:</p>
 
-      <source>/home/cbegin/testdb$ migrate script 20090804225328 20090804225333 > do.sql</source>
+      <source>/home/cbegin/testdb$ migrate script 20090804225207 20090804225333 > do.sql</source>
 
       <p>The script command outputs to stdout, so you can let it print to the console, or pipe it to a file or command.</p>
 
       <p>To generate the corresponding “undo” script, simply specify the version numbers in the opposite order:</p>
 
-      <source>/home/cbegin/testdb$ migrate script 20090804225333 20090804225328 > undo.sql</source>
+      <source>/home/cbegin/testdb$ migrate script 20090804225333 20090804225207 > undo.sql</source>
+
+      <p>To generate a script which includes the first version, specify '0' as the lower version:</p>
+
+      <source>/home/cbegin/testdb$ migrate script 0 20090804225207 > do.sql</source>
+
+      <source>/home/cbegin/testdb$ migrate script 20090804225207 0 > undo.sql</source>
+
     </section>
   </body>
 

src/test/java/org/apache/ibatis/migration/MigratorTest.java

@@ -101,6 +101,7 @@ public void shouldRunThroughFullMigrationUseCaseInOneTestToEnsureOrder() throws
       testHelpCommand(f);
       testDoScriptCommand(f);
       testUndoScriptCommand(f);
+      testScriptCommandWithTheSameVersion(f);
 
     } catch (Throwable t) {
       System.err.println(buffer);
@@ -188,12 +189,23 @@ private void testDoScriptCommand(File f) throws Exception {
     assertFalse(buffer.toString().contains("FAILURE"));
     assertFalse(buffer.toString().contains("20080827200210"));
     assertFalse(buffer.toString().contains("20080827200211"));
-    assertTrue(buffer.toString().contains("20080827200212"));
+    assertFalse(buffer.toString().contains("20080827200212"));
     assertTrue(buffer.toString().contains("20080827200213"));
     assertTrue(buffer.toString().contains("20080827200214"));
     assertFalse(buffer.toString().contains("20080827200215"));
     assertFalse(buffer.toString().contains("-- @UNDO"));
     buffer.clear();
+
+    safeMigratorMain(args("--path=" + f.getAbsolutePath(), "script", "0", "20080827200211"));
+    assertFalse(buffer.toString().contains("FAILURE"));
+    assertTrue(buffer.toString().contains("20080827200210"));
+    assertTrue(buffer.toString().contains("20080827200211"));
+    assertFalse(buffer.toString().contains("20080827200212"));
+    assertFalse(buffer.toString().contains("20080827200213"));
+    assertFalse(buffer.toString().contains("20080827200214"));
+    assertFalse(buffer.toString().contains("20080827200215"));
+    assertFalse(buffer.toString().contains("-- @UNDO"));
+    buffer.clear();
   }
 
   private void testUndoScriptCommand(File f) throws Exception {
@@ -202,11 +214,28 @@ private void testUndoScriptCommand(File f) throws Exception {
     assertFalse(buffer.toString().contains("20080827200210"));
     assertFalse(buffer.toString().contains("20080827200211"));
     assertFalse(buffer.toString().contains("20080827200212"));
-    assertTrue(buffer.toString().contains("20080827200213"));
+    assertFalse(buffer.toString().contains("20080827200213"));
     assertTrue(buffer.toString().contains("20080827200214"));
     assertTrue(buffer.toString().contains("20080827200215"));
     assertTrue(buffer.toString().contains("-- @UNDO"));
     buffer.clear();
+
+    safeMigratorMain(args("--path=" + f.getAbsolutePath(), "script", "20080827200211", "0"));
+    assertFalse(buffer.toString().contains("FAILURE"));
+    assertTrue(buffer.toString().contains("20080827200210"));
+    assertTrue(buffer.toString().contains("20080827200211"));
+    assertFalse(buffer.toString().contains("20080827200212"));
+    assertFalse(buffer.toString().contains("20080827200213"));
+    assertFalse(buffer.toString().contains("20080827200214"));
+    assertFalse(buffer.toString().contains("20080827200215"));
+    assertTrue(buffer.toString().contains("-- @UNDO"));
+    buffer.clear();
+  }
+
+  private void testScriptCommandWithTheSameVersion(File f) throws Exception {
+    safeMigratorMain(args("--path=" + f.getAbsolutePath(), "script", "20080827200211", "20080827200211"));
+    assertTrue(buffer.toString().contains("FAILURE"));
+    buffer.clear();
   }
 
   private void safeMigratorMain(String[] args) throws Exception {