diff --git a/src/libraries/System.Data.Odbc/src/Resources/Strings.resx b/src/libraries/System.Data.Odbc/src/Resources/Strings.resx index 53a3e16c098d17..d3d82fe56cbb38 100644 --- a/src/libraries/System.Data.Odbc/src/Resources/Strings.resx +++ b/src/libraries/System.Data.Odbc/src/Resources/Strings.resx @@ -386,9 +386,6 @@ The ODBC provider did not return results from SQLGETTYPEINFO. - - Connection string exceeds maximum allowed length of {0}. - Unknown SQL type - {0}. diff --git a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/Odbc32.cs b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/Odbc32.cs index 917aa2d079e272..615ef91ac73c96 100644 --- a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/Odbc32.cs +++ b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/Odbc32.cs @@ -24,18 +24,17 @@ internal static Exception UnknownSQLType(ODBC32.SQL_TYPE sqltype) { return ADP.Argument(SR.GetString(SR.Odbc_UnknownSQLType, sqltype.ToString())); } - internal static Exception ConnectionStringTooLong() - { - return ADP.Argument(SR.GetString(SR.OdbcConnection_ConnectionStringTooLong, ODBC32.MAX_CONNECTION_STRING_LENGTH)); - } + internal static ArgumentException GetSchemaRestrictionRequired() { return ADP.Argument(SR.GetString(SR.ODBC_GetSchemaRestrictionRequired)); } + internal static ArgumentOutOfRangeException NotSupportedEnumerationValue(Type type, int value) { return ADP.ArgumentOutOfRange(SR.GetString(SR.ODBC_NotSupportedEnumerationValue, type.Name, value.ToString(System.Globalization.CultureInfo.InvariantCulture)), type.Name); } + internal static ArgumentOutOfRangeException NotSupportedCommandType(CommandType value) { #if DEBUG @@ -664,12 +663,6 @@ internal enum SQL_DRIVER COMPLETE_REQUIRED = 3, } - // todo:move - // internal const. not odbc specific - // - // Connection string max length - internal const int MAX_CONNECTION_STRING_LENGTH = 1024; - // Column set for SQLPrimaryKeys internal enum SQL_PRIMARYKEYS : short { diff --git a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionString.cs b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionString.cs index 74790e05ac1f2a..7efb675d68b5bb 100644 --- a/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionString.cs +++ b/src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionString.cs @@ -22,14 +22,6 @@ internal OdbcConnectionString(string connectionString, bool validate) : base(con int position = 0; _expandedConnectionString = ExpandDataDirectories(ref filename, ref position); } - if (validate || (null == _expandedConnectionString)) - { - // do not check string length if it was expanded because the final result may be shorter than the original - if ((null != connectionString) && (ODBC32.MAX_CONNECTION_STRING_LENGTH < connectionString.Length)) - { // MDAC 83536 - throw ODBC.ConnectionStringTooLong(); - } - } } } }