1.1 --- a/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Tue Dec 24 11:54:58 2013 +0100
     1.2 +++ b/java/sql-dk/test/info/globalcode/sql/dk/CLIParserTest.java	Tue Dec 24 12:05:05 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 static info.globalcode.sql.dk.CLIOptions.DEFAULT_NAME_PREFIX;
     1.8  import java.sql.Types;
     1.9  import java.util.Collection;
    1.10  import static org.testng.Assert.*;
    1.11 @@ -110,7 +109,7 @@
    1.12  		String[] args = new String[]{
    1.13  			Tokens.DB, DATABASE_NAME_1,
    1.14  			Tokens.SQL, SQL_1,
    1.15 -			Tokens.DATA, DEFAULT_NAME_PREFIX + NAME_1, DATA_1, DEFAULT_NAME_PREFIX + NAME_2, DATA_2, DEFAULT_NAME_PREFIX + NAME_3, DATA_3};
    1.16 +			Tokens.DATA_NAMED, NAME_1, DATA_1, NAME_2, DATA_2, NAME_3, DATA_3};
    1.17  		CLIOptions options = parser.parseOptions(args);
    1.18  		options.validate();
    1.19  
    1.20 @@ -130,7 +129,7 @@
    1.21  			Tokens.SQL, SQL_1,
    1.22  			Tokens.NAME_PREFIX, "$",
    1.23  			Tokens.TYPES, " " + NAME_1 + TYPE_NAME_SEPARATOR + "int" + "," + NAME_3 + TYPE_NAME_SEPARATOR + "boolean",
    1.24 -			Tokens.DATA, "$" + NAME_1, DATA_1, "$" + NAME_2, DATA_2, "$" + NAME_3, DATA_3};
    1.25 +			Tokens.DATA_NAMED, NAME_1, DATA_1, NAME_2, DATA_2, NAME_3, DATA_3};
    1.26  		CLIOptions options = parser.parseOptions(args);
    1.27  		options.validate();
    1.28