1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Mon Dec 16 15:15:32 2013 +0100
     1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java	Mon Dec 16 15:29:02 2013 +0100
     1.3 @@ -1,6 +1,7 @@
     1.4  package info.globalcode.sql.dk;
     1.5  
     1.6  import static info.globalcode.sql.dk.Functions.isNotEmpty;
     1.7 +import static info.globalcode.sql.dk.Functions.isEmpty;
     1.8  import static info.globalcode.sql.dk.Functions.equalz;
     1.9  import java.util.ArrayList;
    1.10  import java.util.Collection;
    1.11 @@ -16,6 +17,7 @@
    1.12  	public static final String DEFAULT_NAME_PREFIX = ":";
    1.13  	private String sql;
    1.14  	private String databaseName;
    1.15 +	private String databaseNameToTest;
    1.16  	private String namePrefix = DEFAULT_NAME_PREFIX;
    1.17  	private String formatterName;
    1.18  	private boolean batch;
    1.19 @@ -34,7 +36,9 @@
    1.20  		VERSION,
    1.21  		LICENSE,
    1.22  		FORMATTERS,
    1.23 -		TYPES
    1.24 +		TYPES,
    1.25 +		DATABASES,
    1.26 +		CONNECTION
    1.27  	}
    1.28  
    1.29  	public enum COMMAND_TYPE {
    1.30 @@ -77,6 +81,9 @@
    1.31  			if (!equalz(namePrefix, DEFAULT_NAME_PREFIX)) {
    1.32  				e.addProblem(new InvalidOptionsException.OptionProblem("Do not specify name prefix if just showing info."));
    1.33  			}
    1.34 +			if (showInfo.contains(INFO_TYPE.CONNECTION) && isEmpty(databaseNameToTest, false)) {
    1.35 +				e.addProblem(new InvalidOptionsException.OptionProblem("Please specify which database should be tested."));
    1.36 +			}
    1.37  		}
    1.38  
    1.39  		if (!namedParameters.isEmpty() && !numberedParameters.isEmpty()) {
    1.40 @@ -182,4 +189,12 @@
    1.41  	public EnumSet<INFO_TYPE> getShowInfo() {
    1.42  		return showInfo;
    1.43  	}
    1.44 +
    1.45 +	public String getDatabaseNameToTest() {
    1.46 +		return databaseNameToTest;
    1.47 +	}
    1.48 +
    1.49 +	public void setDatabaseNameToTest(String databaseNameToTest) {
    1.50 +		this.databaseNameToTest = databaseNameToTest;
    1.51 +	}
    1.52  }