Only check inexact match when no exact match is found.

Fix dotnet#39620
yyjdelete · Jul 27, 2020 · eb63416 · eb63416
1 parent 2207a35
commit eb63416
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/libraries/Common/src/System/Data/ProviderBase/DbMetaDataFactory.cs b/src/libraries/Common/src/System/Data/ProviderBase/DbMetaDataFactory.cs
@@ -278,7 +278,7 @@ internal DataRow FindMetaDataCollectionRow(string collectionName)
                             exactCollectionName = candidateCollectionName;
                             haveExactMatch = true;
                         }
-                        else
+                        else if (haveExactMatch == false)
                         {
                             // have an inexact match - ok only if it is the only one
                             if (exactCollectionName != null)

diff --git a/src/libraries/System.Data.OleDb/src/System/Data/ProviderBase/DbMetaDataFactory.cs b/src/libraries/System.Data.OleDb/src/System/Data/ProviderBase/DbMetaDataFactory.cs
@@ -303,7 +303,7 @@ internal DataRow FindMetaDataCollectionRow(string collectionName)
                             exactCollectionName = candidateCollectionName;
                             haveExactMatch = true;
                         }
-                        else
+                        else if (haveExactMatch == false)
                         {
                             // have an inexact match - ok only if it is the only one
                             if (exactCollectionName != null)