Fix ordering of tags (#5945)

This commit is contained in:
WithoutPants 2025-06-20 16:03:56 +10:00 committed by GitHub
parent c09913a614
commit 849a368d3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -74,7 +74,9 @@ var (
table: imagesTagsJoinTable,
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{
@ -112,7 +114,9 @@ var (
table: galleriesTagsJoinTable,
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{
@ -168,7 +172,9 @@ var (
table: scenesTagsJoinTable,
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{
@ -274,7 +280,9 @@ var (
table: performersTagsJoinTable,
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{
@ -304,7 +312,9 @@ var (
table: studiosTagsJoinTable,
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{
@ -336,7 +346,7 @@ var (
},
fkColumn: tagRelationsJoinTable.Col(tagParentIDColumn),
foreignTable: tagTableMgr,
orderBy: tagTableMgr.table.Col("name").Asc(),
orderBy: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
}
tagsChildTagsTableMgr = *tagsParentTagsTableMgr.invert()
@ -363,7 +373,7 @@ var (
},
fkColumn: groupsTagsJoinTable.Col(tagIDColumn),
foreignTable: tagTableMgr,
orderBy: tagTableMgr.table.Col("name").Asc(),
orderBy: goqu.COALESCE(tagTableMgr.table.Col("sort_name"), tagTableMgr.table.Col("name")).Asc(),
}
groupRelationshipTableMgr = &table{