aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2024-05-17 13:51:56 -0400
committerJoshua M. Boniface <joshua@boniface.me>2024-05-17 13:51:56 -0400
commit4ded042dde3fc14201a5f8e6d3dfaca1b889ff22 (patch)
treef7ff3c8fff13e07bf79ba481e749f66bf480a2e7
parent424ca49c266349563786a7f1dcfb5fbf7db4b48d (diff)
Backport pull request #11698 from jellyfin/release-10.9.z
Fix not binding to SQL parameters Original-merge: d303ca56e3684433073cd0dbd8625885907628cf Merged-by: nielsvanvelzen <nielsvanvelzen@users.noreply.github.com> Backported-by: Joshua M. Boniface <joshua@boniface.me>
-rw-r--r--Emby.Server.Implementations/Data/SqliteItemRepository.cs12
1 files changed, 3 insertions, 9 deletions
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 9ef1bd66d..34d753093 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -2323,7 +2323,7 @@ namespace Emby.Server.Implementations.Data
columns.Add(builder.ToString());
- query.ExcludeItemIds = [..query.ExcludeItemIds, item.Id, ..item.ExtraIds];
+ query.ExcludeItemIds = [.. query.ExcludeItemIds, item.Id, .. item.ExtraIds];
query.ExcludeProviderIds = item.ProviderIds;
}
@@ -2831,7 +2831,7 @@ namespace Emby.Server.Implementations.Data
prepend.Add((ItemSortBy.Random, SortOrder.Ascending));
}
- orderBy = query.OrderBy = [..prepend, ..orderBy];
+ orderBy = query.OrderBy = [.. prepend, .. orderBy];
}
else if (orderBy.Count == 0)
{
@@ -5144,7 +5144,7 @@ AND Type = @InternalPersonType)");
list.AddRange(inheritedTags.Select(i => (6, i)));
// Remove all invalid values.
- list.RemoveAll(i => string.IsNullOrEmpty(i.Item2));
+ list.RemoveAll(i => string.IsNullOrWhiteSpace(i.Item2));
return list;
}
@@ -5202,12 +5202,6 @@ AND Type = @InternalPersonType)");
var itemValue = currentValueInfo.Value;
- // Don't save if invalid
- if (string.IsNullOrWhiteSpace(itemValue))
- {
- continue;
- }
-
statement.TryBind("@Type" + index, currentValueInfo.MagicNumber);
statement.TryBind("@Value" + index, itemValue);
statement.TryBind("@CleanValue" + index, GetCleanValue(itemValue));