1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Mon Dec 23 18:27:57 2013 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Mon Dec 23 20:15:23 2013 +0100
     1.3 @@ -70,6 +70,9 @@
     1.4  				case Tokens.NAME_PREFIX:
     1.5  					options.setNamePrefix(fetchNext(args, ++i));
     1.6  					break;
     1.7 +				case Tokens.NAME_SUFFIX:
     1.8 +					options.setNameSuffix(fetchNext(args, ++i));
     1.9 +					break;
    1.10  				case Tokens.DB:
    1.11  					options.setDatabaseName(fetchNext(args, ++i));
    1.12  					break;
    1.13 @@ -83,7 +86,7 @@
    1.14  					for (i++; i < args.length; i++) {
    1.15  						arg = args[i];
    1.16  
    1.17 -						if (arg.startsWith(options.getNamePrefix())) { // Named parameters:
    1.18 +						if (arg.startsWith(options.getNamePrefix()) && arg.endsWith(options.getNameSuffix())) { // Named parameters:
    1.19  							String paramName = arg.substring(options.getNamePrefix().length());
    1.20  							String paramValue = fetchNext(args, ++i);
    1.21  							options.addNamedParameter(new NamedParameter(paramName, paramValue, namedTypes.get(paramName)));
    1.22 @@ -154,6 +157,7 @@
    1.23  		public static final String BATCH = "--batch";
    1.24  		public static final String DATA = "--data";
    1.25  		public static final String NAME_PREFIX = "--name-prefix";
    1.26 +		public static final String NAME_SUFFIX = "--name-suffix";
    1.27  		public static final String TYPES = "--types";
    1.28  		public static final String FORMATTER = "--formatter";
    1.29  		public static final String INFO_HELP = "--help";