From 9117212b6af4dc3439cb92b2eba137926740de4b Mon Sep 17 00:00:00 2001
From: Ainur <59531286+yagudin10@users.noreply.github.com>
Date: Thu, 24 Mar 2022 21:43:32 +0300
Subject: [PATCH] CB-1796 add new clickhouse driver (#724)

* CB-1796 add new clickhouse driver

* CB-1796 rename driver folders

* CB-1796 rename driver folders
---
 .../plugin.xml                                |  5 +++-
 server/drivers/clickhouse_com/pom.xml         | 25 +++++++++++++++++++
 server/drivers/pom.xml                        |  1 +
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 server/drivers/clickhouse_com/pom.xml

diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml
index 9a35e8fe7e..284e055fec 100644
--- a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml
+++ b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml
@@ -9,6 +9,7 @@
         <resource name="drivers/oracle"/>
         <resource name="drivers/postgresql"/>
         <resource name="drivers/clickhouse"/>
+        <resource name="drivers/clickhouse_com"/>
         <resource name="drivers/derby"/>
         <resource name="drivers/jaybird"/>
         <resource name="drivers/h2"/>
@@ -25,7 +26,8 @@
         <bundle id="drivers.mariadb" label="MariaDB drivers"/>
         <bundle id="drivers.oracle" label="Oracle drivers"/>
         <bundle id="drivers.postgresql" label="PostgreSQL drivers"/>
-        <bundle id="drivers.clickhouse" label="Clickhouse drivers"/>
+        <bundle id="drivers.clickhouse" label="Clickhouse (legacy) drivers"/>
+        <bundle id="drivers.clickhouse_com" label="Clickhouse drivers"/>
         <bundle id="drivers.derby" label="Derby drivers"/>
         <bundle id="drivers.firebird" label="Firebird drivers"/>
         <bundle id="drivers.h2" label="H2 drivers"/>
@@ -44,6 +46,7 @@
         <driver id="postgresql:postgres-jdbc"/>
         <driver id="jaybird:jaybird"/>
         <driver id="clickhouse:yandex_clickhouse"/>
+        <driver id="clickhouse:com_clickhouse"/>
         <driver id="generic:derby_server"/>
         <driver id="h2:h2_embedded"/>
         <driver id="sqlite:sqlite_jdbc"/>
diff --git a/server/drivers/clickhouse_com/pom.xml b/server/drivers/clickhouse_com/pom.xml
new file mode 100644
index 0000000000..c3d83b333d
--- /dev/null
+++ b/server/drivers/clickhouse_com/pom.xml
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.clickhouse_com</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>clickhouse_com</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.clickhouse</groupId>
+            <artifactId>clickhouse-jdbc</artifactId>
+            <version>0.3.2-patch7</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/server/drivers/pom.xml b/server/drivers/pom.xml
index 56a30f7bee..9562a0dcdc 100644
--- a/server/drivers/pom.xml
+++ b/server/drivers/pom.xml
@@ -12,6 +12,7 @@
 
     <modules>
         <module>clickhouse</module>
+        <module>clickhouse_com</module>
         <module>db2</module>
         <module>db2-jt400</module>
         <module>derby</module>