From 47d677ddc9604b76845e93c5f16f80d6e58b38e6 Mon Sep 17 00:00:00 2001
From: Lau <laucomm@gmail.com>
Date: Mon, 24 Feb 2020 15:39:26 +0100
Subject: [PATCH] Revert "Use `DbConnectionStringBuilder` instead of its OleDb
 equivalent."

This reverts commit 25f8685320bd45fb065c5cb5170561bfa2513828.
---
 .../Migrations/JetMigrationsSqlGenerator.cs     | 13 +++++--------
 .../DbConnectionStringBuilderExtensions.cs      | 17 -----------------
 src/System.Data.Jet/JetProviderFactory.cs       |  4 +++-
 src/System.Data.Jet/System.Data.Jet.csproj      |  1 -
 4 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 src/System.Data.Jet/DbConnectionStringBuilderExtensions.cs

diff --git a/src/EFCore.Jet/Migrations/JetMigrationsSqlGenerator.cs b/src/EFCore.Jet/Migrations/JetMigrationsSqlGenerator.cs
index 6798c9c..1c40c7c 100644
--- a/src/EFCore.Jet/Migrations/JetMigrationsSqlGenerator.cs
+++ b/src/EFCore.Jet/Migrations/JetMigrationsSqlGenerator.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Jet;
+using System.Data.OleDb;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -453,14 +454,10 @@ namespace EntityFrameworkCore.Jet.Migrations
             Check.NotNull(operation, nameof(operation));
             Check.NotNull(builder, nameof(builder));
 
-            var connectionStringBuilder = JetProviderFactory.Instance.CreateConnectionStringBuilder();
-            connectionStringBuilder.ConnectionString = _options.ConnectionString;
-
-            var provider = connectionStringBuilder.GetProvider();
-            if (string.IsNullOrEmpty(provider))
-            {
-                provider = JetConfiguration.OleDbDefaultProvider;
-            }
+            var connectionStringBuilder = new OleDbConnectionStringBuilder(_options.ConnectionString);
+            var provider = string.IsNullOrEmpty(connectionStringBuilder.Provider)
+                ? JetConfiguration.OleDbDefaultProvider
+                : connectionStringBuilder.Provider;
             
             builder
                 .Append("CREATE DATABASE ")
diff --git a/src/System.Data.Jet/DbConnectionStringBuilderExtensions.cs b/src/System.Data.Jet/DbConnectionStringBuilderExtensions.cs
deleted file mode 100644
index 2774245..0000000
--- a/src/System.Data.Jet/DbConnectionStringBuilderExtensions.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Data.Common;
-
-namespace System.Data.Jet
-{
-    public static class DbConnectionStringBuilderExtensions
-    {
-        private const string ProviderKey = "Provider";
-
-        public static string GetProvider(this DbConnectionStringBuilder source)
-            => source.TryGetValue(ProviderKey, out var providerName)
-                ? providerName as string
-                : null;
-
-        public static void SetProvider(this DbConnectionStringBuilder source, string value)
-            => source[ProviderKey] = value;
-    }
-}
\ No newline at end of file
diff --git a/src/System.Data.Jet/JetProviderFactory.cs b/src/System.Data.Jet/JetProviderFactory.cs
index f07f5d9..50d00a5 100644
--- a/src/System.Data.Jet/JetProviderFactory.cs
+++ b/src/System.Data.Jet/JetProviderFactory.cs
@@ -66,7 +66,9 @@ namespace System.Data.Jet
         /// </returns>
         public override DbConnectionStringBuilder CreateConnectionStringBuilder()
         {
-            return new OleDbConnectionStringBuilder();
+            OleDbConnectionStringBuilder oleDbConnectionStringBuilder = new OleDbConnectionStringBuilder();
+            
+            return oleDbConnectionStringBuilder;
         }
 
         /// <summary>
diff --git a/src/System.Data.Jet/System.Data.Jet.csproj b/src/System.Data.Jet/System.Data.Jet.csproj
index 58c883a..10bd780 100644
--- a/src/System.Data.Jet/System.Data.Jet.csproj
+++ b/src/System.Data.Jet/System.Data.Jet.csproj
@@ -97,7 +97,6 @@
     <Compile Include="LogHelper.cs" />
     <Compile Include="Messages.cs" />
     <Compile Include="OleDbColumnFlagEnum.cs" />
-    <Compile Include="DbConnectionStringBuilderExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs" />
     <Compile Include="XmlObjectSerializer.cs" />