--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Mon Dec 16 15:15:32 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Mon Dec 16 15:29:02 2013 +0100
@@ -1,6 +1,7 @@
 package info.globalcode.sql.dk;
 
 import static info.globalcode.sql.dk.Functions.isNotEmpty;
+import static info.globalcode.sql.dk.Functions.isEmpty;
 import static info.globalcode.sql.dk.Functions.equalz;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -16,6 +17,7 @@
 	public static final String DEFAULT_NAME_PREFIX = ":";
 	private String sql;
 	private String databaseName;
+	private String databaseNameToTest;
 	private String namePrefix = DEFAULT_NAME_PREFIX;
 	private String formatterName;
 	private boolean batch;
@@ -34,7 +36,9 @@
 		VERSION,
 		LICENSE,
 		FORMATTERS,
-		TYPES
+		TYPES,
+		DATABASES,
+		CONNECTION
 	}
 
 	public enum COMMAND_TYPE {
@@ -77,6 +81,9 @@
 			if (!equalz(namePrefix, DEFAULT_NAME_PREFIX)) {
 				e.addProblem(new InvalidOptionsException.OptionProblem("Do not specify name prefix 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."));
+			}
 		}
 
 		if (!namedParameters.isEmpty() && !numberedParameters.isEmpty()) {
@@ -182,4 +189,12 @@
 	public EnumSet<INFO_TYPE> getShowInfo() {
 		return showInfo;
 	}
+
+	public String getDatabaseNameToTest() {
+		return databaseNameToTest;
+	}
+
+	public void setDatabaseNameToTest(String databaseNameToTest) {
+		this.databaseNameToTest = databaseNameToTest;
+	}
 }