Skip to content

HCK-14467: Error when applying DDL statements containing comments #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chulanovskyi-bs merged 2 commits into from
Jan 27, 2026
Merged

HCK-14467: Error when applying DDL statements containing comments #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a996bd8
HCK-14467: Extend logic to handle inline comments
Nightlngale Jan 26, 2026
fcb969b
HCK-14467: Restore split logic
Nightlngale Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion shared/Db2Client/src/main/java/org/db2/Db2Service.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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<String> statements = new java.util.ArrayList<>();
Expand Down
Binary file modified shared/addons/Db2Client.jar
View file
Open in desktop
Binary file not shown.