Skip to content

Flatten | DbMetaDataFactory -> SqlMetaDataFactory #3818

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

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Flatten | DbMetaDataFactory -> SqlMetaDataFactory #3818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
54a66cc
Remove unnecessary references to DbMetaDataFactory
edwardneal Nov 30, 2025
950069c
Remove unnecessary cacheMetaDataFactory parameter and logic
edwardneal Nov 30, 2025
629fc1b
Remove unused capability to provide normalized server version
edwardneal Nov 30, 2025
3bbd21f
Convert CollectionDataSet property to auto-property
edwardneal Nov 30, 2025
798cc08
Cleanup of SqlMetaDataFactory prior to merge
edwardneal Nov 30, 2025
dd3b711
Cleanup of DbMetaDataFactory prior to merge
edwardneal Dec 1, 2025
93c26f9
Merge logic to create CollectionDataSet
edwardneal Dec 1, 2025
a9e5bda
Merge Dispose logic
edwardneal Dec 1, 2025
f4d957a
Merge DataTable population method
edwardneal Dec 1, 2025
6d22f3f
Merge ExecuteCommand population method
edwardneal Dec 1, 2025
6d216e5
Merge top-level GetSchema method
edwardneal Dec 1, 2025
1188903
Merge SupportedByCurrentVersion and properties, remove now-unused bas…
edwardneal Dec 1, 2025
707c87f
Replace unnecessary private properties with variables
edwardneal Dec 1, 2025
32ea25a
Remove DbMetaDataFactory
edwardneal Dec 1, 2025
0722b56
Merge main
edwardneal Dec 1, 2025
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/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs">
<Link>Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbMetaDataFactory.cs">
<Link>Microsoft\Data\ProviderBase\DbMetaDataFactory.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
<Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
</Compile>
Expand Down
3 changes: 0 additions & 3 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,6 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs">
<Link>Microsoft\Data\SqlClient\Diagnostics\SqlDiagnosticListener.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbMetaDataFactory.cs">
<Link>Microsoft\Data\ProviderBase\DbMetaDataFactory.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbReferenceCollection.cs">
<Link>Microsoft\Data\ProviderBase\DbReferenceCollection.cs</Link>
</Compile>
Expand Down
12 changes: 1 addition & 11 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,9 +1066,6 @@ internal static IndexOutOfRangeException InvalidBufferSizeOrIndex(int numBytes,
internal static Exception InvalidDataLength(long length)
=> IndexOutOfRange(StringsHelper.GetString(Strings.SQL_InvalidDataLength, length.ToString(CultureInfo.InvariantCulture)));

internal static bool CompareInsensitiveInvariant(string strvalue, string strconst)
=> 0 == CultureInfo.InvariantCulture.CompareInfo.Compare(strvalue, strconst, CompareOptions.IgnoreCase);

internal static void SetCurrentTransaction(Transaction transaction) => Transaction.Current = transaction;

internal static Exception NonSeqByteAccess(long badIndex, long currIndex, string method)
Expand All @@ -1079,9 +1076,6 @@ internal static Exception NonSeqByteAccess(long badIndex, long currIndex, string

internal static Exception NegativeParameter(string parameterName) => InvalidOperation(StringsHelper.GetString(Strings.ADP_NegativeParameter, parameterName));

internal static Exception InvalidXmlMissingColumn(string collectionName, string columnName)
=> Argument(StringsHelper.GetString(Strings.MDF_InvalidXmlMissingColumn, collectionName, columnName));

internal static InvalidOperationException AsyncOperationPending() => InvalidOperation(StringsHelper.GetString(Strings.ADP_PendingAsyncOperation));
#endregion

Expand Down Expand Up @@ -1168,7 +1162,7 @@ internal static Exception InvalidCommandTimeout(int value, [CallerMemberName] st
=> Argument(StringsHelper.GetString(Strings.ADP_InvalidCommandTimeout, value.ToString(CultureInfo.InvariantCulture)), property);
#endregion

#region DbMetaDataFactory
#region SqlMetaDataFactory
internal static Exception DataTableDoesNotExist(string collectionName)
=> Argument(StringsHelper.GetString(Strings.MDF_DataTableDoesNotExist, collectionName));

Expand Down Expand Up @@ -1205,8 +1199,6 @@ internal static InvalidOperationException OpenConnectionRequired(string method,
internal static Exception OpenReaderExists(Exception e, bool marsOn)
=> InvalidOperation(StringsHelper.GetString(Strings.ADP_OpenReaderExists, marsOn ? ADP.Command : ADP.Connection), e);

internal static Exception InvalidXml() => Argument(StringsHelper.GetString(Strings.MDF_InvalidXml));

internal static Exception InvalidXmlInvalidValue(string collectionName, string columnName)
=> Argument(StringsHelper.GetString(Strings.MDF_InvalidXmlInvalidValue, collectionName, columnName));

Expand All @@ -1224,8 +1216,6 @@ internal static Exception UndefinedCollection(string collectionName)
internal static Exception AmbiguousCollectionName(string collectionName)
=> Argument(StringsHelper.GetString(Strings.MDF_AmbiguousCollectionName, collectionName));

internal static Exception MissingRestrictionColumn() => Argument(StringsHelper.GetString(Strings.MDF_MissingRestrictionColumn));

internal static Exception MissingRestrictionRow() => Argument(StringsHelper.GetString(Strings.MDF_MissingRestrictionRow));

internal static Exception UndefinedPopulationMechanism(string populationMechanism)
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Microsoft/Data/ProviderBase/DbConnectionInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ protected internal virtual DataTable GetSchema(
{
Debug.Assert(outerConnection is not null, "outerConnection may not be null.");

DbMetaDataFactory metaDataFactory = factory.GetMetaDataFactory(poolGroup, this);
SqlMetaDataFactory metaDataFactory = factory.GetMetaDataFactory(poolGroup, this);
Debug.Assert(metaDataFactory is not null, "metaDataFactory may not be null.");

return metaDataFactory.GetSchema(outerConnection, collectionName, restrictions);
Expand Down
Loading
Loading