--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Wed Jan 15 18:15:55 2014 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Wed Jan 15 21:06:12 2014 +0100
@@ -128,12 +128,16 @@
 				case Tokens.INFO_JDBC_DRIVERS:
 					options.addShowInfo(InfoType.JDBC_DRIVERS);
 					break;
+				case Tokens.INFO_JDBC_PROPERTIES:
+					options.addShowInfo(InfoType.JDBC_PROPERTIES);
+					options.addDatabaseNameToListProperties(fetchNext(args, ++i));
+					break;
 				case Tokens.INFO_DATABASES:
 					options.addShowInfo(InfoType.DATABASES);
 					break;
 				case Tokens.INFO_CONNECTION:
 					options.addShowInfo(InfoType.CONNECTION);
-					options.addDatabaseNamesToTest(fetchNext(args, ++i));
+					options.addDatabaseNameToTest(fetchNext(args, ++i));
 					break;
 				default:
 					throw new CLIParserException("Unknown option: " + arg);
@@ -170,6 +174,7 @@
 		public static final String INFO_FORMATTERS = "--list-formatters"; // bash-completion:option // help: print list of available formatters
 		public static final String INFO_TYPES = "--list-types"; // bash-completion:option // help: print list of available data types
 		public static final String INFO_JDBC_DRIVERS = "--list-jdbc-drivers"; // bash-completion:option // help: list of available JDBC drivers
+		public static final String INFO_JDBC_PROPERTIES = "--list-jdbc-properties"; // bash-completion:option // help: list of available JDBC properties for given database
 		public static final String INFO_DATABASES = "--list-databases"; // bash-completion:option // help: print list of configured databases
 		public static final String INFO_CONNECTION = "--test-connection"; // bash-completion:option // help: test connection to particular database