Merge pull request #217 from v-xiangs/TVP-precision-fix

Tvp precision fix

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

@@ -16,6 +16,7 @@ public final class SQLServerDataColumn {
     int javaSqlType;
     int precision = 0;
     int scale = 0;
+    int numberOfDigitsIntegerPart = 0;
 
     /**
      * Initializes a new instance of SQLServerDataColumn with the column name and type.

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

@@ -161,8 +161,18 @@ public synchronized void addRow(Object... values) throws SQLServerException {
                                 currentColumnMetadata.precision = precision;
                                 isColumnMetadataUpdated = true;
                             }
-                            if (isColumnMetadataUpdated)
+
+                            // precision equal: the maximum number of digits in integer part + the maximum scale
+                            int numberOfDigitsIntegerPart = precision - bd.scale();
+                            if (numberOfDigitsIntegerPart > currentColumnMetadata.numberOfDigitsIntegerPart) {
+                                currentColumnMetadata.numberOfDigitsIntegerPart = numberOfDigitsIntegerPart;
+                                isColumnMetadataUpdated = true;
+                            }
+
+                            if (isColumnMetadataUpdated) {
+                                currentColumnMetadata.precision = currentColumnMetadata.scale + currentColumnMetadata.numberOfDigitsIntegerPart;
                                 columnMetadata.put(pair.getKey(), currentColumnMetadata);
+                            }
                         }
                         rowValues[pair.getKey()] = bd;
                         break;

src/test/java/com/microsoft/sqlserver/jdbc/tvp/TVPNumericTest.java

@@ -0,0 +1,125 @@
+/*
+ * Microsoft JDBC Driver for SQL Server
+ * 
+ * Copyright(c) Microsoft Corporation All rights reserved.
+ * 
+ * This program is made available under the terms of the MIT License. See the LICENSE file in the project root for more information.
+ */
+package com.microsoft.sqlserver.jdbc.tvp;
+
+import java.sql.SQLException;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+
+import com.microsoft.sqlserver.jdbc.SQLServerDataTable;
+import com.microsoft.sqlserver.jdbc.SQLServerException;
+import com.microsoft.sqlserver.jdbc.SQLServerPreparedStatement;
+import com.microsoft.sqlserver.testframework.AbstractTest;
+import com.microsoft.sqlserver.testframework.DBConnection;
+import com.microsoft.sqlserver.testframework.DBResultSet;
+import com.microsoft.sqlserver.testframework.DBStatement;
+
+@RunWith(JUnitPlatform.class)
+public class TVPNumericTest extends AbstractTest {
+
+    private static DBConnection conn = null;
+    static DBStatement stmt = null;
+    static DBResultSet rs = null;
+    static SQLServerDataTable tvp = null;
+    static String expectecValue1 = "hello";
+    static String expectecValue2 = "world";
+    static String expectecValue3 = "again";
+    private static String tvpName = "numericTVP";
+    private static String charTable = "tvpNumericTable";
+    private static String procedureName = "procedureThatCallsTVP";
+
+    /**
+     * Test a previous failure regarding to numeric precision. Issue #211
+     * 
+     * @throws SQLServerException
+     */
+    @Test
+    public void testNumericPresicionIssue_211() throws SQLServerException {
+        tvp = new SQLServerDataTable();
+        tvp.addColumnMetadata("c1", java.sql.Types.NUMERIC);
+
+        tvp.addRow(12.12);
+        tvp.addRow(1.123);
+
+        SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) connection
+                .prepareStatement("INSERT INTO " + charTable + " select * from ? ;");
+        pstmt.setStructured(1, tvpName, tvp);
+
+        pstmt.execute();
+
+        if (null != pstmt) {
+            pstmt.close();
+        }
+    }
+
+    @BeforeEach
+    private void testSetup() throws SQLException {
+        conn = new DBConnection(connectionString);
+        stmt = conn.createStatement();
+
+        dropProcedure();
+        dropTables();
+        dropTVPS();
+
+        createTVPS();
+        createTables();
+        createPreocedure();
+    }
+
+    private void dropProcedure() throws SQLException {
+        String sql = " IF EXISTS (select * from sysobjects where id = object_id(N'" + procedureName + "') and OBJECTPROPERTY(id, N'IsProcedure') = 1)"
+                + " DROP PROCEDURE " + procedureName;
+        stmt.execute(sql);
+    }
+
+    private static void dropTables() throws SQLException {
+        stmt.executeUpdate("if object_id('" + charTable + "','U') is not null" + " drop table " + charTable);
+    }
+
+    private static void dropTVPS() throws SQLException {
+        stmt.executeUpdate("IF EXISTS (SELECT * FROM sys.types WHERE is_table_type = 1 AND name = '" + tvpName + "') " + " drop type " + tvpName);
+    }
+
+    private static void createPreocedure() throws SQLException {
+        String sql = "CREATE PROCEDURE " + procedureName + " @InputData " + tvpName + " READONLY " + " AS " + " BEGIN " + " INSERT INTO " + charTable
+                + " SELECT * FROM @InputData" + " END";
+
+        stmt.execute(sql);
+    }
+
+    private void createTables() throws SQLException {
+        String sql = "create table " + charTable + " (c1 numeric(6,3) null);";
+        stmt.execute(sql);
+    }
+
+    private void createTVPS() throws SQLException {
+        String TVPCreateCmd = "CREATE TYPE " + tvpName + " as table (c1 numeric(6,3) null)";
+        stmt.executeUpdate(TVPCreateCmd);
+    }
+
+    @AfterEach
+    private void terminateVariation() throws SQLException {
+        if (null != conn) {
+            conn.close();
+        }
+        if (null != stmt) {
+            stmt.close();
+        }
+        if (null != rs) {
+            rs.close();
+        }
+        if (null != tvp) {
+            tvp.clear();
+        }
+    }
+
+}