fixed getTables, getColumns, turned on tests in maven (some fail, but it is ok)

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java

@@ -139,7 +139,9 @@ public static String commaSeparated(Collection<?> values) {
         for (Object value : values) {
             sb.append(value.toString().replaceAll(",", "\\\\,")).append(",");
         }
-        sb.setLength(sb.length() - 1);
+        if (sb.length() > 0) {
+            sb.setLength(sb.length() - 1);
+        }
         return sb.toString();
     }
 

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

@@ -5,12 +5,13 @@
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
 public class JdbcUtils {
     //Define a map to store the mapping between ClickHouse data types and SQL data types
     private static final Map<ClickHouseDataType, Integer> CLICKHOUSE_TO_SQL_TYPE_MAP = generateTypeMap();
     private static Map<ClickHouseDataType, Integer> generateTypeMap() {
-        Map<ClickHouseDataType, Integer> map = new HashMap<>();
+        Map<ClickHouseDataType, Integer> map = new TreeMap<>(); // TreeMap is used to sort the keys in natural order so FixedString will be before String :-) (type match should be more accurate)
         map.put(ClickHouseDataType.Int8, Types.TINYINT);
         map.put(ClickHouseDataType.UInt8, Types.TINYINT);
         map.put(ClickHouseDataType.Int16, Types.SMALLINT);

jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/DatabaseMetaData.java

@@ -674,7 +674,7 @@ public ResultSet getTables(String catalog, String schemaPattern, String tableNam
         // TODO: when switch between catalog and schema is implemented, then TABLE_SCHEMA and TABLE_CAT should be populated accordingly
 //        String commentColumn = connection.getServerVersion().check("[21.6,)") ? "t.comment" : "''";
         // TODO: handle useCatalogs == true and return schema catalog name
-        String catalogPlaceholder = useCatalogs ? "'local' " : "";
+        String catalogPlaceholder = useCatalogs ? "'local' " : "''";
 
         String sql = "SELECT " +
                  catalogPlaceholder + " AS TABLE_CAT, " +
@@ -712,7 +712,7 @@ public ResultSet getTables(String catalog, String schemaPattern, String tableNam
     @Override
     public ResultSet getSchemas() throws SQLException {
         // TODO: handle useCatalogs == true and return schema catalog name
-        String catalogPlaceholder = useCatalogs ? "'local' " : "";
+        String catalogPlaceholder = useCatalogs ? "'local' " : "''";
         return connection.createStatement().executeQuery("SELECT name AS TABLE_SCHEM, " + catalogPlaceholder + " AS TABLE_CATALOG FROM system.databases ORDER BY name");
     }
 
@@ -741,28 +741,27 @@ public ResultSet getTableTypes() throws SQLException {
     public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException {
         //TODO: Best way to convert type to JDBC data type
         // TODO: handle useCatalogs == true and return schema catalog name
-        String catalogPlaceholder = useCatalogs ? "'local' " : "";
+        String catalogPlaceholder = useCatalogs ? "'local' " : "''";
 
         String sql = "SELECT " +
                 catalogPlaceholder + " AS TABLE_CAT, " +
                 "database AS TABLE_SCHEM, " +
                 "table AS TABLE_NAME, " +
                 "name AS COLUMN_NAME, " +
                 JdbcUtils.generateSqlTypeEnum("system.columns.type") + " AS DATA_TYPE, " +
-                "type AS TYPE_NAME, " +
-                 JdbcUtils.generateSqlTypeSizes("system.columns.type") + " AS COLUMN_SIZE, " +
-
+                "replaceRegexpOne(type, '^Nullable\\(([\\\\w ,\\\\)\\\\(]+)\\)$', '\\\\1') AS TYPE_NAME, " +
+                JdbcUtils.generateSqlTypeSizes("system.columns.type") + " AS COLUMN_SIZE, " +
                 "toInt32(0) AS BUFFER_LENGTH, " +
-                "if(numeric_scale IS NOT NULL, numeric_scale, 0) as DECIMAL_DIGITS,  " +
-                "toInt32(system.columns.numeric_precision_radix) AS NUM_PREC_RADIX, " +
+                "IF (numeric_scale == 0, NULL, numeric_scale) as DECIMAL_DIGITS,  " +
+                "toInt32(numeric_precision_radix) AS NUM_PREC_RADIX, " +
                 "toInt32(position(type, 'Nullable(') >= 1 ?" + java.sql.DatabaseMetaData.typeNullable + " : " + java.sql.DatabaseMetaData.typeNoNulls + ") as NULLABLE, " +
                 "system.columns.comment AS REMARKS, " +
                 "system.columns.default_expression AS COLUMN_DEF, " +
                 "toInt32(0) AS SQL_DATA_TYPE, " +
                 "toInt32(0) AS SQL_DATETIME_SUB, " +
                 "character_octet_length AS CHAR_OCTET_LENGTH, " +
                 "toInt32(system.columns.position) AS ORDINAL_POSITION, " +
-                "position(type, 'Nullable(') >= 1 ? 'YES' : 'NO' AS IS_NULLABLE," +
+                "position(upper(type), 'NULLABLE') >= 1 ? 'YES' : 'NO' AS IS_NULLABLE," +
                 "NULL AS SCOPE_CATALOG, " +
                 "NULL AS SCOPE_SCHEMA, " +
                 "NULL AS SCOPE_TABLE, " +
@@ -773,7 +772,8 @@ public ResultSet getColumns(String catalog, String schemaPattern, String tableNa
                 " WHERE database LIKE '" + (schemaPattern == null ? "%" : schemaPattern) + "'" +
                 " AND database LIKE '" + (catalog == null ? "%" : catalog) + "'" +
                 " AND table LIKE '" + (tableNamePattern == null ? "%" : tableNamePattern) + "'" +
-                " AND name LIKE '" + (columnNamePattern == null ? "%" : columnNamePattern) + "'";
+                " AND name LIKE '" + (columnNamePattern == null ? "%" : columnNamePattern) + "'" +
+                " ORDER BY TABLE_SCHEM, TABLE_NAME, ORDINAL_POSITION";
         log.info("getColumns: {}", sql);
 
         return connection.createStatement().executeQuery(sql);
@@ -1035,7 +1035,7 @@ public RowIdLifetime getRowIdLifetime() throws SQLException {
     @Override
     public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
         // TODO: handle useCatalogs == true and return schema catalog name
-        String catalogPlaceholder = useCatalogs ? "'local' " : "";
+        String catalogPlaceholder = useCatalogs ? "'local' " : "''";
         return connection.createStatement().executeQuery("SELECT name AS TABLE_SCHEM, " + catalogPlaceholder + " AS TABLE_CATALOG FROM system.databases " +
                 "WHERE name LIKE '" + (schemaPattern == null ? "%" : schemaPattern) + "'");
     }