1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java Thu Dec 26 22:32:06 2013 +0100
1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java Thu Dec 26 22:39:38 2013 +0100
1.3 @@ -18,14 +18,15 @@
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 info.globalcode.sql.dk.InfoLister.InfoType;
1.10 import java.io.OutputStream;
1.11 import java.util.ArrayList;
1.12 import java.util.Collection;
1.13 import java.util.EnumSet;
1.14 +import java.util.HashSet;
1.15 import java.util.List;
1.16 +import java.util.Set;
1.17 import java.util.regex.Pattern;
1.18 import java.util.regex.PatternSyntaxException;
1.19
1.20 @@ -39,7 +40,7 @@
1.21 public static final String DEFAULT_NAME_SUFFIX = "(?=([^\\w]|$))";
1.22 private String sql;
1.23 private String databaseName;
1.24 - private String databaseNameToTest;
1.25 + private Set<String> databaseNameToTest = new HashSet<>();
1.26 private String namePrefix = DEFAULT_NAME_PREFIX;
1.27 private String nameSuffix = DEFAULT_NAME_SUFFIX;
1.28 private String formatterName;
1.29 @@ -84,7 +85,7 @@
1.30 if (!equalz(nameSuffix, DEFAULT_NAME_SUFFIX)) {
1.31 e.addProblem(new InvalidOptionsException.OptionProblem("Do not specify name suffix if just showing info."));
1.32 }
1.33 - if (showInfo.contains(InfoType.CONNECTION) && isEmpty(databaseNameToTest, false)) {
1.34 + if (showInfo.contains(InfoType.CONNECTION) && databaseNameToTest.isEmpty()) {
1.35 e.addProblem(new InvalidOptionsException.OptionProblem("Please specify which database should be tested."));
1.36 }
1.37 }
1.38 @@ -210,12 +211,12 @@
1.39 return showInfo;
1.40 }
1.41
1.42 - public String getDatabaseNameToTest() {
1.43 + public Set<String> getDatabaseNameToTest() {
1.44 return databaseNameToTest;
1.45 }
1.46
1.47 - public void setDatabaseNameToTest(String databaseNameToTest) {
1.48 - this.databaseNameToTest = databaseNameToTest;
1.49 + public void addDatabaseNameToTest(String databaseNameToTest) {
1.50 + this.databaseNameToTest.add(databaseNameToTest);
1.51 }
1.52
1.53 public SQLCommand getSQLCommand() {