...

Jeffery-Wasty · Apr 16, 2024 · 28ba94a · 28ba94a
1 parent c537206
commit 28ba94a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 120 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java
@@ -17,7 +17,6 @@
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.Date;
 import java.sql.ResultSet;

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -8444,13 +8444,15 @@ boolean supportsTransactions() throws SQLServerException {
         try {
             this.connectionCommand("SELECT @@TRANCOUNT", "SQLServerConnection.supportsTransactions");
         } catch (SQLServerException e) {
-            if (e.getMessage().equals(SQLServerException.getErrString("R_transactionsNotSupported"))) {
-                return supportsTransactions = false;
+            if (e.getMessage().trim().equals(SQLServerException.getErrString("R_transactionsNotSupported"))) {
+                supportsTransactions = false;
+                return false;
             }
             throw e;
         }
 
-        return supportsTransactions = true;
+        supportsTransactions = true;
+        return true;
     }
 
     /**

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java
@@ -555,7 +555,6 @@ public int executeUpdate() throws SQLServerException, SQLTimeoutException {
         }
 
         checkClosed();
-
         connection.unprepareUnreferencedPreparedStatementHandles(false);
         executeStatement(new PrepStmtExecCmd(this, EXECUTE_UPDATE));
 

diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyMoneyTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyMoneyTest.java
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             checkClosed();
             connection.unprepareUnreferencedPreparedStatementHandles(false);
             executeStatement(new PrepStmtExecCmd(this, EXECUTE_UPDATE));
@@ Expand Down @@