diff --git a/cmake/install.inc b/cmake/install.inc
index a5b01f43cb7e8a302a9cf2d6d7ef48ddb8ed944e..2f0404334c06125e6ee8241ab91b22064ab20b89 100755
--- a/cmake/install.inc
+++ b/cmake/install.inc
@@ -32,7 +32,7 @@ ELSEIF (TD_WINDOWS)
#INSTALL(TARGETS taos RUNTIME DESTINATION driver)
#INSTALL(TARGETS shell RUNTIME DESTINATION .)
IF (TD_MVN_INSTALLED)
- INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.17-dist.jar DESTINATION connector/jdbc)
+ INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.18-dist.jar DESTINATION connector/jdbc)
ENDIF ()
ELSEIF (TD_DARWIN)
SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
diff --git a/src/connector/jdbc/CMakeLists.txt b/src/connector/jdbc/CMakeLists.txt
index b64161e2e4fd6fc00abb659118cfdcd50dfcf0a8..59b09c8695d59c1fd0584f73a7e4be1eb1ab1c0b 100644
--- a/src/connector/jdbc/CMakeLists.txt
+++ b/src/connector/jdbc/CMakeLists.txt
@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
POST_BUILD
COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.17-dist.jar ${LIBRARY_OUTPUT_PATH}
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.18-dist.jar ${LIBRARY_OUTPUT_PATH}
COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
COMMENT "build jdbc driver")
ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})
diff --git a/src/connector/jdbc/deploy-pom.xml b/src/connector/jdbc/deploy-pom.xml
index 1f03c3c6fe5e1d5f1d7d12a0df7babb6edb789f1..34b0a3c6d37530ad01600a455d426c1606613c23 100755
--- a/src/connector/jdbc/deploy-pom.xml
+++ b/src/connector/jdbc/deploy-pom.xml
@@ -5,7 +5,7 @@
com.taosdata.jdbc
taos-jdbcdriver
- 2.0.17
+ 2.0.18
jar
JDBCDriver
diff --git a/src/connector/jdbc/pom.xml b/src/connector/jdbc/pom.xml
index 6be0ca036e797decb668c42a81eeaafb91d52787..bc90cae0dbe88e4f573991fe6f6635613d981053 100755
--- a/src/connector/jdbc/pom.xml
+++ b/src/connector/jdbc/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.taosdata.jdbc
taos-jdbcdriver
- 2.0.17
+ 2.0.18
jar
JDBCDriver
https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
index 60ed747670c0665286db295d8c647863cc68887b..11d4a143535d7e116d92875a6eb52b5bf7a5b6e0 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
@@ -7,8 +7,8 @@ import java.sql.*;
public class AuthenticationTest {
-// private static final String host = "127.0.0.1";
- private static final String host = "master";
+ private static final String host = "127.0.0.1";
+ // private static final String host = "master";
private static final String user = "root";
private static final String password = "123456";
private Connection conn;
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
index c8da3661588d4afe7077e64f79374cbf77b77699..185c0306f5259206c96072b7f306f18a7a8a8f7e 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
@@ -9,33 +9,33 @@ import java.util.Random;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class RestfulJDBCTest {
- // private static final String host = "127.0.0.1";
- private static final String host = "master";
+ private static final String host = "127.0.0.1";
+ // private static final String host = "master";
private static Connection connection;
private Random random = new Random(System.currentTimeMillis());
/**
* select * from log.log
**/
-// @Test
-// public void testCase001() {
-// try {
-// Statement statement = connection.createStatement();
-// ResultSet resultSet = statement.executeQuery("select * from log.log");
-// ResultSetMetaData metaData = resultSet.getMetaData();
-// while (resultSet.next()) {
-// for (int i = 1; i <= metaData.getColumnCount(); i++) {
-// String column = metaData.getColumnLabel(i);
-// String value = resultSet.getString(i);
-// System.out.print(column + ":" + value + "\t");
-// }
-// System.out.println();
-// }
-// statement.close();
-// } catch (SQLException e) {
-// e.printStackTrace();
-// }
-// }
+ @Test
+ public void testCase001() {
+ try {
+ Statement statement = connection.createStatement();
+ ResultSet resultSet = statement.executeQuery("select * from log.log");
+ ResultSetMetaData metaData = resultSet.getMetaData();
+ while (resultSet.next()) {
+ for (int i = 1; i <= metaData.getColumnCount(); i++) {
+ String column = metaData.getColumnLabel(i);
+ String value = resultSet.getString(i);
+ System.out.print(column + ":" + value + "\t");
+ }
+ System.out.println();
+ }
+ statement.close();
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
+ }
/**
* create database
@@ -118,7 +118,7 @@ public class RestfulJDBCTest {
for (int i = 1; i <= columnCount; i++) {
String columnLabel = meta.getColumnLabel(i);
String value = rs.getString(i);
- System.out.print(columnLabel + ": " + value+"\t");
+ System.out.print(columnLabel + ": " + value + "\t");
}
System.out.println();
}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetMetaDataTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetMetaDataTest.java
index 0af6aa431ca71a588efb820e924dcbfa80068821..13973d8b6bf6c11ced27866724b91c0746a024d0 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetMetaDataTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetMetaDataTest.java
@@ -9,8 +9,8 @@ import java.sql.*;
public class RestfulResultSetMetaDataTest {
- // private static final String host = "127.0.0.1";
- private static final String host = "master";
+ private static final String host = "127.0.0.1";
+// private static final String host = "master";
private static Connection conn;
private static Statement stmt;
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetTest.java
index 70fdd35d6ae78ac7d94e45cf1c570c6fe2e41f61..a14d09588d21f5d405cbb2456c9833d2a411ea96 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulResultSetTest.java
@@ -12,8 +12,8 @@ import java.sql.*;
public class RestfulResultSetTest {
- // private static final String host = "127.0.0.1";
- private static final String host = "master";
+ private static final String host = "127.0.0.1";
+// private static final String host = "master";
private static Connection conn;
private static Statement stmt;
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java
index 090c8f146bc925d0cbdf6068da569955fcae42b2..313abfd27865ef37d8b522b38951b17902f5a486 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java
@@ -11,8 +11,8 @@ import java.sql.*;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class SQLTest {
-// private static final String host = "127.0.0.1";
- private static final String host = "master";
+ private static final String host = "127.0.0.1";
+ // private static final String host = "master";
private static Connection connection;
@Test