Skip to content

[jdbc-v2] Added test for WITH statement with parameters. #2392

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
chernser merged 3 commits into from
May 28, 2025
Merged

[jdbc-v2] Added test for WITH statement with parameters. #2392

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
957b48e
added test for WITH statement with parameters. Removed Java 9 api fro…
chernser May 27, 2025
318509c
Merge branch 'main' into fix_with_statement
chernser May 28, 2025
fe265b3
Addded more tests and fixed another variant of WITH statement
chernser May 28, 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
1 change: 1 addition & 0 deletions clickhouse-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
<configuration>
<excludes>
<exclude>META-INF/services/*</exclude>
<exclude>com/clickhouse/client/ClickHouseTestClient.class</exclude>
</excludes>
</configuration>
</execution>
Expand Down
38 changes: 6 additions & 32 deletions jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,18 @@
import java.sql.SQLWarning;
import java.sql.SQLXML;
import java.sql.Savepoint;
import java.sql.ShardingKey;
import java.sql.Statement;
import java.sql.Struct;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.Executor;
import java.util.stream.Collectors;

public class ConnectionImpl implements Connection, JdbcV2Wrapper {
private static final Logger log = LoggerFactory.getLogger(ConnectionImpl.class);
Expand Down Expand Up @@ -548,7 +550,9 @@ public Properties getClientInfo() throws SQLException {
@Override
public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
try {
return new com.clickhouse.jdbc.types.Array(List.of(elements), typeName, JdbcUtils.convertToSqlType(ClickHouseDataType.valueOf(typeName)).getVendorTypeNumber());
List<Object> list =
(elements == null || elements.length == 0) ? Collections.emptyList() : Arrays.stream(elements, 0, elements.length).collect(Collectors.toList());
return new com.clickhouse.jdbc.types.Array(list, typeName, JdbcUtils.convertToSqlType(ClickHouseDataType.valueOf(typeName)).getVendorTypeNumber());
Comment on lines +553 to +555
Copy link
Copy Markdown
Contributor

@windsurf-bot windsurf-bot bot Jun 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Arrays.stream approach for handling array elements could potentially have issues with null elements within the array. Consider using a more robust approach that explicitly handles null elements within the array:

Suggested change
List<Object> list =
(elements == null || elements.length == 0) ? Collections.emptyList() : Arrays.stream(elements, 0, elements.length).collect(Collectors.toList());
return new com.clickhouse.jdbc.types.Array(list, typeName, JdbcUtils.convertToSqlType(ClickHouseDataType.valueOf(typeName)).getVendorTypeNumber());
List<Object> list = Collections.emptyList();
if (elements != null && elements.length > 0) {
list = Arrays.stream(elements)
.collect(Collectors.toList());
}

} catch (Exception e) {
throw new SQLException("Failed to create array", ExceptionUtils.SQL_STATE_CLIENT_ERROR, e);
}
Expand Down Expand Up @@ -601,36 +605,6 @@ public int getNetworkTimeout() throws SQLException {
return -1;
}

@Override
public void beginRequest() throws SQLException {
Connection.super.beginRequest();
}

@Override
public void endRequest() throws SQLException {
Connection.super.endRequest();
}

@Override
public boolean setShardingKeyIfValid(ShardingKey shardingKey, ShardingKey superShardingKey, int timeout) throws SQLException {
return Connection.super.setShardingKeyIfValid(shardingKey, superShardingKey, timeout);
}

@Override
public boolean setShardingKeyIfValid(ShardingKey shardingKey, int timeout) throws SQLException {
return Connection.super.setShardingKeyIfValid(shardingKey, timeout);
}

@Override
public void setShardingKey(ShardingKey shardingKey, ShardingKey superShardingKey) throws SQLException {
Connection.super.setShardingKey(shardingKey, superShardingKey);
}

@Override
public void setShardingKey(ShardingKey shardingKey) throws SQLException {
Connection.super.setShardingKey(shardingKey);
}

/**
* Returns instance of the client used to execute queries by this connection.
* @return - client instance
Expand Down
12 changes: 0 additions & 12 deletions jdbc-v2/src/main/java/com/clickhouse/jdbc/DataSourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
import javax.sql.DataSource;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.ConnectionBuilder;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.ShardingKeyBuilder;
import java.util.Properties;
import java.util.logging.Logger;

Expand Down Expand Up @@ -78,18 +76,8 @@ public int getLoginTimeout() throws SQLException {
throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
}

@Override
public ConnectionBuilder createConnectionBuilder() throws SQLException {
return DataSource.super.createConnectionBuilder();
}

@Override
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
}

@Override
public ShardingKeyBuilder createShardingKeyBuilder() throws SQLException {
return DataSource.super.createShardingKeyBuilder();
}
}
24 changes: 0 additions & 24 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 @@ -526,30 +526,6 @@ public long executeLargeUpdate(String sql, String[] columnNames) throws SQLExcep
return executeUpdate(sql, columnNames);
}

@Override
public String enquoteLiteral(String val) throws SQLException {
checkClosed();
return Statement.super.enquoteLiteral(val);
}

@Override
public String enquoteIdentifier(String identifier, boolean alwaysQuote) throws SQLException {
checkClosed();
return Statement.super.enquoteIdentifier(identifier, alwaysQuote);
}

@Override
public boolean isSimpleIdentifier(String identifier) throws SQLException {
checkClosed();
return Statement.super.isSimpleIdentifier(identifier);
}

@Override
public String enquoteNCharLiteral(String val) throws SQLException {
checkClosed();
return Statement.super.enquoteNCharLiteral(val);
}

/**
* Return query ID of last executed statement. It is not guaranteed when statements is used concurrently.
* @return query ID
Expand Down
44 changes: 42 additions & 2 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
import java.sql.Types;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
Expand Down Expand Up @@ -292,17 +295,54 @@ public void testTernaryOperator() throws Exception {

@Test(groups = "integration")
void testWithClause() throws Exception {
int count = 0;
try (Connection conn = getJdbcConnection()) {
try (PreparedStatement stmt = conn.prepareStatement("with data as (SELECT number FROM numbers(100)) select * from data ")) {
stmt.execute();
ResultSet rs = stmt.getResultSet();
int count = 0;
while (rs.next()) {
count++;
}
assertEquals(count, 100);
}
}
}

@Test(groups = "integration")
void testWithClauseWithParams() throws Exception {
final String table = "test_with_stmt";
try (Connection conn = getJdbcConnection()) {
try (Statement stmt = conn.createStatement()) {
stmt.execute("DROP TABLE IF EXISTS " + table);
stmt.execute("CREATE TABLE " + table + " (v1 String) Engine MergeTree ORDER BY ()");
stmt.execute("INSERT INTO " + table + " VALUES ('A'), ('B')");
}
final Timestamp target_time = Timestamp.valueOf(LocalDateTime.now());
try (PreparedStatement stmt = conn.prepareStatement("WITH " +
" toDateTime(?) as target_time, " +
" (SELECT 123) as magic_number" +
" SELECT *, target_time, magic_number FROM " + table)) {
stmt.setTimestamp(1, target_time);
stmt.execute();
ResultSet rs = stmt.getResultSet();
int count = 0;
assertEquals(rs.getMetaData().getColumnCount(), 3);
while (rs.next()) {
Assert.assertEquals(
rs.getTimestamp("target_time").toLocalDateTime().truncatedTo(ChronoUnit.SECONDS),
target_time.toInstant().atZone(ZoneId.of("UTC")).toLocalDateTime().truncatedTo(ChronoUnit.SECONDS));
Assert.assertEquals(rs.getString("magic_number"), "123");
Assert.assertEquals(
rs.getTimestamp(2).toLocalDateTime().truncatedTo(ChronoUnit.SECONDS),
target_time.toInstant().atZone(ZoneId.of("UTC")).toLocalDateTime().truncatedTo(ChronoUnit.SECONDS));
Assert.assertEquals(rs.getString(3), "123");

count++;
}
assertEquals(count, 2, "Expected 2 rows");

}
}
assertEquals(count, 100);
}

@Test(groups = { "integration" })
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,8 @@
<configuration>
<source>${minJdk}</source>
<target>${minJdk}</target>
<testSource>17</testSource>
<testTarget>17</testTarget>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Xlint:all</arg>
Expand Down
Loading