Skip to content

[release/6.0] Remove 1024 character limit on ODBC connection strings #73155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 1 commit into from
Aug 12, 2022
Merged

[release/6.0] Remove 1024 character limit on ODBC connection strings #73155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/libraries/System.Data.Odbc/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,6 @@
<data name="ADP_OdbcNoTypesFromProvider" xml:space="preserve">
<value>The ODBC provider did not return results from SQLGETTYPEINFO.</value>
</data>
<data name="OdbcConnection_ConnectionStringTooLong" xml:space="preserve">
<value>Connection string exceeds maximum allowed length of {0}.</value>
</data>
<data name="Odbc_UnknownSQLType" xml:space="preserve">
<value>Unknown SQL type - {0}.</value>
</data>
Expand Down
2 changes: 2 additions & 0 deletions src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<NoWarn>$(NoWarn);CA2249;CA1838</NoWarn>
<Nullable>enable</Nullable>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>1</ServicingVersion>
<PackageDescription>Provides a collection of classes used to access an ODBC data source in the managed space

Commonly Used Types:
Expand Down
13 changes: 3 additions & 10 deletions src/libraries/System.Data.Odbc/src/System/Data/Odbc/Odbc32.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
{
Expand Down
8 changes: 0 additions & 8 deletions src/libraries/System.Data.Odbc/src/System/Data/Odbc/OdbcConnectionString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
}
}
}