diff --git a/shared/Db2Client/src/main/java/org/db2/Db2Service.java b/shared/Db2Client/src/main/java/org/db2/Db2Service.java index 21778aa..55b7aec 100644 --- a/shared/Db2Client/src/main/java/org/db2/Db2Service.java +++ b/shared/Db2Client/src/main/java/org/db2/Db2Service.java @@ -32,7 +32,8 @@ public JSONArray executeQuery(String query) throws SQLException { } public int applyScript(String script) throws SQLException { - String[] statements = splitStatements(script); + String cleanedScript = removeComments(script); + String[] statements = splitStatements(cleanedScript); int totalUpdateCount = 0; for (String statement : statements) { @@ -72,6 +73,10 @@ public int applyScript(String script) throws SQLException { return totalUpdateCount; } + private String removeComments(String script) { + return script.replaceAll("(?s)(?m)(?<=\\n)(?:/\\*.*?\\*/|--.*?$)(?=\\n)", ""); + } + private String[] splitStatements(String query) { String[] parts = query.trim().split(";\\s+", -1); java.util.ArrayList statements = new java.util.ArrayList<>(); diff --git a/shared/addons/Db2Client.jar b/shared/addons/Db2Client.jar index 1ce2335..62923b8 100644 Binary files a/shared/addons/Db2Client.jar and b/shared/addons/Db2Client.jar differ