From ea6d81f7ac5a4ab4091745d8da8892ff4eb867fc Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 3 Jan 2018 11:47:26 +1100 Subject: [PATCH 1/2] U4-10701 Umbraco.MemberHasAccess generates slow query after upgrading to 7.7.6 --- .../Repositories/MemberGroupRepository.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs index a760ebb717..c7e8a5c328 100644 --- a/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs @@ -183,17 +183,17 @@ namespace Umbraco.Core.Persistence.Repositories } public IEnumerable GetMemberGroupsForMember(string username) - { - var sql = new Sql() + { + var sql = new Sql() .Select("un.*") .From("umbracoNode AS un") .InnerJoin("cmsMember2MemberGroup") - .On("un.id = cmsMember2MemberGroup.MemberGroup") - .LeftJoin("(SELECT umbracoNode.id, cmsMember.LoginName FROM umbracoNode INNER JOIN cmsMember ON umbracoNode.id = cmsMember.nodeId) AS member") - .On("member.id = cmsMember2MemberGroup.Member") - .Where("un.nodeObjectType=@objectType", new {objectType = NodeObjectTypeId }) - .Where("member.LoginName=@loginName", new {loginName = username}); - + .On("cmsMember2MemberGroup.MemberGroup = un.id") + .InnerJoin("cmsMember") + .On("cmsMember.nodeId = cmsMember2MemberGroup.Member") + .Where("un.nodeObjectType=@objectType", new { objectType = NodeObjectTypeId }) + .Where("cmsMember.LoginName=@loginName", new { loginName = username }); + return Database.Fetch(sql) .DistinctBy(dto => dto.NodeId) .Select(x => _modelFactory.BuildEntity(x)); From 27b9385df56f5a4a65e9c0819bb65c11fdc61a54 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Wed, 3 Jan 2018 11:08:55 +0000 Subject: [PATCH 2/2] Update client build NPM dependancy for gulp-connect to use 5.0.0 as next/latest version required you to use CoffeeScript to compile their src code to use the module/component --- src/Umbraco.Web.UI.Client/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 0286d5f358..b1ee7be7bf 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -26,7 +26,7 @@ "cssnano": "^3.7.6", "gulp": "^3.9.1", "gulp-concat": "^2.6.0", - "gulp-connect": "^5.0.0", + "gulp-connect": "5.0.0", "gulp-less": "^3.1.0", "gulp-ngdocs": "^0.3.0", "gulp-open": "^2.0.0",