--- a/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Thu Dec 26 01:53:15 2013 +0100
+++ b/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Thu Dec 26 11:58:14 2013 +0100
@@ -19,7 +19,6 @@
 
 import info.globalcode.sql.dk.CLIParser.Tokens;
 import static info.globalcode.sql.dk.CLIParser.TYPE_NAME_SEPARATOR;
-import java.sql.Types;
 import java.util.Collection;
 import static org.testng.Assert.*;
 import org.testng.annotations.BeforeMethod;
@@ -87,7 +86,7 @@
 		String[] args = new String[]{
 			Tokens.DB, DATABASE_NAME_1,
 			Tokens.SQL, SQL_1,
-			Tokens.TYPES, " int,string, boolean",
+			Tokens.TYPES, " INTEGER,VARCHAR, BOOLEAN",
 			Tokens.DATA, DATA_1, DATA_2, DATA_3};
 		CLIOptions options = parser.parseOptions(args);
 		options.validate();
@@ -99,9 +98,9 @@
 		assertEquals(options.getNumberedParameters().get(0).getValue(), DATA_1);
 		assertEquals(options.getNumberedParameters().get(1).getValue(), DATA_2);
 		assertEquals(options.getNumberedParameters().get(2).getValue(), DATA_3);
-		assertEquals(options.getNumberedParameters().get(0).getType(), Types.INTEGER);
-		assertEquals(options.getNumberedParameters().get(1).getType(), Types.VARCHAR);
-		assertEquals(options.getNumberedParameters().get(2).getType(), Types.BOOLEAN);
+		assertEquals(options.getNumberedParameters().get(0).getType(), SQLType.INTEGER);
+		assertEquals(options.getNumberedParameters().get(1).getType(), SQLType.VARCHAR);
+		assertEquals(options.getNumberedParameters().get(2).getType(), SQLType.BOOLEAN);
 	}
 
 	@Test
@@ -128,7 +127,7 @@
 			Tokens.DB, DATABASE_NAME_1,
 			Tokens.SQL, SQL_1,
 			Tokens.NAME_PREFIX, "$",
-			Tokens.TYPES, " " + NAME_1 + TYPE_NAME_SEPARATOR + "int" + "," + NAME_3 + TYPE_NAME_SEPARATOR + "boolean",
+			Tokens.TYPES, " " + NAME_1 + TYPE_NAME_SEPARATOR + "INTEGER" + "," + NAME_3 + TYPE_NAME_SEPARATOR + "BOOLEAN",
 			Tokens.DATA_NAMED, NAME_1, DATA_1, NAME_2, DATA_2, NAME_3, DATA_3};
 		CLIOptions options = parser.parseOptions(args);
 		options.validate();
@@ -137,12 +136,12 @@
 		assertEquals(options.getSql(), SQL_1);
 		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_1, DATA_1, SQLType.INTEGER);
 		assertNamedParameter(options.getNamedParameters(), NAME_2, DATA_2, Parameter.DEFAULT_TYPE);
-		assertNamedParameter(options.getNamedParameters(), NAME_3, DATA_3, Types.BOOLEAN);
+		assertNamedParameter(options.getNamedParameters(), NAME_3, DATA_3, SQLType.BOOLEAN);
 	}
 
-	private void assertNamedParameter(Collection<NamedParameter> params, String name, Object value, int type) {
+	private void assertNamedParameter(Collection<NamedParameter> params, String name, Object value, SQLType type) {
 		for (NamedParameter p : params) {
 			if (name.equals(p.getName())) {
 				assertEquals(p.getValue(), value, "value does not match – name: " + name);