You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2008/08/23 09:30:35 UTC
svn commit: r688273 - in
/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration:
CommandLine.java MigrationReader.java commands/UndoCommand.java
Author: cbegin
Date: Sat Aug 23 00:30:34 2008
New Revision: 688273
URL: http://svn.apache.org/viewvc?rev=688273&view=rev
Log:
minor output improvements
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java
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/UndoCommand.java
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java?rev=688273&r1=688272&r2=688273&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java Sat Aug 23 00:30:34 2008
@@ -141,8 +141,8 @@
out.println(" init Creates (if necessary) and initializes a migration path.");
out.println(" new <description> Creates a new migration with the provided description.");
out.println(" run Run all unapplied migrations.");
- out.println(" version <version> Migrates the database up or down to the specified version.");
out.println(" undo Undoes the last migration applied to the database.");
+ out.println(" version <version> Migrates the database up or down to the specified version.");
out.println(" status Prints the changelog from the database if the changelog table exists.");
out.println();
out.flush();
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=688273&r1=688272&r2=688273&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 Sat Aug 23 00:30:34 2008
@@ -18,7 +18,7 @@
String line;
while ((line = reader.readLine()) != null) {
if (line != null) {
- if (line.trim().startsWith("--//@UNDO")) {
+ if (line.trim().startsWith("--//") && line.contains("@UNDO")) {
currentBuilder = undoBuilder;
}
currentBuilder.append(line);
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UndoCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UndoCommand.java?rev=688273&r1=688272&r2=688273&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UndoCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UndoCommand.java Sat Aug 23 00:30:34 2008
@@ -40,7 +40,7 @@
}
}
} catch (Exception e) {
- throw new RuntimeException("<Description>. Cause: " + e, e);
+ throw new MigrationException("Error undoing last migration. Cause: " + e, e);
}
}