Skip to content
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

retrieve paramater encryption metadata if they are not retrieved yet #220

Merged
merged 6 commits into from
Mar 30, 2017
Merged

retrieve paramater encryption metadata if they are not retrieved yet #220

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1ed35b5
retrieve paramater encryption metadata if they are not retrieved yet
xiangyushawn Mar 24, 2017
bc8b7a4
remove length check since it's already done
xiangyushawn Mar 24, 2017
67e4306
instead of checking the first parameter, using a flag
xiangyushawn Mar 27, 2017
96b8f42
fix a typo
xiangyushawn Mar 27, 2017
bbb5e25
only call buildPreparedStrings for the first prepared statewment
xiangyushawn Mar 28, 2017
277b50e
update hasNewTypeDefinitions when setter type changes
xiangyushawn Mar 29, 2017
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
6 changes: 5 additions & 1 deletion 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 @@ -415,7 +415,11 @@ final void doExecutePreparedStatement(PrepStmtExecCmd command) throws SQLServerE

boolean hasNewTypeDefinitions = buildPreparedStrings(inOutParam, false);
if ((Util.shouldHonorAEForParameters(stmtColumnEncriptionSetting, connection)) && (0 < inOutParam.length) && !isInternalEncryptionQuery) {
getParameterEncryptionMetadata(inOutParam);

// retrieve paramater encryption metadata if they are not retrieved yet
if (null == inOutParam[0].getCryptoMetadata()) {
getParameterEncryptionMetadata(inOutParam);
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this fix will work only if the first parameter is encrypted. Consider the case where first parameter is not encrypted, then it will fall back to the old behavior as inOutParam[0].getCryptoMetadata() is null.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you. fixed with flag


// maxRows is set to 0 when retreving encryption metadata,
// need to set it back
Expand Down