Skip to content

Merge | SqlCommand Encryption Methods #3676

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
benrr101 merged 31 commits into from
Oct 30, 2025
Merged

Merge | SqlCommand Encryption Methods #3676

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
08f86b6
Merge test behavior overrides
benrr101 Sep 4, 2025
9063c0b
Create encryption partial - the reader partial is getting too big.
benrr101 Sep 4, 2025
85bda18
Merge GetParameterEncryptionDataReader from netcore, update netfx to …
benrr101 Sep 4, 2025
45e568b
Merge GetParameterEncryptionDataReaderAsync from netcore, update netf…
benrr101 Sep 4, 2025
cc242fb
Factor out the second result set read for ReadDescribeEncryptionParam…
benrr101 Sep 5, 2025
d1fbee0
Factor out ReadDescribeEncryptionParameterResults1 from ReadDescribeE…
benrr101 Sep 5, 2025
04ea706
Factor out ReadDescribeEncryptionParameterResults3 from ReadDescribeE…
benrr101 Sep 5, 2025
70ba99f
Repeat factoring out in netcore
benrr101 Sep 5, 2025
db8bd2a
Executive decision: removing debug-only row count - it's to make sure…
benrr101 Sep 5, 2025
2f870c2
Merge ReadDescribeEncryptionParameterResults
benrr101 Sep 5, 2025
31662a0
Merge ShouldCacheEncryptinMetadata, keysToBeSentToEnclave and require…
benrr101 Sep 8, 2025
ee8ce4c
Merge enclavePackage, enclaveAttestationParameters, customData, custo…
benrr101 Sep 8, 2025
ee295ee
Merge ShouldUseEnclaveBasedWorkflow, _customColumnEncryptionKeyStoreP…
benrr101 Sep 8, 2025
cfd3353
Merge _sqlRPCParameterEncryptionRegArray, _currentlyExecutingDescribe…
benrr101 Sep 8, 2025
cd5ce3f
Merge InvalidateEnclaveession, GetEnclaveSessionParameters
benrr101 Sep 8, 2025
f4046b5
Merge ValidateCustomProviders
benrr101 Sep 8, 2025
e0656c3
Merge ResetEncryptionState()
benrr101 Sep 8, 2025
cb34479
Merge PrepareTransparentEncryptionFinallyBlock
benrr101 Sep 8, 2025
6b82413
Merge _rowsAffectedBySpDescribeParameterEncryption and RowsAffectedBy…
benrr101 Sep 9, 2025
588a724
Merge SetColumnEncryptionSetting and _wasBatchModeColumnEncryptionSet…
benrr101 Sep 9, 2025
016756b
Merge GetColumnEncryptionCustomKeyProvidersNames and TryGetColumnEncr…
benrr101 Sep 9, 2025
5bc19f9
Merge TryFetchInputParameterEncryptionInfo
benrr101 Sep 9, 2025
06e0bf1
Merge PrepareDescribeParameterEncryptionRequest
benrr101 Sep 10, 2025
db8b2e7
Merge ClearDescribeParameterEncryptionRequests
benrr101 Sep 11, 2025
0b683cc
Merge _rpcForEncryption, BuildStoredProcedureStatementForColumnEncryp…
benrr101 Sep 11, 2025
dfe729b
Addressing comments from @edwardneal
benrr101 Oct 9, 2025
cdc98bf
Renaming the result set reading methods and applying a bit more clean…
benrr101 Oct 10, 2025
0728917
Merge branch 'main' into dev/russellben/merge/sqlcommand-nocer-encryp…
benrr101 Oct 20, 2025
ca5037e
Probably fixing that bug
benrr101 Oct 22, 2025
8c168c1
Reorder/rename parameter results methods to fit guidelines
benrr101 Oct 27, 2025
3028240
Correcting a few more mistakes
benrr101 Oct 27, 2025
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/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.Encryption.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ private SqlParameter BuildStoredProcedureStatementForColumnEncryption(
if (returnValueParameter is not null)
{
SqlParameter.AppendPrefixedParameterName(execStatement, returnValueParameter.ParameterName);
execStatement.Append("=");
execStatement.Append('=');
Comment thread
benrr101 marked this conversation as resolved.
}

execStatement.Append(ParseAndQuoteIdentifier(storedProcedureName, isUdtTypeName: false));
Expand Down Expand Up @@ -198,7 +198,7 @@ private SqlParameter BuildStoredProcedureStatementForColumnEncryption(
// @TODO: Invert
if (parameter.Direction is not ParameterDirection.ReturnValue)
{
execStatement.Append(' ');
execStatement.Append(", ");
Comment thread
benrr101 marked this conversation as resolved.
Comment thread
benrr101 marked this conversation as resolved.
SqlParameter.AppendPrefixedParameterName(execStatement, parameter.ParameterName);
execStatement.Append('=');
SqlParameter.AppendPrefixedParameterName(execStatement, parameter.ParameterName);
Expand Down
Loading