Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 04:14:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ordering of tags (#5945)

Browse Source
This commit is contained in:
WithoutPants
2025-06-20 16:03:56 +10:00
committed by GitHub
parent c09913a614
commit 849a368d3d
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/sqlite/tables.go
View File

@@ -74,7 +74,9 @@ var (
table: imagesTagsJoinTable, table: imagesTagsJoinTable,
idColumn: imagesTagsJoinTable.Col(imageIDColumn), idColumn: imagesTagsJoinTable.Col(imageIDColumn),
}, },
fkColumn: imagesTagsJoinTable.Col(tagIDColumn), fkColumn: imagesTagsJoinTable.Col(tagIDColumn),
foreignTable: tagTableMgr,
orderBy: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
} }
imagesPerformersTableMgr = &joinTable{ imagesPerformersTableMgr = &joinTable{
@@ -112,7 +114,9 @@ var (
table: galleriesTagsJoinTable, table: galleriesTagsJoinTable,
idColumn: galleriesTagsJoinTable.Col(galleryIDColumn), idColumn: galleriesTagsJoinTable.Col(galleryIDColumn),
}, },
fkColumn: galleriesTagsJoinTable.Col(tagIDColumn), fkColumn: galleriesTagsJoinTable.Col(tagIDColumn),
foreignTable: tagTableMgr,
orderBy: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
} }
galleriesPerformersTableMgr = &joinTable{ galleriesPerformersTableMgr = &joinTable{
@@ -168,7 +172,9 @@ var (
table: scenesTagsJoinTable, table: scenesTagsJoinTable,
idColumn: scenesTagsJoinTable.Col(sceneIDColumn), idColumn: scenesTagsJoinTable.Col(sceneIDColumn),
}, },
fkColumn: scenesTagsJoinTable.Col(tagIDColumn), fkColumn: scenesTagsJoinTable.Col(tagIDColumn),
foreignTable: tagTableMgr,
orderBy: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
} }
scenesPerformersTableMgr = &joinTable{ scenesPerformersTableMgr = &joinTable{
@@ -274,7 +280,9 @@ var (
table: performersTagsJoinTable, table: performersTagsJoinTable,
idColumn: performersTagsJoinTable.Col(performerIDColumn), idColumn: performersTagsJoinTable.Col(performerIDColumn),
}, },
fkColumn: performersTagsJoinTable.Col(tagIDColumn), fkColumn: performersTagsJoinTable.Col(tagIDColumn),
foreignTable: tagTableMgr,
orderBy: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
} }
performersStashIDsTableMgr = &stashIDTable{ performersStashIDsTableMgr = &stashIDTable{
@@ -304,7 +312,9 @@ var (
table: studiosTagsJoinTable, table: studiosTagsJoinTable,
idColumn: studiosTagsJoinTable.Col(studioIDColumn), idColumn: studiosTagsJoinTable.Col(studioIDColumn),
}, },
fkColumn: studiosTagsJoinTable.Col(tagIDColumn), fkColumn: studiosTagsJoinTable.Col(tagIDColumn),
foreignTable: tagTableMgr,
orderBy: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
} }
studiosStashIDsTableMgr = &stashIDTable{ studiosStashIDsTableMgr = &stashIDTable{
@@ -336,7 +346,7 @@ var (
}, },
fkColumn: tagRelationsJoinTable.Col(tagParentIDColumn), fkColumn: tagRelationsJoinTable.Col(tagParentIDColumn),
foreignTable: tagTableMgr, foreignTable: tagTableMgr,
orderBy: tagTableMgr.table.Col("name").Asc(), orderBy: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
} }
tagsChildTagsTableMgr = *tagsParentTagsTableMgr.invert() tagsChildTagsTableMgr = *tagsParentTagsTableMgr.invert()
@@ -363,7 +373,7 @@ var (
}, },
fkColumn: groupsTagsJoinTable.Col(tagIDColumn), fkColumn: groupsTagsJoinTable.Col(tagIDColumn),
foreignTable: tagTableMgr, foreignTable: tagTableMgr,
orderBy: tagTableMgr.table.Col("name").Asc(), orderBy: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
} }
groupRelationshipTableMgr = &table{ groupRelationshipTableMgr = &table{