Discarded count should always be 1

microsoft · Jan 5, 2024 · 9bb0f3e · 9bb0f3e
1 parent 62fc6d8
commit 9bb0f3e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java b/src/main/java/com/microsoft/sqlserver/jdbc/Parameter.java
@@ -592,6 +592,11 @@ private void setTypeDefinition(DTV dtv) {
                             param.typeDefinition = SSType.DECIMAL.toString() + "(" + valueLength + "," + scale + ")";
                         }
                     } else {
+                        if (inScale == null) {
+                            // If inscale is null, null has been passed to a bigDecimal column. This will corrupt the
+                            // destination, so we block it.
+                            param.typeDefinition = null;
+                        }
                         if (con.getCalcBigDecimalPrecision() && dtv.getJavaType() == JavaType.BIGDECIMAL
                                 && null != dtv.getSetterValue()) {
                             String[] plainValueArray = ((BigDecimal) dtv.getSetterValue()).abs().toPlainString()

diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/PreparedStatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/PreparedStatementTest.java
@@ -299,6 +299,8 @@ public void testBatchedUnprepare() throws SQLException {
                 if (prevDiscardActionCount > con.getServerPreparedStatementDiscardThreshold()) {
                     prevDiscardActionCount = 0;
                 }
+
+                assertSame(1, con.getDiscardedServerPreparedStatementCount());
             }
 
             // Skipped for now due to unexpected failures. Not functional so not critical.
@@ -398,7 +400,10 @@ public void testStatementPoolingEviction() throws SQLException {
                 }
 
                 // If we use it, now discard queue should be "full".
-                if (0 != testNo)
+                // At any point, con.getDiscardedPreparedStatementCount will always be 1 (i.e. the last eviction).
+                if (0 == testNo)
+                    assertSame(1, con.getDiscardedServerPreparedStatementCount());
+                else
                     assertSame(0, con.getDiscardedServerPreparedStatementCount());
 
                 // Adding one more statement should cause one more pooled statement to be invalidated and