Adjusting based on the BasicExample

Author: Paultagoras

examples/jdbc/src/main/java/com/clickhouse/examples/jdbc/Basic.java

@@ -234,13 +234,15 @@ public static void main(String[] args) {
         // jdbc:ch:https://[email protected]:443
         // jdbc:ch:https://demo:[email protected]
         String url = System.getProperty("chUrl", "jdbc:ch://localhost");
+        System.setProperty("clickhouse.jdbc.v2", "true");
 
         try {
             usedPooledConnection(url);
         } catch (SQLException e) {
             e.printStackTrace();
         }
 
+        System.out.println(url);
         try (Connection conn = getConnection(url)) {
             connectWithCustomSettings(url);
             insertByteArray(conn);

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

@@ -210,15 +210,26 @@ public void setCursorName(String name) throws SQLException {
     @Override
     public boolean execute(String sql) throws SQLException {
         checkClosed();
-        StatementType type = parseStatementType(sql);
-
-        if (type == StatementType.SELECT) {
-            executeQuery(sql);
-            return true;
-        } else {
-            executeUpdate(sql);
-            return false;
+        List<String> statements = List.of(sql.split(";"));
+        boolean firstIsResult = false;
+
+        int index = 0;
+        for (String statement : statements) {
+            StatementType type = parseStatementType(statement);
+
+            if (type == StatementType.SELECT) {
+                executeQuery(statement);
+                if (index == 0) {
+                    firstIsResult = true;
+                }
+            } else {
+                executeUpdate(statement);
+            }
+
+            index++;
         }
+
+        return firstIsResult;
     }
 
     @Override

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

@@ -13,6 +13,7 @@
 import java.util.stream.Collectors;
 
 public class JdbcConfiguration {
+    private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(JdbcConfiguration.class);
     public static final String PREFIX_CLICKHOUSE = "jdbc:clickhouse:";
     public static final String PREFIX_CLICKHOUSE_SHORT = "jdbc:ch:";
 
@@ -82,17 +83,26 @@ public DriverPropertyInfo[] getPropertyInfo() {
     }
 
     private Map<String, String> parseUrl(String urlString) {
+        log.debug("Parsing URL: {}", urlString);
         URL url;
         try {
-            url = new URL(stripUrlPrefix(urlString));
+            String urlStripped = stripUrlPrefix(urlString);
+            int index = urlStripped.indexOf("//");
+            if (index == 0) {//Add in the HTTP protocol if it is missing
+                urlStripped = "http:" + urlStripped;
+            }
+
+            url = new URL(urlStripped);
         } catch (MalformedURLException e) {
             throw new IllegalArgumentException("URL is malformed.");
         }
 
         Map<String, String> urlProperties = new HashMap<>();
         urlProperties.put("host", url.getHost());
-        urlProperties.put("port", String.valueOf(url.getPort() == -1 ? 8443 : url.getPort()));
         urlProperties.put("protocol", url.getProtocol());
+        urlProperties.put("port", String.valueOf(url.getPort() == -1 ?
+                url.getProtocol().equalsIgnoreCase("HTTP") ? 8123 : 8443
+                : url.getPort()));
 
         try {
             urlProperties.put("database", url.getPath().substring(1));