Merge branch 'devel' into fix/cb-4776/input-default-value-handling

dbeaver · Mar 29, 2024 · 9b4e0f6 · 9b4e0f6
2 parents 0c905c1 + 8004db0
commit 9b4e0f6
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 2 deletions.
diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml
@@ -17,6 +17,7 @@
         <resource name="drivers/sqlite/xerial"/>
         <resource name="drivers/mssql/new"/>
         <resource name="drivers/trino"/>
+        <resource name="drivers/kyuubi"/>
     </extension>
 
     <!-- Bundles  -->
@@ -36,6 +37,7 @@
         <bundle id="drivers.sqlite.xerial" label="SQLite drivers"/>
         <bundle id="drivers.mssql.new" label="SQL Server drivers"/>
         <bundle id="drivers.trino" label="Trino drivers"/>
+        <bundle id="drivers.kyuubi" label="Apache Kyuubi drivers"/>
     </extension>
 
     <!-- Enabled drivers -->
@@ -55,6 +57,7 @@
         <driver id="sqlserver:microsoft"/>
         <driver id="generic:trino_jdbc"/>
         <driver id="generic:duckdb_jdbc"/>
+        <driver id="generic:kyuubi_hive"/>
     </extension>
 
 

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverInfo.java
@@ -182,6 +182,7 @@ public WebPropertyInfo[] getDriverProperties() throws DBWebException {
             cfg.setUrl(driver.getSampleURL());
             cfg.setHostName(DBConstants.HOST_LOCALHOST);
             cfg.setHostPort(driver.getDefaultPort());
+            cfg.setDatabaseName(driver.getDefaultDatabase());
             cfg.setUrl(driver.getConnectionURL(cfg));
             DBPPropertyDescriptor[] properties = driver.getDataSourceProvider().getConnectionProperties(webSession.getProgressMonitor(), driver, cfg);
             if (properties == null) {

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
@@ -364,9 +364,16 @@ public WebSQLExecuteInfo updateResultsDataBatch(
                     isAutoCommitEnabled = txnManager.isAutoCommit();
                     if (txnManager.isSupportsTransactions() && isAutoCommitEnabled) {
                         txnManager.setAutoCommit(monitor, false);
-                        savepoint = txnManager.setSavepoint(monitor, null);
                         revertToAutoCommit = true;
                     }
+                    if (!txnManager.isAutoCommit() && txnManager.supportsSavepoints()) {
+                        try {
+                            savepoint = txnManager.setSavepoint(monitor, null);
+                        } catch (Throwable e) {
+                            // May be savepoints not supported
+                            log.debug("Can't set savepoint", e);
+                        }
+                    }
                 }
                 try {
                     Map<String, Object> options = Collections.emptyMap();

diff --git a/server/drivers/kyuubi/pom.xml b/server/drivers/kyuubi/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.kyuubi</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>kyuubi</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.kyuubi</groupId>
+            <artifactId>kyuubi-hive-jdbc-shaded</artifactId>
+            <version>1.9.0</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/server/drivers/pom.xml b/server/drivers/pom.xml
@@ -18,6 +18,7 @@
         <module>h2</module>
         <module>h2_v2</module>
         <module>jaybird</module>
+        <module>kyuubi</module>
         <module>mysql</module>
         <module>mariadb</module>
         <module>oracle</module>

diff --git a/server/drivers/trino/pom.xml b/server/drivers/trino/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>io.trino</groupId>
             <artifactId>trino-jdbc</artifactId>
-            <version>422</version>
+            <version>438</version>
         </dependency>
     </dependencies>