Skip to content

Commit e472245

Browse files
authored
Merge | SqlCommand Public Properties (#3611)
* Merge: * _parameters * _pendingCancel * _preparedConnectionCloseCount * _preparedConnectionReconnectCount * _prepareHandle * s_cachedInvalidPrepareHandle * Statistics * Merge Connection, DbConnection * Merging RetryLogicProvider and _retryLogicProvider # Conflicts: # src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlCommand.cs * Merge Transaction, DbTransaction * Merge CommandText * Replace "" with string.Empty * Merge CommandTimeout, _commandTimeout, and ADP.InvalidCommandTimeout * Merge CommandType * Removed temp storage of _commandType * Merge ColumnEncryptionSetting, _columnEncryptionSetting * Merge Parameters and DbParameterCollection * Merging DesignTimeVisible, _designTimeVisible * Merging EnableOptimizedParameterBinding, UpdatedRowSource, _updatedRowSource * Merge StatementCompleted and _statementCompletedEventHandler * Merging Notification, NotificationAutoEnlist, _notification, _notificationAutoEnlist, _sqlDep * Merge DefaultCommandTimeout, InternalTdsConnection, IsColumnEncryptionEnabled, InternalRecordsAffected, _rowsAffected, PropertyChanging() * merge _transaction and _batchRPCMode * Restore ResetCommandTimeout that got accidentally obliterated in a previous commit * Fix logic issue in IsColumnEncryptionEnabled, reinstate TypeDescriptor.Refresh on netfx
1 parent 6b0c5c2 commit e472245

File tree

4 files changed

+540
-930
lines changed

4 files changed

+540
-930
lines changed

0 commit comments

Comments
 (0)