Remove the setBulkCopyOptions method from PreparedStatement

-Since the change has added connection string options for setting
various bulk copy options, this non-standard API is not needed.

Author: machavan

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

@@ -133,11 +133,6 @@ private void setPreparedStatementHandle(int handle) {
      */
     private SQLServerBulkCopy bcOperation = null;
 
-    /**
-     * Bulk Copy Options to be used for bulkcopy
-     */
-    private SQLServerBulkCopyOptions bcOptions = null;
-
     /**
      * Bulkcopy operation table name
      */
@@ -186,16 +181,6 @@ private void setUseBulkCopyForBatchInsert(boolean useBulkCopyForBatchInsert) thr
         this.useBulkCopyForBatchInsert = useBulkCopyForBatchInsert;
     }
 
-    /**
-     * Sets SQLServerBulkCopyOptions in preapred statement.
-     * 
-     * @param options
-     *        the user supplied SQLServerBulkCopyOptions value
-     */
-    public void setBulkCopyOptions(SQLServerBulkCopyOptions options) {
-    	this.bcOptions = options;
-    }
-    
     @Override
     public int getPreparedStatementHandle() throws SQLServerException {
         checkClosed();
@@ -2239,12 +2224,7 @@ public int[] executeBatch() throws SQLServerException, BatchUpdateException, SQL
 
                         if (null == bcOperation) {
                             bcOperation = new SQLServerBulkCopy(connection);
-                            SQLServerBulkCopyOptions option = null;
-                            if (this.bcOptions == null) {
-                            	option = new SQLServerBulkCopyOptions(connection);
-                            } else {
-                                option = this.bcOptions;
-                            }
+                            SQLServerBulkCopyOptions option = new SQLServerBulkCopyOptions(connection);
                             option.setBulkCopyTimeout(queryTimeout);
                             bcOperation.setBulkCopyOptions(option);
                             bcOperation.setDestinationTableName(bcOperationTableName);
@@ -2425,12 +2405,7 @@ public long[] executeLargeBatch() throws SQLServerException, BatchUpdateExceptio
 
                         if (null == bcOperation) {
                             bcOperation = new SQLServerBulkCopy(connection);
-                            SQLServerBulkCopyOptions option = null;
-                            if (this.bcOptions == null) {
-                            	option = new SQLServerBulkCopyOptions(connection);
-                            } else {
-                                option = this.bcOptions;
-                            }
+                            SQLServerBulkCopyOptions option = new SQLServerBulkCopyOptions(connection);
                             option.setBulkCopyTimeout(queryTimeout);
                             bcOperation.setBulkCopyOptions(option);
                             bcOperation.setDestinationTableName(bcOperationTableName);

src/test/java/com/microsoft/sqlserver/jdbc/preparedStatement/BatchExecutionWithBCOptionsTest.java

@@ -320,108 +320,6 @@ public void testBulkInsertNoOptions() throws Exception {
         }
     }
 
-    /**
-     * Test with useBulkCopyBatchInsert=true passing SQLServerBulkCopyOptions with
-     * constraint check enabled
-     *
-     * @throws SQLException
-     */
-    @Test
-    public void testBulkInsertWithConstraintCheckEnabled() throws Exception {
-        // Set BulkCopy options
-        SQLServerBulkCopyOptions options = new SQLServerBulkCopyOptions();
-        // options.setKeepIdentity(true); // Preserve identity values from the source
-        options.setCheckConstraints(true); // enable constraint checks
-        // options.setTableLock(true); // Lock the destination table for faster insert
-        // options.setBatchSize(1000); // Batch size for the bulk copy
-        // options.setTimeout(60); // Timeout in seconds
-
-        try (Connection connection = PrepUtil.getConnection(connectionString + ";useBulkCopyForBatchInsert=true;")) {
-            try (PreparedStatement pstmt = connection.prepareStatement("insert into " + tableName + " values(?, ?)")) {
-
-                ((SQLServerPreparedStatement) pstmt).setBulkCopyOptions(options);
-
-                pstmt.setInt(1, 1);
-                pstmt.setInt(2, 0);
-                pstmt.addBatch();
-
-                pstmt.setInt(1, 2);
-                pstmt.setInt(2, 2);
-                pstmt.addBatch();
-
-                pstmt.setInt(1, 3);
-                pstmt.setInt(2, 0);
-                pstmt.addBatch();
-
-                pstmt.setInt(1, 4);
-                pstmt.setInt(2, 4);
-                pstmt.addBatch();
-
-                pstmt.executeBatch();
-
-                fail(TestResource.getResource("R_expectedExceptionNotThrown"));
-
-            }
-        } catch (SQLException e) {
-            if (!e.getMessage().contains("CHECK")) {
-                fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
-            }
-        }
-    }
-
-    /**
-     * Test with useBulkCopyBatchInsert=true passing SQLServerBulkCopyOptions with
-     * constraint check disabled
-     *
-     * @throws SQLException
-     */
-    @Test
-    public void testBulkInsertWithConstraintCheckDisabled() throws Exception {
-        // Set BulkCopy options
-        SQLServerBulkCopyOptions options = new SQLServerBulkCopyOptions();
-        // options.setKeepIdentity(true); // Preserve identity values from the source
-        options.setCheckConstraints(false); // enable constraint checks
-        // options.setTableLock(true); // Lock the destination table for faster insert
-        // options.setBatchSize(1000); // Batch size for the bulk copy
-        // options.setTimeout(60); // Timeout in seconds
-
-        try (Connection connection = PrepUtil.getConnection(connectionString + ";useBulkCopyForBatchInsert=true;")) {
-            try (PreparedStatement pstmt = connection.prepareStatement("insert into " + tableName + " values(?, ?)")) {
-
-                ((SQLServerPreparedStatement) pstmt).setBulkCopyOptions(options);
-
-                pstmt.setInt(1, 1);
-                pstmt.setInt(2, 0);
-                pstmt.addBatch();
-
-                pstmt.setInt(1, 2);
-                pstmt.setInt(2, 2);
-                pstmt.addBatch();
-
-                pstmt.setInt(1, 3);
-                pstmt.setInt(2, 0);
-                pstmt.addBatch();
-
-                pstmt.setInt(1, 4);
-                pstmt.setInt(2, 4);
-                pstmt.addBatch();
-
-                pstmt.executeBatch();
-
-                try (Statement stmt = connection.createStatement()) {
-                    try (ResultSet rs = stmt.executeQuery("select count(*) from " + tableName)) {
-                        if (rs.next()) {
-                            int cnt = rs.getInt(1);
-                            assertEquals(cnt, 4, "row count should have been 4");
-                        }
-                    }
-                }
-            }
-        } catch (SQLException e) {
-            fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
-        }
-    }
-
     /**
      * Test with useBulkCopyBatchInsert=true and
      * bulkCopyOptionDefaultsTableLock=true