Skip to content

[JDBC-V2] Fix DatabaseMetadata to return empty ResultSet where expected #2534

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 2 commits into from
Aug 13, 2025
Merged

[JDBC-V2] Fix DatabaseMetadata to return empty ResultSet where expected #2534

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
2a0b19e
added check for empty result set. fixed places where empty RS should …
chernser Aug 12, 2025
3d6487c
removed useless log.warn about unsupported methods
chernser Aug 12, 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
55 changes: 28 additions & 27 deletions jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import com.clickhouse.client.api.sql.SQLUtils;
import com.clickhouse.data.ClickHouseColumn;
import com.clickhouse.data.ClickHouseDataType;
import com.clickhouse.jdbc.ClientInfoProperties;
import com.clickhouse.jdbc.ConnectionImpl;
import com.clickhouse.jdbc.Driver;
import com.clickhouse.jdbc.DriverProperties;
import com.clickhouse.jdbc.JdbcV2Wrapper;
import com.clickhouse.jdbc.ResultSetImpl;
import com.clickhouse.jdbc.ClientInfoProperties;
import com.clickhouse.jdbc.DriverProperties;
import com.clickhouse.jdbc.internal.ExceptionUtils;
import com.clickhouse.jdbc.internal.JdbcUtils;
import com.clickhouse.jdbc.internal.MetadataResultSet;
Expand Down Expand Up @@ -903,7 +903,6 @@ private static String columnDataTypeToSqlType(String value) {
@Override
public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) throws SQLException {
//Return an empty result set with the required columns
log.warn("getColumnPrivileges is not supported and may return invalid results");
try {
return connection.createStatement().executeQuery("SELECT NULL::Nullable(String) AS TABLE_CAT, " +
"NULL::Nullable(String) AS TABLE_SCHEM, " +
Expand All @@ -912,7 +911,8 @@ public ResultSet getColumnPrivileges(String catalog, String schema, String table
"NULL::Nullable(String) AS GRANTOR, " +
"NULL::Nullable(String) AS GRANTEE, " +
"NULL::Nullable(String) AS PRIVILEGE, " +
"NULL::Nullable(String) AS IS_GRANTABLE");
"NULL::Nullable(String) AS IS_GRANTABLE" +
" LIMIT 0");
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand All @@ -921,15 +921,15 @@ public ResultSet getColumnPrivileges(String catalog, String schema, String table
@Override
public ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) throws SQLException {
//Return an empty result set with the required columns
log.warn("getTablePrivileges is not supported and may return invalid results");
try {
return connection.createStatement().executeQuery("SELECT NULL::Nullable(String) AS TABLE_CAT, " +
"NULL::Nullable(String) AS TABLE_SCHEM, " +
"NULL::Nullable(String) AS TABLE_NAME, " +
"NULL::Nullable(String) AS GRANTOR, " +
"NULL::Nullable(String) AS GRANTEE, " +
"NULL::Nullable(String) AS PRIVILEGE, " +
"NULL::Nullable(String) AS IS_GRANTABLE");
"NULL::Nullable(String) AS IS_GRANTABLE" +
" LIMIT 0");
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand All @@ -938,7 +938,6 @@ public ResultSet getTablePrivileges(String catalog, String schemaPattern, String
@Override
public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) throws SQLException {
//Return an empty result set with the required columns
log.warn("getBestRowIdentifier is not supported and may return invalid results");
try {
return connection.createStatement().executeQuery("SELECT NULL::Nullable(Int16) AS SCOPE, " +
"NULL::Nullable(String) AS COLUMN_NAME, " +
Expand All @@ -947,7 +946,8 @@ public ResultSet getBestRowIdentifier(String catalog, String schema, String tabl
"NULL::Nullable(Int32) AS COLUMN_SIZE, " +
"NULL::Nullable(Int32) AS BUFFER_LENGTH, " +
"NULL::Nullable(Int16) AS DECIMAL_DIGITS, " +
"NULL::Nullable(Int16) AS PSEUDO_COLUMN");
"NULL::Nullable(Int16) AS PSEUDO_COLUMN" +
" LIMIT 0");
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand All @@ -956,7 +956,6 @@ public ResultSet getBestRowIdentifier(String catalog, String schema, String tabl
@Override
public ResultSet getVersionColumns(String catalog, String schema, String table) throws SQLException {
//Return an empty result set with the required columns
log.warn("getVersionColumns is not supported and may return invalid results");
try {
return connection.createStatement().executeQuery("SELECT NULL::Nullable(Int16) AS SCOPE, " +
"NULL::Nullable(String) AS COLUMN_NAME, " +
Expand All @@ -965,7 +964,8 @@ public ResultSet getVersionColumns(String catalog, String schema, String table)
"NULL::Nullable(Int32) AS COLUMN_SIZE, " +
"NULL::Nullable(Int32) AS BUFFER_LENGTH, " +
"NULL::Nullable(Int16) AS DECIMAL_DIGITS, " +
"NULL::Nullable(Int16) AS PSEUDO_COLUMN");
"NULL::Nullable(Int16) AS PSEUDO_COLUMN" +
" LIMIT 0");
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand Down Expand Up @@ -995,8 +995,7 @@ public ResultSet getPrimaryKeys(String catalog, String schema, String table) thr

@Override
public ResultSet getImportedKeys(String catalog, String schema, String table) throws SQLException {
//Return an empty result set with the required columns
log.warn("getImportedKeys is not supported and may return invalid results");
// ClickHouse has no notion of foreign key. This method should return empty resultset
try {
String sql = "SELECT NULL::Nullable(String) AS PKTABLE_CAT, " +
"NULL::Nullable(String) AS PKTABLE_SCHEM, " +
Expand All @@ -1011,7 +1010,8 @@ public ResultSet getImportedKeys(String catalog, String schema, String table) th
"NULL::Nullable(Int16) AS DELETE_RULE, " +
"NULL::Nullable(String) AS FK_NAME, " +
"NULL::Nullable(String) AS PK_NAME, " +
"NULL::Nullable(Int16) AS DEFERRABILITY";
"NULL::Nullable(Int16) AS DEFERRABILITY" +
" LIMIT 0";
return connection.createStatement().executeQuery(sql);
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
Expand All @@ -1020,8 +1020,7 @@ public ResultSet getImportedKeys(String catalog, String schema, String table) th

@Override
public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException {
//Return an empty result set with the required columns
log.warn("getExportedKeys is not supported and may return invalid results");
// ClickHouse has no notion of foreign key. This method should return empty resultset
try {
return connection.createStatement().executeQuery("SELECT NULL::Nullable(String) AS PKTABLE_CAT, " +
"NULL::Nullable(String) AS PKTABLE_SCHEM, " +
Expand All @@ -1036,7 +1035,8 @@ public ResultSet getExportedKeys(String catalog, String schema, String table) th
"NULL::Nullable(Int16) AS DELETE_RULE, " +
"NULL::Nullable(String) AS FK_NAME, " +
"NULL::Nullable(String) AS PK_NAME, " +
"NULL::Nullable(Int16) AS DEFERRABILITY");
"NULL::Nullable(Int16) AS DEFERRABILITY" +
" LIMIT 0");
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand All @@ -1045,7 +1045,6 @@ public ResultSet getExportedKeys(String catalog, String schema, String table) th
@Override
public ResultSet getCrossReference(String parentCatalog, String parentSchema, String parentTable, String foreignCatalog, String foreignSchema, String foreignTable) throws SQLException {
//Return an empty result set with the required columns
log.warn("getCrossReference is not supported and may return invalid results");
try {
String columns = "NULL ::Nullable(String) AS PKTABLE_CAT, " +
"NULL::Nullable(String) AS PKTABLE_SCHEM, " +
Expand All @@ -1060,7 +1059,8 @@ public ResultSet getCrossReference(String parentCatalog, String parentSchema, St
"NULL::Nullable(Int16) AS DELETE_RULE, " +
"NULL::Nullable(String) AS FK_NAME, " +
"NULL::Nullable(String) AS PK_NAME, " +
"NULL::Nullable(Int16) AS DEFERRABILITY";
"NULL::Nullable(Int16) AS DEFERRABILITY" +
" LIMIT 0";
return connection.createStatement().executeQuery("SELECT " + columns);
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
Expand Down Expand Up @@ -1150,7 +1150,8 @@ public ResultSet getIndexInfo(String catalog, String schema, String table, boole
"null::Nullable(String) AS ASC_OR_DESC, " +
"null::Nullable(Int64) AS CARDINALITY, " +
"null::Nullable(Int64) AS PAGES, " +
"null::Nullable(String) AS FILTER_CONDITION ";
"null::Nullable(String) AS FILTER_CONDITION " +
" LIMIT 0";
return connection.createStatement().executeQuery(sql);
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
Expand Down Expand Up @@ -1220,7 +1221,6 @@ public boolean supportsBatchUpdates() throws SQLException {
@Override
public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) throws SQLException {
//Return an empty result set with the required columns
log.warn("getUDTs is not supported and may return invalid results");
try {
return connection.createStatement().executeQuery("SELECT " +
"NULL::Nullable(String) AS TYPE_CAT, " +
Expand All @@ -1229,7 +1229,8 @@ public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePa
"NULL::Nullable(String) AS CLASS_NAME, " +
"NULL::Nullable(Int32) AS DATA_TYPE, " +
"NULL::Nullable(String) AS REMARKS, " +
"NULL::Nullable(Int16) AS BASE_TYPE");
"NULL::Nullable(Int16) AS BASE_TYPE" +
" LIMIT 0");
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand Down Expand Up @@ -1266,15 +1267,15 @@ public boolean supportsGetGeneratedKeys() throws SQLException {
@Override
public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) throws SQLException {
//Return an empty result set with the required columns
log.warn("getSuperTypes is not supported and may return invalid results");
try {
return connection.createStatement().executeQuery(
"SELECT NULL::Nullable(String) AS TYPE_CAT, "
+ "NULL::Nullable(String) AS TYPE_SCHEM, "
+ "NULL::Nullable(String) AS TYPE_NAME, "
+ "NULL::Nullable(String) AS SUPERTYPE_CAT, "
+ "NULL::Nullable(String) AS SUPERTYPE_SCHEM, "
+ "NULL::Nullable(String) AS SUPERTYPE_NAME");
+ "NULL::Nullable(String) AS SUPERTYPE_NAME" +
" LIMIT 0");
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand All @@ -1283,14 +1284,14 @@ public ResultSet getSuperTypes(String catalog, String schemaPattern, String type
@Override
public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern) throws SQLException {
//Return an empty result set with the required columns
log.warn("getSuperTables is not supported and may return invalid results");
try {
return connection.createStatement().executeQuery(
"SELECT "
+ "NULL::Nullable(String) AS TABLE_CAT, "
+ "NULL::Nullable(String) AS TABLE_SCHEM, "
+ "NULL::Nullable(String) AS TABLE_NAME, "
+ "NULL::Nullable(String) AS SUPERTABLE_NAME");
+ "NULL::Nullable(String) AS SUPERTABLE_NAME" +
" LIMIT 0");
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand All @@ -1299,7 +1300,6 @@ public ResultSet getSuperTables(String catalog, String schemaPattern, String tab
@Override
public ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern) throws SQLException {
//Return an empty result set with the required columns
log.warn("getAttributes is not supported and may return invalid results");
try {
return connection.createStatement().executeQuery(
"SELECT "
Expand All @@ -1323,7 +1323,8 @@ public ResultSet getAttributes(String catalog, String schemaPattern, String type
+ "NULL::Nullable(String) AS SCOPE_CATALOG, "
+ "NULL::Nullable(String) AS SCOPE_SCHEMA, "
+ "NULL::Nullable(String) AS SCOPE_TABLE, "
+ "NULL::Nullable(Int16) AS SOURCE_DATA_TYPE");
+ "NULL::Nullable(Int16) AS SOURCE_DATA_TYPE" +
" LIMIT 0");
} catch (Exception e) {
throw ExceptionUtils.toSqlState(e);
}
Expand Down
Loading
Loading