Skip to content

Port SqlParameter changes from netcore to netfx #1812

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 6 commits into from
Nov 2, 2022
Merged

Port SqlParameter changes from netcore to netfx #1812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb3fcbf
port changes
Wraith2 Oct 24, 2022
1d8296c
set the parameters on the rpc
Wraith2 Oct 24, 2022
557bbc5
fix parameter conuting
Wraith2 Oct 24, 2022
f4002ca
sync encryption param building code and make sure that the important …
Wraith2 Nov 1, 2022
615104d
audit reuse of sysparams and make sure all locations have direction, …
Wraith2 Nov 1, 2022
27a369c
review feedback
Wraith2 Nov 1, 2022
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
10 changes: 9 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4058,6 +4058,7 @@ private void PrepareDescribeParameterEncryptionRequest(_SqlRPC originalRpcReques
tsqlParam.SqlDbType = ((text.Length << 1) <= TdsEnums.TYPE_SIZE_LIMIT) ? SqlDbType.NVarChar : SqlDbType.NText;
tsqlParam.Value = text;
tsqlParam.Size = text.Length;
tsqlParam.Direction = ParameterDirection.Input;
}
else
{
Expand All @@ -4075,6 +4076,7 @@ private void PrepareDescribeParameterEncryptionRequest(_SqlRPC originalRpcReques
tsqlParam.SqlDbType = ((text.Length << 1) <= TdsEnums.TYPE_SIZE_LIMIT) ? SqlDbType.NVarChar : SqlDbType.NText;
tsqlParam.Value = text;
tsqlParam.Size = text.Length;
tsqlParam.Direction = ParameterDirection.Input;
}
}

Expand Down Expand Up @@ -4151,13 +4153,15 @@ private void PrepareDescribeParameterEncryptionRequest(_SqlRPC originalRpcReques
paramsParam.SqlDbType = ((parameterList.Length << 1) <= TdsEnums.TYPE_SIZE_LIMIT) ? SqlDbType.NVarChar : SqlDbType.NText;
paramsParam.Size = parameterList.Length;
paramsParam.Value = parameterList;
paramsParam.Direction = ParameterDirection.Input;

if (attestationParameters != null)
{
SqlParameter attestationParametersParam = describeParameterEncryptionRequest.systemParams[2];
attestationParametersParam.Direction = ParameterDirection.Input;
attestationParametersParam.SqlDbType = SqlDbType.VarBinary;
attestationParametersParam.Size = attestationParameters.Length;
attestationParametersParam.Value = attestationParameters;
attestationParametersParam.Direction = ParameterDirection.Input;
}
}

Expand Down Expand Up @@ -5791,13 +5795,15 @@ private _SqlRPC BuildPrepExec(CommandBehavior behavior)
sqlParam.SqlDbType = ((paramList.Length << 1) <= TdsEnums.TYPE_SIZE_LIMIT) ? SqlDbType.NVarChar : SqlDbType.NText;
sqlParam.Value = paramList;
sqlParam.Size = paramList.Length;
sqlParam.Direction = ParameterDirection.Input;

//@batch_text
string text = GetCommandText(behavior);
sqlParam = rpc.systemParams[2];
sqlParam.SqlDbType = ((text.Length << 1) <= TdsEnums.TYPE_SIZE_LIMIT) ? SqlDbType.NVarChar : SqlDbType.NText;
sqlParam.Size = text.Length;
sqlParam.Value = text;
sqlParam.Direction = ParameterDirection.Input;

SetUpRPCParameters(rpc, false, _parameters);
return rpc;
Expand Down Expand Up @@ -5899,6 +5905,7 @@ private _SqlRPC BuildExecute(bool inSchema)
//@handle
SqlParameter sqlParam = rpc.systemParams[0];
sqlParam.SqlDbType = SqlDbType.Int;
sqlParam.Size = 4;
sqlParam.Value = _prepareHandle;
sqlParam.Direction = ParameterDirection.Input;

Expand Down Expand Up @@ -5951,6 +5958,7 @@ private void BuildExecuteSql(CommandBehavior behavior, string commandText, SqlPa
sqlParam.SqlDbType = ((paramList.Length << 1) <= TdsEnums.TYPE_SIZE_LIMIT) ? SqlDbType.NVarChar : SqlDbType.NText;
sqlParam.Size = paramList.Length;
sqlParam.Value = paramList;
sqlParam.Direction = ParameterDirection.Input;

bool inSchema = (0 != (behavior & CommandBehavior.SchemaOnly));
SetUpRPCParameters(rpc, inSchema, parameters);
Expand Down
Loading