Fix for provider initialization sequence in fluent constructor (#508)

CollaboratingPlatypus · Mar 12, 2019 · 2018349 · 2018349
1 parent 69edf7d
commit 2018349
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 86 deletions.
diff --git a/PetaPoco.Tests.Unit/DatabaseConfigurationTests.cs b/PetaPoco.Tests.Unit/DatabaseConfigurationTests.cs
@@ -437,5 +437,24 @@ public void UsingConnectionWithProvider_AfterCreate_InstanceShouldBeValid()
             db.ConnectionString.ShouldBe(connString);
             db.Provider.ShouldBeOfType<FakeProvider>();
         }
+
+        [Fact]
+        public void UsingConnectionWithProviderName_AfterCreate_InstanceShouldBeValid()
+        {
+            DatabaseProvider.RegisterCustomProvider<FakeProvider>("fake");
+            try
+            {
+                var connString = "Data Source = foo";
+                var connection = new SqlConnection(connString);
+                var db = new Database(config.UsingConnection(connection).UsingProviderName("FakeProvider"));
+
+                db.ConnectionString.ShouldBe(connString);
+                db.Provider.ShouldBeOfType<FakeProvider>();
+            }
+            finally
+            {
+                DatabaseProvider.ClearCustomProviders();
+            }
+        }
     }
 }
diff --git a/PetaPoco.Tests.Unit/DatabaseTests.cs b/PetaPoco.Tests.Unit/DatabaseTests.cs
@@ -94,7 +94,7 @@ public void Construct_GivenInvalidArguments_ShouldThrow()
                 }
                 catch (Exception e)
                 {
-                    e.Message.ShouldContain("Either a provider name or provider must be registered");
+                    e.Message.ShouldContain("Unable to locate a provider");
                     throw;
                 }
             });