Skip to content

Added literal prefix and suffix to getTypeInfo() to be close to v1 #2884

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

Open
chernser wants to merge 1 commit into
base: main
Choose a base branch
from
+173 −3
Open

Added literal prefix and suffix to getTypeInfo() to be close to v1 #2884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
123 changes: 122 additions & 1 deletion 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 @@ -13,6 +13,7 @@
import com.clickhouse.jdbc.internal.JdbcUtils;
import com.clickhouse.logging.Logger;
import com.clickhouse.logging.LoggerFactory;
import com.google.common.collect.ImmutableMap;

import java.sql.Connection;
import java.sql.JDBCType;
Expand Down Expand Up @@ -1344,9 +1345,129 @@ public ResultSet getTypeInfo() throws SQLException {
row.put("DATA_TYPE", type.getVendorTypeNumber());
};

private static class TypeLiteralInfo {
private final String prefix;
private final String suffix;
TypeLiteralInfo(String prefix, String suffix){
this.prefix = prefix;
this.suffix = suffix;
}

public String getPrefix() {
return prefix;
}

public String getSuffix() {
return suffix;
}
}

private static final Map<String, TypeLiteralInfo> TYPE_LITERAL_INFO_MAP;
static {
ImmutableMap.Builder<String, TypeLiteralInfo> mBuilder = ImmutableMap.builder();
// ---------------------------------------------------------
// Core String, Text & Binary Types
// ---------------------------------------------------------
mBuilder.put("String", new TypeLiteralInfo("'", "'"));
mBuilder.put("FixedString", new TypeLiteralInfo("'", "'"));
mBuilder.put("UUID", new TypeLiteralInfo("'", "'"));

// Aliased String/Binary Types from your list
mBuilder.put("BINARY", new TypeLiteralInfo("'", "'"));
mBuilder.put("NATIONAL CHAR VARYING", new TypeLiteralInfo("'", "'"));
mBuilder.put("BINARY VARYING", new TypeLiteralInfo("'", "'"));
mBuilder.put("NCHAR LARGE OBJECT", new TypeLiteralInfo("'", "'"));
Comment on lines +1375 to +1379
mBuilder.put("NATIONAL CHARACTER VARYING", new TypeLiteralInfo("'", "'"));
mBuilder.put("NATIONAL CHARACTER LARGE OBJECT", new TypeLiteralInfo("'", "'"));
mBuilder.put("NATIONAL CHAR", new TypeLiteralInfo("'", "'"));
mBuilder.put("CHAR LARGE OBJECT", new TypeLiteralInfo("'", "'"));
mBuilder.put("CHARACTER VARYING", new TypeLiteralInfo("'", "'"));
mBuilder.put("NATIONAL CHARACTER", new TypeLiteralInfo("'", "'"));
mBuilder.put("LONGBLOB", new TypeLiteralInfo("'", "'"));
mBuilder.put("CHAR VARYING", new TypeLiteralInfo("'", "'"));
mBuilder.put("MEDIUMBLOB", new TypeLiteralInfo("'", "'"));
mBuilder.put("CLOB", new TypeLiteralInfo("'", "'"));
mBuilder.put("LONGTEXT", new TypeLiteralInfo("'", "'"));
mBuilder.put("MEDIUMTEXT", new TypeLiteralInfo("'", "'"));
mBuilder.put("TINYTEXT", new TypeLiteralInfo("'", "'"));
mBuilder.put("NVARCHAR", new TypeLiteralInfo("'", "'"));
mBuilder.put("TINYBLOB", new TypeLiteralInfo("'", "'"));
mBuilder.put("CHARACTER", new TypeLiteralInfo("'", "'"));
mBuilder.put("CHAR", new TypeLiteralInfo("'", "'"));
mBuilder.put("BLOB", new TypeLiteralInfo("'", "'"));
mBuilder.put("VARCHAR2", new TypeLiteralInfo("'", "'"));
mBuilder.put("TEXT", new TypeLiteralInfo("'", "'"));
mBuilder.put("NCHAR", new TypeLiteralInfo("'", "'"));
mBuilder.put("NCHAR VARYING", new TypeLiteralInfo("'", "'"));
mBuilder.put("BINARY LARGE OBJECT", new TypeLiteralInfo("'", "'"));
mBuilder.put("VARBINARY", new TypeLiteralInfo("'", "'"));
mBuilder.put("BYTEA", new TypeLiteralInfo("'", "'"));
mBuilder.put("VARCHAR", new TypeLiteralInfo("'", "'"));

// ---------------------------------------------------------
// Date & Time Types (including aliases)
// ---------------------------------------------------------
mBuilder.put("DateTime", new TypeLiteralInfo("'", "'"));
mBuilder.put("DateTime32", new TypeLiteralInfo("'", "'"));
mBuilder.put("DateTime64", new TypeLiteralInfo("'", "'"));
mBuilder.put("Date", new TypeLiteralInfo("'", "'"));
mBuilder.put("Date32", new TypeLiteralInfo("'", "'"));
mBuilder.put("Time", new TypeLiteralInfo("'", "'"));
mBuilder.put("Time64", new TypeLiteralInfo("'", "'"));
mBuilder.put("TIMESTAMP", new TypeLiteralInfo("'", "'"));

// ---------------------------------------------------------
// Network Types (including aliases)
// ---------------------------------------------------------
mBuilder.put("IPv4", new TypeLiteralInfo("'", "'"));
mBuilder.put("IPv6", new TypeLiteralInfo("'", "'"));
mBuilder.put("INET4", new TypeLiteralInfo("'", "'"));
mBuilder.put("INET6", new TypeLiteralInfo("'", "'"));

// ---------------------------------------------------------
// Enum Types (including aliases)
// ---------------------------------------------------------
mBuilder.put("Enum", new TypeLiteralInfo("'", "'"));
mBuilder.put("Enum8", new TypeLiteralInfo("'", "'"));
mBuilder.put("Enum16", new TypeLiteralInfo("'", "'"));
mBuilder.put("ENUM", new TypeLiteralInfo("'", "'"));

// ---------------------------------------------------------
// Complex / Collection Types
// ---------------------------------------------------------
mBuilder.put("Array", new TypeLiteralInfo("[", "]"));
mBuilder.put("Map", new TypeLiteralInfo("{", "}"));
mBuilder.put("Tuple", new TypeLiteralInfo("(", ")"));
mBuilder.put("AggregateFunction", new TypeLiteralInfo("(", ")"));
mBuilder.put("SimpleAggregateFunction", new TypeLiteralInfo("(", ")"));

// ---------------------------------------------------------
// Geo Types
// ---------------------------------------------------------
mBuilder.put("Point", new TypeLiteralInfo("(", ")"));
mBuilder.put("Ring", new TypeLiteralInfo("[", "]"));
mBuilder.put("Polygon", new TypeLiteralInfo("[", "]"));
mBuilder.put("MultiPolygon", new TypeLiteralInfo("[", "]"));
mBuilder.put("LineString", new TypeLiteralInfo("[", "]"));
mBuilder.put("MultiLineString", new TypeLiteralInfo("[", "]"));

TYPE_LITERAL_INFO_MAP = mBuilder.buildKeepingLast();
}

