fixed tests and removed unused code

Author: chernser

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

@@ -1,11 +1,12 @@
 package com.clickhouse.client.api.metadata;
 
 import com.clickhouse.data.ClickHouseColumn;
-import com.clickhouse.data.ClickHouseDataType;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 public class TableSchema {
 
@@ -125,16 +126,5 @@ public String toString() {
                 ", hasDefaults=" + hasDefaults +
                 '}';
     }
-
-    public static final Collection<ClickHouseColumn> SIMPLE_SHOW_STMT_SCHEMA =
-            Collections.unmodifiableCollection(Arrays.asList(ClickHouseColumn.of("name", ClickHouseDataType.String.name())));
-
-    public static final Collection<ClickHouseColumn> SHOW_TABLES_SCHEMA = SIMPLE_SHOW_STMT_SCHEMA;
-    public static final Collection<ClickHouseColumn> SHOW_DATABASES_SCHEMA = SIMPLE_SHOW_STMT_SCHEMA;
-    public static final Collection<ClickHouseColumn> SHOW_DICTIONARIES_SCHEMA = SIMPLE_SHOW_STMT_SCHEMA;
-    public static final Collection<ClickHouseColumn> SHOW_USERS_SCHEMA = SIMPLE_SHOW_STMT_SCHEMA;
-    public static final Collection<ClickHouseColumn> SHOW_ROLES_SCHEMA = SIMPLE_SHOW_STMT_SCHEMA;
-    public static final Collection<ClickHouseColumn> SHOW_GRANTS_SCHEMA = Collections.unmodifiableCollection(Arrays.asList(ClickHouseColumn.of("GRANTS", ClickHouseDataType.String.name())));
-
 }
 

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

@@ -26,7 +26,7 @@
 
 public class ResultSetImpl implements ResultSet, JdbcV2Wrapper {
     private static final Logger log = LoggerFactory.getLogger(ResultSetImpl.class);
-    private final ResultSetMetaData metaData;
+    private ResultSetMetaData metaData;
     protected ClickHouseBinaryFormatReader reader;
     private QueryResponse response;
     private boolean closed;
@@ -53,10 +53,7 @@ protected ResultSetImpl(ResultSetImpl resultSet) {
         this.parentStatement = resultSet.parentStatement;
         this.response = resultSet.response;
         this.reader = resultSet.reader;
-        TableSchema tableMetadata = resultSet.getSchema();
-        this.metaData = new ResultSetMetaDataImpl(tableMetadata
-                .getColumns(), tableMetadata.getDatabaseName(), "", tableMetadata.getTableName(),
-                Collections.emptyMap());
+        this.metaData = resultSet.metaData;
         this.closed = false;
         this.wasNull = false;
         this.defaultCalendar = parentStatement.connection.defaultCalendar;
@@ -438,6 +435,10 @@ public ResultSetMetaData getMetaData() throws SQLException {
         return metaData;
     }
 
+    protected void setMetaData(ResultSetMetaDataImpl metaData) {
+        this.metaData = metaData;
+    }
+
     @Override
     public Object getObject(int columnIndex) throws SQLException {
         return getObject(columnIndex, JdbcUtils.convertToJavaClass(getSchema().getColumnByIndex(columnIndex).getDataType()));

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

@@ -80,63 +80,30 @@ public static StatementType parseStatementType(String sql) {
                     continue;
                 }
 
-                StatementType statementType = null;
-                Object[] parseResult = null;
                 switch (tokens[0].toUpperCase()) {
-                    case "SELECT":
-                        statementType = StatementType.SELECT;
-                        break;
-                    case "WITH":
-                        statementType = StatementType.SELECT;
-                        break;
+                    case "SELECT": return StatementType.SELECT;
+                    case "WITH": return StatementType.SELECT;
                     case "INSERT":
-                        statementType = StatementType.INSERT;
                         for (String token : tokens) {
                             if (token.equalsIgnoreCase("SELECT")) {
-                                statementType = StatementType.INSERT_INTO_SELECT;
+                                return StatementType.INSERT_INTO_SELECT;
                             }
                         }
-                        break;
-                    case "DELETE":
-                        statementType = StatementType.DELETE;
-                        break;
-                    case "UPDATE":
-                        statementType = StatementType.UPDATE;
-                        break;
-                    case "CREATE":
-                        statementType = StatementType.CREATE;
-                        break;
-                    case "DROP":
-                        statementType = StatementType.DROP;
-                        break;
-                    case "ALTER":
-                        statementType = StatementType.ALTER;
-                        break;
-                    case "TRUNCATE":
-                        statementType = StatementType.TRUNCATE;
-                        break;
-                    case "USE":
-                        statementType = StatementType.USE;
-                        break;
-                    case "SHOW":
-                        statementType = StatementType.SHOW;
-                        break;
-                    case "DESCRIBE":
-                        statementType = StatementType.DESCRIBE;
-                        break;
-                    case "EXPLAIN":
-                        statementType = StatementType.EXPLAIN;
-                        break;
-                    case "SET":
-                        statementType = StatementType.SET;
-                        break;
-                    case "KILL":
-                        statementType = StatementType.KILL;
-                        break;
-                    default:
-                        statementType = StatementType.OTHER;
+                        return StatementType.INSERT;
+                    case "DELETE": return StatementType.DELETE;
+                    case "UPDATE": return StatementType.UPDATE;
+                    case "CREATE": return StatementType.CREATE;
+                    case "DROP": return StatementType.DROP;
+                    case "ALTER": return StatementType.ALTER;
+                    case "TRUNCATE": return StatementType.TRUNCATE;
+                    case "USE": return StatementType.USE;
+                    case "SHOW": return StatementType.SHOW;
+                    case "DESCRIBE": return StatementType.DESCRIBE;
+                    case "EXPLAIN": return StatementType.EXPLAIN;
+                    case "SET": return StatementType.SET;
+                    case "KILL": return StatementType.KILL;
+                    default: return StatementType.OTHER;
                 }
-                return statementType;
             }
         }
 

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

@@ -3,6 +3,7 @@
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.jdbc.ResultSetImpl;
+import com.clickhouse.jdbc.metadata.ResultSetMetaDataImpl;
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
@@ -22,6 +23,9 @@ public class MetadataResultSet extends ResultSetImpl {
     public MetadataResultSet(ResultSetImpl resultSet) throws SQLException {
         super(resultSet);
         this.overridingSchemaAdaptor = new OverridingSchemaAdaptor(resultSet.getSchema());
+        this.setMetaData(new ResultSetMetaDataImpl(overridingSchemaAdaptor.getColumns(),
+                overridingSchemaAdaptor.getDatabaseName(), "",
+                overridingSchemaAdaptor.getTableName(), Collections.emptyMap()));
         ResultSetMetaData metaData = getMetaData();
         int count = metaData.getColumnCount();
         cachedColumnLabels = new String[count];

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

@@ -89,11 +89,7 @@ public boolean isSigned(int column) throws SQLException {
 
     @Override
     public int getColumnDisplaySize(int column) throws SQLException {
-        try {
-            return getColumn(column).getColumnName().length();
-        } catch (Exception e) {
-            throw ExceptionUtils.toSqlState(e);
-        }
+        return 80;
     }
 
     @Override