From b49b361fdf302d9f6967bc63329c17c7d56e1c01 Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 5 Nov 2020 13:47:55 +0800 Subject: [PATCH] change --- .../jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java | 8 ++++++++ .../src/test/java/com/taosdata/jdbc/TSDBDriverTest.java | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java index cd45048a77..63c42ca399 100755 --- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java +++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java @@ -249,6 +249,7 @@ public class TSDBDriver implements java.sql.Driver { return null; // parse properties + String urlForMeta = url; int beginningOfSlashes = url.indexOf("//"); int index = url.indexOf("?"); if (index != -1) { @@ -271,6 +272,10 @@ public class TSDBDriver implements java.sql.Driver { } } } + // parse Product Name + String dbProductName = url.substring(0, beginningOfSlashes); + dbProductName = dbProductName.substring(dbProductName.indexOf(":") + 1); + dbProductName = dbProductName.substring(0, dbProductName.indexOf(":")); // parse dbname url = url.substring(beginningOfSlashes + 2); int indexOfSlash = url.indexOf("/"); @@ -291,6 +296,9 @@ public class TSDBDriver implements java.sql.Driver { if (url != null && url.length() > 0 && url.trim().length() > 0) { urlProps.setProperty(TSDBDriver.PROPERTY_KEY_HOST, url); } + + this.dbMetaData = new TSDBDatabaseMetaData(dbProductName, urlForMeta, urlProps.getProperty(TSDBDriver.PROPERTY_KEY_USER)); + /* String urlForMeta = url; String dbProductName = url.substring(url.indexOf(":") + 1); diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java index 627daf76ac..b4a7af127a 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java @@ -57,6 +57,12 @@ public class TSDBDriverTest { } catch (IOException e) { e.printStackTrace(); } + + try { + Class.forName("com.taosdata.jdbc.TSDBDriver"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } } -- GitLab