diff --git a/src/connector/jdbc/CMakeLists.txt b/src/connector/jdbc/CMakeLists.txt index b91ebcd38fe19045b10007f5bb546a48c30ebb88..53a8965fa23b72a971ac537994fc8a01547791f7 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-1.0.1-dist.jar ${LIBRARY_OUTPUT_PATH} + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-*.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/pom.xml b/src/connector/jdbc/pom.xml index 8840fd7e823fd21f212739a38ed5cccdc4bb2914..75abea9edcd4b2f14d69feeb885669801b54700d 100755 --- a/src/connector/jdbc/pom.xml +++ b/src/connector/jdbc/pom.xml @@ -39,15 +39,7 @@ UTF-8 1.8 - 3.0.1 3.6.0 - 1.6 - 3.1.0 - 2.19.1 - 2.8.2 - 1.6.7 - 2.5.3 - 1.9.5 1.1.2 3.5 @@ -106,114 +98,8 @@ true - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - UTF-8 - UTF-8 - UTF-8 - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - - - - maven-deploy-plugin - ${maven-deploy-plugin.version} - - - default-deploy - deploy - - deploy - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - ossrh-td - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - true - false - forked-path - -Dgpg.passphrase=${gpg.passphrase} - - - - org.apache.maven.scm - maven-scm-provider-gitexe - ${maven-scm-provider-gitexe.version} - - - - - - - ossrh-td - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh-td - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - 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 de86162b1c5af270479db7b88d457c5d267a4000..4640f6b446b6d285806408856489c5e950b37a81 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 @@ -170,8 +170,13 @@ public class TSDBConnection implements Connection { public void setTransactionIsolation(int level) throws SQLException { } + /** + * The transaction isolation level option is not supported by TDengine. + * @return + * @throws SQLException + */ public int getTransactionIsolation() throws SQLException { - throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG); + return Connection.TRANSACTION_NONE; } public SQLWarning getWarnings() throws SQLException { @@ -214,11 +219,17 @@ public class TSDBConnection implements Connection { } public void setHoldability(int holdability) throws SQLException { - throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG); + // intentionally left empty to support druid connection pool. } + /** + * the transaction is not supported by TDengine, so the opened ResultSet Objects will remain open + * @return + * @throws SQLException + */ public int getHoldability() throws SQLException { - throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG); + //intentionally left empty to support HikariCP connection. + return ResultSet.HOLD_CURSORS_OVER_COMMIT; } public Savepoint setSavepoint() throws SQLException {