Added support for multiple provider connection strings. Implements csharpfritz#286

Author: parithon

CoreWiki.Data/StartupExtensions.cs

@@ -20,9 +20,10 @@ public static class StartupExtensions
 		public static IServiceCollection AddRepositories(this IServiceCollection services, IConfiguration config) {
 
 			Action<DbContextOptionsBuilder> optionsBuilder;
-			var connectionString = config.GetConnectionString("CoreWikiData");
+			var provider = config["DataProvider"].ToLowerInvariant();
+			var connectionString = config.GetConnectionString($"CoreWikiData:{provider}");
 
-			switch (config["DataProvider"].ToLowerInvariant()) {
+			switch (provider) {
 				case "postgres":
 					services.AddEntityFrameworkNpgsql();
 					optionsBuilder = options => options.UseNpgsql(connectionString);

CoreWiki/Areas/Identity/IdentityHostingStartup.cs

@@ -56,15 +56,16 @@ private static void ConfigureDb(WebHostBuilderContext context, IServiceCollectio
 		{
 
 			Action<DbContextOptionsBuilder> optionsBuilder;
-			var connectionString = context.Configuration.GetConnectionString("CoreWikiIdentityContextConnection");
+			var provider = context.Configuration["DataProvider"].ToLowerInvariant();
+			var connectionString = context.Configuration.GetConnectionString($"CoreWikiIdentity:{provider}");
 
-			switch (context.Configuration["DataProvider"].ToLowerInvariant())
+			switch(provider)
 			{
 				case "postgres":
 					optionsBuilder = options => options.UseNpgsql(connectionString);
 					break;
 				default:
-					connectionString = !string.IsNullOrEmpty(connectionString) ? connectionString : "DataSource =./App_Data/wikiIdentity.db";
+					connectionString = !string.IsNullOrEmpty(connectionString) ? connectionString : "DataSource=./App_Data/wikiIdentity.db";
 					optionsBuilder = options => options.UseSqlite(connectionString);
 					break;
 			}

CoreWiki/appsettings.json

@@ -6,12 +6,16 @@
 			"Default": "Warning"
 		}
 	},
-	"DataProvider":  "",
+	"DataProvider": "",
 	"ConnectionStrings": {
-		//"CoreWikiIdentityContextConnection": "host=localhost;port=5432;user id=postgres;password=password",
-		//"CoreWikiData": "host=localhost;port=5432;user id=postgres;password=password"
-		"CoreWikiIdentityContextConnection": "DataSource=./App_Data/wikiIdentity.db",
-		"CoreWikiData": "DataSource=./App_Data/wikiContent.db"
+		"CoreWikiIdentity": {
+			"": "DataSource=./App_Data/wikiIdentity.db",
+			"postgres": "host=localhost;port=5432;user id=postgres;password=password"
+		},
+		"CoreWikiData": {
+			"": "DataSource=./App_Data/wikiContent.db",
+			"postgres": "host=localhost;port=5432;user id=postgres;password=password"
+		}
 	},
 	"Authentication": {
 		"Microsoft": {
@@ -32,12 +36,12 @@
 		"FromName": "No Reply Team"
 	},
 	"CspSettings": {
-		"ImageSources": [ ],
-		"StyleSources": [ ],
-		"ScriptSources": [ ],
-		"FontSources": [ ],
-		"FormActions": [ ],
-		"FrameAncestors": [ ],
-		"ReportUris": [ ]
+		"ImageSources": [],
+		"StyleSources": [],
+		"ScriptSources": [],
+		"FontSources": [],
+		"FormActions": [],
+		"FrameAncestors": [],
+		"ReportUris": []
 	}
 }