Skip to content

Backport: Fixed New Type Param Definitions logic in doExecutePreparedStatement #2683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2025
Merged

Backport: Fixed New Type Param Definitions logic in doExecutePreparedStatement #2683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ final void doExecutePreparedStatement(PrepStmtExecCmd command) throws SQLServerE
parameterNames);
encryptionMetadataIsRetrieved = true;
setMaxRowsAndMaxFieldSize();
hasNewTypeDefinitions = buildPreparedStrings(inOutParam, true);
buildPreparedStrings(inOutParam, true);
}

if ((Util.shouldHonorAEForParameters(stmtColumnEncriptionSetting, connection)) && (0 < inOutParam.length)
Expand All @@ -664,7 +664,7 @@ final void doExecutePreparedStatement(PrepStmtExecCmd command) throws SQLServerE

// fix an issue when inserting unicode into non-encrypted nchar column using setString() and AE is on on
// Connection
hasNewTypeDefinitions = buildPreparedStrings(inOutParam, true);
buildPreparedStrings(inOutParam, true);
}

boolean needsPrepare = true;
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ public class AESetup extends AbstractTest {
AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("JDBCEncryptedNumeric")));
public static final String SCALE_DATE_TABLE_AE = TestUtils.escapeSingleQuotes(
AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("JDBCEncryptedScaleDate")));
public static final String VARY_STRING_TABLE_AE = TestUtils
.escapeSingleQuotes(AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("JDBCEncryptedString")));

final static char[] HEXCHARS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};

Expand Down
135 changes: 107 additions & 28 deletions ...test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/RegressionAlwaysEncryptedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ public class RegressionAlwaysEncryptedTest extends AESetup {
static String charTable[][] = {{"Char", "char(20) COLLATE Latin1_General_BIN2"},
{"Varchar", "varchar(50) COLLATE Latin1_General_BIN2"},};

static String stringTable[][] = {{"VarcharMax", "varchar(max)"},};

static String stringVaryLengthTable[][] = {{"VarcharMax", "varchar(max) COLLATE Latin1_General_BIN2"},};

@ParameterizedTest
@MethodSource("enclaveParams")
public void alwaysEncrypted1(String serverName, String url, String protocol) throws Exception {
Expand All @@ -48,25 +52,26 @@ public void alwaysEncrypted1(String serverName, String url, String protocol) thr
.getConnection(AETestConnectionString + ";columnEncryptionSetting=enabled;", AEInfo);
Statement stmt = connection.createStatement()) {
dropTables(stmt);
try {
createTable(NUMERIC_TABLE_AE, cekJks, numericTable);

createTable(NUMERIC_TABLE_AE, cekJks, numericTable);
populateNumericTable(connection);
verifyNumericTable(connection, false);

populateNumericTable(connection);
verifyNumericTable(connection, false);
dropTables(stmt);
createTable(DATE_TABLE_AE, cekJks, dateTable);

dropTables(stmt);
createTable(DATE_TABLE_AE, cekJks, dateTable);
populateDateTable(connection);
verifyDateTable(connection);

populateDateTable(connection);
verifyDateTable(connection);
dropTables(stmt);
createTable(NUMERIC_TABLE_AE, cekJks, numericTable);

dropTables(stmt);
createTable(NUMERIC_TABLE_AE, cekJks, numericTable);

populateNumericTableWithNull(connection);
verifyNumericTable(connection, true);

dropTables(stmt);
populateNumericTableWithNull(connection);
verifyNumericTable(connection, true);
} finally {
dropTables(stmt);
}
}
}

Expand All @@ -78,22 +83,23 @@ public void alwaysEncrypted2(String serverName, String url, String protocol) thr
.getConnection(AETestConnectionString + ";columnEncryptionSetting=enabled;", AEInfo);
Statement stmt = connection.createStatement()) {
dropTables(stmt);
try {
createTable(CHAR_TABLE_AE, cekJks, charTable);
populateCharTable(connection);
verifyCharTable(connection);

createTable(CHAR_TABLE_AE, cekJks, charTable);
populateCharTable(connection);
verifyCharTable(connection);

dropTables(stmt);
createTable(DATE_TABLE_AE, cekJks, dateTable);
populateDateTable(connection);
verifyDateTable(connection);
dropTables(stmt);
createTable(DATE_TABLE_AE, cekJks, dateTable);
populateDateTable(connection);
verifyDateTable(connection);

dropTables(stmt);
createTable(NUMERIC_TABLE_AE, cekJks, numericTable);
populateNumericTableSpecificSetter(connection);
verifyNumericTable(connection, false);

dropTables(stmt);
dropTables(stmt);
createTable(NUMERIC_TABLE_AE, cekJks, numericTable);
populateNumericTableSpecificSetter(connection);
verifyNumericTable(connection, false);
} finally {
dropTables(stmt);
}
}
}

Expand Down Expand Up @@ -228,6 +234,79 @@ private void verifyNumericTable(Connection connection, boolean isNull) throws SQ
}
}

@ParameterizedTest
@MethodSource("enclaveParams")
public void testStringColumnEncryptWithVaryLength(String serverName, String url, String protocol) throws Exception {
setAEConnectionString(serverName, url, protocol);
try (Connection connection = PrepUtil
.getConnection(AETestConnectionString + ";columnEncryptionSetting=enabled;", AEInfo);
Statement stmt = connection.createStatement()) {
dropTables(stmt);

createTable(VARY_STRING_TABLE_AE, cekJks, stringVaryLengthTable);

try {
verifyStringTable(connection, false);
} finally {
dropTables(stmt);
}
}
}

@ParameterizedTest
@MethodSource("enclaveParams")
public void testStringColumnEncryptWithVaryLengthClearParam(String serverName, String url,
String protocol) throws Exception {
setAEConnectionString(serverName, url, protocol);
try (Connection connection = PrepUtil
.getConnection(AETestConnectionString + ";columnEncryptionSetting=enabled;", AEInfo);
Statement stmt = connection.createStatement()) {
dropTables(stmt);

createTable(VARY_STRING_TABLE_AE, cekJks, stringVaryLengthTable);
try {
verifyStringTable(connection, true);
} finally {
dropTables(stmt);
}
}
}

private void verifyStringTable(Connection connection, boolean enableClearParameters) throws SQLException {
String sql = "insert into " + VARY_STRING_TABLE_AE + " values(?, ?, ?)";

try (PreparedStatement sqlPstmt = connection.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY,
ResultSet.CONCUR_READ_ONLY, connection.getHoldability())) {
String data1 = "a";

if (enableClearParameters) {
sqlPstmt.clearParameters();
}
sqlPstmt.setString(1, data1);
sqlPstmt.setString(2, data1);
sqlPstmt.setString(3, data1);
sqlPstmt.executeUpdate();

String data2 = data1 + "aa";
if (enableClearParameters) {
sqlPstmt.clearParameters();
}
sqlPstmt.setString(1, data2);
sqlPstmt.setString(2, data2);
sqlPstmt.setString(3, data2);
sqlPstmt.executeUpdate();

String data3 = data2 + "aaa";
if (enableClearParameters) {
sqlPstmt.clearParameters();
}
sqlPstmt.setString(1, data3);
sqlPstmt.setString(2, data3);
sqlPstmt.setString(3, data3);
sqlPstmt.executeUpdate();
}
}

public static void dropTables(Statement stmt) throws SQLException {
TestUtils.dropTableIfExists(DATE_TABLE_AE, stmt);
TestUtils.dropTableIfExists(CHAR_TABLE_AE, stmt);
Expand Down