diff --git a/src/libraries/System.Data.Odbc/src/Resources/Strings.resx b/src/libraries/System.Data.Odbc/src/Resources/Strings.resx
index b6860f2dd50aa8..5332b0d1798eb9 100644
--- a/src/libraries/System.Data.Odbc/src/Resources/Strings.resx
+++ b/src/libraries/System.Data.Odbc/src/Resources/Strings.resx
@@ -392,9 +392,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.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
index eff55039c3e9f4..7307a05b9ab9b3 100644
--- a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
+++ b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
@@ -5,6 +5,8 @@
$(NoWarn);CA2249;CA1838
enable
true
+ true
+ 1
Provides a collection of classes used to access an ODBC data source in the managed space
Commonly Used Types:
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 6c326926ba576e..9f2213056e9f6e 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();
- }
- }
}
}
}