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

The try catch for getting a user when we are in Upgrading state also needs to work for SqlCe

Browse Source
This commit is contained in:
mikkelhm
2017-08-01 12:19:26 +02:00
parent 005bee7650
commit 8cb29182f4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/Services/UserService.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.ComponentModel;
using System.Data.Common;
using System.Data.SqlClient;
using System.Data.SqlServerCe;
using System.Globalization;
using System.Linq;
using System.Linq.Expressions;
@@ -205,9 +206,9 @@ namespace Umbraco.Core.Services
{
return repository.GetByUsername(username, includeSecurityData: true);
}
catch (SqlException ex)
catch (Exception ex) when (ex is SqlException || ex is SqlCeException)
{
//we need to handle this one specific case which is when we are upgrading to 7.6 since the user group
//we need to handle this one specific case which is when we are upgrading to 7.7 since the user group
//tables don't exist yet. This is the 'easiest' way to deal with this without having to create special
//version checks in the BackOfficeSignInManager and calling into other special overloads that we'd need
//like "GetUserById(int id, bool includeSecurityData)" which may cause confusion because the result of
@@ -219,7 +220,6 @@ namespace Umbraco.Core.Services
}
throw;
}
}
}
@@ -704,9 +704,9 @@ namespace Umbraco.Core.Services
var result = repository.Get(id);
return result;
}
catch (SqlException ex)
catch (Exception ex) when (ex is SqlException || ex is SqlCeException)
{
//we need to handle this one specific case which is when we are upgrading to 7.6 since the user group
//we need to handle this one specific case which is when we are upgrading to 7.7 since the user group
//tables don't exist yet. This is the 'easiest' way to deal with this without having to create special
//version checks in the BackOfficeSignInManager and calling into other special overloads that we'd need
//like "GetUserById(int id, bool includeSecurityData)" which may cause confusion because the result of