diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-04-17 11:33:38 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-04-17 11:33:38 -0400 |
| commit | 88738b804f4cc7c6f49c602ba08e0ab8f66e7ed2 (patch) | |
| tree | eceef99d83ed83fd34d558e1b824b2bb135ac2ef | |
| parent | 7395cc9b936ce9b10ff30d91d6f4a81e2f5620fc (diff) | |
| parent | 23e3243a733c3ed18190758d9403d6da213378f6 (diff) | |
Merge pull request #1659 from MediaBrowser/dev
update inherited tags
| -rw-r--r-- | MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs index 212be2849..746321e70 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs @@ -80,7 +80,7 @@ namespace MediaBrowser.Server.Implementations.Persistence private IDbCommand _updateInheritedRatingCommand; private IDbCommand _updateInheritedTagsCommand; - private const int LatestSchemaVersion = 62; + private const int LatestSchemaVersion = 63; /// <summary> /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class. @@ -760,7 +760,7 @@ namespace MediaBrowser.Server.Implementations.Persistence _saveItemCommand.GetParameter(index++).Value = item.SourceType.ToString(); var trailer = item as Trailer; - if (trailer != null) + if (trailer != null && trailer.TrailerTypes.Count > 0) { _saveItemCommand.GetParameter(index++).Value = string.Join("|", trailer.TrailerTypes.Select(i => i.ToString()).ToArray()); } @@ -1962,7 +1962,7 @@ namespace MediaBrowser.Server.Implementations.Persistence var index = 0; foreach (var type in query.ExcludeTrailerTypes) { - clauses.Add("TrailerTypes not like @TrailerTypes" + index); + clauses.Add("(TrailerTypes is null OR TrailerTypes not like @TrailerTypes" + index + ")"); cmd.Parameters.Add(cmd, "@TrailerTypes" + index, DbType.String).Value = "%" + type + "%"; index++; } @@ -2186,7 +2186,7 @@ namespace MediaBrowser.Server.Implementations.Persistence var excludeTagIndex = 0; foreach (var excludeTag in query.ExcludeTags) { - whereClauses.Add("Tags not like @excludeTag" + excludeTagIndex); + whereClauses.Add("(Tags is null OR Tags not like @excludeTag" + excludeTagIndex + ")"); cmd.Parameters.Add(cmd, "@excludeTag" + excludeTagIndex, DbType.String).Value = "%" + excludeTag + "%"; excludeTagIndex++; } @@ -2194,7 +2194,7 @@ namespace MediaBrowser.Server.Implementations.Persistence excludeTagIndex = 0; foreach (var excludeTag in query.ExcludeInheritedTags) { - whereClauses.Add("InheritedTags not like @excludeInheritedTag" + excludeTagIndex); + whereClauses.Add("(InheritedTags is null OR InheritedTags not like @excludeInheritedTag" + excludeTagIndex +")"); cmd.Parameters.Add(cmd, "@excludeInheritedTag" + excludeTagIndex, DbType.String).Value = "%" + excludeTag + "%"; excludeTagIndex++; } |