Support DataDirectory placeholder in LocalDB connection string

This commit is contained in:
Ronald Barendse
2021-09-17 20:20:36 +02:00
parent 4ad34270dd
commit fd5cef6b42
4 changed files with 47 additions and 10 deletions

View File

@@ -14,8 +14,43 @@ namespace Umbraco.Cms.Core.Configuration
public ConfigConnectionString(string name, string connectionString, string providerName = null)
{
Name = name ?? throw new ArgumentNullException(nameof(name));
ConnectionString = connectionString;
ProviderName = string.IsNullOrEmpty(providerName) ? ParseProviderName(connectionString) : providerName;
ConnectionString = ParseConnectionString(connectionString, ref providerName);
ProviderName = providerName;
}
private static string ParseConnectionString(string connectionString, ref string providerName)
{
if (string.IsNullOrEmpty(connectionString))
{
return null;
}
var builder = new DbConnectionStringBuilder
{
ConnectionString = connectionString
};
// Replace data directory placeholder
const string attachDbFileNameKey = "AttachDbFileName";
const string dataDirectoryPlaceholder = "|DataDirectory|";
if (builder.TryGetValue(attachDbFileNameKey, out var attachDbFileNameValue) &&
attachDbFileNameValue is string attachDbFileName &&
attachDbFileName.Contains(dataDirectoryPlaceholder))
{
var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
if (!string.IsNullOrEmpty(dataDirectory))
{
builder[attachDbFileNameKey] = attachDbFileName.Replace(dataDirectoryPlaceholder, dataDirectory);
}
}
// Also parse provider name now we already have a builder
if (string.IsNullOrEmpty(providerName))
{
providerName = ParseProviderName(builder);
}
return builder.ToString();
}
/// <summary>
@@ -37,13 +72,18 @@ namespace Umbraco.Cms.Core.Configuration
ConnectionString = connectionString
};
return ParseProviderName(builder);
}
private static string ParseProviderName(DbConnectionStringBuilder builder)
{
if ((builder.TryGetValue("Data Source", out var dataSource) || builder.TryGetValue("DataSource", out dataSource)) &&
dataSource?.ToString().EndsWith(".sdf", StringComparison.OrdinalIgnoreCase) == true)
{
return Cms.Core.Constants.DbProviderNames.SqlCe;
return Constants.DbProviderNames.SqlCe;
}
return Cms.Core.Constants.DbProviderNames.SqlServer;
return Constants.DbProviderNames.SqlServer;
}
}
}

View File

@@ -160,10 +160,6 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
string connectionString = LocalDbConnectionString;
const string providerName = Constants.DbProviderNames.SqlServer;
// Replace data directory placeholder (this is not supported by LocalDB)
var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
connectionString = connectionString.Replace("|DataDirectory|", dataDirectory);
_configManipulator.SaveConnectionString(connectionString, providerName);
_databaseFactory.Configure(connectionString, providerName);

View File

@@ -94,8 +94,6 @@ namespace Umbraco.Cms.Infrastructure.Runtime
_logger.LogError(exception, msg);
};
AppDomain.CurrentDomain.SetData("DataDirectory", _hostingEnvironment?.MapPathContentRoot(Constants.SystemDirectories.Data));
// acquire the main domain - if this fails then anything that should be registered with MainDom will not operate
AcquireMainDom();

View File

@@ -94,6 +94,9 @@ namespace Umbraco.Extensions
services.AddLogger(tempHostingEnvironment, loggingConfig, config);
// The DataDirectory is used to resolve database file paths (directly supported by SQL CE and manually replaced for LocalDB)
AppDomain.CurrentDomain.SetData("DataDirectory", tempHostingEnvironment?.MapPathContentRoot(Constants.SystemDirectories.Data));
// Manually create and register the HttpContextAccessor. In theory this should not be registered
// again by the user but if that is the case it's not the end of the world since HttpContextAccessor
// is just based on AsyncLocal, see https://github.com/dotnet/aspnetcore/blob/main/src/Http/Http/src/HttpContextAccessor.cs