From 7cbbc0733e0a9e6a8e5af4397aaafcfa9a6598dc Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 5 Nov 2020 14:22:19 +0800 Subject: [PATCH] change --- .../src/main/java/com/taosdata/jdbc/TSDBConnection.java | 3 ++- .../main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java | 2 +- .../src/test/java/com/taosdata/jdbc/TSDBDriverTest.java | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java index ac0e4eb84a..57230ee65b 100644 --- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java +++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java @@ -197,12 +197,13 @@ public class TSDBConnection implements Connection { } public SQLWarning getWarnings() throws SQLException { + //todo: implement getWarnings according to the warning messages returned from TDengine throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG); } public void clearWarnings() throws SQLException { // left blank to support HikariCP connection - //todo: implement getWarnings according to the warning messages returned from TDengine + //todo: implement clearWarnings according to the warning messages returned from TDengine } public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException { diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java index c1d9d2af8e..f4dee67adf 100644 --- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java +++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java @@ -96,7 +96,7 @@ public class TSDBDatabaseMetaData implements java.sql.DatabaseMetaData { } public int getDriverMajorVersion() { - return 0; + return 2; } public int getDriverMinorVersion() { 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 cdda5ea894..d254b242af 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 @@ -8,6 +8,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.sql.*; +import java.util.Enumeration; import java.util.Properties; import static org.junit.Assert.*; @@ -68,7 +69,6 @@ public class TSDBDriverTest { } } - @Test public void testConnectWithJdbcURL() { final String url = "jdbc:TAOS://localhost:6030/log?user=root&password=taosdata"; @@ -114,6 +114,12 @@ public class TSDBDriverTest { assertNotNull("failure - connection should not be null", conn); } printRs(); + Properties clientInfo = conn.getClientInfo(); + Enumeration propertyNames = clientInfo.propertyNames(); + while (propertyNames.hasMoreElements()) { + String name = (String) propertyNames.nextElement(); + System.out.println(name + " : " + clientInfo.getProperty(name)); + } } catch (SQLException e) { e.printStackTrace(); fail("failure - should not throw Exception"); -- GitLab