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

Refactor ISqlContext and SqlTemplates

Browse Source
This commit is contained in:
Stephan
2017-09-22 18:28:21 +02:00
parent c43bf6c741
commit ee1941b9bf
118 changed files with 619 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web/Install/InstallHelper.cs
View File

@@ -46,7 +46,7 @@ namespace Umbraco.Web.Install
new NewInstallStep(_httpContext, Current.Services.UserService, _databaseBuilder),
new UpgradeStep(_databaseBuilder),
new FilePermissionsStep(),
new MajorVersion7UpgradeReport(_databaseBuilder, Current.RuntimeState, Current.DatabaseContext, Current.ScopeProvider),
new MajorVersion7UpgradeReport(_databaseBuilder, Current.RuntimeState, Current.SqlContext, Current.ScopeProvider),
new Version73FileCleanup(_httpContext, _logger),
new ConfigureMachineKey(),
new DatabaseConfigureStep(_databaseBuilder),
@@ -124,7 +124,7 @@ namespace Umbraco.Web.Install
{
// we don't have DatabaseProvider anymore... doing it differently
//dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
dbProvider = GetDbProviderString(Current.DatabaseContext);
dbProvider = GetDbProviderString(Current.SqlContext);
}
var check = new org.umbraco.update.CheckForUpgrade();
@@ -146,7 +146,7 @@ namespace Umbraco.Web.Install
}
}
internal static string GetDbProviderString(IDatabaseContext databaseContext)
internal static string GetDbProviderString(ISqlContext sqlContext)
{
var dbProvider = string.Empty;
@@ -154,7 +154,7 @@ namespace Umbraco.Web.Install
//dbProvider = ApplicationContext.Current.DatabaseContext.DatabaseProvider.ToString();
//
// doing it differently
var syntax = databaseContext.SqlSyntax;
var syntax = sqlContext.SqlSyntax;
if (syntax is SqlCeSyntaxProvider)
dbProvider = "SqlServerCE";
else if (syntax is MySqlSyntaxProvider)