From 201dc323ad0b83e2df7e55d239d7308062b9879e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 3 Sep 2019 15:58:27 +0200 Subject: [PATCH] [jOOQ/jOOQ#9146] ParserCLI --from-dialect is not case insensitive --- jOOQ/src/main/java/org/jooq/ParserCLI.java | 35 +++++++++------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/ParserCLI.java b/jOOQ/src/main/java/org/jooq/ParserCLI.java index 11fabce763..7699a40481 100644 --- a/jOOQ/src/main/java/org/jooq/ParserCLI.java +++ b/jOOQ/src/main/java/org/jooq/ParserCLI.java @@ -59,31 +59,24 @@ public final class ParserCLI { private static final Pattern FLAG = Pattern.compile("^/([\\w\\-]+)\\s+(\\w+)\\s*$"); - public static final void main(String[] args) { + public static final void main(String... args) throws Exception { Args a; Settings settings = new Settings(); DSLContext ctx; - try { - a = parse(args); - settings(a, settings); - ctx = ctx(a, settings); + a = parse(args); + settings(a, settings); + ctx = ctx(a, settings); - if (a.interactive || args == null || args.length == 0) { - interactiveMode(ctx, a); - } - else if (a.toDialect == null || a.sql == null) { - System.out.println("Mandatory arguments: -t and -s. Use -h for help"); - throw new RuntimeException(); - } - else { - render(ctx, a); - } + if (a.interactive || args == null || args.length == 0) { + interactiveMode(ctx, a); } - catch (Exception e) { - e.printStackTrace(System.err); - System.exit(-1); - return; + else if (a.toDialect == null || a.sql == null) { + System.out.println("Mandatory arguments: -t and -s. Use -h for help"); + throw new RuntimeException(); + } + else { + render(ctx, a); } } @@ -296,9 +289,9 @@ public final class ParserCLI { throw e; } } - else if ("-f".equals(args[i]) || "--from-dialect".equals(args[i].toUpperCase())) { + else if ("-f".equals(args[i]) || "--from-dialect".equals(args[i])) { try { - result.fromDialect = SQLDialect.valueOf(args[++i]); + result.fromDialect = SQLDialect.valueOf(args[++i].toUpperCase()); continue argsLoop; } catch (IllegalArgumentException e) {