diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
8 files changed, 199 insertions, 200 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index e0f2fee13..65905b082 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -4,7 +4,6 @@ using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; -using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Persistence; @@ -267,16 +266,6 @@ namespace MediaBrowser.Server.Implementations.Library items.Add(RootFolder); - var specialFeatures = items.OfType<Movie>().SelectMany(i => i.SpecialFeatures).ToList(); - var localTrailers = items.SelectMany(i => i.LocalTrailers).ToList(); - var themeSongs = items.SelectMany(i => i.ThemeSongs).ToList(); - var themeVideos = items.SelectMany(i => i.ThemeVideos).ToList(); - - items.AddRange(specialFeatures); - items.AddRange(localTrailers); - items.AddRange(themeSongs); - items.AddRange(themeVideos); - // Need to use DistinctBy Id because there could be multiple instances with the same id // due to sharing the default library var userRootFolders = _userManager.Users.Select(i => i.RootFolder) @@ -304,39 +293,6 @@ namespace MediaBrowser.Server.Implementations.Library private void UpdateItemInLibraryCache(BaseItem item) { LibraryItemsCache.AddOrUpdate(item.Id, item, delegate { return item; }); - - foreach (var subItem in item.LocalTrailers) - { - // Prevent access to foreach variable in closure - var copy = subItem; - LibraryItemsCache.AddOrUpdate(subItem.Id, subItem, delegate { return copy; }); - } - - foreach (var subItem in item.ThemeSongs) - { - // Prevent access to foreach variable in closure - var copy = subItem; - LibraryItemsCache.AddOrUpdate(subItem.Id, subItem, delegate { return copy; }); - } - - foreach (var subItem in item.ThemeVideos) - { - // Prevent access to foreach variable in closure - var copy = subItem; - LibraryItemsCache.AddOrUpdate(subItem.Id, subItem, delegate { return copy; }); - } - - var movie = item as Movie; - - if (movie != null) - { - foreach (var subItem in movie.SpecialFeatures) - { - // Prevent access to foreach variable in closure - var special1 = subItem; - LibraryItemsCache.AddOrUpdate(subItem.Id, subItem, delegate { return special1; }); - } - } } /// <summary> @@ -661,8 +617,6 @@ namespace MediaBrowser.Server.Implementations.Library { cancellationToken.ThrowIfCancellationRequested(); - _logger.Debug("Getting {0}: {1}", typeof(T).Name, name); - path = Path.Combine(path, FileSystem.GetValidFilename(name)); var fileInfo = new DirectoryInfo(path); @@ -968,9 +922,12 @@ namespace MediaBrowser.Server.Implementations.Library BaseItem item; - LibraryItemsCache.TryGetValue(id, out item); + if (LibraryItemsCache.TryGetValue(id, out item)) + { + return item; + } - return item; + return ItemRepository.GetItem(id); } /// <summary> @@ -1130,7 +1087,7 @@ namespace MediaBrowser.Server.Implementations.Library /// <returns>Task{BaseItem}.</returns> public BaseItem RetrieveItem(Guid id) { - return ItemRepository.RetrieveItem(id); + return ItemRepository.GetItem(id); } /// <summary> diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs index d308cb74b..7087c0421 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs +++ b/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs @@ -3,6 +3,7 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Persistence; using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; @@ -28,6 +29,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks private readonly ILogger _logger; private readonly ILibraryManager _libraryManager; private readonly IServerApplicationPaths _appPaths; + private readonly IItemRepository _itemRepo; /// <summary> /// Initializes a new instance of the <see cref="ImageCleanupTask" /> class. @@ -36,12 +38,13 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks /// <param name="logger">The logger.</param> /// <param name="libraryManager">The library manager.</param> /// <param name="appPaths">The app paths.</param> - public ImageCleanupTask(Kernel kernel, ILogger logger, ILibraryManager libraryManager, IServerApplicationPaths appPaths) + public ImageCleanupTask(Kernel kernel, ILogger logger, ILibraryManager libraryManager, IServerApplicationPaths appPaths, IItemRepository itemRepo) { _kernel = kernel; _logger = logger; _libraryManager = libraryManager; _appPaths = appPaths; + _itemRepo = itemRepo; } /// <summary> @@ -138,20 +141,14 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks images = images.Concat(item.ScreenshotImagePaths); } - if (item.LocalTrailers != null) - { - images = item.LocalTrailers.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem))); - } + var localTrailers = _itemRepo.GetItems(item.LocalTrailerIds).ToList(); + images = localTrailers.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem))); - if (item.ThemeSongs != null) - { - images = item.ThemeSongs.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem))); - } + var themeSongs = _itemRepo.GetItems(item.ThemeSongIds).ToList(); + images = themeSongs.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem))); - if (item.ThemeVideos != null) - { - images = item.ThemeVideos.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem))); - } + var themeVideos = _itemRepo.GetItems(item.ThemeVideoIds).ToList(); + images = themeVideos.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem))); var video = item as Video; @@ -162,9 +159,10 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks var movie = item as Movie; - if (movie != null && movie.SpecialFeatures != null) + if (movie != null) { - images = movie.SpecialFeatures.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem))); + var specialFeattures = _itemRepo.GetItems(movie.SpecialFeatureIds).ToList(); + images = specialFeattures.Aggregate(images, (current, subItem) => current.Concat(GetPathsInUse(subItem))); } return images; diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs index d7863c0ba..dcceb382c 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs +++ b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs @@ -5,6 +5,7 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Providers.MediaInfo; using MediaBrowser.Model.Entities; using System; @@ -43,6 +44,8 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks /// </summary> private readonly IIsoManager _isoManager; + private readonly IItemRepository _itemRepo; + private readonly ILogger _logger; /// <summary> @@ -67,11 +70,12 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks /// <param name="logManager">The log manager.</param> /// <param name="mediaEncoder">The media encoder.</param> /// <param name="isoManager">The iso manager.</param> - public VideoImagesTask(ILibraryManager libraryManager, ILogManager logManager, IMediaEncoder mediaEncoder, IIsoManager isoManager) + public VideoImagesTask(ILibraryManager libraryManager, ILogManager logManager, IMediaEncoder mediaEncoder, IIsoManager isoManager, IItemRepository itemRepo) { _libraryManager = libraryManager; _mediaEncoder = mediaEncoder; _isoManager = isoManager; + _itemRepo = itemRepo; _logger = logManager.GetLogger(GetType().Name); ImageCache = new FileSystemRepository(Kernel.Instance.FFMpegManager.VideoImagesDataPath); @@ -205,15 +209,18 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks { var allItems = sourceItems.ToList(); - var localTrailers = allItems.SelectMany(i => i.LocalTrailers); - var themeVideos = allItems.SelectMany(i => i.ThemeVideos); + var localTrailers = allItems.SelectMany(i => _itemRepo.GetItems(i.LocalTrailerIds).Cast<Video>()); + + var themeVideos = allItems.SelectMany(i => _itemRepo.GetItems(i.ThemeVideoIds).Cast<Video>()); var videos = allItems.OfType<Video>().ToList(); var items = videos; items.AddRange(localTrailers); + items.AddRange(themeVideos); - items.AddRange(videos.OfType<Movie>().SelectMany(i => i.SpecialFeatures).ToList()); + + items.AddRange(videos.OfType<Movie>().SelectMany(i => _itemRepo.GetItems(i.SpecialFeatureIds).Cast<Video>()).ToList()); return items.Where(i => { diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs index ab03bdd7d..93bb174c6 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs @@ -132,29 +132,31 @@ namespace MediaBrowser.Server.Implementations.Sqlite cancellationToken.ThrowIfCancellationRequested(); - var cmd = connection.CreateCommand(); - cmd.CommandText = "replace into displaypreferences (id, data) values (@1, @2)"; - cmd.AddParam("@1", displayPreferences.Id); - cmd.AddParam("@2", serialized); - - using (var tran = connection.BeginTransaction()) + using (var cmd = connection.CreateCommand()) { - try + cmd.CommandText = "replace into displaypreferences (id, data) values (@1, @2)"; + cmd.AddParam("@1", displayPreferences.Id); + cmd.AddParam("@2", serialized); + + using (var tran = connection.BeginTransaction()) { - cmd.Transaction = tran; + try + { + cmd.Transaction = tran; - await cmd.ExecuteNonQueryAsync(cancellationToken); + await cmd.ExecuteNonQueryAsync(cancellationToken); - tran.Commit(); - } - catch (OperationCanceledException) - { - tran.Rollback(); - } - catch (Exception e) - { - Logger.ErrorException("Failed to commit transaction.", e); - tran.Rollback(); + tran.Commit(); + } + catch (OperationCanceledException) + { + tran.Rollback(); + } + catch (Exception e) + { + Logger.ErrorException("Failed to commit transaction.", e); + tran.Rollback(); + } } } } @@ -174,7 +176,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite var cmd = connection.CreateCommand(); cmd.CommandText = "select data from displaypreferences where id = @id"; - + var idParam = cmd.Parameters.Add("@id", DbType.Guid); idParam.Value = displayPreferencesId; diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs index a3d184888..9138baad0 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs @@ -1,3 +1,4 @@ +using System.Linq; using MediaBrowser.Common.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Persistence; @@ -156,17 +157,33 @@ namespace MediaBrowser.Server.Implementations.Sqlite /// <param name="id">The id.</param> /// <returns>BaseItem.</returns> /// <exception cref="System.ArgumentException"></exception> - public BaseItem RetrieveItem(Guid id) + public BaseItem GetItem(Guid id) { if (id == Guid.Empty) { - throw new ArgumentException(); + throw new ArgumentNullException("id"); } return RetrieveItemInternal(id); } /// <summary> + /// Retrieves the items. + /// </summary> + /// <param name="ids">The ids.</param> + /// <returns>IEnumerable{BaseItem}.</returns> + /// <exception cref="System.ArgumentNullException">ids</exception> + public IEnumerable<BaseItem> GetItems(IEnumerable<Guid> ids) + { + if (ids == null) + { + throw new ArgumentNullException("ids"); + } + + return ids.Select(RetrieveItemInternal); + } + + /// <summary> /// Internal retrieve from items or users table /// </summary> /// <param name="id">The id.</param> @@ -176,35 +193,37 @@ namespace MediaBrowser.Server.Implementations.Sqlite { if (id == Guid.Empty) { - throw new ArgumentException(); + throw new ArgumentNullException("id"); } - var cmd = connection.CreateCommand(); - cmd.CommandText = "select obj_type,data from items where guid = @guid"; - var guidParam = cmd.Parameters.Add("@guid", DbType.Guid); - guidParam.Value = id; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) + using (var cmd = connection.CreateCommand()) { - if (reader.Read()) + cmd.CommandText = "select obj_type,data from items where guid = @guid"; + var guidParam = cmd.Parameters.Add("@guid", DbType.Guid); + guidParam.Value = id; + + using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) { - var type = reader.GetString(0); - using (var stream = GetStream(reader, 1)) + if (reader.Read()) { - var itemType = _typeMapper.GetType(type); - - if (itemType == null) + var type = reader.GetString(0); + using (var stream = GetStream(reader, 1)) { - Logger.Error("Cannot find type {0}. Probably belongs to plug-in that is no longer loaded.", type); - return null; - } + var itemType = _typeMapper.GetType(type); - var item = _jsonSerializer.DeserializeFromStream(stream, itemType); - return item as BaseItem; + if (itemType == null) + { + Logger.Error("Cannot find type {0}. Probably belongs to plug-in that is no longer loaded.", type); + return null; + } + + var item = _jsonSerializer.DeserializeFromStream(stream, itemType); + return item as BaseItem; + } } } + return null; } - return null; } /// <summary> @@ -220,30 +239,32 @@ namespace MediaBrowser.Server.Implementations.Sqlite throw new ArgumentNullException(); } - var cmd = connection.CreateCommand(); - cmd.CommandText = "select obj_type,data from items where guid in (select child from children where guid = @guid)"; - var guidParam = cmd.Parameters.Add("@guid", DbType.Guid); - guidParam.Value = parent.Id; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) + using (var cmd = connection.CreateCommand()) { - while (reader.Read()) - { - var type = reader.GetString(0); + cmd.CommandText = "select obj_type,data from items where guid in (select child from children where guid = @guid)"; + var guidParam = cmd.Parameters.Add("@guid", DbType.Guid); + guidParam.Value = parent.Id; - using (var stream = GetStream(reader, 1)) + using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) + { + while (reader.Read()) { - var itemType = _typeMapper.GetType(type); - if (itemType == null) - { - Logger.Error("Cannot find type {0}. Probably belongs to plug-in that is no longer loaded.", type); - continue; - } - var item = _jsonSerializer.DeserializeFromStream(stream, itemType) as BaseItem; - if (item != null) + var type = reader.GetString(0); + + using (var stream = GetStream(reader, 1)) { - item.Parent = parent; - yield return item; + var itemType = _typeMapper.GetType(type); + if (itemType == null) + { + Logger.Error("Cannot find type {0}. Probably belongs to plug-in that is no longer loaded.", type); + continue; + } + var item = _jsonSerializer.DeserializeFromStream(stream, itemType) as BaseItem; + if (item != null) + { + item.Parent = parent; + yield return item; + } } } } diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs index 897ece764..6aeb63d9b 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs @@ -121,13 +121,14 @@ namespace MediaBrowser.Server.Implementations.Sqlite { try { - var cmd = connection.CreateCommand(); - - foreach (var query in queries) + using (var cmd = connection.CreateCommand()) { - cmd.Transaction = tran; - cmd.CommandText = query; - cmd.ExecuteNonQuery(); + foreach (var query in queries) + { + cmd.Transaction = tran; + cmd.CommandText = query; + cmd.ExecuteNonQuery(); + } } tran.Commit(); @@ -268,6 +269,9 @@ namespace MediaBrowser.Server.Implementations.Sqlite command.Transaction = tran; command.ExecuteNonQuery(); + + command.Dispose(); + numCommands++; } diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs index 8b4dcd49d..4e3f17750 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs @@ -184,30 +184,32 @@ namespace MediaBrowser.Server.Implementations.Sqlite cancellationToken.ThrowIfCancellationRequested(); - var cmd = connection.CreateCommand(); - cmd.CommandText = "replace into userdata (key, userId, data) values (@1, @2, @3)"; - cmd.AddParam("@1", key); - cmd.AddParam("@2", userId); - cmd.AddParam("@3", serialized); - - using (var tran = connection.BeginTransaction()) + using (var cmd = connection.CreateCommand()) { - try + cmd.CommandText = "replace into userdata (key, userId, data) values (@1, @2, @3)"; + cmd.AddParam("@1", key); + cmd.AddParam("@2", userId); + cmd.AddParam("@3", serialized); + + using (var tran = connection.BeginTransaction()) { - cmd.Transaction = tran; + try + { + cmd.Transaction = tran; - await cmd.ExecuteNonQueryAsync(cancellationToken); + await cmd.ExecuteNonQueryAsync(cancellationToken); - tran.Commit(); - } - catch (OperationCanceledException) - { - tran.Rollback(); - } - catch (Exception e) - { - Logger.ErrorException("Failed to commit transaction.", e); - tran.Rollback(); + tran.Commit(); + } + catch (OperationCanceledException) + { + tran.Rollback(); + } + catch (Exception e) + { + Logger.ErrorException("Failed to commit transaction.", e); + tran.Rollback(); + } } } } @@ -245,27 +247,29 @@ namespace MediaBrowser.Server.Implementations.Sqlite /// <returns>Task{UserItemData}.</returns> private async Task<UserItemData> RetrieveUserData(Guid userId, string key) { - var cmd = connection.CreateCommand(); - cmd.CommandText = "select data from userdata where key = @key and userId=@userId"; + using (var cmd = connection.CreateCommand()) + { + cmd.CommandText = "select data from userdata where key = @key and userId=@userId"; - var idParam = cmd.Parameters.Add("@key", DbType.String); - idParam.Value = key; + var idParam = cmd.Parameters.Add("@key", DbType.String); + idParam.Value = key; - var userIdParam = cmd.Parameters.Add("@userId", DbType.Guid); - userIdParam.Value = userId; + var userIdParam = cmd.Parameters.Add("@userId", DbType.Guid); + userIdParam.Value = userId; - using (var reader = await cmd.ExecuteReaderAsync(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow).ConfigureAwait(false)) - { - if (reader.Read()) + using (var reader = await cmd.ExecuteReaderAsync(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow).ConfigureAwait(false)) { - using (var stream = GetStream(reader, 0)) + if (reader.Read()) { - return _jsonSerializer.DeserializeFromStream<UserItemData>(stream); + using (var stream = GetStream(reader, 0)) + { + return _jsonSerializer.DeserializeFromStream<UserItemData>(stream); + } } } - } - return new UserItemData(); + return new UserItemData(); + } } } } diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs index b95a54156..eb5868932 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteUserRepository.cs @@ -127,29 +127,31 @@ namespace MediaBrowser.Server.Implementations.Sqlite cancellationToken.ThrowIfCancellationRequested(); - var cmd = connection.CreateCommand(); - cmd.CommandText = "replace into users (guid, data) values (@1, @2)"; - cmd.AddParam("@1", user.Id); - cmd.AddParam("@2", serialized); - - using (var tran = connection.BeginTransaction()) + using (var cmd = connection.CreateCommand()) { - try + cmd.CommandText = "replace into users (guid, data) values (@1, @2)"; + cmd.AddParam("@1", user.Id); + cmd.AddParam("@2", serialized); + + using (var tran = connection.BeginTransaction()) { - cmd.Transaction = tran; + try + { + cmd.Transaction = tran; - await cmd.ExecuteNonQueryAsync(cancellationToken); + await cmd.ExecuteNonQueryAsync(cancellationToken); - tran.Commit(); - } - catch (OperationCanceledException) - { - tran.Rollback(); - } - catch (Exception e) - { - Logger.ErrorException("Failed to commit transaction.", e); - tran.Rollback(); + tran.Commit(); + } + catch (OperationCanceledException) + { + tran.Rollback(); + } + catch (Exception e) + { + Logger.ErrorException("Failed to commit transaction.", e); + tran.Rollback(); + } } } } @@ -160,17 +162,19 @@ namespace MediaBrowser.Server.Implementations.Sqlite /// <returns>IEnumerable{User}.</returns> public IEnumerable<User> RetrieveAllUsers() { - var cmd = connection.CreateCommand(); - cmd.CommandText = "select data from users"; - - using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) + using (var cmd = connection.CreateCommand()) { - while (reader.Read()) + cmd.CommandText = "select data from users"; + + using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) { - using (var stream = GetStream(reader, 0)) + while (reader.Read()) { - var user = _jsonSerializer.DeserializeFromStream<User>(stream); - yield return user; + using (var stream = GetStream(reader, 0)) + { + var user = _jsonSerializer.DeserializeFromStream<User>(stream); + yield return user; + } } } } @@ -197,12 +201,14 @@ namespace MediaBrowser.Server.Implementations.Sqlite cancellationToken.ThrowIfCancellationRequested(); - var cmd = connection.CreateCommand(); - cmd.CommandText = "delete from users where guid=@guid"; - var guidParam = cmd.Parameters.Add("@guid", DbType.Guid); - guidParam.Value = user.Id; + using (var cmd = connection.CreateCommand()) + { + cmd.CommandText = "delete from users where guid=@guid"; + var guidParam = cmd.Parameters.Add("@guid", DbType.Guid); + guidParam.Value = user.Id; - return ExecuteCommand(cmd); + return ExecuteCommand(cmd); + } } } } |