Updating where the proxy happens

Author: Paultagoras

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

@@ -1,97 +1,64 @@
 package com.clickhouse.jdbc;
 
 import javax.sql.DataSource;
-
-import com.clickhouse.client.config.ClickHouseDefaults;
-import com.clickhouse.jdbc.internal.ClickHouseConnectionImpl;
-import com.clickhouse.jdbc.internal.ClickHouseJdbcUrlParser;
-import com.clickhouse.jdbc.internal.ClickHouseJdbcUrlParser.ConnectionInfo;
-
 import java.io.PrintWriter;
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
-import java.util.logging.Logger;
-
-public class ClickHouseDataSource extends JdbcWrapper implements DataSource {
-    private final String url;
-    private final Properties props;
-
-    protected final ClickHouseDriver driver;
-    protected final ConnectionInfo connInfo;
 
-    protected PrintWriter printWriter;
-    protected int loginTimeoutSeconds = 0;
+public class ClickHouseDataSource implements javax.sql.DataSource, com.clickhouse.jdbc.JdbcV2Wrapper {
+    private final DataSource dataSource;
+    private final ClickHouseDriver driver;
 
     public ClickHouseDataSource(String url) throws SQLException {
         this(url, new Properties());
     }
 
     public ClickHouseDataSource(String url, Properties properties) throws SQLException {
-        if (url == null) {
-            throw new IllegalArgumentException("Incorrect ClickHouse jdbc url. It must be not null");
-        }
-        this.url = url;
-        this.props = new Properties();
-        if (properties != null && !properties.isEmpty()) {
-            this.props.putAll(properties);
-        }
-
         this.driver = new ClickHouseDriver();
-        new VersionSelectingDriver();//This is a workaround to make sure the driver is loaded
-        this.connInfo = ClickHouseJdbcUrlParser.parse(url, properties);
+
+        if (driver.isV2(url)) {
+            //v2
+            this.dataSource = new com.clickhouse.jdbc.DataSourceImpl(url, properties);
+        } else {
+            //v1
+            this.dataSource = new DataSourceV1(url, properties);
+        }
     }
 
     @Override
-    public ClickHouseConnection getConnection() throws SQLException {
-        return new ClickHouseConnectionImpl(connInfo);
+    public Connection getConnection() throws SQLException {
+        return dataSource.getConnection();
     }
 
     @Override
-    public ClickHouseConnection getConnection(String username, String password) throws SQLException {
-        if (username == null || username.isEmpty()) {
-            throw SqlExceptionUtils.clientError("Non-empty user name is required");
-        }
-
-        if (password == null) {
-            password = "";
-        }
-
-        if (username.equals(props.getProperty(ClickHouseDefaults.USER.getKey()))
-                && password.equals(props.getProperty(ClickHouseDefaults.PASSWORD.getKey()))) {
-            return new ClickHouseConnectionImpl(connInfo);
-        }
-
-        Properties properties = new Properties();
-        properties.putAll(this.props);
-        properties.setProperty(ClickHouseDefaults.USER.getKey(), username);
-        properties.setProperty(ClickHouseDefaults.PASSWORD.getKey(), password);
-        return new ClickHouseConnectionImpl(url, properties);
+    public Connection getConnection(String username, String password) throws SQLException {
+        return dataSource.getConnection(username, password);
     }
 
     @Override
     public PrintWriter getLogWriter() throws SQLException {
-        return printWriter;
+        return dataSource.getLogWriter();
     }
 
     @Override
     public void setLogWriter(PrintWriter out) throws SQLException {
-        printWriter = out;
+        dataSource.setLogWriter(out);
     }
 
     @Override
     public void setLoginTimeout(int seconds) throws SQLException {
-        loginTimeoutSeconds = seconds;
+        dataSource.setLoginTimeout(seconds);
     }
 
     @Override
     public int getLoginTimeout() throws SQLException {
-        return loginTimeoutSeconds;
+        return dataSource.getLoginTimeout();
     }
 
-    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-        return ClickHouseDriver.parentLogger;
+    @Override
+    public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        return dataSource.getParentLogger();
     }
 }

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

@@ -149,17 +149,17 @@ public String getDriverName() throws SQLException {
 
     @Override
     public String getDriverVersion() throws SQLException {
-        return ClickHouseDriver.driverVersionString;
+        return DriverV1.driverVersionString;
     }
 
     @Override
     public int getDriverMajorVersion() {
-        return ClickHouseDriver.driverVersion.getMajorVersion();
+        return DriverV1.driverVersion.getMajorVersion();
     }
 
     @Override
     public int getDriverMinorVersion() {
-        return ClickHouseDriver.driverVersion.getMinorVersion();
+        return DriverV1.driverVersion.getMinorVersion();
     }
 
     @Override
@@ -1217,12 +1217,12 @@ public int getDatabaseMinorVersion() throws SQLException {
 
     @Override
     public int getJDBCMajorVersion() throws SQLException {
-        return ClickHouseDriver.specVersion.getMajorVersion();
+        return DriverV1.specVersion.getMajorVersion();
     }
 
     @Override
     public int getJDBCMinorVersion() throws SQLException {
-        return ClickHouseDriver.specVersion.getMinorVersion();
+        return DriverV1.specVersion.getMinorVersion();
     }
 
     @Override