Fix DbConnectionValidator when Shell Settings from database

src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantValidator.cs

@@ -117,7 +117,8 @@ private async Task AssertConnectionValidityAndApplyErrorsAsync(string databasePr
                 case DbConnectionValidatorResult.InvalidConnection:
                     errors.Add(new ModelError(nameof(TenantViewModel.ConnectionString), S["The provided connection string is invalid or server is unreachable."]));
                     break;
-                case DbConnectionValidatorResult.DocumentFound:
+                case DbConnectionValidatorResult.ShellDescriptorDocumentFound:
+                case DbConnectionValidatorResult.DocumentTableFound:
                     errors.Add(new ModelError(nameof(TenantViewModel.TablePrefix), S["The provided table prefix already exists."]));
                     break;
             }

src/OrchardCore/OrchardCore.Data.YesSql.Abstractions/DbConnectionValidatorResult.cs

@@ -1,22 +1,21 @@
 namespace OrchardCore.Data;
 
+/// <summary>
+/// 'Unknown' indicates that the connection string status is unknown or was not validated.
+/// 'NoProvider' indicated that the database provider is missing.
+/// 'DocumentTableNotFound' indicates that the connection string was valid, while the Document table does not exists.
+/// 'DocumentFound' indicates that the connection string was valid, while the Document table exists.
+/// 'ShellDescriptorDocumentFound' indicates that the connection string was valid and the document table exists with at least one shell-descriptor document.
+/// 'InvalidConnection' unable to open a connection to the given connection string.
+/// 'UnsupportedProvider' indicates invalid or unsupported database provider.
+/// </summary>
 public enum DbConnectionValidatorResult
 {
-    // Unknown indicates that the connection string status is unknown or was not yet validated
     Unknown,
-
-    // NoProvider indicated that the provider is missing
     NoProvider,
-
-    // DocumentNotFound indicates that the connection string was valid, yet the Document table does not exist 
-    DocumentNotFound,
-
-    // DocumentFound indicates that the connection string was valid, yet the Document table exist
-    DocumentFound,
-
-    // InvalidConnection unable to open a connection to the given connection string
+    DocumentTableNotFound,
+    DocumentTableFound,
+    ShellDescriptorDocumentFound,
     InvalidConnection,
-
-    // UnsupportedProvider indicated invalid or unsupported database provider
     UnsupportedProvider
 }

src/OrchardCore/OrchardCore.Data.YesSql/DbConnectionValidator.cs

@@ -50,7 +50,7 @@ public async Task<DbConnectionValidatorResult> ValidateAsync(string databaseProv
 
         if (provider != null && !provider.HasConnectionString)
         {
-            return DbConnectionValidatorResult.DocumentNotFound;
+            return DbConnectionValidatorResult.DocumentTableNotFound;
         }
 
         if (String.IsNullOrWhiteSpace(connectionString))
@@ -80,25 +80,31 @@ public async Task<DbConnectionValidatorResult> ValidateAsync(string databaseProv
 
             using var result = await selectCommand.ExecuteReaderAsync();
 
-            // at this point the query succeeded and the table exists
-            return DbConnectionValidatorResult.DocumentFound;
+            // At this point, the query work and the 'Document' table exists.
+            if (result.HasRows)
+            {
+                // At this point we know that the Document table and the ShellDescriptor record exists.
+                return DbConnectionValidatorResult.ShellDescriptorDocumentFound;
+            }
+
+            // At this point the Document table exists with no ShellDescriptor document.
+            return DbConnectionValidatorResult.DocumentTableFound;
         }
         catch
         {
-            // at this point we know that the document table does not exist
-
-            return DbConnectionValidatorResult.DocumentNotFound;
+            // At this point we know that the document table does not exist.
+            return DbConnectionValidatorResult.DocumentTableNotFound;
         }
     }
 
     private ISqlBuilder GetSelectBuilderForDocumentTable(string tablePrefix, DatabaseProviderName providerName)
     {
         var selectBuilder = GetSqlBuilder(providerName, tablePrefix);
-
         selectBuilder.Select();
         selectBuilder.AddSelector("*");
         selectBuilder.Table(_tableNameConvention.GetDocumentTable());
         selectBuilder.Take("1");
+        selectBuilder.WhereAnd("Type = 'OrchardCore.Shells.Database.Models.DatabaseShellsSettings, OrchardCore.Infrastructure'");
 
         return selectBuilder;
     }
