[Sqlshell-svn] /devel/src/main/java/nl/improved/sqlclient/commands

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2010-01-24 14:59:02 +0100 (Sun, 24 Jan 2010)
New Revision: 458

Modified:
   src/main/java/nl/improved/sqlclient/commands/SettingsCommand.java
Log:
fix set command stacktrace when no arguments provided


Modified: src/main/java/nl/improved/sqlclient/commands/SettingsCommand.java
===================================================================
--- src/main/java/nl/improved/sqlclient/commands/SettingsCommand.java	2010-01-24 13:48:20 UTC (rev 457)
+++ src/main/java/nl/improved/sqlclient/commands/SettingsCommand.java	2010-01-24 13:59:02 UTC (rev 458)
@@ -20,6 +20,9 @@
     }
 
     public CommandResult execute(SQLCommand cmd) {
+        if (cmd.getUntrimmedCommandString().length() <=4) {
+            return new SimpleCommandResult(false, "Failure: See help set for usage");
+        }
         String cmdString = cmd.getUntrimmedCommandString().substring("set ".length()).trim();
         String setter = cmdString.substring(0, cmdString.indexOf('='));
         if (setter.equals("hSeparatorChar")) {
@@ -67,9 +70,9 @@
     public CharSequence getHelp() {
         return "Change settings of sqlshell properties" +
                "Settings are:\n"+
-               "hSeparatorChar\n"+
-               "vSeparatorChar (values Y/N)\n" +
-               "readAutoCommit\n" +
+               "hSeparatorChar              (current value: '"+ResultBuilder.getHorizontalSeparator()+"')\n"+
+               "vSeparatorChar (values Y/N) (current value: '"+ResultBuilder.getVerticalSeparator()+"')\n" +
+               "readAutoCommit              (current value: '"+(ReadCommand.getAutoCommit() ? "Y" :"N")+"')\n" +
                "@variable=value";
     }