alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-01 07:51:54 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix user data queries

Browse Source
This commit is contained in:
Luke Pulverenti
2016-06-20 21:59:26 -04:00
parent 2d6954f520
commit 192cbe34aa
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@@ -156,8 +156,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
"create index if not exists idx_AncestorIds2 on AncestorIds(AncestorIdText)",
"create table if not exists UserDataKeys (ItemId GUID, UserDataKey TEXT Priority INT, PRIMARY KEY (ItemId, UserDataKey))",
//"create index if not exists idx_UserDataKeys1 on UserDataKeys(ItemId)",
"create index if not exists idx_UserDataKeys2 on UserDataKeys(ItemId,Priority)",
"create table if not exists ItemValues (ItemId GUID, Type INT, Value TEXT, CleanValue TEXT)",
//"create index if not exists idx_ItemValues on ItemValues(ItemId)",
@@ -294,7 +292,10 @@ namespace MediaBrowser.Server.Implementations.Persistence
"create index if not exists idx_TypeTopParentId7 on TypedBaseItems(TopParentId,MediaType,IsVirtualItem,PresentationUniqueKey)",
// items by name
"create index if not exists idx_ItemValues3 on ItemValues(ItemId,Type,CleanValue)"
"create index if not exists idx_ItemValues3 on ItemValues(ItemId,Type,CleanValue)",
//"create index if not exists idx_UserDataKeys1 on UserDataKeys(ItemId)",
"create index if not exists idx_UserDataKeys2 on UserDataKeys(ItemId,Priority)"
};
_connection.RunQueries(postQueries, Logger);
@@ -1712,7 +1713,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
return string.Empty;
}
return " left join UserDataDb.UserData on (select UserDataKey from UserDataKeys where ItemId=Guid order by Priority LIMIT 1)=UserDataDb.UserData.Key";
return " left join UserDataDb.UserData on (select UserDataKey from UserDataKeys where ItemId=Guid order by Priority LIMIT 1)=UserDataDb.UserData.Key And (UserId=@UserId)";
}
private string GetGroupBy(InternalItemsQuery query)
@@ -1961,11 +1962,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
{
if (query.User != null)
{
query.SortBy = new[] { "SimilarityScore", "IsPlayed", "Random" };
query.SortBy = new[] { "SimilarityScore", ItemSortBy.IsPlayed, ItemSortBy.Random };
}
else
{
query.SortBy = new[] { "SimilarityScore", "Random" };
query.SortBy = new[] { "SimilarityScore", ItemSortBy.Random };
}
query.SortOrder = SortOrder.Descending;
}
@@ -2296,7 +2297,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
if (EnableJoinUserData(query))
{
whereClauses.Add("(UserId is null or UserId=@UserId)");
//whereClauses.Add("(UserId is null or UserId=@UserId)");
}
if (query.IsCurrentSchema.HasValue)
{

1
MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
View File

@@ -66,6 +66,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
"create index if not exists idx_userdata on userdata(key)",
"create unique index if not exists userdataindex on userdata (key, userId)",
"create index if not exists userdataindex1 on userdata (key, userId)",
//pragmas
"pragma temp_store = memory",