diff options
Diffstat (limited to 'mcs/class/referencesource/System.Data/System/Data/Common')
91 files changed, 719 insertions, 326 deletions
diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/ActivityCorrelator.cs b/mcs/class/referencesource/System.Data/System/Data/Common/ActivityCorrelator.cs index 4fc17b4ebdd..e40cbc2c505 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/ActivityCorrelator.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/ActivityCorrelator.cs @@ -2,7 +2,7 @@ // <copyright file="ActivityCorrelator.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterSwitches.cs b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterSwitches.cs index 67842354caf..be5d8321b93 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterSwitches.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterSwitches.cs @@ -2,8 +2,8 @@ // <copyright file="AdapterSwitches.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">markash</owner> +// <owner current="true" primary="false">laled</owner> //------------------------------------------------------------------------------ #if DEBUG diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs index f8880b5d09b..04cd1e4a72c 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs @@ -2,8 +2,8 @@ // <copyright file="AdapterUtil.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -78,7 +78,7 @@ namespace System.Data.Common { } // NOTE: Initializing a Task in SQL CLR requires the "UNSAFE" permission set (http://msdn.microsoft.com/en-us/library/ms172338.aspx) - // Therefore we are lazily initializing these Tasks to avoid forcing customers to use the "UNSAFE" set when they are actually using no Async features (See Dev11 Bug #193253) + // Therefore we are lazily initializing these Tasks to avoid forcing customers to use the "UNSAFE" set when they are actually using no Async features (See Dev11 static private Task<bool> _trueTask = null; static internal Task<bool> TrueTask { get { @@ -803,7 +803,7 @@ namespace System.Data.Common { return ADP.InvalidOperation(Res.GetString(Res.ADP_InvalidMixedUsageOfSecureAndClearCredential)); } - static internal ArgumentException InvalidMixedArgumentOfSecureAndClearCredential() { + static internal ArgumentException InvalidMixedArgumentOfSecureAndClearCredential() { return ADP.Argument(Res.GetString(Res.ADP_InvalidMixedUsageOfSecureAndClearCredential)); } @@ -820,11 +820,35 @@ namespace System.Data.Common { return ADP.InvalidOperation(Res.GetString(Res.ADP_InvalidMixedUsageOfSecureCredentialAndContextConnection)); } - static internal ArgumentException InvalidMixedArgumentOfSecureCredentialAndContextConnection() + static internal ArgumentException InvalidMixedArgumentOfSecureCredentialAndContextConnection() { return ADP.Argument(Res.GetString(Res.ADP_InvalidMixedUsageOfSecureCredentialAndContextConnection)); } + static internal InvalidOperationException InvalidMixedUsageOfAccessTokenAndContextConnection() { + return ADP.InvalidOperation(Res.GetString(Res.ADP_InvalidMixedUsageOfAccessTokenAndContextConnection)); + } + + static internal InvalidOperationException InvalidMixedUsageOfAccessTokenAndIntegratedSecurity() { + return ADP.InvalidOperation(Res.GetString(Res.ADP_InvalidMixedUsageOfAccessTokenAndIntegratedSecurity)); + } + + static internal InvalidOperationException InvalidMixedUsageOfAccessTokenAndUserIDPassword() { + return ADP.InvalidOperation(Res.GetString(Res.ADP_InvalidMixedUsageOfAccessTokenAndUserIDPassword)); + } + + static internal Exception InvalidMixedUsageOfAccessTokenAndCredential() { + return ADP.InvalidOperation(Res.GetString(Res.ADP_InvalidMixedUsageOfAccessTokenAndCredential)); + } + + static internal Exception InvalidMixedUsageOfAccessTokenAndAuthentication() { + return ADP.InvalidOperation(Res.GetString(Res.ADP_InvalidMixedUsageOfAccessTokenAndAuthentication)); + } + + static internal Exception InvalidMixedUsageOfCredentialAndAccessToken() { + return ADP.InvalidOperation(Res.GetString(Res.ADP_InvalidMixedUsageOfCredentialAndAccessToken)); + } + // // DbConnection // @@ -1568,6 +1592,10 @@ namespace System.Data.Common { return ADP.Argument(Res.GetString(Res.ADP_ParameterValueOutOfRange, value.ToString())); } + static internal ArgumentException ParameterValueOutOfRange(String value) { + return ADP.Argument(Res.GetString(Res.ADP_ParameterValueOutOfRange, value)); + } + static internal ArgumentException VersionDoesNotSupportDataType(string typeName) { return Argument(Res.GetString(Res.ADP_VersionDoesNotSupportDataType, typeName)); } @@ -1761,6 +1789,7 @@ namespace System.Data.Common { internal const string ChangeDatabase = "ChangeDatabase"; internal const string Cancel = "Cancel"; internal const string Clone = "Clone"; + internal const string ColumnEncryptionSystemProviderNamePrefix = "MSSQL_"; internal const string CommitTransaction = "CommitTransaction"; internal const string CommandTimeout = "CommandTimeout"; internal const string ConnectionString = "ConnectionString"; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/BigIntegerStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/BigIntegerStorage.cs index d3544903d86..e26e965964b 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/BigIntegerStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/BigIntegerStorage.cs @@ -2,8 +2,8 @@ // <copyright file="BigIntStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/BooleanStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/BooleanStorage.cs index de174a86bbc..cc64c9506da 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/BooleanStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/BooleanStorage.cs @@ -2,9 +2,9 @@ // <copyright file="BooleanStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/ByteStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/ByteStorage.cs index 12a9df123c7..d41d1576bc7 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/ByteStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/ByteStorage.cs @@ -2,9 +2,9 @@ // <copyright file="ByteStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/CharStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/CharStorage.cs index b03c0df2c2b..f1baf809a6c 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/CharStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/CharStorage.cs @@ -2,9 +2,9 @@ // <copyright file="CharStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DBCommand.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DBCommand.cs index 3a2e01b2620..cc4399fe385 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DBCommand.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DBCommand.cs @@ -2,8 +2,8 @@ // <copyright file="DbCommand.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DBCommandBuilder.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DBCommandBuilder.cs index 9744b25b2cf..4205f95998a 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DBCommandBuilder.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DBCommandBuilder.cs @@ -2,8 +2,8 @@ // <copyright file="CommandBuilder.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DBConnection.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DBConnection.cs index e9967e0c0b1..52f04500598 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DBConnection.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DBConnection.cs @@ -2,9 +2,9 @@ // <copyright file="DbConnection.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DBConnectionString.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DBConnectionString.cs index ed7b7b4c5d1..42e1b6bb1f1 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DBConnectionString.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DBConnectionString.cs @@ -2,8 +2,8 @@ // <copyright file="DBConnectionString.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -251,7 +251,7 @@ namespace System.Data.Common { //Debug.WriteLine("14/15/16 this AllowOnly and entry AllowOnly but no restrictions"); } - // verify _hasPassword & _parsetable are in [....] between Everett/Whidbey + // verify _hasPassword & _parsetable are in sync between Everett/Whidbey Debug.Assert(!_hasPassword || ContainsKey(KEY.Password) || ContainsKey(KEY.Pwd), "OnDeserialized password mismatch this"); Debug.Assert(null == entry || !entry._hasPassword || entry.ContainsKey(KEY.Password) || entry.ContainsKey(KEY.Pwd), "OnDeserialized password mismatch entry"); diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermission.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermission.cs index 46c2906efac..ed6140309e9 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermission.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermission.cs @@ -2,8 +2,8 @@ // <copyright file="DBDataPermission.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermissionAttribute.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermissionAttribute.cs index 0d22095d6b5..518e2c5215b 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermissionAttribute.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermissionAttribute.cs @@ -2,8 +2,8 @@ // <copyright file="DBDataPermissionAttribute.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DBParameter.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DBParameter.cs index be9208922d4..4a0ba35742c 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DBParameter.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DBParameter.cs @@ -2,8 +2,8 @@ // <copyright file="DbParameter.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DBSchemaRow.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DBSchemaRow.cs index 06cf3ac1477..25850cffe0c 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DBSchemaRow.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DBSchemaRow.cs @@ -2,8 +2,8 @@ // <copyright file="DBSchemaRow.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DBSchemaTable.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DBSchemaTable.cs index 8a548a5fa94..c6c8917273a 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DBSchemaTable.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DBSchemaTable.cs @@ -2,8 +2,8 @@ // <copyright file="DBSchemaTable.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DataAdapter.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DataAdapter.cs index 1dbda974752..e36220920bd 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DataAdapter.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DataAdapter.cs @@ -2,8 +2,8 @@ // <copyright file="DataAdapter.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DataColumnMapping.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DataColumnMapping.cs index acaf957c51a..f6a843e2cb2 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DataColumnMapping.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DataColumnMapping.cs @@ -2,8 +2,8 @@ // <copyright file="DataColumnMapping.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DataColumnMappingCollection.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DataColumnMappingCollection.cs index 6156160922b..b37e7560329 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DataColumnMappingCollection.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DataColumnMappingCollection.cs @@ -2,8 +2,8 @@ // <copyright file="DataColumnMappingCollection.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DataRecordInternal.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DataRecordInternal.cs index 9c8a7d31ece..659db8d52fd 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DataRecordInternal.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DataRecordInternal.cs @@ -2,8 +2,8 @@ // <copyright file="DataRecordInternal.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DataStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DataStorage.cs index 69087c233be..cf66ff06e91 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DataStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DataStorage.cs @@ -2,8 +2,8 @@ // <copyright file="DataStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DataTableMapping.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DataTableMapping.cs index 96567755f36..bbb0276ca4a 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DataTableMapping.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DataTableMapping.cs @@ -2,8 +2,8 @@ // <copyright file="DataTableMapping.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DataTableMappingCollection.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DataTableMappingCollection.cs index 9ef08940450..a235804a3ae 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DataTableMappingCollection.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DataTableMappingCollection.cs @@ -2,8 +2,8 @@ // <copyright file="DataTableMappingCollection.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DateTimeOffsetStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DateTimeOffsetStorage.cs index b92e6fc6fa5..457dc17f2a1 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DateTimeOffsetStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DateTimeOffsetStorage.cs @@ -2,8 +2,8 @@ // <copyright file="DateTimeOffsetStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DateTimeStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DateTimeStorage.cs index cce489890e5..4ff7014c5b1 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DateTimeStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DateTimeStorage.cs @@ -2,9 +2,9 @@ // <copyright file="DateTimeStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionOptions.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionOptions.cs index 9f63711fbb1..43b8e22a340 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionOptions.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionOptions.cs @@ -2,8 +2,8 @@ // <copyright file="DBConnectionOptions.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -109,6 +109,7 @@ namespace System.Data.Common { private readonly Hashtable _parsetable; internal readonly NameValuePair KeyChain; internal readonly bool HasPasswordKeyword; + internal readonly bool HasUserIdKeyword; // differences between OleDb and Odbc // ODBC: @@ -144,12 +145,14 @@ namespace System.Data.Common { if (0 < _usersConnectionString.Length) { KeyChain = ParseInternal(_parsetable, _usersConnectionString, true, synonyms, UseOdbcRules); HasPasswordKeyword = (_parsetable.ContainsKey(KEY.Password) || _parsetable.ContainsKey(SYNONYM.Pwd)); + HasUserIdKeyword = (_parsetable.ContainsKey(KEY.User_ID) || _parsetable.ContainsKey(SYNONYM.UID)); } } protected DbConnectionOptions(DbConnectionOptions connectionOptions) { // Clone used by SqlConnectionString _usersConnectionString = connectionOptions._usersConnectionString; HasPasswordKeyword = connectionOptions.HasPasswordKeyword; + HasUserIdKeyword = connectionOptions.HasUserIdKeyword; UseOdbcRules = connectionOptions.UseOdbcRules; _parsetable = connectionOptions._parsetable; KeyChain = connectionOptions.KeyChain; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionPoolKey.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionPoolKey.cs index 9142ef6dd15..6ab3ddbb13b 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionPoolKey.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionPoolKey.cs @@ -2,8 +2,8 @@ // <copyright file="ConnectionPoolKey.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionStringBuilder.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionStringBuilder.cs index f716a2679ca..5192551a19a 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionStringBuilder.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionStringBuilder.cs @@ -2,8 +2,8 @@ // <copyright file="DbConnectionStringBuilder.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -128,7 +128,7 @@ namespace System.Data.Common { foreach(string keyword in Keys) { object value; if (ShouldSerialize(keyword) && TryGetValue(keyword, out value)) { - string keyvalue = (null != value) ? Convert.ToString(value, CultureInfo.InvariantCulture) : (string)null; + string keyvalue = ConvertValueToString(value); AppendKeyValuePair(builder, keyword, keyvalue, UseOdbcRules); } } @@ -213,6 +213,10 @@ namespace System.Data.Common { } } + internal virtual string ConvertValueToString(object value) { + return (value == null) ? (string)null : Convert.ToString(value, CultureInfo.InvariantCulture); + } + void System.Collections.IDictionary.Add(object keyword, object value) { Add(ObjectToString(keyword), value); } @@ -378,7 +382,7 @@ namespace System.Data.Common { } // all keywords in Keys list that do not have strongly typed property, ODBC case - // ignore 'Workaround Oracle Bug 914652' via IsFixedSize + // ignore 'Workaround Oracle if (!IsFixedSize) { attributes = null; foreach(string keyword in Keys) { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionStringCommon.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionStringCommon.cs index 307e3f9aa1e..f943f272b3a 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionStringCommon.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbConnectionStringCommon.cs @@ -2,8 +2,8 @@ // <copyright file="DbConnectionStringBuilder.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ using System; @@ -236,17 +236,21 @@ namespace System.Data.Common { } } - internal static class DbConnectionStringBuilderUtil { + internal static class DbConnectionStringBuilderUtil + { - internal static bool ConvertToBoolean(object value) { + internal static bool ConvertToBoolean(object value) + { Debug.Assert(null != value, "ConvertToBoolean(null)"); string svalue = (value as string); - if (null != svalue) { + if (null != svalue) + { if (StringComparer.OrdinalIgnoreCase.Equals(svalue, "true") || StringComparer.OrdinalIgnoreCase.Equals(svalue, "yes")) return true; else if (StringComparer.OrdinalIgnoreCase.Equals(svalue, "false") || StringComparer.OrdinalIgnoreCase.Equals(svalue, "no")) return false; - else { + else + { string tmp = svalue.Trim(); // Remove leading & trailing white space. if (StringComparer.OrdinalIgnoreCase.Equals(tmp, "true") || StringComparer.OrdinalIgnoreCase.Equals(tmp, "yes")) return true; @@ -255,23 +259,28 @@ namespace System.Data.Common { } return Boolean.Parse(svalue); } - try { + try + { return ((IConvertible)value).ToBoolean(CultureInfo.InvariantCulture); } - catch(InvalidCastException e) { + catch (InvalidCastException e) + { throw ADP.ConvertFailed(value.GetType(), typeof(Boolean), e); } } - internal static bool ConvertToIntegratedSecurity(object value) { + internal static bool ConvertToIntegratedSecurity(object value) + { Debug.Assert(null != value, "ConvertToIntegratedSecurity(null)"); string svalue = (value as string); - if (null != svalue) { + if (null != svalue) + { if (StringComparer.OrdinalIgnoreCase.Equals(svalue, "sspi") || StringComparer.OrdinalIgnoreCase.Equals(svalue, "true") || StringComparer.OrdinalIgnoreCase.Equals(svalue, "yes")) return true; else if (StringComparer.OrdinalIgnoreCase.Equals(svalue, "false") || StringComparer.OrdinalIgnoreCase.Equals(svalue, "no")) return false; - else { + else + { string tmp = svalue.Trim(); // Remove leading & trailing white space. if (StringComparer.OrdinalIgnoreCase.Equals(tmp, "sspi") || StringComparer.OrdinalIgnoreCase.Equals(tmp, "true") || StringComparer.OrdinalIgnoreCase.Equals(tmp, "yes")) return true; @@ -280,28 +289,36 @@ namespace System.Data.Common { } return Boolean.Parse(svalue); } - try { + try + { return ((IConvertible)value).ToBoolean(CultureInfo.InvariantCulture); } - catch(InvalidCastException e) { + catch (InvalidCastException e) + { throw ADP.ConvertFailed(value.GetType(), typeof(Boolean), e); } } - internal static int ConvertToInt32(object value) { - try { + internal static int ConvertToInt32(object value) + { + try + { return ((IConvertible)value).ToInt32(CultureInfo.InvariantCulture); } - catch(InvalidCastException e) { + catch (InvalidCastException e) + { throw ADP.ConvertFailed(value.GetType(), typeof(Int32), e); } } - internal static string ConvertToString(object value) { - try { + internal static string ConvertToString(object value) + { + try + { return ((IConvertible)value).ToString(CultureInfo.InvariantCulture); } - catch(InvalidCastException e) { + catch (InvalidCastException e) + { throw ADP.ConvertFailed(value.GetType(), typeof(String), e); } } @@ -309,35 +326,43 @@ namespace System.Data.Common { const string ApplicationIntentReadWriteString = "ReadWrite"; const string ApplicationIntentReadOnlyString = "ReadOnly"; - internal static bool TryConvertToApplicationIntent(string value, out ApplicationIntent result) { + internal static bool TryConvertToApplicationIntent(string value, out ApplicationIntent result) + { Debug.Assert(Enum.GetNames(typeof(ApplicationIntent)).Length == 2, "ApplicationIntent enum has changed, update needed"); Debug.Assert(null != value, "TryConvertToApplicationIntent(null,...)"); - if (StringComparer.OrdinalIgnoreCase.Equals(value, ApplicationIntentReadOnlyString)) { + if (StringComparer.OrdinalIgnoreCase.Equals(value, ApplicationIntentReadOnlyString)) + { result = ApplicationIntent.ReadOnly; return true; } - else if (StringComparer.OrdinalIgnoreCase.Equals(value, ApplicationIntentReadWriteString)) { + else if (StringComparer.OrdinalIgnoreCase.Equals(value, ApplicationIntentReadWriteString)) + { result = ApplicationIntent.ReadWrite; return true; } - else { + else + { result = DbConnectionStringDefaults.ApplicationIntent; return false; } } - internal static bool IsValidApplicationIntentValue(ApplicationIntent value) { + internal static bool IsValidApplicationIntentValue(ApplicationIntent value) + { Debug.Assert(Enum.GetNames(typeof(ApplicationIntent)).Length == 2, "ApplicationIntent enum has changed, update needed"); return value == ApplicationIntent.ReadOnly || value == ApplicationIntent.ReadWrite; } - internal static string ApplicationIntentToString(ApplicationIntent value) { + internal static string ApplicationIntentToString(ApplicationIntent value) + { Debug.Assert(IsValidApplicationIntentValue(value)); - if (value == ApplicationIntent.ReadOnly) { + if (value == ApplicationIntent.ReadOnly) + { return ApplicationIntentReadOnlyString; } - else { + else + { return ApplicationIntentReadWriteString; } } @@ -352,60 +377,321 @@ namespace System.Data.Common { /// in any case above, if the conerted value is out of valid range, the method raises ArgumentOutOfRangeException. /// </summary> /// <returns>applicaiton intent value in the valid range</returns> - internal static ApplicationIntent ConvertToApplicationIntent(string keyword, object value) { + internal static ApplicationIntent ConvertToApplicationIntent(string keyword, object value) + { Debug.Assert(null != value, "ConvertToApplicationIntent(null)"); string sValue = (value as string); ApplicationIntent result; - if (null != sValue) { + if (null != sValue) + { // We could use Enum.TryParse<ApplicationIntent> here, but it accepts value combinations like // "ReadOnly, ReadWrite" which are unwelcome here // Also, Enum.TryParse is 100x slower than plain StringComparer.OrdinalIgnoreCase.Equals method. - if (TryConvertToApplicationIntent(sValue, out result)) { + if (TryConvertToApplicationIntent(sValue, out result)) + { return result; } // try again after remove leading & trailing whitespaces. sValue = sValue.Trim(); - if (TryConvertToApplicationIntent(sValue, out result)) { + if (TryConvertToApplicationIntent(sValue, out result)) + { return result; } // string values must be valid throw ADP.InvalidConnectionOptionValue(keyword); } - else { + else + { // the value is not string, try other options ApplicationIntent eValue; - if (value is ApplicationIntent) { + if (value is ApplicationIntent) + { // quick path for the most common case eValue = (ApplicationIntent)value; } - else if (value.GetType().IsEnum) { + else if (value.GetType().IsEnum) + { // explicitly block scenarios in which user tries to use wrong enum types, like: // builder["ApplicationIntent"] = EnvironmentVariableTarget.Process; // workaround: explicitly cast non-ApplicationIntent enums to int throw ADP.ConvertFailed(value.GetType(), typeof(ApplicationIntent), null); } + else + { + try + { + // Enum.ToObject allows only integral and enum values (enums are blocked above), rasing ArgumentException for the rest + eValue = (ApplicationIntent)Enum.ToObject(typeof(ApplicationIntent), value); + } + catch (ArgumentException e) + { + // to be consistent with the messages we send in case of wrong type usage, replace + // the error with our exception, and keep the original one as inner one for troubleshooting + throw ADP.ConvertFailed(value.GetType(), typeof(ApplicationIntent), e); + } + } + + // ensure value is in valid range + if (IsValidApplicationIntentValue(eValue)) + { + return eValue; + } + else + { + throw ADP.InvalidEnumerationValue(typeof(ApplicationIntent), (int)eValue); + } + } + } + + const string SqlPasswordString = "Sql Password"; + const string ActiveDirectoryPasswordString = "Active Directory Password"; + const string ActiveDirectoryIntegratedString = "Active Directory Integrated"; + + internal static bool TryConvertToAuthenticationType(string value, out SqlAuthenticationMethod result) + { + Debug.Assert(Enum.GetNames(typeof(SqlAuthenticationMethod)).Length == 4, "SqlAuthenticationMethod enum has changed, update needed"); + + bool isSuccess = false; + + if (StringComparer.InvariantCultureIgnoreCase.Equals(value, SqlPasswordString)) + { + result = SqlAuthenticationMethod.SqlPassword; + isSuccess = true; + } + else if (StringComparer.InvariantCultureIgnoreCase.Equals(value, ActiveDirectoryPasswordString)) + { + result = SqlAuthenticationMethod.ActiveDirectoryPassword; + isSuccess = true; + } + else if (StringComparer.InvariantCultureIgnoreCase.Equals(value, ActiveDirectoryIntegratedString)) + { + result = SqlAuthenticationMethod.ActiveDirectoryIntegrated; + isSuccess = true; + } + else + { + result = DbConnectionStringDefaults.Authentication; + } + return isSuccess; + } + + /// <summary> + /// Column Encryption Setting. + /// </summary> + const string ColumnEncryptionSettingEnabledString = "Enabled"; + const string ColumnEncryptionSettingDisabledString = "Disabled"; + + /// <summary> + /// Convert a string value to the corresponding SqlConnectionColumnEncryptionSetting. + /// </summary> + /// <param name="value"></param> + /// <param name="result"></param> + /// <returns></returns> + internal static bool TryConvertToColumnEncryptionSetting(string value, out SqlConnectionColumnEncryptionSetting result) { + bool isSuccess = false; + + if (StringComparer.InvariantCultureIgnoreCase.Equals(value, ColumnEncryptionSettingEnabledString)) { + result = SqlConnectionColumnEncryptionSetting.Enabled; + isSuccess = true; + } + else if (StringComparer.InvariantCultureIgnoreCase.Equals(value, ColumnEncryptionSettingDisabledString)) { + result = SqlConnectionColumnEncryptionSetting.Disabled; + isSuccess = true; + } + else { + result = DbConnectionStringDefaults.ColumnEncryptionSetting; + } + + return isSuccess; + } + + /// <summary> + /// Is it a valid connection level column encryption setting ? + /// </summary> + /// <param name="value"></param> + /// <returns></returns> + internal static bool IsValidColumnEncryptionSetting(SqlConnectionColumnEncryptionSetting value) { + Debug.Assert(Enum.GetNames(typeof(SqlConnectionColumnEncryptionSetting)).Length == 2, "SqlConnectionColumnEncryptionSetting enum has changed, update needed"); + return value == SqlConnectionColumnEncryptionSetting.Enabled || value == SqlConnectionColumnEncryptionSetting.Disabled; + } + + /// <summary> + /// Convert connection level column encryption setting value to string. + /// </summary> + /// <param name="value"></param> + /// <returns></returns> + internal static string ColumnEncryptionSettingToString(SqlConnectionColumnEncryptionSetting value) { + Debug.Assert(IsValidColumnEncryptionSetting(value), "value is not a valid connection level column encryption setting."); + + switch (value) { + case SqlConnectionColumnEncryptionSetting.Enabled: + return ColumnEncryptionSettingEnabledString; + case SqlConnectionColumnEncryptionSetting.Disabled: + return ColumnEncryptionSettingDisabledString; + + default: + return null; + } + } + + internal static bool IsValidAuthenticationTypeValue(SqlAuthenticationMethod value) { + Debug.Assert(Enum.GetNames(typeof(SqlAuthenticationMethod)).Length == 4, "SqlAuthenticationMethod enum has changed, update needed"); + return value == SqlAuthenticationMethod.SqlPassword + || value == SqlAuthenticationMethod.ActiveDirectoryPassword + || value == SqlAuthenticationMethod.ActiveDirectoryIntegrated + || value == SqlAuthenticationMethod.NotSpecified; + } + + internal static string AuthenticationTypeToString(SqlAuthenticationMethod value) + { + Debug.Assert(IsValidAuthenticationTypeValue(value)); + + switch (value) + { + case SqlAuthenticationMethod.SqlPassword: + return SqlPasswordString; + case SqlAuthenticationMethod.ActiveDirectoryPassword: + return ActiveDirectoryPasswordString; + case SqlAuthenticationMethod.ActiveDirectoryIntegrated: + return ActiveDirectoryIntegratedString; + default: + return null; + } + } + + internal static SqlAuthenticationMethod ConvertToAuthenticationType(string keyword, object value) + { + if (null == value) + { + return DbConnectionStringDefaults.Authentication; + } + + string sValue = (value as string); + SqlAuthenticationMethod result; + if (null != sValue) + { + if (TryConvertToAuthenticationType(sValue, out result)) + { + return result; + } + + // try again after remove leading & trailing whitespaces. + sValue = sValue.Trim(); + if (TryConvertToAuthenticationType(sValue, out result)) + { + return result; + } + + // string values must be valid + throw ADP.InvalidConnectionOptionValue(keyword); + } + else + { + // the value is not string, try other options + SqlAuthenticationMethod eValue; + + if (value is SqlAuthenticationMethod) + { + // quick path for the most common case + eValue = (SqlAuthenticationMethod)value; + } + else if (value.GetType().IsEnum) + { + // explicitly block scenarios in which user tries to use wrong enum types, like: + // builder["ApplicationIntent"] = EnvironmentVariableTarget.Process; + // workaround: explicitly cast non-ApplicationIntent enums to int + throw ADP.ConvertFailed(value.GetType(), typeof(SqlAuthenticationMethod), null); + } + else + { + try + { + // Enum.ToObject allows only integral and enum values (enums are blocked above), rasing ArgumentException for the rest + eValue = (SqlAuthenticationMethod)Enum.ToObject(typeof(SqlAuthenticationMethod), value); + } + catch (ArgumentException e) + { + // to be consistent with the messages we send in case of wrong type usage, replace + // the error with our exception, and keep the original one as inner one for troubleshooting + throw ADP.ConvertFailed(value.GetType(), typeof(SqlAuthenticationMethod), e); + } + } + + // ensure value is in valid range + if (IsValidAuthenticationTypeValue(eValue)) + { + return eValue; + } + else + { + throw ADP.InvalidEnumerationValue(typeof(SqlAuthenticationMethod), (int)eValue); + } + } + } + + /// <summary> + /// Convert the provided value to a SqlConnectionColumnEncryptionSetting. + /// </summary> + /// <param name="keyword"></param> + /// <param name="value"></param> + /// <returns></returns> + internal static SqlConnectionColumnEncryptionSetting ConvertToColumnEncryptionSetting(string keyword, object value) { + if (null == value) { + return DbConnectionStringDefaults.ColumnEncryptionSetting; + } + + string sValue = (value as string); + SqlConnectionColumnEncryptionSetting result; + if (null != sValue) { + if (TryConvertToColumnEncryptionSetting(sValue, out result)) { + return result; + } + + // try again after remove leading & trailing whitespaces. + sValue = sValue.Trim(); + if (TryConvertToColumnEncryptionSetting(sValue, out result)) { + return result; + } + + // string values must be valid + throw ADP.InvalidConnectionOptionValue(keyword); + } + else { + // the value is not string, try other options + SqlConnectionColumnEncryptionSetting eValue; + + if (value is SqlConnectionColumnEncryptionSetting) { + // quick path for the most common case + eValue = (SqlConnectionColumnEncryptionSetting)value; + } + else if (value.GetType().IsEnum) { + // explicitly block scenarios in which user tries to use wrong enum types, like: + // builder["SqlConnectionColumnEncryptionSetting"] = EnvironmentVariableTarget.Process; + // workaround: explicitly cast non-SqlConnectionColumnEncryptionSetting enums to int + throw ADP.ConvertFailed(value.GetType(), typeof(SqlConnectionColumnEncryptionSetting), null); + } else { try { // Enum.ToObject allows only integral and enum values (enums are blocked above), rasing ArgumentException for the rest - eValue = (ApplicationIntent)Enum.ToObject(typeof(ApplicationIntent), value); + eValue = (SqlConnectionColumnEncryptionSetting)Enum.ToObject(typeof(SqlConnectionColumnEncryptionSetting), value); } catch (ArgumentException e) { // to be consistent with the messages we send in case of wrong type usage, replace // the error with our exception, and keep the original one as inner one for troubleshooting - throw ADP.ConvertFailed(value.GetType(), typeof(ApplicationIntent), e); + throw ADP.ConvertFailed(value.GetType(), typeof(SqlConnectionColumnEncryptionSetting), e); } } // ensure value is in valid range - if (IsValidApplicationIntentValue(eValue)) { + if (IsValidColumnEncryptionSetting(eValue)) { return eValue; } else { - throw ADP.InvalidEnumerationValue(typeof(ApplicationIntent), (int)eValue); + throw ADP.InvalidEnumerationValue(typeof(SqlConnectionColumnEncryptionSetting), (int)eValue); } } } @@ -431,38 +717,40 @@ namespace System.Data.Common { // SqlClient internal const ApplicationIntent ApplicationIntent = System.Data.SqlClient.ApplicationIntent.ReadWrite; - internal const string ApplicationName = ".Net SqlClient Data Provider"; - internal const bool AsynchronousProcessing = false; - internal const string AttachDBFilename = ""; - internal const int ConnectTimeout = 15; - internal const bool ConnectionReset = true; - internal const bool ContextConnection = false; - internal const string CurrentLanguage = ""; - internal const string DataSource = ""; - internal const bool Encrypt = false; - internal const bool Enlist = true; - internal const string FailoverPartner = ""; - internal const string InitialCatalog = ""; - internal const bool IntegratedSecurity = false; - internal const int LoadBalanceTimeout = 0; // default of 0 means don't use - internal const bool MultipleActiveResultSets = false; - internal const bool MultiSubnetFailover = false; - internal const int MaxPoolSize = 100; - internal const int MinPoolSize = 0; - internal const string NetworkLibrary = ""; - internal const int PacketSize = 8000; - internal const string Password = ""; - internal const bool PersistSecurityInfo = false; - internal const bool Pooling = true; - internal const bool TrustServerCertificate = false; - internal const string TypeSystemVersion = "Latest"; - internal const string UserID = ""; - internal const bool UserInstance = false; - internal const bool Replication = false; - internal const string WorkstationID = ""; - internal const string TransactionBinding = "Implicit Unbind"; - internal const int ConnectRetryCount = 1; - internal const int ConnectRetryInterval = 10; + internal const string ApplicationName = ".Net SqlClient Data Provider"; + internal const bool AsynchronousProcessing = false; + internal const string AttachDBFilename = ""; + internal const int ConnectTimeout = 15; + internal const bool ConnectionReset = true; + internal const bool ContextConnection = false; + internal const string CurrentLanguage = ""; + internal const string DataSource = ""; + internal const bool Encrypt = false; + internal const bool Enlist = true; + internal const string FailoverPartner = ""; + internal const string InitialCatalog = ""; + internal const bool IntegratedSecurity = false; + internal const int LoadBalanceTimeout = 0; // default of 0 means don't use + internal const bool MultipleActiveResultSets = false; + internal const bool MultiSubnetFailover = false; + internal const int MaxPoolSize = 100; + internal const int MinPoolSize = 0; + internal const string NetworkLibrary = ""; + internal const int PacketSize = 8000; + internal const string Password = ""; + internal const bool PersistSecurityInfo = false; + internal const bool Pooling = true; + internal const bool TrustServerCertificate = false; + internal const string TypeSystemVersion = "Latest"; + internal const string UserID = ""; + internal const bool UserInstance = false; + internal const bool Replication = false; + internal const string WorkstationID = ""; + internal const string TransactionBinding = "Implicit Unbind"; + internal const int ConnectRetryCount = 1; + internal const int ConnectRetryInterval = 10; + internal static readonly SqlAuthenticationMethod Authentication = SqlAuthenticationMethod.NotSpecified; + internal static readonly SqlConnectionColumnEncryptionSetting ColumnEncryptionSetting = SqlConnectionColumnEncryptionSetting.Disabled; } internal static class DbConnectionOptionKeywords { @@ -526,7 +814,9 @@ namespace System.Data.Common { internal const string WorkstationID = "Workstation ID"; internal const string ConnectRetryCount = "ConnectRetryCount"; internal const string ConnectRetryInterval = "ConnectRetryInterval"; - + internal const string Authentication = "Authentication"; + internal const string ColumnEncryptionSetting = "Column Encryption Setting"; + // common keywords (OleDb, OracleClient, SqlClient) internal const string DataSource = "Data Source"; internal const string IntegratedSecurity = "Integrated Security"; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbDataAdapter.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbDataAdapter.cs index 2db82311110..0950ab8f2c3 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbDataAdapter.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbDataAdapter.cs @@ -2,8 +2,8 @@ // <copyright file="DbDataAdapter.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbDataReader.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbDataReader.cs index abee96850cb..c4c8318d0c4 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbDataReader.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbDataReader.cs @@ -2,8 +2,8 @@ // <copyright file="DbDataReader.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbDataSourceEnumerator.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbDataSourceEnumerator.cs index 8b2f5d6e1a7..4071a35a8d9 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbDataSourceEnumerator.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbDataSourceEnumerator.cs @@ -2,8 +2,8 @@ // <copyright file="DbDataSourceEnumerator.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbException.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbException.cs index f113037622f..0a912d55283 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbException.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbException.cs @@ -2,8 +2,8 @@ // <copyright file="DbException.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbParameterCollection.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbParameterCollection.cs index b4e5bb234fb..2f400cca1a4 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbParameterCollection.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbParameterCollection.cs @@ -2,8 +2,8 @@ // <copyright file="DbParameterCollection.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderConfigurationHandler.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderConfigurationHandler.cs index 6411c47e8b1..92ec37fcd53 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderConfigurationHandler.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderConfigurationHandler.cs @@ -2,8 +2,8 @@ // <copyright file="DbProviderConfigurationHandler.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactories.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactories.cs index 7490e8ac3b8..9d3253620ef 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactories.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactories.cs @@ -2,8 +2,8 @@ // <copyright file="DbProviderFactories.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactoriesConfigurationHandler.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactoriesConfigurationHandler.cs index 505e734cef0..4ad569cd8d5 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactoriesConfigurationHandler.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactoriesConfigurationHandler.cs @@ -2,8 +2,8 @@ // <copyright file="DbProviderFactoriesConfigurationHandler.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -17,9 +17,9 @@ namespace System.Data.Common { using System.Xml; // VSTFDevDiv # 624213: System.Data.Common.DbProviderFactories.GetFactoryClasses() still gets OracleClient provider in ClientSku environment. - // NOTES: As part of this bug fix, the decision was taken to make it consistent and to remove all the framework - // providers from the list in the machine.config file. The DbProviderFactories section of the machine.config will contain only - // custom providers names and details. + // NOTES: As part of this + + internal enum DbProvidersIndex : int { Odbc = 0, diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactory.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactory.cs index 4235679cc6b..f0c8fd47880 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactory.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderFactory.cs @@ -2,8 +2,8 @@ // <copyright file="DbProviderFactory.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ using System; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs index a213939a24d..1f13d32d66a 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbProviderSpecificTypePropertyAttribute.cs @@ -2,8 +2,8 @@ // <copyright file="DBProviderSupportedClasses.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DbTransaction.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DbTransaction.cs index 467e740f820..8a3ae904611 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DbTransaction.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DbTransaction.cs @@ -2,8 +2,8 @@ // <copyright file="DbTransaction.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DecimalStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DecimalStorage.cs index b9f8f678493..b8aeda1b852 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DecimalStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DecimalStorage.cs @@ -2,9 +2,9 @@ // <copyright file="DecimalStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/DoubleStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/DoubleStorage.cs index 15af90c023e..b11514c7dc8 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/DoubleStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/DoubleStorage.cs @@ -2,9 +2,9 @@ // <copyright file="DoubleStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/FieldNameLookup.cs b/mcs/class/referencesource/System.Data/System/Data/Common/FieldNameLookup.cs index 41df2b1aa24..5ae72879599 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/FieldNameLookup.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/FieldNameLookup.cs @@ -2,8 +2,8 @@ // <copyright file="FieldNameLookup.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/GreenMethods.cs b/mcs/class/referencesource/System.Data/System/Data/Common/GreenMethods.cs index 8aff41ed34e..ced5a58d80a 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/GreenMethods.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/GreenMethods.cs @@ -2,8 +2,8 @@ // <copyright file="GreenMethods.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ using System; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/Groupbybehavior.cs b/mcs/class/referencesource/System.Data/System/Data/Common/Groupbybehavior.cs index 2b324cfb9c6..73e9a8145f6 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/Groupbybehavior.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/Groupbybehavior.cs @@ -2,8 +2,8 @@ // <copyright file="Groupbybehavior.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">rickfe</owner> +// <owner current="true" primary="false">stevesta</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/HandlerBase.cs b/mcs/class/referencesource/System.Data/System/Data/Common/HandlerBase.cs index 99945fe78ce..3762aa48836 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/HandlerBase.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/HandlerBase.cs @@ -2,8 +2,8 @@ // <copyright file="HandlerBase.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/Int16Storage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/Int16Storage.cs index 8d1d0b2a075..0c62a2043fb 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/Int16Storage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/Int16Storage.cs @@ -2,9 +2,9 @@ // <copyright file="Int16Storage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/Int32Storage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/Int32Storage.cs index 870bd1093f9..1a59d7e12ae 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/Int32Storage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/Int32Storage.cs @@ -2,9 +2,9 @@ // <copyright file="Int32Storage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/Int64Storage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/Int64Storage.cs index f5006299217..26a81b6fa17 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/Int64Storage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/Int64Storage.cs @@ -2,9 +2,9 @@ // <copyright file="Int64Storage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/MultipartIdentifier.cs b/mcs/class/referencesource/System.Data/System/Data/Common/MultipartIdentifier.cs index 531dfa1dfa6..a2a0770434f 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/MultipartIdentifier.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/MultipartIdentifier.cs @@ -2,8 +2,8 @@ // <copyright file="CommandBuilder.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/NameValuePair.cs b/mcs/class/referencesource/System.Data/System/Data/Common/NameValuePair.cs index bcf18890893..f0b7cdc17f4 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/NameValuePair.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/NameValuePair.cs @@ -2,8 +2,8 @@ // <copyright file="NameValuePair.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/NameValuePermission.cs b/mcs/class/referencesource/System.Data/System/Data/Common/NameValuePermission.cs index 9f705d25688..f2088dba955 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/NameValuePermission.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/NameValuePermission.cs @@ -2,8 +2,8 @@ // <copyright file="NameValuePermission.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/NativeMethods.cs b/mcs/class/referencesource/System.Data/System/Data/Common/NativeMethods.cs index ebcf3fc72e4..b1321a4222c 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/NativeMethods.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/NativeMethods.cs @@ -2,9 +2,9 @@ // <copyright file="NativeMethods.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">markash</owner> +// <owner current="true" primary="false">blained</owner> +// <owner current="true" primary="false">mithomas</owner> //------------------------------------------------------------------------------ using System; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/ObjectStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/ObjectStorage.cs index f4c90546b0a..eb3a09d9cc0 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/ObjectStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/ObjectStorage.cs @@ -2,8 +2,8 @@ // <copyright file="ObjectStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/RowUpdatedEventArgs.cs b/mcs/class/referencesource/System.Data/System/Data/Common/RowUpdatedEventArgs.cs index 04af7fa7e77..132952ed769 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/RowUpdatedEventArgs.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/RowUpdatedEventArgs.cs @@ -2,8 +2,8 @@ // <copyright file="RowUpdatedEventArgs.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/RowUpdatingEventArgs.cs b/mcs/class/referencesource/System.Data/System/Data/Common/RowUpdatingEventArgs.cs index 1f6c6918c18..50c8c049277 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/RowUpdatingEventArgs.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/RowUpdatingEventArgs.cs @@ -2,8 +2,8 @@ // <copyright file="RowUpdatingEventArgs.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SByteStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SByteStorage.cs index 0ef3d5edb07..66b54659780 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SByteStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SByteStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SByteStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLConvert.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLConvert.cs index 4c1b691fc06..19b823a39f8 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLConvert.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLConvert.cs @@ -2,8 +2,8 @@ // <copyright file="SQLConvert.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLBinaryStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLBinaryStorage.cs index 75243557089..578f222bd1e 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLBinaryStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLBinaryStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLBinaryStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -90,7 +90,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlBinary newValue = new SqlBinary(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLByteStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLByteStorage.cs index d8f70c87ad3..23c9b8c0109 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLByteStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLByteStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLByteStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -188,7 +188,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlByte newValue = new SqlByte(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLBytesStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLBytesStorage.cs index da7d794b73c..4cbce35faba 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLBytesStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLBytesStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLBytesStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -89,7 +89,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlBinary newValue = new SqlBinary(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLCharsStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLCharsStorage.cs index c8af7abb433..3bdfb3698dd 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLCharsStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLCharsStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLCharsStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -91,7 +91,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlString newValue = new SqlString(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDateTimeStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDateTimeStorage.cs index 60753ae432a..39a1fd72ee3 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDateTimeStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDateTimeStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLDateTimeStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -121,7 +121,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlDateTime newValue = new SqlDateTime(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDecimalStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDecimalStorage.cs index e6a92bf1bff..18ff107280d 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDecimalStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDecimalStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLDecimalStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -186,7 +186,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlDecimal newValue = new SqlDecimal(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDoubleStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDoubleStorage.cs index 8833b829fdd..bf09c21e229 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDoubleStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLDoubleStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLDoubleStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -187,7 +187,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlDouble newValue = new SqlDouble(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLGuidStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLGuidStorage.cs index 79c81806038..497364a79ce 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLGuidStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLGuidStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLGuidStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -90,7 +90,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlGuid newValue = new SqlGuid(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt16Storage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt16Storage.cs index aff67bae529..37fd532da60 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt16Storage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt16Storage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLInt16Storage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -187,7 +187,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlInt16 newValue = new SqlInt16(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt32Storage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt32Storage.cs index 4a31af610c8..b8a2c0eb351 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt32Storage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt32Storage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLInt32Storage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -187,7 +187,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlInt32 newValue = new SqlInt32(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt64Storage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt64Storage.cs index eb608d33842..5c1b344e0ac 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt64Storage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLInt64Storage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLInt64Storage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -188,7 +188,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlInt64 newValue = new SqlInt64(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLMoneyStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLMoneyStorage.cs index fc4a344a326..e50b9d5a6e2 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLMoneyStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLMoneyStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLMoneyStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -187,7 +187,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlMoney newValue = new SqlMoney(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLSingleStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLSingleStorage.cs index d6c69725ea2..f946bd63217 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLSingleStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLSingleStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLSingleStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -188,7 +188,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlSingle newValue = new SqlSingle(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLStringStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLStringStorage.cs index 7201b55c57f..c822097f387 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLStringStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQLStringStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLStringStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -144,7 +144,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlString newValue = new SqlString(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQlBooleanStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQlBooleanStorage.cs index 53fd2a92aac..8c07aa8648c 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQlBooleanStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SQlBooleanStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SQLBooleanStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -119,7 +119,7 @@ namespace System.Data.Common { override public object ConvertXmlToObject(string s) { SqlBoolean newValue = new SqlBoolean(); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); IXmlSerializable tmp = newValue; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlUDTStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlUDTStorage.cs index 1637442fe71..1817b74d4b6 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlUDTStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlUDTStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SqlUDTStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -140,7 +140,7 @@ namespace System.Data.Common { if (implementsIXmlSerializable) { object Obj = System.Activator.CreateInstance (DataType, true); - string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, bug 98767 + string tempStr =string.Concat("<col>", s, "</col>"); // this is done since you can give fragmet to reader, StringReader strReader = new StringReader(tempStr); using (XmlTextReader xmlTextReader = new XmlTextReader(strReader)) { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs index be6cc6e5208..8f3a03926ee 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SqlXmlStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SafeNativeMethods.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SafeNativeMethods.cs index 5f8bf6d36ce..5e1c0ffc321 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SafeNativeMethods.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SafeNativeMethods.cs @@ -2,9 +2,9 @@ // <copyright file="SafeNativeMethods.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ using System; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SchemaTableColumn.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SchemaTableColumn.cs index 69df0612c08..3995656fb8f 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SchemaTableColumn.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SchemaTableColumn.cs @@ -2,7 +2,7 @@ // <copyright file="SchemaTableColumn.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SchemaTableOptionalColumn.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SchemaTableOptionalColumn.cs index 80a96191906..c4ab9bc5a16 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SchemaTableOptionalColumn.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SchemaTableOptionalColumn.cs @@ -2,7 +2,7 @@ // <copyright file="SchemaTableOptionalColumn.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SingleStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SingleStorage.cs index 1f1c8b4511b..2379ea7583a 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SingleStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SingleStorage.cs @@ -2,9 +2,9 @@ // <copyright file="SingleStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SqlEventSource.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SqlEventSource.cs new file mode 100644 index 00000000000..b67fa15fed2 --- /dev/null +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SqlEventSource.cs @@ -0,0 +1,76 @@ +//------------------------------------------------------------------------------ +// <copyright file="SqlEventSource.cs" company="Microsoft"> +// Copyright (c) Microsoft Corporation. All rights reserved. +// </copyright> +// <owner current="true" primary="true">mihailsm</owner> +//------------------------------------------------------------------------------ + +namespace System.Data +{ + using System; + using System.Diagnostics.Tracing; + + [EventSource(Name = SqlEventSource.EventSourceName)] + internal sealed class SqlEventSource : EventSource + { + internal const string EventSourceName = "Microsoft-AdoNet-SystemData"; + + /// <summary> + /// Defines EventId for BeginExecute (Reader, Scalar, NonQuery, XmlReader). + /// </summary> + private const int BeginExecuteEventId = 1; + + /// <summary> + /// Defines EventId for EndExecute (Reader, Scalar, NonQuery, XmlReader). + /// </summary> + private const int EndExecuteEventId = 2; + + // Defines the singleton instance for the Resources ETW provider + internal static readonly SqlEventSource Log = new SqlEventSource(); + + + /// <summary> + /// Keyword definitions. These represent logical groups of events that can be turned on and off independently + /// Often each task has a keyword, but where tasks are determined by subsystem, keywords are determined by + /// usefulness to end users to filter. Generally users don't mind extra events if they are not high volume + /// so grouping low volume events together in a single keywords is OK (users can post-filter by task if desired) + /// <remarks>The visibility of the enum has to be public, otherwise there will be an ArgumentException on calling related WriteEvent method.</remarks> + /// </summary> + public static class Keywords + { + public const EventKeywords SqlClient = (EventKeywords)0x0001; // This is bit 0 + } + + public static class Tasks // this name is important for EventSource + { + /// <summary>Task that tracks sql command execute.</summary> + public const EventTask ExecuteCommand = (EventTask)1; + } + + private SqlEventSource() + { + } + + // unfortunately these are not marked as Start/Stop opcodes. The reason is that we dont want them to participate in + // the EventSource activity IDs (because they currently don't use tasks and this simply confuses the logic) and + // because of versioning requirements we don't have ActivityOptions capability (because mscorlib and System.Data version + // at different rates) Sigh... + [Event(SqlEventSource.BeginExecuteEventId, Keywords = Keywords.SqlClient)] + public void BeginExecute(int objectId, string dataSource, string database, string commandText) + { + // we do not use unsafe code for better performance optization here because optimized helpers make the code unsafe where that would not be the case otherwise. + // This introduces the question of partial trust, which is complex in the SQL case (there are a lot of scenarios and SQL has special security support). + WriteEvent(SqlEventSource.BeginExecuteEventId, objectId, dataSource, database, commandText); + } + + // unfortunately these are not marked as Start/Stop opcodes. The reason is that we dont want them to participate in + // the EventSource activity IDs (because they currently don't use tasks and this simply confuses the logic) and + // because of versioning requirements we don't have ActivityOptions capability (because mscorlib and System.Data version + // at different rates) Sigh... + [Event(SqlEventSource.EndExecuteEventId, Keywords = Keywords.SqlClient)] + public void EndExecute(int objectId, int compositeState, int sqlExceptionNumber) + { + WriteEvent(SqlEventSource.EndExecuteEventId, objectId, compositeState, sqlExceptionNumber); + } + } +} diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/StringStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/StringStorage.cs index 7125e5d8561..2885f9b9ac7 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/StringStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/StringStorage.cs @@ -2,9 +2,9 @@ // <copyright file="StringStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/SupportedJoinOperators.cs b/mcs/class/referencesource/System.Data/System/Data/Common/SupportedJoinOperators.cs index abb658da1aa..b6db9fdce1c 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/SupportedJoinOperators.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/SupportedJoinOperators.cs @@ -2,8 +2,8 @@ // <copyright file="supportedJoinOperators.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">rickfe</owner> +// <owner current="true" primary="false">stevesta</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/System.Data_BID.cs b/mcs/class/referencesource/System.Data/System/Data/Common/System.Data_BID.cs index c95844c82a8..88744558431 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/System.Data_BID.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/System.Data_BID.cs @@ -2,8 +2,8 @@ // <copyright file="System.Data_BID.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //----------------------------------------------------------------------------------------------- using System; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/TimeSpanStorage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/TimeSpanStorage.cs index bf931fc4744..b46bf5fb2eb 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/TimeSpanStorage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/TimeSpanStorage.cs @@ -2,9 +2,9 @@ // <copyright file="TimeSpanStorage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/UInt16Storage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/UInt16Storage.cs index 5bafd626be9..3b44d9adac8 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/UInt16Storage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/UInt16Storage.cs @@ -2,9 +2,9 @@ // <copyright file="UInt16Storage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/UInt32Storage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/UInt32Storage.cs index d2701c49d7e..19d2d3f72f4 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/UInt32Storage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/UInt32Storage.cs @@ -2,9 +2,9 @@ // <copyright file="UInt32Storage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/UInt64Storage.cs b/mcs/class/referencesource/System.Data/System/Data/Common/UInt64Storage.cs index 1242f279c0e..8b727fdde42 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/UInt64Storage.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/UInt64Storage.cs @@ -2,9 +2,9 @@ // <copyright file="UInt64Storage.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="false" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="false" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/UnsafeNativeMethods.cs b/mcs/class/referencesource/System.Data/System/Data/Common/UnsafeNativeMethods.cs index 0c368cfcabe..7fc1d8bc0a0 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/UnsafeNativeMethods.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/UnsafeNativeMethods.cs @@ -2,9 +2,9 @@ // <copyright file="UnsafeNativeMethods.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ using System; diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/dbdatarecord.cs b/mcs/class/referencesource/System.Data/System/Data/Common/dbdatarecord.cs index 7c140b1afd5..2f56981aa41 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/dbdatarecord.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/dbdatarecord.cs @@ -2,8 +2,8 @@ // <copyright file="DbDataRecord.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/dbenumerator.cs b/mcs/class/referencesource/System.Data/System/Data/Common/dbenumerator.cs index 22f6884b61b..5377586b7de 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/dbenumerator.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/dbenumerator.cs @@ -2,8 +2,8 @@ // <copyright file="dbenumerator.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">Microsoft</owner> +// <owner current="true" primary="false">Microsoft</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { @@ -18,7 +18,7 @@ namespace System.Data.Common { public class DbEnumerator : IEnumerator { internal IDataReader _reader; - internal IDataRecord _current; + internal DbDataRecord _current; internal SchemaInfo[] _schemaInfo; // shared schema info among all the data records internal PropertyDescriptorCollection _descriptors; // cached property descriptors private FieldNameLookup _fieldNameLookup; // MDAC 69015 @@ -39,30 +39,21 @@ namespace System.Data.Common { _reader = reader; this.closeReader = closeReader; } + + public DbEnumerator(DbDataReader reader) + : this((IDataReader)reader) { + } - - public object Current { - get { - return _current; - } + public DbEnumerator(DbDataReader reader, bool closeReader) + : this((IDataReader)reader, closeReader) { } - /*public IDataRecord Current { + public object Current { get { return _current; } - }*/ - -/* - virtual internal IDataRecord NewRecord(SchemaInfo[] si, object[] values, PropertyDescriptorCollection descriptors) { - return new DbDataRecord(si, values, descriptors); } - - virtual internal void GetValues(object[] values) { - _reader.GetValues(values); - } -*/ - + public bool MoveNext() { if (null == _schemaInfo) { diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/identifiercase.cs b/mcs/class/referencesource/System.Data/System/Data/Common/identifiercase.cs index bd314fff497..73c8fc1e47a 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/identifiercase.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/identifiercase.cs @@ -2,8 +2,8 @@ // <copyright file="identifiercase.cs" company="Microsoft"> // Copyright (c) Microsoft Corporation. All rights reserved. // </copyright> -// <owner current="true" primary="true">[....]</owner> -// <owner current="true" primary="false">[....]</owner> +// <owner current="true" primary="true">rickfe</owner> +// <owner current="true" primary="false">stevesta</owner> //------------------------------------------------------------------------------ namespace System.Data.Common { |