1.1 --- a/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java Fri Jan 10 20:13:16 2014 +0100
1.2 +++ b/java/sql-dk/src/info/globalcode/sql/dk/CLIOptions.java Fri Jan 10 23:21:28 2014 +0100
1.3 @@ -34,6 +34,8 @@
1.4 import java.util.regex.PatternSyntaxException;
1.5
1.6 /**
1.7 + * Holds options from command line, validates them, combines with configuration and provides derived
1.8 + * objects.
1.9 *
1.10 * @author Ing. František Kučera (frantovo.cz)
1.11 */
1.12 @@ -43,7 +45,7 @@
1.13 public static final String DEFAULT_NAME_SUFFIX = "(?=([^\\w]|$))";
1.14 private String sql;
1.15 private String databaseName;
1.16 - private Set<String> databaseNameToTest = new HashSet<>();
1.17 + private Set<String> databaseNamesToTest = new HashSet<>();
1.18 private String namePrefix = DEFAULT_NAME_PREFIX;
1.19 private String nameSuffix = DEFAULT_NAME_SUFFIX;
1.20 private String formatterName;
1.21 @@ -90,7 +92,7 @@
1.22 if (!equalz(nameSuffix, DEFAULT_NAME_SUFFIX)) {
1.23 e.addProblem(new InvalidOptionsException.OptionProblem("Do not specify name suffix if just showing info."));
1.24 }
1.25 - if (showInfo.contains(InfoType.CONNECTION) && databaseNameToTest.isEmpty()) {
1.26 + if (showInfo.contains(InfoType.CONNECTION) && databaseNamesToTest.isEmpty()) {
1.27 e.addProblem(new InvalidOptionsException.OptionProblem("Please specify which database should be tested."));
1.28 }
1.29 }
1.30 @@ -232,12 +234,12 @@
1.31 return showInfo;
1.32 }
1.33
1.34 - public Set<String> getDatabaseNameToTest() {
1.35 - return databaseNameToTest;
1.36 + public Set<String> getDatabaseNamesToTest() {
1.37 + return databaseNamesToTest;
1.38 }
1.39
1.40 - public void addDatabaseNameToTest(String databaseNameToTest) {
1.41 - this.databaseNameToTest.add(databaseNameToTest);
1.42 + public void addDatabaseNamesToTest(String databaseNameToTest) {
1.43 + this.databaseNamesToTest.add(databaseNameToTest);
1.44 }
1.45
1.46 public SQLCommand getSQLCommand() {