schema,catalog fixes

Author: chernser

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDatabaseMetaData.java

@@ -773,15 +773,22 @@ public ResultSet getTables(String catalog, String schemaPattern, String tableNam
                     : ClickHouseValues.convertToQuotedString(tableNamePattern));
             params.put("types", builder.toString());
             String sql = ClickHouseParameterizedQuery
-                    .apply("select :catalog as TABLE_CAT, :schema as TABLE_SCHEM, t.name as TABLE_NAME, "
+                    .apply("select " +
+                            ":catalog as TABLE_CAT, " +
+                            ":schema as TABLE_SCHEM, " +
+                            "t.name as TABLE_NAME, "
                             + "case when t.engine like '%Log' then 'LOG TABLE' "
                             + "when t.engine in ('Buffer', 'Memory', 'Set') then 'MEMORY TABLE' "
                             + "when t.is_temporary != 0 then 'TEMPORARY TABLE' "
                             + "when t.engine like '%View' then 'VIEW' when t.engine = 'Dictionary' then 'DICTIONARY' "
                             + "when t.engine like 'Async%' or t.engine like 'System%' then 'SYSTEM TABLE' "
                             + "when empty(t.data_paths) then 'REMOTE TABLE' else 'TABLE' end as TABLE_TYPE, "
-                            + ":comment as REMARKS, null as TYPE_CAT, d.engine as TYPE_SCHEM, "
-                            + "t.engine as TYPE_NAME, null as SELF_REFERENCING_COL_NAME, null as REF_GENERATION\n"
+                            + ":comment as REMARKS, " +
+                            "null as TYPE_CAT, " +
+                            "d.engine as TYPE_SCHEM, "
+                            + "t.engine as TYPE_NAME, " +
+                            "null as SELF_REFERENCING_COL_NAME, " +
+                            "null as REF_GENERATION\n"
                             + "from system.tables t inner join system.databases d on t.database = d.name\n"
                             + "where t.database like :database and t.name like :table and TABLE_TYPE in (:types) "
                             + "order by t.database, t.name", params);

jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java

@@ -28,6 +28,8 @@ public class ConnectionImpl implements Connection, JdbcV2Wrapper {
     private String schema;
     private QuerySettings defaultQuerySettings;
 
+    private final com.clickhouse.jdbc.metadata.DatabaseMetaData metadata;
+
     public ConnectionImpl(String url, Properties info) {
         log.debug("Creating connection to {}", url);
         this.url = url;//Raw URL
@@ -49,6 +51,8 @@ public ConnectionImpl(String url, Properties info) {
                 .setClientName(clientName)
                 .build();
         this.defaultQuerySettings = new QuerySettings();
+
+        this.metadata = new com.clickhouse.jdbc.metadata.DatabaseMetaData(this, false);
     }
 
     public String getUser() {
@@ -141,7 +145,7 @@ public boolean isClosed() throws SQLException {
     @Override
     public DatabaseMetaData getMetaData() throws SQLException {
         checkOpen();
-        return new com.clickhouse.jdbc.metadata.DatabaseMetaData(this);
+        return this.metadata;
     }
 
     @Override

jdbc-v2/src/main/java/com/clickhouse/jdbc/Driver.java

@@ -105,7 +105,7 @@ public boolean acceptsURL(String url) throws SQLException {
 
     @Override
     public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
-        return new DriverPropertyInfo[0];
+        return JdbcConfiguration.getDriverPropertyInfo(info).toArray(new DriverPropertyInfo[0]);
     }
 
     public static int getDriverMajorVersion() {

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/DriveProperties.java

@@ -0,0 +1,19 @@
+package com.clickhouse.jdbc.internal;
+
+/**
+ * JDBC driver specific properties. Do not include any ClickHouse client properties here.
+ */
+public enum DriveProperties {
+
+    PLACEHOLDER("placeholder", "Placeholder for unknown properties");
+
+    private final String key;
+
+    private final String description;
+
+    DriveProperties(String key, String description) {
+        this.key = key;
+        this.description = description;
+    }
+
+}

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcConfiguration.java

@@ -1,5 +1,6 @@
 package com.clickhouse.jdbc.internal;
 
+import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.http.ClickHouseHttpProto;
 
 import java.net.MalformedURLException;
@@ -12,6 +13,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 public class JdbcConfiguration {
@@ -25,6 +27,8 @@ public class JdbcConfiguration {
     final String jdbcUrl;
     final boolean disableFrameworkDetection;
 
+    private final Map<String, String> allProperties;
+
     public String getPassword() {
         return password;
     }
@@ -51,6 +55,8 @@ public JdbcConfiguration(String url, Properties info) {
         this.user = info.getProperty("user", "default");
         this.password = info.getProperty("password", "");
         this.disableFrameworkDetection = Boolean.parseBoolean(info.getProperty("disable_frameworks_detection", "false"));
+        this.allProperties = new ConcurrentHashMap<>();
+        info.forEach((k, v) -> allProperties.put(k.toString(), v.toString()));
     }
 
     public static boolean acceptsURL(String url) {
@@ -82,4 +88,20 @@ private String stripUrlPrefix(String url) {
             throw new IllegalArgumentException("URL is not supported.");
         }
     }
+
+    /**
+     * Returns a list of driver property information.
+     * @return a list of driver property information for the driver
+     */
+    public static List<DriverPropertyInfo> getDriverPropertyInfo(Properties userProvidedValues) {
+
+        List<DriverPropertyInfo> listOfProperties = new ArrayList<>(ClientConfigProperties.values().length);
+        for (ClientConfigProperties clientProp : ClientConfigProperties.values()) {
+            Object value = userProvidedValues.getOrDefault(clientProp.getKey(), "");
+            DriverPropertyInfo info = new DriverPropertyInfo(clientProp.getKey(), String.valueOf(value));
+            listOfProperties.add(info);
+        }
+
+        return listOfProperties;
+    }
 }