Merge pull request #3289 from taosdata/TD-1280_fix

Td 1280 fix

src/connector/jdbc/src/test/java/TestPreparedStatement.java

@@ -12,7 +12,8 @@ public class TestPreparedStatement {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, "localhost");
-            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/?user=root&password=taosdata", properties);
+
+            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/", properties);
             String rawSql = "select * from test.log0601";
 //            String[] params = new String[]{"ts", "c1"};
             PreparedStatement pstmt = (TSDBPreparedStatement) connection.prepareStatement(rawSql);

src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java

@@ -13,7 +13,8 @@ public class TestTSDBDatabaseMetaData {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, "localhost");
-            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/?user=root&password=taosdata", properties);
+
+            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/", properties);
             dbMetaData = connection.getMetaData();
             resSet = dbMetaData.getCatalogs();
             while(resSet.next()) {

src/connector/jdbc/src/test/java/TestTSDBSubscribe.java

@@ -17,12 +17,10 @@ public class TestTSDBSubscribe {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
 
-        String cs = String.format("jdbc:TAOS://%s:0/%s?user=root&password=taosdata", host, database);
+        String cs = String.format("jdbc:TAOS://%s:0/%s", host, database);
         return (TSDBConnection)DriverManager.getConnection(cs, properties);
     }
 
-
-
     public static void main(String[] args) throws Exception {
         String usage = "java -Djava.ext.dirs=../ TestTSDBSubscribe [-host host] <-db database> <-topic topic> <-sql sql>";
         if (args.length < 2) {

src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java

@@ -40,8 +40,8 @@ public class BatchInsertTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
                 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java

@@ -29,16 +29,15 @@ public class ConnectionTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         assertTrue(null != connection);
         statement = connection.createStatement();
         assertTrue(null != statement);
 
         // try reconnect
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         try {
             statement.execute("create database if not exists " + dbName);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java

@@ -26,8 +26,8 @@ public class DatabaseMetaDataTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata",
-                properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" , properties);
 
         String sql = "drop database if exists " + dbName;
         statement = (TSDBPreparedStatement) connection.prepareStatement(sql);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java

@@ -28,8 +28,8 @@ public class ImportTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java

@@ -33,8 +33,8 @@ public class PreparedStatementTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata",
-                properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         String sql = "drop database if exists " + dbName;
         statement = (TSDBPreparedStatement) connection.prepareStatement(sql);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java

@@ -35,8 +35,7 @@ public class ResultSetTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
 
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java

@@ -28,8 +28,8 @@ public class SelectTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" , properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java

@@ -31,8 +31,8 @@ public class StableTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" , properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("create database if not exists " + dbName);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java

@@ -30,8 +30,8 @@ public class StatementTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);

src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java

@@ -32,8 +32,8 @@ public class SubscribeTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("create database if not exists " + dbName);