Tweaking default detection

Author: Paultagoras

clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseColumn.java

@@ -589,7 +589,7 @@ private ClickHouseColumn(ClickHouseDataType dataType, String columnName, String
         this.originalTypeName = originalTypeName == null ? dataType.name() : originalTypeName;
         this.nullable = nullable;
         this.lowCardinality = lowCardinality;
-        this.hasDefault = originalTypeName != null && originalTypeName.toUpperCase().contains("DEFAULT");
+        this.hasDefault = false;
 
         if (parameters == null || parameters.isEmpty()) {
             this.parameters = Collections.emptyList();
@@ -734,6 +734,10 @@ public boolean hasDefault() {
         return hasDefault;
     }
 
+    public void setHasDefault(boolean hasDefault) {
+        this.hasDefault = hasDefault;
+    }
+
     public boolean isLowCardinality() {
         return !lowCardinalityDisabled && lowCardinality;
     }

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

@@ -1,11 +1,7 @@
 package com.clickhouse.client.api;
 
 import com.clickhouse.client.ClickHouseClient;
-import com.clickhouse.client.ClickHouseClientBuilder;
-import com.clickhouse.client.ClickHouseConfig;
 import com.clickhouse.client.ClickHouseNode;
-import com.clickhouse.client.ClickHouseNodeSelector;
-import com.clickhouse.client.ClickHouseProtocol;
 import com.clickhouse.client.ClickHouseRequest;
 import com.clickhouse.client.ClickHouseResponse;
 import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
@@ -31,7 +27,6 @@
 import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.client.api.query.Records;
 import com.clickhouse.client.config.ClickHouseClientOption;
-import com.clickhouse.config.ClickHouseOption;
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataStreamFactory;
 import com.clickhouse.data.ClickHouseFormat;
@@ -44,7 +39,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;

client-v2/src/main/java/com/clickhouse/client/api/metadata/TableSchema.java

@@ -61,10 +61,13 @@ public void addColumn(String name, String type) {
         addColumn(name, type, "");
     }
     public void addColumn(String name, String type, String defaultType) {
-        columns.add(ClickHouseColumn.of(name, type));
+        ClickHouseColumn column = ClickHouseColumn.of(name, type);
         if (defaultType.toUpperCase().contains("DEFAULT")) {
             hasDefaults = true;
+            column.setHasDefault(true);
         }
+        columns.add(column);
+
         Map<String, Object> columnMetadata = metadata.computeIfAbsent(name, k -> new HashMap<>());
             columnMetadata.put("type", type);
         colIndex.put(name, columns.size() - 1);