Merge remote-tracking branch 'origin/main' into dev/divang/handle_fatal_severity

Author: Divang Sharma

CHANGELOG.md

@@ -2,6 +2,43 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
+## [13.2.0] Stable Release
+
+### Changed
+
+- **Use sys.all_objects for accurate function and procedure filtering** [#2705](https://github.com/microsoft/mssql-jdbc/pull/2705)
+  **What changed**: Differentiated stored procedures and functions using sys.all_objects instead of sp_stored_procedures.
+  **Who benefits**: Developers using getProcedures() and getFunctions() in JDBC.
+  **Impact**: Ensures correct metadata retrieval, preventing confusion from mixed results.
+
+### Fixed issues
+
+- **Fix trustStoreType JVM property consultation in SSL Connections** [#2724](https://github.com/microsoft/mssql-jdbc/pull/2724)
+  **What was fixed**: Ensured fallback to JVM system property javax.net.ssl.trustStoreType if connection property is unset.
+  **Who benefits**: Users configuring SSL via system properties.
+  **Impact**: Enables proper SSL trust store resolution, improving compatibility with system configurations.
+
+- **Addressed a data integrity and performance issue for bulk copy batch inserts with non-Unicode Strings** [#2735](https://github.com/microsoft/mssql-jdbc/pull/2735)
+  **What was fixed**: Resolved performance degradation and incorrect string handling in bulk copy batch inserts when useBulkCopyForBatchInsert=true and sendStringParametersAsUnicode=false.
+  **Who benefits**: Applications using SQL Server JDBC Bulk Copy for high-volume inserts, especially with non-Unicode or accented character data.
+  **Impact**: Restores expected string storage, improves bulk insert performance for bulk copy API.
+
+- **Handle SQL comments at start of query in getGenerateKeys() method** [#2731](https://github.com/microsoft/mssql-jdbc/pull/2731)
+  **What was fixed**: Corrected detection of INSERT statements when preceded by SQL comments.
+  **Who benefits**: Developers using getGeneratedKeys() after commented SQL inserts.
+  **Impact**: Fixes previously failing key retrieval when comments are present before the query.
+
+- **Fix update count handling for multi-statement queries executed via PreparedStatement execute method.** [#2737](https://github.com/microsoft/mssql-jdbc/pull/2737)
+  **What was fixed**: Corrected update count handling for multi-statement queries run using PreparedStatement execute method, ensuring accurate counts for INSERT and other DML operations.
+  **Who benefits**: Java applications using SQL Server JDBC with multi-statement PreparedStatement executions.
+  **Impact**: Eliminates inconsistent update counts between Statement and PreparedStatement, improving reliability of result processing logic.
+
+- **CodeQL suppression fixes** [#2728](https://github.com/microsoft/mssql-jdbc/pull/2728)
+  **What was fixed**: Suppressed CodeQL rule [SM05141] with justification for broader usage scenarios.
+  **Who benefits**: Developers maintaining code quality tools like CodeQL.
+  **Impact**: Prevents unnecessary alerts for valid usage in multi-environment libraries.
+
+
 ## [13.1.1] Preview Release
 
 ### Added

README.md

@@ -83,7 +83,7 @@ We're now on the Maven Central Repository. Add the following to your POM file to
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>13.1.1.jre11-preview</version>
+	<version>13.2.0.jre11</version>
 </dependency>
 ```
 The driver can be downloaded from [Microsoft](https://aka.ms/downloadmssqljdbc). For driver version 12.1.0 and greater, please use the jre11 version when using Java 11 or greater, and the jre8 version when using Java 8.
@@ -94,7 +94,7 @@ To get the latest version of the driver, add the following to your POM file:
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>13.1.1.jre11-preview</version>
+	<version>13.2.0.jre11</version>
 </dependency>
 ```
 
@@ -129,7 +129,7 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>13.1.1.jre11-preview</version>
+	<version>13.2.0.jre11</version>
 	<scope>compile</scope>
 </dependency>
 
@@ -147,7 +147,7 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>13.1.1.jre11-preview</version>
+	<version>13.2.0.jre11</version>
 	<scope>compile</scope>
 </dependency>
 
@@ -174,7 +174,7 @@ When setting 'useFmtOnly' property to 'true' for establishing a connection or cr
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>13.1.1.jre11-preview</version>
+	<version>13.2.0.jre11</version>
 </dependency>
 
 <dependency>

build.gradle

@@ -11,8 +11,8 @@
 
 apply plugin: 'java'
 
-version = '13.1.1'
-def releaseExt = '-preview'
+version = '13.2.0'
+def releaseExt = ''
 def jreVersion = ""
 def testOutputDir = file("build/classes/java/test")
 def archivesBaseName = 'mssql-jdbc'

mssql-jdbc_auth_LICENSE

@@ -1,5 +1,5 @@
 MICROSOFT SOFTWARE LICENSE TERMS
-MICROSOFT JDBC DRIVER 13.1.1 FOR SQL SERVER
+MICROSOFT JDBC DRIVER 13.2.0 FOR SQL SERVER
 
 These license terms are an agreement between you and Microsoft Corporation (or one of its affiliates). They apply to the software named above and any Microsoft services or software updates (except to the extent such services or updates are accompanied by new or additional terms, in which case those different terms apply prospectively and do not alter your or Microsoft’s rights relating to pre-updated software or services). IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW.  BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS.
 

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>13.1.1</version>
+	<version>13.2.0</version>
 	<packaging>jar</packaging>
 	<name>Microsoft JDBC Driver for SQL Server</name>
 	<description>
@@ -53,7 +53,7 @@
 			Default testing enabled with SQL Server 2019 (SQLv15) -->
 		<excludedGroups>xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos,vectorTest,JSONTest</excludedGroups>
 		<!-- Use -preview for preview release, leave empty for official release. -->
-		<releaseExt>-preview</releaseExt>
+		<releaseExt></releaseExt>
 		<!-- Driver Dependencies -->
 		<org.osgi.core.version>6.0.0</org.osgi.core.version>
 		<azure-security-keyvault-keys.version>4.9.2</azure-security-keyvault-keys.version>
@@ -151,6 +151,7 @@
 			<groupId>net.bytebuddy</groupId>
 			<artifactId>byte-buddy</artifactId>
 			<version>1.15.11</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.bytebuddy</groupId>

src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java

@@ -7,15 +7,15 @@
 
 final class SQLJdbcVersion {
     static final int MAJOR = 13;
-    static final int MINOR = 1;
-    static final int PATCH = 1;
+    static final int MINOR = 2;
+    static final int PATCH = 0;
     static final int BUILD = 0;
     /*
      * Used to load mssql-jdbc_auth DLL.
      * 1. Set to "-preview" for preview release.
      * 2. Set to "" (empty String) for official release.
      */
-    static final String RELEASE_EXT = "-preview";
+    static final String RELEASE_EXT = "";
 
     private SQLJdbcVersion() {
         throw new UnsupportedOperationException(SQLServerException.getErrString("R_notSupported"));

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkBatchInsertRecord.java

@@ -7,7 +7,6 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.nio.charset.Charset;
 import java.sql.Types;
 import java.text.DecimalFormat;
 import java.text.MessageFormat;
@@ -35,7 +34,6 @@ class SQLServerBulkBatchInsertRecord extends SQLServerBulkRecord {
     private int batchParamIndex = -1;
     private List<String> columnList;
     private List<String> valueList;
-    private Charset charset;
 
     /*
      * Class name for logging.
@@ -46,10 +44,10 @@ class SQLServerBulkBatchInsertRecord extends SQLServerBulkRecord {
      * Constructs a SQLServerBulkBatchInsertRecord with the batch parameter, column list, value list, and encoding
      */
     SQLServerBulkBatchInsertRecord(ArrayList<Parameter[]> batchParam, ArrayList<String> columnList,
-            ArrayList<String> valueList, Charset charset, boolean columnNameCaseSensitive) throws SQLServerException {
+            ArrayList<String> valueList, String encoding, boolean columnNameCaseSensitive) throws SQLServerException {
         initLoggerResources();
         if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) {
-            loggerExternal.entering(loggerPackageName, loggerClassName, new Object[] {batchParam, charset.name()});
+            loggerExternal.entering(loggerPackageName, loggerClassName, new Object[] {batchParam, encoding});
         }
 
         if (null == batchParam) {
@@ -64,7 +62,6 @@ class SQLServerBulkBatchInsertRecord extends SQLServerBulkRecord {
         this.columnList = columnList;
         this.valueList = valueList;
         this.columnNameCaseSensitive = columnNameCaseSensitive;
-        this.charset = charset;
         columnMetadata = new HashMap<>();
 
         loggerExternal.exiting(loggerPackageName, loggerClassName);
@@ -189,18 +186,7 @@ else if (dateTimeFormatter != null)
             case Types.LONGVARCHAR:
             case Types.NCHAR:
             case Types.NVARCHAR:
-            case Types.LONGNVARCHAR: {
-                /*
-                 * If string data comes in as a byte array through setString (and sendStringParametersAsUnicode = false)
-                 * through Bulk Copy for Batch Insert API, convert the byte array to a string.
-                 * If the data is already a string, return it as is.
-                 */
-                if (data instanceof byte[]) {
-                    return new String((byte[]) data, charset);
-                }
-                return data;
-            }
-
+            case Types.LONGNVARCHAR:
             case Types.DATE:
             case Types.CLOB:
             default: {

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java

@@ -788,6 +788,20 @@ boolean onRetValue(TDSReader tdsReader) throws SQLServerException {
         return false;
     }
 
+    /**
+     * Override TDS token processing behavior for PreparedStatement.
+     * For regular Statement, the execute API for INSERT requires reading an additional explicit 
+     * TDS_DONE token that contains the actual update count returned by the server.
+     * PreparedStatement does not require this additional token processing, unless
+     * generated keys were requested (which requires processing additional TDS tokens).
+     */
+    @Override
+    protected boolean hasUpdateCountTDSTokenForInsertCmd() {
+        // When generated keys are requested, we need to process additional TDS tokens
+        // to properly locate the ResultSet containing the generated keys
+        return bRequestedGeneratedKeys;
+    }
+
     /**
      * Sends the statement parameters by RPC.
      */
@@ -2218,8 +2232,7 @@ public int[] executeBatch() throws SQLServerException, BatchUpdateException, SQL
                         }
 
                         SQLServerBulkBatchInsertRecord batchRecord = new SQLServerBulkBatchInsertRecord(
-                                batchParamValues, bcOperationColumnList, bcOperationValueList, 
-                                connection.getDatabaseCollation().getCharset(), isDBColationCaseSensitive());
+                                batchParamValues, bcOperationColumnList, bcOperationValueList, null, isDBColationCaseSensitive());
 
                         for (int i = 1; i <= rs.getColumnCount(); i++) {
                             Column c = rs.getColumn(i);
@@ -2427,8 +2440,7 @@ public long[] executeLargeBatch() throws SQLServerException, BatchUpdateExceptio
                         }
 
                         SQLServerBulkBatchInsertRecord batchRecord = new SQLServerBulkBatchInsertRecord(
-                                batchParamValues, bcOperationColumnList, bcOperationValueList, 
-                                connection.getDatabaseCollation().getCharset(), isDBColationCaseSensitive());
+                                batchParamValues, bcOperationColumnList, bcOperationValueList, null, isDBColationCaseSensitive());
 
                         for (int i = 1; i <= rs.getColumnCount(); i++) {
                             Column c = rs.getColumn(i);

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java

@@ -1601,8 +1601,8 @@ boolean onDone(TDSReader tdsReader) throws SQLServerException {
                         if (null != procedureName)
                             return false;
 
-                        // For Insert, we must fetch additional TDS_DONE token that comes with the actual update count
-                        if ((StreamDone.CMD_INSERT == doneToken.getCurCmd()) && (-1 != doneToken.getUpdateCount())
+                        // For Insert operations, check if additional TDS_DONE token processing is required.
+                        if (hasUpdateCountTDSTokenForInsertCmd() && (StreamDone.CMD_INSERT == doneToken.getCurCmd()) && (-1 != doneToken.getUpdateCount())
                                 && EXECUTE == executeMethod) {
                             return true;
                         }
@@ -1845,6 +1845,19 @@ boolean consumeExecOutParam(TDSReader tdsReader) throws SQLServerException {
         return false;
     }
 
+    /**
+     * Determines whether to continue processing additional TDS_DONE tokens for INSERT statements.
+     * For INSERT operations, regular Statement requires reading an additional TDS_DONE token that contains
+     * the actual update count. This method can be overridden by subclasses to customize 
+     * TDS token processing behavior.
+     * 
+     * @return true to continue processing more tokens to get the actual update count for INSERT operations
+     */
+    protected boolean hasUpdateCountTDSTokenForInsertCmd() {
+        // For Insert, we must fetch additional TDS_DONE token that comes with the actual update count
+        return true;
+    }
+
     // --------------------------JDBC 2.0-----------------------------
 
     @Override

src/main/java/com/microsoft/sqlserver/jdbc/VectorUtils.java

@@ -4,6 +4,7 @@
  */
 package com.microsoft.sqlserver.jdbc;
 
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.text.MessageFormat;
@@ -56,7 +57,12 @@ static Vector fromBytes(byte[] bytes) {
 
         ByteBuffer buffer = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
 
-        buffer.position(getHeaderLength()); // Skip the first 8 bytes (header)
+        /*
+         * The cast is required for JDK 8 compatibility.
+         * JDK 8 calls method Buffer.position(I)LBuffer,
+         * while in JDK 9+ calls method ByteBuffer.position(I)LByteBuffer
+         */
+        ((Buffer) buffer).position(getHeaderLength()); // Skip the first 8 bytes (header)
 
         for (int i = 0; i < objectCount; i++) {
             objectArray[i] = buffer.getFloat();