From 3fad85e3a9b36cb154e5280f8523f9c0d736a053 Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 7 Jan 2021 10:50:11 +0800 Subject: [PATCH 1/7] [TD-2286]: fix wrong error info when use unexisted database --- tests/examples/JDBC/JDBCDemo/pom.xml | 8 ++++++++ .../src/main/java/com/taosdata/example/JDBCDemo.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/examples/JDBC/JDBCDemo/pom.xml b/tests/examples/JDBC/JDBCDemo/pom.xml index 46729b8512..d075fc8f2a 100644 --- a/tests/examples/JDBC/JDBCDemo/pom.xml +++ b/tests/examples/JDBC/JDBCDemo/pom.xml @@ -48,4 +48,12 @@ + + + com.taosdata.jdbc + taos-jdbcdriver + 2.0.15 + + + diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java index b5012c215f..791ace6d7d 100644 --- a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java +++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java @@ -21,7 +21,7 @@ public class JDBCDemo { } } - if (host == null || driverType == null) { + if (host == null) { printHelp(); } From 251f9d08367b2eadaafe684215ec66bfe0d7ff1a Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 7 Jan 2021 10:53:24 +0800 Subject: [PATCH 2/7] change --- .../JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java index 791ace6d7d..e569de10cf 100644 --- a/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java +++ b/tests/examples/JDBC/JDBCDemo/src/main/java/com/taosdata/example/JDBCDemo.java @@ -5,7 +5,7 @@ import java.util.Properties; public class JDBCDemo { private static String host; - private static String driverType; + private static String driverType = "jni"; private static final String dbName = "test"; private static final String tbName = "weather"; private Connection connection; From 393de696482dc7ed58ff4cbc474a47a7469bc902 Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 7 Jan 2021 10:59:43 +0800 Subject: [PATCH 3/7] [TD-2286]: fix wrong error message when connect unexists databases --- .../jdbc/cases/ConnectWrongDatabaseTest.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java new file mode 100644 index 0000000000..f73d4e84f5 --- /dev/null +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java @@ -0,0 +1,22 @@ +package com.taosdata.jdbc.cases; + +import org.junit.Test; + +import java.sql.DriverManager; +import java.sql.SQLException; + +public class ConnectWrongDatabaseTest { + + @Test + public void connect() { + try { + Class.forName("com.taosdata.jdbc.TSDBDriver"); + DriverManager.getConnection("jdbc:TAOS://localhost:6030/wrong_db?user=root&password=taosdata"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + +} From d23e74b7d956013000471687e0ac88375ac12515 Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 7 Jan 2021 11:03:38 +0800 Subject: [PATCH 4/7] change --- .../com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java index f73d4e84f5..00dd80f4f3 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java @@ -7,15 +7,13 @@ import java.sql.SQLException; public class ConnectWrongDatabaseTest { - @Test - public void connect() { + @Test(expected = SQLException.class) + public void connect() throws SQLException { try { Class.forName("com.taosdata.jdbc.TSDBDriver"); DriverManager.getConnection("jdbc:TAOS://localhost:6030/wrong_db?user=root&password=taosdata"); } catch (ClassNotFoundException e) { e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); } } From e49fbc8ded46a8c59e869dd96903619c7965f9b6 Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 7 Jan 2021 11:04:43 +0800 Subject: [PATCH 5/7] change --- .../com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java index 00dd80f4f3..f73d4e84f5 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java @@ -7,13 +7,15 @@ import java.sql.SQLException; public class ConnectWrongDatabaseTest { - @Test(expected = SQLException.class) - public void connect() throws SQLException { + @Test + public void connect() { try { Class.forName("com.taosdata.jdbc.TSDBDriver"); DriverManager.getConnection("jdbc:TAOS://localhost:6030/wrong_db?user=root&password=taosdata"); } catch (ClassNotFoundException e) { e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); } } From 868fbdae238279b3ac338b51c9e541865bbe5527 Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 7 Jan 2021 11:05:55 +0800 Subject: [PATCH 6/7] change --- .../java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java index f73d4e84f5..6f11caf045 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java @@ -15,7 +15,8 @@ public class ConnectWrongDatabaseTest { } catch (ClassNotFoundException e) { e.printStackTrace(); } catch (SQLException e) { - e.printStackTrace(); + System.out.println(e.getMessage()); +// e.printStackTrace(); } } From 37bdcd66a47972c390dd63965fb735dc369beed1 Mon Sep 17 00:00:00 2001 From: zyyang Date: Thu, 7 Jan 2021 11:10:24 +0800 Subject: [PATCH 7/7] change --- .../java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java index 6f11caf045..e4d2d7598d 100644 --- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java +++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectWrongDatabaseTest.java @@ -1,5 +1,6 @@ package com.taosdata.jdbc.cases; +import org.junit.Assert; import org.junit.Test; import java.sql.DriverManager; @@ -16,7 +17,7 @@ public class ConnectWrongDatabaseTest { e.printStackTrace(); } catch (SQLException e) { System.out.println(e.getMessage()); -// e.printStackTrace(); + Assert.assertEquals("TDengine Error: Invalid database name", e.getMessage()); } }