Browse Source

Merge | SqlCommand (Part 1) (#3473)

* Aligning CallerMemberName arguments

* Sync TriggerInternalEndAndRetryIfNecessary signatures (as part of syncing method name parameters)

* Sync attribute formatting and some low stakes stylistic/typo stuff

* Move ExecuteReader methods to align with netcore implementation

* Remove SqlCommand from TriggerInternalEndAndRetryIfNecessary functions to align with netfx implementation

* Round one of syncing method signatures

* Align keysToBeSentToEnclave, requiresEnclaveComputations, ShouldCacheEncryptionMetadata

* Align CancelIgnoreFailureCallback and CancelIgnoreFailure

* Remove unsed CompletePendingReadWith* Methods

* Align Write*ExecuteEvent methods

* Align Clone, ICloneable.Clone and NotifyDependency

* Align BeginExecuteReader and ExecuteReader methods as per netcore implementation

* Align InternalExecuteNonQueryWithRetryAsync

* Align ExecuteReaderAsync methods

* Align ExecuteXmlReaderAsync methods

* Sync some more things, like spaces, comments

* sync _prepareHandle

* Rename CachedAsyncState to AsyncState to allow for CachedAsyncState property
Transfer all _cachedAsyncState usages to CachedAsyncState
This could be dangerous since property behavior is slightly different than the direct member variable.

* sync isRetry and isAsync variable names

* Sync { // lines

* Sync event/trace/correlation messages

* Revert "Remove SqlCommand from TriggerInternalEndAndRetryIfNecessary functions to align with netfx implementation"

This reverts commit 6fccc8fba3.

Align netfx implementation with netcore implementation

pull/2894/merge

Benjamin Russell 3 days ago

committed by GitHub

parent

387bb4dd0c

commit

9744a8e271

No known key found for this signature in database GPG Key ID: B5690EEEBB952194

2 changed files with 1245 additions and 1058 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

1. 749
     src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
2. 1554
     src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs

749

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs

File diff suppressed because it is too large

View File

1554

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs

File diff suppressed because it is too large

View File

Write Preview

Loading…

Cancel

Save