@@ -111,7 +117,7 @@ private static IConnectionFactory GetFactory(DatabaseProviderName providerName,
             DatabaseProviderName.MySql => new DbConnectionFactory<MySqlConnection>(connectionString),
             DatabaseProviderName.Sqlite => new DbConnectionFactory<SqliteConnection>(connectionString),
             DatabaseProviderName.Postgres => new DbConnectionFactory<NpgsqlConnection>(connectionString),
-            _ => throw new ArgumentOutOfRangeException("Unsupported Database Provider"),
+            _ => throw new ArgumentOutOfRangeException(nameof(providerName), "Unsupported Database Provider"),
         };
     }
 
@@ -123,7 +129,7 @@ private ISqlBuilder GetSqlBuilder(DatabaseProviderName providerName, string tabl
             DatabaseProviderName.MySql => new MySqlDialect(),
             DatabaseProviderName.Sqlite => new SqliteDialect(),
             DatabaseProviderName.Postgres => new PostgreSqlDialect(),
-            _ => throw new ArgumentOutOfRangeException("Unsupported Database Provider"),
+            _ => throw new ArgumentOutOfRangeException(nameof(providerName), "Unsupported Database Provider"),
         };
 
         var prefix = String.Empty;

src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Configuration/DatabaseShellsStorageOptions.cs

@@ -1,9 +1,11 @@
+using OrchardCore.Data;
+
 namespace OrchardCore.Shells.Database.Configuration
 {
     public class DatabaseShellsStorageOptions
     {
         public bool MigrateFromFiles { get; set; }
-        public string DatabaseProvider { get; set; }
+        public DatabaseProviderName DatabaseProvider { get; set; }
         public string ConnectionString { get; set; }
         public string TablePrefix { get; set; }
     }

src/OrchardCore/OrchardCore.Infrastructure/Shells.Database/Extensions/DatabaseShellContextFactoryExtensions.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using OrchardCore.Data;
 using OrchardCore.Environment.Shell;
 using OrchardCore.Environment.Shell.Builders;
 using OrchardCore.Environment.Shell.Descriptor.Models;
@@ -12,7 +13,7 @@ public static class DatabaseShellContextFactoryExtensions
     {
         internal static Task<ShellContext> GetDatabaseContextAsync(this IShellContextFactory shellContextFactory, DatabaseShellsStorageOptions options)
         {
-            if (options.DatabaseProvider == null)
+            if (options.DatabaseProvider == DatabaseProviderName.None)
             {
                 throw new ArgumentNullException(nameof(options.DatabaseProvider),
                     "The 'OrchardCore.Shells.Database' configuration section should define a 'DatabaseProvider'");
@@ -24,7 +25,7 @@ internal static Task<ShellContext> GetDatabaseContextAsync(this IShellContextFac
                 State = TenantState.Running
             };
 
-            settings["DatabaseProvider"] = options.DatabaseProvider;
+            settings["DatabaseProvider"] = options.DatabaseProvider.ToString();
             settings["ConnectionString"] = options.ConnectionString;
             settings["TablePrefix"] = options.TablePrefix;
 

src/OrchardCore/OrchardCore.Setup.Core/SetupService.cs

@@ -181,7 +181,7 @@ private async Task<string> SetupInternalAsync(SetupContext context)
                 case DbConnectionValidatorResult.InvalidConnection:
                     context.Errors.Add(String.Empty, S["The provided connection string is invalid or server is unreachable."]);
                     break;
-                case DbConnectionValidatorResult.DocumentFound:
+                case DbConnectionValidatorResult.DocumentTableFound:
                     context.Errors.Add(String.Empty, S["The provided database table is already in use."]);
                     break;
             }