svn commit: r803770 - in /ibatis/trunk/java/ibatis-3: ./ ibatis-3-core/src/main/java/org/apache/ibatis/migration/ ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ ibatis-3-core/src/test/java/org/apache/ibatis/migration/

[cbegin]

Author: cbegin
Date: Thu Aug 13 03:46:45 2009
New Revision: 803770

URL: http://svn.apache.org/viewvc?rev=803770&view=rev
Log:
removed --// from executed lines, to avoid failing on MySQL

Modified:
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java
    
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java
    ibatis/trunk/java/ibatis-3/version.properties

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java?rev=803770&r1=803769&r2=803770&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
 Thu Aug 13 03:46:45 2009
@@ -18,8 +18,11 @@
       String line;
       while ((line = reader.readLine()) != null) {
         if (line != null) {
-          if (line.trim().startsWith("--//") && line.contains("@UNDO")) {
-            currentBuilder = undoBuilder;
+          if (line.trim().startsWith("--//")) {
+            if (line.contains("@UNDO")) {
+              currentBuilder = undoBuilder;
+            }
+            line = line.replace("--//","-- ");
           }
           currentBuilder.append(line);
           currentBuilder.append("\n");

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java?rev=803770&r1=803769&r2=803770&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/ScriptCommand.java
 Thu Aug 13 03:46:45 2009
@@ -32,7 +32,7 @@
       }
       for (Change change : migrations) {
         if (shouldRun(change, v1, v2)) {
-          out.println("--// " + change.getFilename());
+          out.println("-- " + change.getFilename());
           File file = scriptFile(change.getFilename());
           FileReader fileReader = new FileReader(file);
           MigrationReader migrationReader = new MigrationReader(fileReader, 
undo, variables);

Modified: 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java?rev=803770&r1=803769&r2=803770&view=diff
==============================================================================
--- 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java
 (original)
+++ 
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java
 Thu Aug 13 03:46:45 2009
@@ -50,7 +50,7 @@
     File f = getExampleDir();
 
     Migrator.main(args("--path=" + f.getAbsolutePath(), "bootstrap", 
"--env=development"));
-    assertTrue(buffer.toString().contains("--// Bootstrap.sql"));
+    assertTrue(buffer.toString().contains("--  Bootstrap.sql"));
     buffer.clear();
 
     Migrator.main(args("--path=" + f.getAbsolutePath(), "status"));
@@ -103,7 +103,7 @@
     assertTrue(buffer.toString().contains("20080827200213"));
     assertTrue(buffer.toString().contains("20080827200214"));
     assertFalse(buffer.toString().contains("20080827200215"));
-    assertFalse(buffer.toString().contains("--//@UNDO"));
+    assertFalse(buffer.toString().contains("-- @UNDO"));
     buffer.clear();
 
     Migrator.main(args("--path=" + f.getAbsolutePath(), 
"script","20080827200215", "20080827200213"));
@@ -113,7 +113,7 @@
     assertTrue(buffer.toString().contains("20080827200213"));
     assertTrue(buffer.toString().contains("20080827200214"));
     assertTrue(buffer.toString().contains("20080827200215"));
-    assertTrue(buffer.toString().contains("--//@UNDO"));
+    assertTrue(buffer.toString().contains("-- @UNDO"));
     buffer.clear();
   }
 

Modified: ibatis/trunk/java/ibatis-3/version.properties
URL: 
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/version.properties?rev=803770&r1=803769&r2=803770&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/version.properties (original)
+++ ibatis/trunk/java/ibatis-3/version.properties Thu Aug 13 03:46:45 2009
@@ -1,5 +1,5 @@
 #Build version info
-#Mon Aug 03 19:49:28 MDT 2009
+#Wed Aug 12 21:42:50 MDT 2009
 version=3.0.0
-buildDate=2009/08/03 19\:49
-buildNum=191
+buildDate=2009/08/12 21\:42
+buildNum=193