#3 DriverManager support added. (#5)

* #3 DriverManager support added. - ResultSet metadata read fix. - Connection close fix. - 1.0.2 version bump. * #3 Code style fixes
dbeaver · Nov 7, 2024 · a4a2326 · a4a2326
1 parent f0aaaec
commit a4a2326
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Download from Maven Central or from the releases page.
     <dependency>
       <groupId>com.dbeaver.jdbc</groupId>
       <artifactId>com.dbeaver.jdbc.driver.libsql</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2</version>
     </dependency>
 </dependencies>
 ```
diff --git a/com.dbeaver.jdbc.driver.libsql/META-INF/MANIFEST.MF b/com.dbeaver.jdbc.driver.libsql/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DBeaver LibSQL JDBC Driver
 Bundle-SymbolicName: com.dbeaver.jdbc.driver.libsql
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.0.2.qualifier
 Bundle-Release-Date: 20230522
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: com.dbeaver.jdbc.driver.libsql,

diff --git a/com.dbeaver.jdbc.driver.libsql/pom.xml b/com.dbeaver.jdbc.driver.libsql/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.dbeaver.jdbc</groupId>
         <artifactId>jdbc-libsql</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>com.dbeaver.jdbc.driver.libsql</artifactId>

diff --git a/...ver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlConnection.java b/...ver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlConnection.java
@@ -100,6 +100,7 @@ private LibSqlPreparedStatement prepareStatementImpl(String sql) throws SQLExcep
 
     @Override
     public void close() throws SQLException {
+        client.close();
     }
 
     @Override

diff --git a/...aver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlConstants.java b/...aver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlConstants.java
@@ -25,7 +25,7 @@ public class LibSqlConstants {
 
     public static final int DRIVER_VERSION_MAJOR = 1;
     public static final int DRIVER_VERSION_MINOR = 0;
-    public static final int DRIVER_VERSION_MICRO = 1;
+    public static final int DRIVER_VERSION_MICRO = 2;
 
     public static final String DRIVER_NAME = "LibSQL";
     public static final String DRIVER_INFO = "DBeaver LibSQL JDBC driver";

diff --git a/...dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlDriver.java b/...dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlDriver.java
@@ -17,20 +17,28 @@
 package com.dbeaver.jdbc.driver.libsql;
 
 
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.DriverPropertyInfo;
-import java.sql.SQLException;
+import java.sql.*;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 
 public class LibSqlDriver implements Driver {
 
-    static final java.util.logging.Logger parentLogger = java.util.logging.Logger.getLogger("com.dbeaver.jdbc.upd.driver.driver");
+    static {
+        Logger logger = Logger.getLogger("com.dbeaver.jdbc.upd.driver.driver");
+        parentLogger = logger;
+        try {
+            DriverManager.registerDriver(new LibSqlDriver());
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "Could not register driver", e);
+        }
+    }
+
+    private static final java.util.logging.Logger parentLogger;
 
     @Override
     public Connection connect(String url, Properties info) throws SQLException {

diff --git a/...c.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlResultSetMetaData.java b/...c.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlResultSetMetaData.java
@@ -45,7 +45,7 @@ public LibSqlResultSetMetaData(@NotNull LibSqlResultSet resultSet) throws SQLExc
     private ResultColumnDataType getDataTypeFromData(int column) {
         LibSqlExecutionResult result = resultSet.getResult();
         if (result != null && !CommonUtils.isEmpty(result.getRows())) {
-            Object columnValue = result.getRows().get(0)[column];
+            Object columnValue = result.getRows().get(0)[column - 1];
             if (columnValue instanceof Boolean) {
                 return ResultColumnDataType.BOOLEAN;
             } else if (columnValue instanceof Number) {

diff --git a/....jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/client/LibSqlClient.java b/....jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/client/LibSqlClient.java
@@ -37,6 +37,7 @@
 import java.sql.SQLException;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
@@ -52,15 +53,20 @@ public class LibSqlClient {
 
     private final URL url;
     private final String authToken;
-    private String userAgent = LibSqlConstants.DRIVER_INFO + " " + LibSqlConstants.DRIVER_VERSION_MAJOR + "." + LibSqlConstants.DRIVER_VERSION_MAJOR;
+    private final ExecutorService clientExecutor;
+    private String userAgent = LibSqlConstants.DRIVER_INFO + " " +
+        LibSqlConstants.DRIVER_VERSION_MAJOR +
+        "." + LibSqlConstants.DRIVER_VERSION_MAJOR +
+        "." + LibSqlConstants.DRIVER_VERSION_MICRO;
     private final HttpClient client;
 
     public LibSqlClient(URL url, String authToken) {
         this.url = url;
         this.authToken = authToken;
 
+        this.clientExecutor = Executors.newSingleThreadExecutor();
         HttpClient.Builder builder = HttpClient.newBuilder()
-            .executor(Executors.newSingleThreadExecutor())
+            .executor(this.clientExecutor)
             .cookieHandler(new CookieManager());
         this.client = builder.build();
     }
@@ -222,6 +228,13 @@ private static void serializeParameterValue(Object value, JsonWriter jsonWriter)
         }
     }
 
+    /**
+     * Closes client. Terminates client executor.
+     */
+    public void close() {
+        clientExecutor.shutdown();
+    }
+
     private static class Response {
         public String error;
         public LibSqlExecutionResult results;

diff --git a/...r.jdbc.driver.libsql/src/test/java/com/dbeaver/jdbc/upd/driver/test/LibSqlDriverTest.java b/...r.jdbc.driver.libsql/src/test/java/com/dbeaver/jdbc/upd/driver/test/LibSqlDriverTest.java
@@ -16,8 +16,6 @@
  */
 package com.dbeaver.jdbc.upd.driver.test;
 
-import com.dbeaver.jdbc.driver.libsql.LibSqlDriver;
-
 import java.sql.*;
 import java.util.Properties;
 
@@ -26,9 +24,8 @@ public static void main(String[] args) throws Exception {
         long startTime = System.currentTimeMillis();
 
         try {
-            LibSqlDriver driver = new LibSqlDriver();
             Properties props = new Properties();
-            try (Connection connection = driver.connect("jdbc:dbeaver:libsql:" + args[0], props)) {
+            try (Connection connection = DriverManager.getConnection("jdbc:dbeaver:libsql:" + args[0], props)) {
                 DatabaseMetaData metaData = connection.getMetaData();
                 System.out.println("Driver: " + metaData.getDriverName());
                 System.out.println("Database: " + metaData.getDatabaseProductName() + " " + metaData.getDatabaseProductVersion());

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dbeaver.jdbc</groupId>
     <artifactId>jdbc-libsql</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <name>DBeaver LibSQL JDBC Project</name>