--- a/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Mon Dec 16 15:15:32 2013 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIParser.java	Mon Dec 16 15:29:02 2013 +0100
@@ -114,6 +114,13 @@
 				case Tokens.INFO_VERSION:
 					options.addShowInfo(CLIOptions.INFO_TYPE.VERSION);
 					break;
+				case Tokens.INFO_DATABASES:
+					options.addShowInfo(CLIOptions.INFO_TYPE.DATABASES);
+					break;
+				case Tokens.INFO_CONNECTION:
+					options.addShowInfo(CLIOptions.INFO_TYPE.CONNECTION);
+					options.setDatabaseNameToTest(fetchNext(args, ++i));
+					break;
 				default:
 					throw new CLIParserException("Unknown option: " + arg);
 			}
@@ -145,6 +152,8 @@
 		public static final String INFO_LICENSE = "--license";
 		public static final String INFO_FORMATTERS = "--list-formatters";
 		public static final String INFO_TYPES = "--list-types";
+		public static final String INFO_DATABASES = "--list-databases";
+		public static final String INFO_CONNECTION = "--test-connection";
 
 		private Tokens() {
 		}