lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-11-24 08:46:48 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Code styling in AutomaticDataMigrations and DistributedLockSchemaBuilder

Browse Source
This commit is contained in:
Benedek Farkas
2025-10-16 15:58:00 +02:00
parent 1df4132fc2
commit 287b68b86d
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Orchard/Data/Migration/AutomaticDataMigrations.cs
View File

@@ -5,9 +5,9 @@ using Orchard.Data.Migration.Schema;
using Orchard.Environment;
using Orchard.Environment.Configuration;
using Orchard.Environment.Features;
using Orchard.Exceptions;
using Orchard.Logging;
using Orchard.Tasks.Locking.Services;
using Orchard.Exceptions;
namespace Orchard.Data.Migration {
/// <summary>
@@ -44,16 +44,21 @@ namespace Orchard.Data.Migration {
public void Activated() {
EnsureDistributedLockSchemaExists();
IDistributedLock @lock;
if (_distributedLockService.TryAcquireLock(GetType().FullName, TimeSpan.FromMinutes(30), TimeSpan.FromMilliseconds(250), out @lock)) {
if (_distributedLockService.TryAcquireLock(
GetType().FullName,
TimeSpan.FromMinutes(30),
TimeSpan.FromMilliseconds(250),
out IDistributedLock @lock)) {
using (@lock) {
// Let's make sure that the basic set of features is enabled. If there are any that are not enabled, then let's enable them first.
// Let's make sure that the basic set of features is enabled.
// If there are any that are not enabled, then let's enable them first.
var theseFeaturesShouldAlwaysBeActive = new[] {
"Common", "Containers", "Contents", "Dashboard", "Feeds", "Navigation", "Scheduling", "Settings", "Shapes", "Title"
};
var enabledFeatures = _featureManager.GetEnabledFeatures().Select(f => f.Id).ToList();
var featuresToEnable = theseFeaturesShouldAlwaysBeActive.Where(shouldBeActive => !enabledFeatures.Contains(shouldBeActive)).ToList();
var featuresToEnable = theseFeaturesShouldAlwaysBeActive.Where(
shouldBeActive => !enabledFeatures.Contains(shouldBeActive)).ToList();
if (featuresToEnable.Any()) {
_featureManager.EnableFeatures(featuresToEnable, true);
}
@@ -78,10 +83,10 @@ namespace Orchard.Data.Migration {
}
/// <summary>
/// This ensures that the framework migrations have run for the distributed locking feature, as existing Orchard installations will not have the required tables when upgrading.
/// This ensures that the framework migrations have run for the distributed locking feature, as existing
/// Orchard installations will not have the required tables when upgrading.
/// </summary>
private void EnsureDistributedLockSchemaExists()
{
private void EnsureDistributedLockSchemaExists() {
// Ensure the distributed lock record schema exists.
var schemaBuilder = new SchemaBuilder(_dataMigrationInterpreter);
var distributedLockSchemaBuilder = new DistributedLockSchemaBuilder(_shellSettings, schemaBuilder);

5
src/Orchard/Tasks/Locking/Services/DistributedLockSchemaBuilder.cs
View File

@@ -28,8 +28,9 @@ namespace Orchard.Tasks.Locking.Services {
public bool SchemaExists() {
try {
var tablePrefix = String.IsNullOrEmpty(_shellSettings.DataTablePrefix) ? "" : _shellSettings.DataTablePrefix + "_";
_schemaBuilder.ExecuteSql(String.Format("select * from {0}{1}", tablePrefix, TableName));
var tablePrefix = string.IsNullOrEmpty(_shellSettings.DataTablePrefix) ? "" : $"{_shellSettings.DataTablePrefix}_";
_schemaBuilder.ExecuteSql($"select * from {tablePrefix}{TableName}");
return true;
}
catch {