michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backport pull request #11698 from jellyfin/release-10.9.z

Browse Source 
Fix not binding to SQL parameters

Original-merge: d303ca56e3

Merged-by: nielsvanvelzen <nielsvanvelzen@users.noreply.github.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Bond-009 2024-05-17 13:51:56 -04:00 committed by Joshua M. Boniface
parent 424ca49c26
commit 4ded042dde
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Emby.Server.Implementations/Data/SqliteItemRepository.cs
View File

@ -2323,7 +2323,7 @@ namespace Emby.Server.Implementations.Data
columns.Add(builder.ToString()); columns.Add(builder.ToString());
query.ExcludeItemIds = [..query.ExcludeItemIds, item.Id, ..item.ExtraIds]; query.ExcludeItemIds = [.. query.ExcludeItemIds, item.Id, .. item.ExtraIds];
query.ExcludeProviderIds = item.ProviderIds; query.ExcludeProviderIds = item.ProviderIds;
} }
@ -2831,7 +2831,7 @@ namespace Emby.Server.Implementations.Data
prepend.Add((ItemSortBy.Random, SortOrder.Ascending)); prepend.Add((ItemSortBy.Random, SortOrder.Ascending));
} }
orderBy = query.OrderBy = [..prepend, ..orderBy]; orderBy = query.OrderBy = [.. prepend, .. orderBy];
} }
else if (orderBy.Count == 0) else if (orderBy.Count == 0)
{ {
@ -5144,7 +5144,7 @@ AND Type = @InternalPersonType)");
list.AddRange(inheritedTags.Select(i => (6, i))); list.AddRange(inheritedTags.Select(i => (6, i)));
// Remove all invalid values. // Remove all invalid values.
list.RemoveAll(i => string.IsNullOrEmpty(i.Item2)); list.RemoveAll(i => string.IsNullOrWhiteSpace(i.Item2));
return list; return list;
} }
@ -5202,12 +5202,6 @@ AND Type = @InternalPersonType)");
var itemValue = currentValueInfo.Value; var itemValue = currentValueInfo.Value;
// Don't save if invalid
if (string.IsNullOrWhiteSpace(itemValue))
{
continue;
}
statement.TryBind("@Type" + index, currentValueInfo.MagicNumber); statement.TryBind("@Type" + index, currentValueInfo.MagicNumber);
statement.TryBind("@Value" + index, itemValue); statement.TryBind("@Value" + index, itemValue);
statement.TryBind("@CleanValue" + index, GetCleanValue(itemValue)); statement.TryBind("@CleanValue" + index, GetCleanValue(itemValue));