--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIStarter.java Mon Dec 16 00:29:22 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIStarter.java Mon Dec 16 12:10:45 2013 +0100
@@ -1,13 +1,22 @@
package info.globalcode.sql.dk;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
/**
*
* @author Ing. František Kučera (frantovo.cz)
*/
public class CLIStarter {
+ private static final Logger log = Logger.getLogger(CLIStarter.class.getName());
+
public static void main(String[] args) {
- CLIParser parser = new CLIParser();
- CLIOptions options = parser.parseOptions(args);
+ try {
+ CLIParser parser = new CLIParser();
+ CLIOptions options = parser.parseOptions(args);
+ } catch (CLIParserException e) {
+ log.log(Level.SEVERE, null, e);
+ }
}
}
--- a/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java Mon Dec 16 00:29:22 2013 +0100
+++ b/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java Mon Dec 16 12:10:45 2013 +0100
@@ -111,7 +111,7 @@
Tokens.DB, DATABASE_NAME_1,
Tokens.SQL, SQL_1,
Tokens.NAME_PREFIX, "$",
- Tokens.TYPES, " " + NAME_1 + TYPE_NAME_SEPARATOR + "int" + "," + NAME_2 + TYPE_NAME_SEPARATOR + "string" + "," + NAME_3 + TYPE_NAME_SEPARATOR + "boolean",
+ Tokens.TYPES, " " + NAME_1 + TYPE_NAME_SEPARATOR + "int" + "," + NAME_3 + TYPE_NAME_SEPARATOR + "boolean",
Tokens.DATA, "$" + NAME_1, DATA_1, "$" + NAME_2, DATA_2, "$" + NAME_3, DATA_3};
CLIOptions options = parser.parseOptions(args);
options.validate();
@@ -121,7 +121,7 @@
assertEquals(options.getMode(), CLIOptions.MODE.QUERY_NOW);
assertEquals(options.getNamedParameters().size(), 3);
assertNamedParameter(options.getNamedParameters(), NAME_1, DATA_1, Types.INTEGER);
- assertNamedParameter(options.getNamedParameters(), NAME_2, DATA_2, Types.VARCHAR);
+ assertNamedParameter(options.getNamedParameters(), NAME_2, DATA_2, Parameter.DEFAULT_TYPE);
assertNamedParameter(options.getNamedParameters(), NAME_3, DATA_3, Types.BOOLEAN);
}