[CONJ-642] travis activating testing option "useBulkStmts"

mariadb-corporation · Sep 3, 2018 · 141dd93 · 141dd93
1 parent e7c0940
commit 141dd93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis/script.sh b/.travis/script.sh
@@ -18,10 +18,10 @@ case "$TYPE" in
    urlString='jdbc:mariadb://mariadb.example.com:3305/testj?user=bob&allowMultiQueries=true&enablePacketDebug=true'
    ;;
  "BULK_SERVER" )
-   urlString='jdbc:mariadb://mariadb.example.com:3305/testj?user=bob&useBatchMultiSend=true&useServerPrepStmts=true&enablePacketDebug=true'
+   urlString='jdbc:mariadb://mariadb.example.com:3305/testj?user=bob&useBatchMultiSend=true&useServerPrepStmts=true&enablePacketDebug=true&useBulkStmts=true'
    ;;
  "NO_BULK_CLIENT" )
-   urlString='jdbc:mariadb://mariadb.example.com:3305/testj?user=bob&useBatchMultiSend=false&enablePacketDebug=true'
+   urlString='jdbc:mariadb://mariadb.example.com:3305/testj?user=bob&useBatchMultiSend=true&enablePacketDebug=true'
    ;;
  "NO_BULK_SERVER" )
    urlString='jdbc:mariadb://mariadb.example.com:3305/testj?user=bob&useBatchMultiSend=false&useServerPrepStmts=true&enablePacketDebug=true'

diff --git a/src/test/java/org/mariadb/jdbc/ErrorMessageTest.java b/src/test/java/org/mariadb/jdbc/ErrorMessageTest.java
@@ -90,7 +90,7 @@ public void testSmallRewriteErrorMessage() throws SQLException {
 
     @Test
     public void testSmallMultiBatchErrorMessage() throws SQLException {
-        try (Connection connection = setBlankConnection("&allowMultiQueries=true&useServerPrepStmts=false")) {
+        try (Connection connection = setConnection("&allowMultiQueries=true&useServerPrepStmts=false")) {
             executeBatchWithException(connection);
             fail("Must Have thrown error");
         } catch (SQLException sqle) {
@@ -127,7 +127,7 @@ public void testSmallPrepareErrorMessage() throws SQLException {
     @Test
     public void testSmallBulkErrorMessage() throws SQLException {
         Assume.assumeFalse(sharedIsAurora());
-        try (Connection connection = setBlankConnection("&useBatchMultiSend=true")) {
+        try (Connection connection = setConnection("&useBatchMultiSend=true")) {
             executeBatchWithException(connection);
             fail("Must Have thrown error");
         } catch (SQLException sqle) {
@@ -169,7 +169,7 @@ public void testBigRewriteErrorMessage() throws SQLException {
 
     @Test
     public void testBigMultiErrorMessage() throws SQLException {
-        try (Connection connection = setBlankConnection("&allowMultiQueries=true&useServerPrepStmts=false")) {
+        try (Connection connection = setConnection("&allowMultiQueries=true&useServerPrepStmts=false")) {
             executeBigBatchWithException(connection);
             fail("Must Have thrown error");
         } catch (SQLException sqle) {
@@ -216,7 +216,7 @@ public void testBigPrepareErrorMessage() throws SQLException {
     @Test
     public void testBigBulkErrorMessage() throws SQLException {
         Assume.assumeFalse(sharedIsAurora());
-        try (Connection connection = setBlankConnection("&useBatchMultiSend=true")) {
+        try (Connection connection = setConnection("&useBatchMultiSend=true")) {
             executeBigBatchWithException(connection);
             fail("Must Have thrown error");
         } catch (SQLException sqle) {