private static final Consumer<Map<String, Object>> TYPE_INFO_LITERAL_FUNCTION = row -> {
String typeName = (String) row.get("TYPE_NAME");

TypeLiteralInfo literalInfo = TYPE_LITERAL_INFO_MAP.get(typeName);
if (literalInfo != null) {
row.put("LITERAL_PREFIX", literalInfo.prefix);
row.put("LITERAL_SUFFIX", literalInfo.suffix);
}
Comment on lines +1461 to +1464
};

private static final List<Consumer<Map<String, Object>>> GET_TYPE_INFO_MUTATORS = Arrays.asList(
TYPE_INFO_VALUE_FUNCTION,
NULLABILITY_VALUE_FUNCTION
NULLABILITY_VALUE_FUNCTION,
TYPE_INFO_LITERAL_FUNCTION
);

private static final String DATA_TYPE_INFO_SQL = getDataTypeInfoSql();
Expand Down
53 changes: 51 additions & 2 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,47 @@ public void testGetServerVersions() throws Exception {
}
}

private static final java.util.Map<ClickHouseDataType, String[]> TYPE_LITERAL_EXPECTATIONS;
static {
java.util.Map<ClickHouseDataType, String[]> map = new java.util.EnumMap<>(ClickHouseDataType.class);

String[] quote = new String[]{"'", "'"};
map.put(ClickHouseDataType.String, quote);
map.put(ClickHouseDataType.FixedString, quote);
map.put(ClickHouseDataType.UUID, quote);
map.put(ClickHouseDataType.Date, quote);
map.put(ClickHouseDataType.Date32, quote);
map.put(ClickHouseDataType.DateTime, quote);
map.put(ClickHouseDataType.DateTime32, quote);
map.put(ClickHouseDataType.DateTime64, quote);
map.put(ClickHouseDataType.Time, quote);
map.put(ClickHouseDataType.Time64, quote);
map.put(ClickHouseDataType.Enum, quote);
map.put(ClickHouseDataType.Enum8, quote);
map.put(ClickHouseDataType.Enum16, quote);
map.put(ClickHouseDataType.IPv4, quote);
map.put(ClickHouseDataType.IPv6, quote);

String[] bracket = new String[]{"[", "]"};
map.put(ClickHouseDataType.Array, bracket);
map.put(ClickHouseDataType.Ring, bracket);
map.put(ClickHouseDataType.Polygon, bracket);
map.put(ClickHouseDataType.MultiPolygon, bracket);
map.put(ClickHouseDataType.LineString, bracket);
map.put(ClickHouseDataType.MultiLineString, bracket);

String[] brace = new String[]{"{", "}"};
map.put(ClickHouseDataType.Map, brace);

String[] parenthesis = new String[]{"(", ")"};
map.put(ClickHouseDataType.Tuple, parenthesis);
map.put(ClickHouseDataType.Point, parenthesis);
map.put(ClickHouseDataType.AggregateFunction, parenthesis);
map.put(ClickHouseDataType.SimpleAggregateFunction, parenthesis);

TYPE_LITERAL_EXPECTATIONS = java.util.Collections.unmodifiableMap(map);
}

