feat(tgsql): CliArgument.getScript(): Added check invalid parameter

FOLLOW UP: a86e4dd
project-tsurugi · Mar 6, 2024 · ecb68c2 · ecb68c2
1 parent a86e4dd
commit ecb68c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/argument/CliArgument.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/argument/CliArgument.java
@@ -572,6 +572,9 @@ public boolean getNoCommit() {
         if (this.otherList == null || otherList.isEmpty()) {
             throw new ParameterException("specify /path/to/script.sql");
         }
+        if (otherList.size() > 1) {
+            throw new ParameterException(MessageFormat.format("contains invalid parameter {0}", otherList));
+        }
         return otherList.get(0);
     }
 

diff --git a/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ScriptConfigBuilder.java b/modules/tgsql/cli/src/main/java/com/tsurugidb/console/cli/config/ScriptConfigBuilder.java
@@ -1,13 +1,16 @@
 package com.tsurugidb.console.cli.config;
 
 import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.EnumSet;
 
 import javax.annotation.Nonnull;
 
+import com.beust.jcommander.ParameterException;
 import com.tsurugidb.console.cli.argument.CliArgument;
 import com.tsurugidb.console.core.config.ScriptCommitMode;
 
@@ -62,6 +65,10 @@ private void fillScript() {
             if (!Files.exists(script)) {
                 throw new FileNotFoundException(script.toString());
             }
+        } catch (ParameterException e) {
+            throw e;
+        } catch (IOException e) {
+            throw new UncheckedIOException(/* e.getMessage(), */ e);
         } catch (Exception e) {
             throw new RuntimeException("invalid script", e);
         }