1.1 --- a/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Thu Dec 26 01:53:15 2013 +0100
     1.2 +++ b/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Thu Dec 26 11:58:14 2013 +0100
     1.3 @@ -19,7 +19,6 @@
     1.4  
     1.5  import info.globalcode.sql.dk.CLIParser.Tokens;
     1.6  import static info.globalcode.sql.dk.CLIParser.TYPE_NAME_SEPARATOR;
     1.7 -import java.sql.Types;
     1.8  import java.util.Collection;
     1.9  import static org.testng.Assert.*;
    1.10  import org.testng.annotations.BeforeMethod;
    1.11 @@ -87,7 +86,7 @@
    1.12  		String[] args = new String[]{
    1.13  			Tokens.DB, DATABASE_NAME_1,
    1.14  			Tokens.SQL, SQL_1,
    1.15 -			Tokens.TYPES, " int,string, boolean",
    1.16 +			Tokens.TYPES, " INTEGER,VARCHAR, BOOLEAN",
    1.17  			Tokens.DATA, DATA_1, DATA_2, DATA_3};
    1.18  		CLIOptions options = parser.parseOptions(args);
    1.19  		options.validate();
    1.20 @@ -99,9 +98,9 @@
    1.21  		assertEquals(options.getNumberedParameters().get(0).getValue(), DATA_1);
    1.22  		assertEquals(options.getNumberedParameters().get(1).getValue(), DATA_2);
    1.23  		assertEquals(options.getNumberedParameters().get(2).getValue(), DATA_3);
    1.24 -		assertEquals(options.getNumberedParameters().get(0).getType(), Types.INTEGER);
    1.25 -		assertEquals(options.getNumberedParameters().get(1).getType(), Types.VARCHAR);
    1.26 -		assertEquals(options.getNumberedParameters().get(2).getType(), Types.BOOLEAN);
    1.27 +		assertEquals(options.getNumberedParameters().get(0).getType(), SQLType.INTEGER);
    1.28 +		assertEquals(options.getNumberedParameters().get(1).getType(), SQLType.VARCHAR);
    1.29 +		assertEquals(options.getNumberedParameters().get(2).getType(), SQLType.BOOLEAN);
    1.30  	}
    1.31  
    1.32  	@Test
    1.33 @@ -128,7 +127,7 @@
    1.34  			Tokens.DB, DATABASE_NAME_1,
    1.35  			Tokens.SQL, SQL_1,
    1.36  			Tokens.NAME_PREFIX, "$",
    1.37 -			Tokens.TYPES, " " + NAME_1 + TYPE_NAME_SEPARATOR + "int" + "," + NAME_3 + TYPE_NAME_SEPARATOR + "boolean",
    1.38 +			Tokens.TYPES, " " + NAME_1 + TYPE_NAME_SEPARATOR + "INTEGER" + "," + NAME_3 + TYPE_NAME_SEPARATOR + "BOOLEAN",
    1.39  			Tokens.DATA_NAMED, NAME_1, DATA_1, NAME_2, DATA_2, NAME_3, DATA_3};
    1.40  		CLIOptions options = parser.parseOptions(args);
    1.41  		options.validate();
    1.42 @@ -137,12 +136,12 @@
    1.43  		assertEquals(options.getSql(), SQL_1);
    1.44  		assertEquals(options.getMode(), CLIOptions.MODE.QUERY_NOW);
    1.45  		assertEquals(options.getNamedParameters().size(), 3);
    1.46 -		assertNamedParameter(options.getNamedParameters(), NAME_1, DATA_1, Types.INTEGER);
    1.47 +		assertNamedParameter(options.getNamedParameters(), NAME_1, DATA_1, SQLType.INTEGER);
    1.48  		assertNamedParameter(options.getNamedParameters(), NAME_2, DATA_2, Parameter.DEFAULT_TYPE);
    1.49 -		assertNamedParameter(options.getNamedParameters(), NAME_3, DATA_3, Types.BOOLEAN);
    1.50 +		assertNamedParameter(options.getNamedParameters(), NAME_3, DATA_3, SQLType.BOOLEAN);
    1.51  	}
    1.52  
    1.53 -	private void assertNamedParameter(Collection<NamedParameter> params, String name, Object value, int type) {
    1.54 +	private void assertNamedParameter(Collection<NamedParameter> params, String name, Object value, SQLType type) {
    1.55  		for (NamedParameter p : params) {
    1.56  			if (name.equals(p.getName())) {
    1.57  				assertEquals(p.getValue(), value, "value does not match – name: " + name);