Merge branch 'dev-v7' into temp-view-compilation

.github/README.md

@@ -46,4 +46,5 @@ Umbraco is contribution focused and community driven. If you want to contribute
 
 Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md).
 
-To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).
+You can comment and report issues on the [github issue tracker](https://github.com/umbraco/Umbraco-CMS/issues).
+Since [September 2018](https://umbraco.com/blog/a-second-take-on-umbraco-issue-tracker-hello-github-issues/) the old issue tracker is in read only mode, but can still be found at [http://issues.umbraco.org](http://issues.umbraco.org).

build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1

@@ -94,14 +94,14 @@ function Get-UmbracoBuildEnv
   }
 
   # ensure we have node
-  $node = "$path\node-v6.9.1-win-x86"
-  $source = "http://nodejs.org/dist/v6.9.1/node-v6.9.1-win-x86.7z"
+  $node = "$path\node-v8.12.0-win-x86"
+  $source = "http://nodejs.org/dist/v8.12.0/node-v8.12.0-win-x86.7z "
   if (-not (test-path $node))
   {
     Write-Host "Download Node..."
-    Invoke-WebRequest $source -OutFile "$path\node-v6.9.1-win-x86.7z"
-    &$sevenZip x "$path\node-v6.9.1-win-x86.7z" -o"$path" -aos > $nul
-    Remove-File "$path\node-v6.9.1-win-x86.7z"    
+    Invoke-WebRequest $source -OutFile "$path\node-v8.12.0-win-x86.7z"
+    &$sevenZip x "$path\node-v8.12.0-win-x86.7z" -o"$path" -aos > $nul
+    Remove-File "$path\node-v8.12.0-win-x86.7z"    
   }
 
   # note: why? node already brings everything we need!

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -28,7 +28,7 @@
       <dependency id="HtmlAgilityPack" version="[1.4.9.5, 2.0.0)" />
       <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
       <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.6, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.7, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
       <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />

build/NuSpecs/tools/Readme.txt

@@ -21,6 +21,6 @@ The following items will now be automatically included when creating a deploy pa
 system: umbraco, umbraco_client, config\splashes and global.asax.
 
 Please read the release notes on our.umbraco.com:
-http://our.umbraco.com/contribute/releases
+https://our.umbraco.com/download/releases
 
-- Umbraco
+- Umbraco

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs

@@ -24,7 +24,7 @@ public override void Up()
             // We need to get all datatypes with an alias of "umbraco.tags" so we can loop over them and set the missing values if needed
             var datatypes = Context.Database.Fetch<DataTypeDto>("SELECT * FROM cmsDataType");
             var tagsDataTypes = datatypes.Where(x => string.Equals(x.PropertyEditorAlias, Constants.PropertyEditors.TagsAlias, StringComparison.InvariantCultureIgnoreCase));
-            var dataTypePreValues = Context.Database.Fetch<DataTypePreValueDto>("SELECT * FROM cmsDataTypePrevalues");
+            var dataTypePreValues = Context.Database.Fetch<DataTypePreValueDto>("SELECT * FROM cmsDataTypePreValues");
 
             foreach (var datatype in tagsDataTypes)
             {
@@ -36,7 +36,7 @@ public override void Up()
                 // if the "storageType" has not been set we do so by adding a new row in the table for the nodid and set it
                 if (result == null)
                 {
-                    Insert.IntoTable("CmsDataTypePrevalues").Row(new
+                    Insert.IntoTable("cmsDataTypePreValues").Row(new
                     {
                         datatypeNodeId = datatype.DataTypeId,
                         value = "Csv",

src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
@@ -47,43 +48,32 @@ public IEnumerable<IAuditItem> GetPagedResultsByQuery(IQuery<IAuditItem> query,
             var sql = GetBaseQuery(false);
 
             if (query == null) query = new Query<IAuditItem>();
+            var queryHasWhereClause = query.GetWhereClauses().Any();
             var translatorIds = new SqlTranslator<IAuditItem>(sql, query);
             var translatedQuery = translatorIds.Translate();
 
-            var customFilterWheres = customFilter != null ? customFilter.GetWhereClauses().ToArray() : null;
+            var customFilterWheres = customFilter?.GetWhereClauses().ToArray();
             var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0;
             if (hasCustomFilter)
             {
                 var filterSql = new Sql();
-                var first = true;
-                foreach (var filterClaus in customFilterWheres)
+                foreach (var filterClause in customFilterWheres)
                 {
-                    if (first == false)
-                    {
-                        filterSql.Append(" AND ");
-                    }
-                    filterSql.Append(string.Format("({0})", filterClaus.Item1), filterClaus.Item2);
-                    first = false;
+                    filterSql.Append($"AND ({filterClause.Item1})", filterClause.Item2);
                 }
 
-                translatedQuery = GetFilteredSqlForPagedResults(translatedQuery, filterSql);
+                translatedQuery = GetFilteredSqlForPagedResults(translatedQuery, filterSql, queryHasWhereClause);
             }
 
             if (auditTypeFilter.Length > 0)
             {
                 var filterSql = new Sql();
-                var first = true;
-                foreach (var filterClaus in auditTypeFilter)
+                foreach (var filterClause in auditTypeFilter)
                 {
-                    if (first == false || hasCustomFilter)
-                    {
-                        filterSql.Append(" AND ");
-                    }
-                    filterSql.Append("(logHeader = @logHeader)", new {logHeader = filterClaus.ToString() });
-                    first = false;
+                    filterSql.Append("AND (logHeader = @logHeader)", new { logHeader = filterClause.ToString() });
                 }
 
-                translatedQuery = GetFilteredSqlForPagedResults(translatedQuery, filterSql);
+                translatedQuery = GetFilteredSqlForPagedResults(translatedQuery, filterSql, queryHasWhereClause || hasCustomFilter);
             }
 
             if (orderDirection == Direction.Descending)
@@ -99,7 +89,7 @@ public IEnumerable<IAuditItem> GetPagedResultsByQuery(IQuery<IAuditItem> query,
                 dto => new AuditItem(dto.Id, dto.Comment, Enum<AuditType>.ParseOrNull(dto.Header) ?? AuditType.Custom, dto.UserId)).ToArray();
 
             //Mapping the DateStamp
-            for (int i = 0; i < pages.Length; i++)
+            for (var i = 0; i < pages.Length; i++)
             {
                 pages[i].CreateDate = pagedResult.Items[i].Datestamp;
             }
@@ -169,14 +159,17 @@ protected override Guid NodeObjectTypeId
         }
         #endregion
 
-        private Sql GetFilteredSqlForPagedResults(Sql sql, Sql filterSql)
+        private Sql GetFilteredSqlForPagedResults(Sql sql, Sql filterSql, bool hasWhereClause)
         {
             Sql filteredSql;
 
             // Apply filter
             if (filterSql != null)
             {
-                var sqlFilter = " WHERE " + filterSql.SQL.TrimStart("AND ");
+                //ensure we don't append a WHERE if there is already one
+                var sqlFilter = hasWhereClause
+                    ? filterSql.SQL
+                    : " WHERE " + filterSql.SQL.TrimStart("AND ");
 
                 //NOTE: this is certainly strange - NPoco handles this much better but we need to re-create the sql
                 // instance a couple of times to get the parameter order correct, for some reason the first

src/Umbraco.Core/Persistence/Repositories/UserRepository.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Web.Security;
 using Newtonsoft.Json;
 using Umbraco.Core.Configuration;
@@ -710,34 +711,34 @@ public IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageI
 
 
 
-        private IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords, string orderBy, Direction orderDirection,
-            string[] includeUserGroups = null,
-            string[] excludeUserGroups = null,
-            UserState[] userState = null,
+        private IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords, string orderBy, Direction orderDirection,
+            string[] includeUserGroups = null,
+            string[] excludeUserGroups = null,
+            UserState[] userState = null,
             IQuery<IUser> customFilter = null)
         {
             if (string.IsNullOrWhiteSpace(orderBy)) throw new ArgumentException("Value cannot be null or whitespace.", "orderBy");
 
 
             Sql filterSql = null;
             var customFilterWheres = customFilter != null ? customFilter.GetWhereClauses().ToArray() : null;
-            var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0;
+            var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0;
             if (hasCustomFilter
-                || (includeUserGroups != null && includeUserGroups.Length > 0) || (excludeUserGroups != null && excludeUserGroups.Length > 0)
-                || (userState != null && userState.Length > 0 && userState.Contains(UserState.All) == false))
-                filterSql = new Sql();
+                || (includeUserGroups != null && includeUserGroups.Length > 0) || (excludeUserGroups != null && excludeUserGroups.Length > 0)
+                || (userState != null && userState.Length > 0 && userState.Contains(UserState.All) == false))
+                filterSql = new Sql();
 
             if (hasCustomFilter)
             {
                 foreach (var filterClause in customFilterWheres)
                 {
-                    filterSql.Append(string.Format("AND ({0})", filterClause.Item1), filterClause.Item2);
+                    filterSql.Append($"AND ({filterClause.Item1})", filterClause.Item2);
                 }
-            }
+            }
 
             if (includeUserGroups != null && includeUserGroups.Length > 0)
             {
-                var subQuery = @"AND (umbracoUser.id IN (SELECT DISTINCT umbracoUser.id
+                const string subQuery = @"AND (umbracoUser.id IN (SELECT DISTINCT umbracoUser.id
 		            FROM umbracoUser
 		            INNER JOIN umbracoUser2UserGroup ON umbracoUser2UserGroup.userId = umbracoUser.id
 		            INNER JOIN umbracoUserGroup ON umbracoUserGroup.id = umbracoUser2UserGroup.userGroupId
@@ -747,21 +748,21 @@ FROM umbracoUser
 
             if (excludeUserGroups != null && excludeUserGroups.Length > 0)
             {
-                var subQuery = @"AND (umbracoUser.id NOT IN (SELECT DISTINCT umbracoUser.id
+                const string subQuery = @"AND (umbracoUser.id NOT IN (SELECT DISTINCT umbracoUser.id
 		            FROM umbracoUser
 		            INNER JOIN umbracoUser2UserGroup ON umbracoUser2UserGroup.userId = umbracoUser.id
 		            INNER JOIN umbracoUserGroup ON umbracoUserGroup.id = umbracoUser2UserGroup.userGroupId
 		            WHERE umbracoUserGroup.userGroupAlias IN (@userGroups)))";
                 filterSql.Append(subQuery, new { userGroups = excludeUserGroups });
-            }
+            }
 
             if (userState != null && userState.Length > 0)
-            {
+            {
                 //the "ALL" state doesn't require any filtering so we ignore that, if it exists in the list we don't do any filtering
                 if (userState.Contains(UserState.All) == false)
                 {
                     var sb = new StringBuilder("(");
-                    var appended = false;
+                    var appended = false;
 
                     if (userState.Contains(UserState.Active))
                     {
@@ -797,67 +798,81 @@ FROM umbracoUser
 
                     filterSql.Append("AND " + sb);
                 }
-            }
-
-            // Get base query for returning IDs
-            var sqlBaseIds = GetBaseQuery("id");
-
+            }
+
+            // Get base query for returning IDs
+            var sqlBaseIds = GetBaseQuery("id");
+
             if (query == null) query = new Query<IUser>();
+            var queryHasWhereClause = query.GetWhereClauses().Any();
             var translatorIds = new SqlTranslator<IUser>(sqlBaseIds, query);
-            var sqlQueryIds = translatorIds.Translate();
-
-            //get sorted and filtered sql
+            var sqlQueryIds = translatorIds.Translate();
+            var sqlBaseFull = GetBaseQuery("umbracoUser.*, umbracoUserGroup.*, umbracoUserGroup2App.*, umbracoUserStartNode.*");
+            var translatorFull = new SqlTranslator<IUser>(sqlBaseFull, query);
+
+            //get sorted and filtered sql
             var sqlNodeIdsWithSort = GetSortedSqlForPagedResults(
-                GetFilteredSqlForPagedResults(sqlQueryIds, filterSql),
+                GetFilteredSqlForPagedResults(sqlQueryIds, filterSql, queryHasWhereClause),
                 orderDirection, orderBy);
 
             // Get page of results and total count
             var pagedResult = Database.Page<UserDto>(pageIndex + 1, pageSize, sqlNodeIdsWithSort);
-            totalRecords = Convert.ToInt32(pagedResult.TotalItems);
-
-            //NOTE: We need to check the actual items returned, not the 'totalRecords', that is because if you request a page number
-            // that doesn't actually have any data on it, the totalRecords will still indicate there are records but there are none in
-            // the pageResult.
+            totalRecords = Convert.ToInt32(pagedResult.TotalItems);
+
+            //NOTE: We need to check the actual items returned, not the 'totalRecords', that is because if you request a page number
+            // that doesn't actually have any data on it, the totalRecords will still indicate there are records but there are none in
+            // the pageResult.
             if (pagedResult.Items.Any())
             {
                 //Create the inner paged query that was used above to get the paged result, we'll use that as the inner sub query
                 var args = sqlNodeIdsWithSort.Arguments;
                 string sqlStringCount, sqlStringPage;
                 Database.BuildPageQueries<UserDto>(pageIndex * pageSize, pageSize, sqlNodeIdsWithSort.SQL, ref args, out sqlStringCount, out sqlStringPage);
-
-                var sqlQueryFull = GetBaseQuery("umbracoUser.*, umbracoUserGroup.*, umbracoUserGroup2App.*, umbracoUserStartNode.*");
-
-                var fullQueryWithPagedInnerJoin = sqlQueryFull
-                    .Append("INNER JOIN (")
-                    //join the paged query with the paged query arguments
+
+                var sqlQueryFull = translatorFull.Translate();
+
+                //We need to make this FULL query an inner join on the paged ID query
+                var splitQuery = sqlQueryFull.SQL.Split(new[] { "WHERE " }, StringSplitOptions.None);
+                var fullQueryWithPagedInnerJoin = new Sql(splitQuery[0])
+                    .Append("INNER JOIN (")
+                    //join the paged query with the paged query arguments
                     .Append(sqlStringPage, args)
                     .Append(") temp ")
                     .Append("ON umbracoUser.id = temp.id");
 
                 AddGroupLeftJoin(fullQueryWithPagedInnerJoin);
 
+                if (splitQuery.Length > 1)
+                {
+                    //add the original where clause back with the original arguments
+                    fullQueryWithPagedInnerJoin.Where(splitQuery[1], sqlQueryIds.Arguments);
+                }   
+
                 //get sorted and filtered sql
                 var fullQuery = GetSortedSqlForPagedResults(
-                    GetFilteredSqlForPagedResults(fullQueryWithPagedInnerJoin, filterSql),
+                    GetFilteredSqlForPagedResults(fullQueryWithPagedInnerJoin, filterSql, queryHasWhereClause),
                     orderDirection, orderBy);
 
                 var users = ConvertFromDtos(Database.Fetch<UserDto, UserGroupDto, UserGroup2AppDto, UserStartNodeDto, UserDto>(new UserGroupRelator().Map, fullQuery))
                     .ToArray(); // important so we don't iterate twice, if we don't do this we can end up with null values in cache if we were caching.    
 
                 return users;
-            }
+            }
 
             return Enumerable.Empty<IUser>();
         }
 
-        private Sql GetFilteredSqlForPagedResults(Sql sql, Sql filterSql)
+        private Sql GetFilteredSqlForPagedResults(Sql sql, Sql filterSql, bool hasWhereClause)
         {
             Sql filteredSql;
 
             // Apply filter
             if (filterSql != null)
             {
-                var sqlFilter = " WHERE " + filterSql.SQL.TrimStart("AND ");
+                //ensure we don't append a WHERE if there is already one
+                var sqlFilter = hasWhereClause
+                    ? filterSql.SQL
+                    : " WHERE " + filterSql.SQL.TrimStart("AND ");
 
                 //NOTE: this is certainly strange - NPoco handles this much better but we need to re-create the sql
                 // instance a couple of times to get the parameter order correct, for some reason the first

src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs

@@ -290,6 +290,9 @@ private Sql GetFilteredSqlForPagedResults(Sql sql, Func<Tuple<string, object[]>>
             // Apply filter
             if (defaultFilter != null)
             {
+                //NOTE: It is assumed here that the `sql` already contains a WHERE clause, see UserRepository.GetFilteredSqlForPagedResults
+                // for an example of when it's not assumed there's already a WHERE clause
+
                 var filterResult = defaultFilter();
 
                 //NOTE: this is certainly strange - NPoco handles this much better but we need to re-create the sql
@@ -993,4 +996,4 @@ public override Sql BuildPagedQuery(string selectColumns)
             }
         }
     }
-}
+}

src/Umbraco.Core/Services/ServerRegistrationService.cs

@@ -77,7 +77,7 @@ public void TouchServer(string serverAddress, string serverIdentity, TimeSpan st
                 regs = xr.Repository.GetAll().ToArray();
 
                 // default role is single server, but if registrations contain more
-                // than one active server, then role is master or slave
+                // than one active server, then role is master or replica
                 _currentServerRole = regs.Count(x => x.IsActive) > 1
                     ? (server.IsMaster ? ServerRole.Master : ServerRole.Slave)
                     : ServerRole.Single;
@@ -175,4 +175,4 @@ public ServerRole GetCurrentServerRole()
             return _currentServerRole;
         }
     }
-}
+}