yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ParseConnectionString to pass tests

Browse Source
This commit is contained in:
Ronald Barendse
2021-09-20 11:38:54 +02:00
parent bc29155032
commit fed720042c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Core/Configuration/ConfigConnectionString.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Cms.Core.Configuration
{
if (string.IsNullOrEmpty(connectionString))
{
return null;
return connectionString;
}
var builder = new DbConnectionStringBuilder
@@ -41,6 +41,9 @@ namespace Umbraco.Cms.Core.Configuration
if (!string.IsNullOrEmpty(dataDirectory))
{
builder[attachDbFileNameKey] = attachDbFileName.Replace(dataDirectoryPlaceholder, dataDirectory);
// Mutate the existing connection string (note: the builder also lowercases the properties)
connectionString = builder.ToString();
}
}
@@ -50,7 +53,7 @@ namespace Umbraco.Cms.Core.Configuration
providerName = ParseProviderName(builder);
}
return builder.ToString();
return connectionString;
}
/// <summary>

3
src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
View File

@@ -4,7 +4,6 @@ using Microsoft.Extensions.Options;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Migrations;
using Umbraco.Cms.Core.Scoping;
using Umbraco.Cms.Core.Services;
@@ -144,7 +143,7 @@ namespace Umbraco.Cms.Infrastructure.Migrations.Install
#region Configure Connection String
public const string EmbeddedDatabaseConnectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;";
public const string EmbeddedDatabaseConnectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1";
/// <summary>
/// Configures a connection string for the embedded database.