--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Mon Dec 23 18:27:57 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Mon Dec 23 20:15:23 2013 +0100
@@ -33,10 +33,12 @@
 public class CLIOptions {
 
 	public static final String DEFAULT_NAME_PREFIX = ":";
+	public static final String DEFAULT_NAME_SUFFIX = ":";
 	private String sql;
 	private String databaseName;
 	private String databaseNameToTest;
 	private String namePrefix = DEFAULT_NAME_PREFIX;
+	private String nameSuffix = DEFAULT_NAME_SUFFIX;
 	private String formatterName;
 	private boolean batch;
 
@@ -90,6 +92,9 @@
 			if (!equalz(namePrefix, DEFAULT_NAME_PREFIX)) {
 				e.addProblem(new InvalidOptionsException.OptionProblem("Do not specify name prefix if just showing info."));
 			}
+			if (!equalz(nameSuffix, DEFAULT_NAME_SUFFIX)) {
+				e.addProblem(new InvalidOptionsException.OptionProblem("Do not specify name suffix if just showing info."));
+			}
 			if (showInfo.contains(INFO_TYPE.CONNECTION) && isEmpty(databaseNameToTest, false)) {
 				e.addProblem(new InvalidOptionsException.OptionProblem("Please specify which database should be tested."));
 			}
@@ -175,6 +180,14 @@
 		this.namePrefix = namePrefix;
 	}
 
+	public String getNameSuffix() {
+		return nameSuffix;
+	}
+
+	public void setNameSuffix(String nameSuffix) {
+		this.nameSuffix = nameSuffix;
+	}
+
 	public String getFormatterName() {
 		return formatterName;
 	}