Make Sqlite database name configurable (OrchardCMS#15209)

urbanit · Mar 18, 2024 · 7d6073c · 7d6073c
1 parent 0570e11
commit 7d6073c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/SetupTenantTask.cs b/src/OrchardCore.Modules/OrchardCore.Tenants/Workflows/Activities/SetupTenantTask.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/src/OrchardCore/OrchardCore.Abstractions/Setup/SetupConstants.cs b/src/OrchardCore/OrchardCore.Abstractions/Setup/SetupConstants.cs
@@ -10,6 +10,7 @@ public static class SetupConstants
         public const string DatabaseProvider = "DatabaseProvider";
         public const string DatabaseConnectionString = "DatabaseConnectionString";
         public const string DatabaseTablePrefix = "DatabaseTablePrefix";
+        public const string DatabaseName = "DatabaseName";
         public const string DatabaseSchema = "DatabaseSchema";
         public const string SiteTimeZone = "SiteTimeZone";
         public const string FeatureProfile = "FeatureProfile";

diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs b/src/OrchardCore/OrchardCore.Data.YesSql/OrchardCoreBuilderExtensions.cs
@@ -79,7 +79,7 @@ public static OrchardCoreBuilder AddDataAccess(this OrchardCoreBuilder builder)
                             var databaseFolder = SqliteHelper.GetDatabaseFolder(shellOptions, shellSettings.Name);
                             Directory.CreateDirectory(databaseFolder);
 
-                            var connectionString = SqliteHelper.GetConnectionString(sqliteOptions, databaseFolder);
+                            var connectionString = SqliteHelper.GetConnectionString(sqliteOptions, databaseFolder, shellSettings["DatabaseName"]);
                             storeConfiguration
                                 .UseSqLite(connectionString, IsolationLevel.ReadUncommitted)
                                 .UseDefaultIdGenerator();

diff --git a/src/OrchardCore/OrchardCore.Data.YesSql/SqliteHelper.cs b/src/OrchardCore/OrchardCore.Data.YesSql/SqliteHelper.cs
@@ -6,18 +6,27 @@ namespace OrchardCore.Data;
 
 public static class SqliteHelper
 {
-    public static string GetConnectionString(SqliteOptions sqliteOptions, ShellOptions shellOptions, string shellName) =>
-        GetConnectionString(sqliteOptions, GetDatabaseFolder(shellOptions, shellName));
+    public static string GetConnectionString(SqliteOptions sqliteOptions, ShellOptions shellOptions, string shellName, string databaseName = "")
+        => GetConnectionString(sqliteOptions, GetDatabaseFolder(shellOptions, shellName), databaseName);
 
-    public static string GetConnectionString(SqliteOptions sqliteOptions, string databaseFolder) =>
-        new SqliteConnectionStringBuilder
+    public static string GetConnectionString(SqliteOptions sqliteOptions, string databaseFolder, string databaseName = "")
+    {
+        if (string.IsNullOrEmpty(databaseName))
         {
-            DataSource = Path.Combine(databaseFolder, "yessql.db"),
+            // For backward compatibility, we assume that the database name is 'yessql.db'.
+            databaseName = "yessql.db";
+        }
+
+        return new SqliteConnectionStringBuilder
+        {
+            DataSource = string.IsNullOrEmpty(databaseFolder)
+            ? databaseName
+            : Path.Combine(databaseFolder, databaseName),
             Cache = SqliteCacheMode.Shared,
             Pooling = sqliteOptions.UseConnectionPooling
         }
         .ToString();
-
+    }
     public static string GetDatabaseFolder(ShellOptions shellOptions, string shellName) =>
         Path.Combine(shellOptions.ShellsApplicationDataPath, shellOptions.ShellsContainerName, shellName);
 }
diff --git a/src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs b/src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs
@@ -161,6 +161,11 @@ private async Task<string> SetupInternalAsync(SetupContext context)
                 shellSettings["Schema"] = context.Properties.TryGetValue(SetupConstants.DatabaseSchema, out var schema) ? schema?.ToString() : null;
             }
 
+            if (shellSettings["DatabaseProvider"] == DatabaseProviderValue.Sqlite && string.IsNullOrEmpty(shellSettings["DatabaseName"]))
+            {
+                shellSettings["DatabaseName"] = context.Properties.TryGetValue(SetupConstants.DatabaseName, out var dbName) ? dbName?.ToString() : "OrchardCore.db";
+            }
+
             var validationContext = new DbConnectionValidatorContext(shellSettings);
             switch (await _dbConnectionValidator.ValidateAsync(validationContext))
             {