@Test(groups = { "integration" })
public void testGetTypeInfo() throws Exception {
try (Connection conn = getJdbcConnection()) {
Expand Down Expand Up @@ -638,8 +679,16 @@ public void testGetTypeInfo() throws Exception {
assertEquals(rs.getInt("DATA_TYPE"), rs.getObject("DATA_TYPE"));

assertEquals(rs.getInt("PRECISION"), dataType.getMaxPrecision());
assertNull(rs.getString("LITERAL_PREFIX"));
assertNull(rs.getString("LITERAL_SUFFIX"));

String[] expectedLiterals = TYPE_LITERAL_EXPECTATIONS.get(dataType);
if (expectedLiterals != null) {
assertEquals(rs.getString("LITERAL_PREFIX"), expectedLiterals[0]);
assertEquals(rs.getString("LITERAL_SUFFIX"), expectedLiterals[1]);
} else {
assertNull(rs.getString("LITERAL_PREFIX"), "Expected null prefix for " + dataType);
assertNull(rs.getString("LITERAL_SUFFIX"), "Expected null suffix for " + dataType);
}

assertEquals(rs.getInt("MINIMUM_SCALE"), dataType.getMinScale());
assertEquals(rs.getInt("MAXIMUM_SCALE"), dataType.getMaxScale());
assertNull(rs.getString("CREATE_PARAMS"));
Expand Down
Loading