Skip to content

Clean empty lines in sql query #2277

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
mzitnik merged 2 commits into from
Apr 3, 2025
Merged

Clean empty lines in sql query #2277

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
a9b7c42
Clean empty lines in sql query
mzitnik Apr 3, 2025
b2a5b69
Adding a few more tests cases like remarks
mzitnik Apr 3, 2025
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
2 changes: 2 additions & 0 deletions jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ protected static String parseJdbcEscapeSyntax(String sql) {
// Handle outer escape syntax
//sql = sql.replaceAll("\\{escape '([^']*)'\\}", "'$1'");

// Clean new empty lines in sql
sql = sql.replaceAll("(?m)^\\s*$\\n?", "");
// Add more replacements as needed for other JDBC escape sequences
LOG.trace("Parsed SQL: {}", sql);
return sql;
Expand Down
64 changes: 64 additions & 0 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,4 +573,68 @@ public void testSwitchDatabase() throws Exception {
}
}
}

@Test(groups = { "integration" })
public void testNewLineSQLParsing() throws Exception {
try (Connection conn = getJdbcConnection()) {
String sqlCreate = "CREATE TABLE balance ( `id` UUID, `currency` String, `amount` Decimal(64, 18), `create_time` DateTime64(6), `_version` UInt64, `_sign` UInt8 ) ENGINE = ReplacingMergeTree PRIMARY KEY id ORDER BY id;";
try (Statement stmt = conn.createStatement()) {
int r = stmt.executeUpdate(sqlCreate);
assertEquals(r, 0);
}
try (Statement stmt = conn.createStatement()) {
String sqlInsert = "INSERT INTO balance VALUES (generateUUIDv4(), 'EUR', '42.42', now(), 144, 255);";
int r = stmt.executeUpdate(sqlInsert);
assertEquals(r, 1);
}
try (Statement stmt = conn.createStatement()) {
String sqlSelect = new StringBuilder("-- SELECT amount FROM balance FINAL;\n")
Comment thread
mzitnik marked this conversation as resolved.
.append("SELECT amount FROM balance FINAL;").toString();
ResultSet rs = stmt.executeQuery(sqlSelect);
assertTrue(rs.next());
}
try (Statement stmt = conn.createStatement()) {
String sqlSelect = new StringBuilder("-- SELECT * FROM balance\n")
.append("\n")
.append("WITH balance_cte AS (\n")
.append("SELECT\n")
.append("id, currency, amount\n")
.append("FROM balance\n")
.append("LIMIT 10\n")
.append(")\n")
.append("SELECT * FROM balance_cte;").toString();
ResultSet rs = stmt.executeQuery(sqlSelect);
assertTrue(rs.next());
assertFalse(rs.next());
}
try (Statement stmt = conn.createStatement()) {
String sqlSelect = new StringBuilder("-- SELECT amount FROM balance FINAL;\n")
.append("\n")
.append("SELECT amount FROM balance FINAL;").toString();
ResultSet rs = stmt.executeQuery(sqlSelect);
assertTrue(rs.next());
}
try (Statement stmt = conn.createStatement()) {
String sqlSelect = new StringBuilder("-- SELECT amount FROM balance FINAL;\n")
.append("\n")
.append("SELECT amount /* test */FROM balance FINAL;").toString();
ResultSet rs = stmt.executeQuery(sqlSelect);
assertTrue(rs.next());
}
try (Statement stmt = conn.createStatement()) {
String sqlSelect = new StringBuilder("-- SELECT amount FROM balance FINAL;\n")
.append("\n")
.append("SELECT amount FROM balance FINAL; /* test */").toString();
ResultSet rs = stmt.executeQuery(sqlSelect);
assertTrue(rs.next());
}
try (Statement stmt = conn.createStatement()) {
String sqlSelect = new StringBuilder("-- SELECT amount FROM balance FINAL;\n")
.append("\n")
.append("SELECT amount FROM balance FINAL; /* test */ -- SELECT 1").toString();
ResultSet rs = stmt.executeQuery(sqlSelect);
assertTrue(rs.next());
}
}
}
}
Loading