--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Wed Jan 15 18:15:55 2014 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Wed Jan 15 21:06:12 2014 +0100
@@ -46,6 +46,7 @@
 	private String sql;
 	private String databaseName;
 	private Set<String> databaseNamesToTest = new HashSet<>();
+	private Set<String> databaseNamesToListProperties = new HashSet<>();
 	private String namePrefix = DEFAULT_NAME_PREFIX;
 	private String nameSuffix = DEFAULT_NAME_SUFFIX;
 	private String formatterName;
@@ -95,6 +96,9 @@
 			if (showInfo.contains(InfoType.CONNECTION) && databaseNamesToTest.isEmpty()) {
 				e.addProblem(new InvalidOptionsException.OptionProblem("Please specify which database should be tested."));
 			}
+			if (showInfo.contains(InfoType.JDBC_PROPERTIES) && databaseNamesToListProperties.isEmpty()) {
+				e.addProblem(new InvalidOptionsException.OptionProblem("Please specify for which database the properties should be listed."));
+			}
 		}
 
 		if (!namedParameters.isEmpty() && !numberedParameters.isEmpty()) {
@@ -238,10 +242,18 @@
 		return databaseNamesToTest;
 	}
 
-	public void addDatabaseNamesToTest(String databaseNameToTest) {
-		this.databaseNamesToTest.add(databaseNameToTest);
+	public void addDatabaseNameToTest(String name) {
+		databaseNamesToTest.add(name);
 	}
 
+	public Set<String> getDatabaseNamesToListProperties() {
+		return databaseNamesToListProperties;
+	}
+
+	public void addDatabaseNameToListProperties(String name) {
+		databaseNamesToListProperties.add(name);
+	}
+	
 	public SQLCommand getSQLCommand() {
 		if (namedParameters.isEmpty()) {
 			return new SQLCommandNumbered(sql, numberedParameters);