Author: cbegin Date: Sun Jan 24 00:38:34 2010 New Revision: 902516 URL: http://svn.apache.org/viewvc?rev=902516&view=rev Log: Added command shortcuts.
Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java?rev=902516&r1=902515&r2=902516&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java Sun Jan 24 00:38:34 2010 @@ -90,7 +90,21 @@ } else if (SCRIPT.equals(command)) { new ScriptCommand(repository, environment, force).execute(params); } else { - throw new MigrationException("Attempt to execute unkown command."); + String match = null; + for (String knownCommand : KNOWN_COMMANDS) { + if (knownCommand.startsWith(command)) { + if (match != null) { + throw new MigrationException("Ambiguous command shortcut: " + command); + } + match = knownCommand; + } + } + if (match != null) { + command = match; + runCommand(); + } else { + throw new MigrationException("Attempt to execute unkown command: " + command); + } } } @@ -130,11 +144,7 @@ repository = new File(repository.getAbsolutePath()); if (command == null) { parseError = "No command specified."; - } else { - if (!KNOWN_COMMANDS.contains(command)) { - parseError = "Unknown command: " + command; - } - } + } } } Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java?rev=902516&r1=902515&r2=902516&view=diff ============================================================================== --- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java (original) +++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/migration/MigratorTest.java Sun Jan 24 00:38:34 2010 @@ -59,7 +59,7 @@ assertTrue(buffer.toString().contains("-- Bootstrap.sql")); buffer.clear(); - Migrator.main(args("--path=" + f.getAbsolutePath(), "status")); + Migrator.main(args("--path=" + f.getAbsolutePath(), "sta")); assertTrue(buffer.toString().contains("...pending...")); buffer.clear();