Skip to content

Fix sql syntax issues (closes #20453) #21307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
idseefeld wants to merge 6 commits into from
Closed

Fix sql syntax issues (closes #20453) #21307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8345703
Squash merge
idseefeld Jan 6, 2026
fe84f00
Merge branch 'main' into v173/20453-fix-more-sql-syntax-issues-squash
idseefeld Jan 7, 2026
2dc12f2
fix Copilot' comments
idseefeld Jan 7, 2026
42fb558
fix merge manually - main branch into v173/20453-fix-more-sql-syntax-…
idseefeld Jan 7, 2026
9f52553
Merge branch 'main' into v173/20453-fix-more-sql-syntax-issues-squash
idseefeld Jan 7, 2026
daafaa3
Merge branch 'main' into v173/20453-fix-more-sql-syntax-issues
idseefeld Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Umbraco.Cms.Api.Management/Controllers/DataType/Tree/DataTypeTreeControllerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ protected override Ordering ItemOrdering
{
get
{
var ordering = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectType), Direction.Descending); // We need to override to change direction
ordering.Next = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text));
var ordering = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectTypeColumnName, Direction.Descending); // We need to override to change direction
ordering.Next = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName);

return ordering;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Cms.Api.Management/Controllers/Document/Tree/DocumentTreeControllerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected DocumentTreeControllerBase(

protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Document;

protected override Ordering ItemOrdering => Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.SortOrder));
protected override Ordering ItemOrdering => Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.SortOrderColumnName);

protected override DocumentTreeItemResponseModel MapTreeItemViewModel(Guid? parentId, IEntitySlim entity)
{
Expand Down
4 changes: 2 additions & 2 deletions ....Api.Management/Controllers/DocumentBlueprint/Tree/DocumentBlueprintTreeControllerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ protected override Ordering ItemOrdering
{
get
{
var ordering = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectType), Direction.Descending); // We need to override to change direction
ordering.Next = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text));
var ordering = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectTypeColumnName, Direction.Descending); // We need to override to change direction
ordering.Next = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName);

return ordering;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Cms.Api.Management/Controllers/Media/Tree/MediaTreeControllerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public MediaTreeControllerBase(

protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Media;

protected override Ordering ItemOrdering => Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.SortOrder));
protected override Ordering ItemOrdering => Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.SortOrderColumnName);

protected override MediaTreeItemResponseModel MapTreeItemViewModel(Guid? parentKey, IEntitySlim entity)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Cms.Api.Management/Controllers/RecycleBin/RecycleBinControllerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ protected virtual IEntitySlim[] GetSiblingEntities(Guid target, int before, int
after,
out totalBefore,
out totalAfter,
ordering: Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text)))
ordering: Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName))
.ToArray();

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Cms.Api.Management/Controllers/Tree/EntityTreeControllerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protected EntityTreeControllerBase(IEntityService entityService, FlagProviderCol

protected abstract UmbracoObjectTypes ItemObjectType { get; }

protected virtual Ordering ItemOrdering => Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text));
protected virtual Ordering ItemOrdering => Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName);

protected async Task<ActionResult<PagedViewModel<TItem>>> GetRoot(int skip, int take)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Cms.Api.Management/Controllers/Tree/FolderTreeControllerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ protected override Ordering ItemOrdering
get
{
// Override to order by type (folder vs item) before the text
var ordering = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectType));
ordering.Next = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text));
var ordering = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectTypeColumnName);
ordering.Next = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName);

return ordering;
}
Expand Down
6 changes: 6 additions & 0 deletions src/Umbraco.Core/Persistence/Constants-DatabaseSchema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ public static class DatabaseSchema
// TODO: Why aren't all table names with the same prefix?
public const string TableNamePrefix = "umbraco";

public const string PrimaryKeyNameId = "id";
public const string PrimaryKeyNamePK = "pk";
public const string PrimaryKeyNameKey = "key";
public const string NodeIdName = "nodeId";
public const string UniqueIdName = "uniqueId";

public static class Tables
{
public const string Lock = TableNamePrefix + "Lock";
Expand Down
3 changes: 3 additions & 0 deletions src/Umbraco.Core/Services/EntityService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,9 @@ public IEnumerable<IEntitySlim> GetPagedDescendants(
IQuery<IUmbracoEntity>? filter = null,
Ordering? ordering = null)
{
// Ensure deterministic results. Descendants are expected to be ordered by Path by default.
ordering ??= Ordering.By("path");

using (ScopeProvider.CreateCoreScope(autoComplete: true))
{
Guid objectTypeGuid = objectType.GetGuid();
Expand Down
Loading
Loading