All DbContext's now use common DbContextFactory to create the connect…

…ion string. This allows us to easily switch out the server if needed.
danielmackay · Dec 17, 2023 · de08830 · de08830
1 parent 8acc913
commit de08830
Show file tree

Hide file tree

Showing 24 changed files with 71 additions and 72 deletions.
diff --git a/BackingFields/ApplicationDbContext.cs b/BackingFields/ApplicationDbContext.cs
@@ -1,6 +1,5 @@
 using Common;
 using Microsoft.EntityFrameworkCore;
-using System.Data.Common;
 
 namespace BackingFields;
 

diff --git a/BackingFields/BackingFields.csproj b/BackingFields/BackingFields.csproj
@@ -11,8 +11,4 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/BufferingAndStreaming/ApplicationDbContext.cs b/BufferingAndStreaming/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace BufferingAndStreaming;
@@ -10,8 +11,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=BufferingAndStreaming;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("BufferingAndStreaming"));
 
         optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/BulkDeletes/ApplicationDbContext.cs b/BulkDeletes/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace BulkDeletes;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=BulkDeletes;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("BulkDeletes"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/BulkUpdates/ApplicationDbContext.cs b/BulkUpdates/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace BulkUpdates;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=BulkUpdate;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("BulkUpdate"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/CompiledModels/ApplicationDbContext.cs b/CompiledModels/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using CompiledModels.CompiledModels;
+using Common;
+using CompiledModels.CompiledModels;
 using Microsoft.EntityFrameworkCore;
 
 namespace CompiledModels;
@@ -10,8 +11,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=CompiledModels;Trusted_Connection=True")
+            .UseSqlServer(DbConnectionFactory.Create("CompiledModels"))
             .UseModel(ApplicationDbContextModel.Instance);
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });

diff --git a/CompiledQueries/ApplicationDbContext.cs b/CompiledQueries/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace CompiledQueries;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=CompiledQueries;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("CompiledQueries"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/DbContextPooling/Program.cs b/DbContextPooling/Program.cs
@@ -1,4 +1,5 @@
-using DbContextPooling;
+using Common;
+using DbContextPooling;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -8,7 +9,7 @@
 Console.WriteLine("Pooling WITHOUT Dependency Injection");
 
 var options = new DbContextOptionsBuilder<ApplicationDbContext>()
-    .UseSqlServer(@"Server=(localdb)\mssqllocaldb;Database=DbContextPooling;Trusted_Connection=True");
+        .UseSqlServer(DbConnectionFactory.Create("DbContextPooling"));
 
 var factory = new PooledDbContextFactory<ApplicationDbContext>(options.Options);
 
@@ -20,7 +21,7 @@
 
 var services = new ServiceCollection();
 services.AddDbContextPool<ApplicationDbContext>(
-    o => o.UseSqlServer(@"Server=(localdb)\mssqllocaldb;Database=DbContextPooling;Trusted_Connection=True"));
+    o => o.UseSqlServer(DbConnectionFactory.Create("DbContextPooling")));
 
 var sp = services.BuildServiceProvider();
 

diff --git a/Directory.Build.Props b/Directory.Build.Props
@@ -1,5 +1,8 @@
 <Project>
-  <PropertyGroup>
-    <TreatWarningsAsErrors Condition="'$(Configuration)' != 'Debug'">true</TreatWarningsAsErrors>
-  </PropertyGroup>
-</Project>
+    <PropertyGroup>
+        <TreatWarningsAsErrors Condition="'$(Configuration)' != 'Debug'">true</TreatWarningsAsErrors>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(MSBuildProjectName)' != 'Common'">
+        <ProjectReference Include="..\Common\Common.csproj"/>
+    </ItemGroup>
+</Project>
diff --git a/JsonColumns/ApplicationDbContext.cs b/JsonColumns/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace JsonColumns;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=JsonColumns;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("JsonColumns"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/KeysetPagination/ApplicationDbContext.cs b/KeysetPagination/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace KeysetPagination;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=KeysetPagination;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("KeysetPagination"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/MigrationBundles/ApplicationDbContext.cs b/MigrationBundles/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace MigrationBundles;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=MigrationBundles;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("MigrationBundles"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/OwnedEntities/ApplicationDbContext.cs b/OwnedEntities/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace OwnedEntities;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=OwnedEntities;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("OwnedEntities"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/QueryFilters/ApplicationDbContext.cs b/QueryFilters/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace QueryFilters;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=QueryFilters;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("QueryFilters"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/Sequences/ApplicationDbContext.cs b/Sequences/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace Sequences;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=Sequences;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("Sequences"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/ShadowProperties/ApplicationDbContext.cs b/ShadowProperties/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace ShadowProperties;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=ShadowProperties;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("ShadowProperties"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/SplitQueries/BloggingContext.cs b/SplitQueries/BloggingContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 
@@ -22,8 +23,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         var splitQueryBehavior = _useSplitQueries ? QuerySplittingBehavior.SplitQuery : QuerySplittingBehavior.SingleQuery;
 
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=SplitQueries;Trusted_Connection=True",
+            .UseSqlServer(DbConnectionFactory.Create("SplitQueries"),
                 options => options.UseQuerySplittingBehavior(splitQueryBehavior));
 
         optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });

diff --git a/TablePerConcreteType/Complex/ComplexDbContext.cs b/TablePerConcreteType/Complex/ComplexDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace TablePerConcreateType.Complex;
@@ -14,8 +15,7 @@ public class ComplexDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=ComplexTpc;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("ComplexTpc"));
 
         optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/TablePerHierarchy/Complex/ComplexDbContext.cs b/TablePerHierarchy/Complex/ComplexDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace TablePerHierarchy.Complex;
@@ -12,8 +13,7 @@ public class ComplexDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=ComplexTph;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("ComplexTph"));
 
         optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/TablePerType/Complex/ComplexDbContext.cs b/TablePerType/Complex/ComplexDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace TablePerType.Complex;
@@ -14,8 +15,7 @@ public class ComplexDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=ComplexTpt;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("ComplexTpt"));
 
         optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/Tags/ApplicationDbContext.cs b/Tags/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace Tags;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=Tags;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("Tags"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/TemporalTables/ApplicationDbContext.cs b/TemporalTables/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace TemporalTables;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=TemporalTables;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("TemporalTables"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/UnmappedTypes/ApplicationDbContext.cs b/UnmappedTypes/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 
 namespace UnmappedTypes;
@@ -10,8 +11,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=UnmappedTypes;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("UnmappedTypes"));
 
         optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }

diff --git a/ValueConverters/ApplicationDbContext.cs b/ValueConverters/ApplicationDbContext.cs
@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Common;
+using Microsoft.EntityFrameworkCore;
 
 namespace ValueConverters;
 
@@ -9,8 +10,7 @@ public class ApplicationDbContext : DbContext
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
         optionsBuilder
-            .UseSqlServer(
-                @"Server=(localdb)\mssqllocaldb;Database=ValueConverters;Trusted_Connection=True");
+            .UseSqlServer(DbConnectionFactory.Create("ValueConverters"));
 
         //optionsBuilder.LogTo(Console.WriteLine, new[] { RelationalEventId.CommandExecuted });
     }