From ba928d872e823ff679117724aebecbec0fa0f9f6 Mon Sep 17 00:00:00 2001 From: cvium Date: Sat, 16 Sep 2023 07:25:29 +0200 Subject: [PATCH 1/2] fix: open the connection when using SqliteConnection directly --- Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs | 2 ++ Jellyfin.Server/Migrations/Routines/MigrateAuthenticationDb.cs | 1 + Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs | 3 ++- Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs | 1 + Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs | 3 ++- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs index c7c9c12501..f4456c215a 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs @@ -64,6 +64,8 @@ namespace Jellyfin.Server.Migrations.Routines using (var connection = new SqliteConnection($"Filename={Path.Combine(dataPath, DbFilename)}")) { using var userDbConnection = new SqliteConnection($"Filename={Path.Combine(dataPath, "users.db")}"); + connection.Open(); + userDbConnection.Open(); _logger.LogWarning("Migrating the activity database may take a while, do not stop Jellyfin."); using var dbContext = _provider.CreateDbContext(); diff --git a/Jellyfin.Server/Migrations/Routines/MigrateAuthenticationDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateAuthenticationDb.cs index 63cbe49503..c845beef2f 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateAuthenticationDb.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateAuthenticationDb.cs @@ -58,6 +58,7 @@ namespace Jellyfin.Server.Migrations.Routines var dataPath = _appPaths.DataPath; using (var connection = new SqliteConnection($"Filename={Path.Combine(dataPath, DbFilename)}")) { + connection.Open(); using var dbContext = _dbProvider.CreateDbContext(); var authenticatedDevices = connection.Query("SELECT * FROM Tokens"); diff --git a/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs b/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs index 06eda329cb..996f3fe8a6 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs @@ -66,7 +66,8 @@ namespace Jellyfin.Server.Migrations.Routines // Migrate parental rating strings to new levels _logger.LogInformation("Recalculating parental rating levels based on rating string."); - using (var connection = new SqliteConnection($"Filename={dbPath}")) + using var connection = new SqliteConnection($"Filename={dbPath}"); + connection.Open(); using (var transaction = connection.BeginTransaction()) { var queryResult = connection.Query("SELECT DISTINCT OfficialRating FROM TypedBaseItems"); diff --git a/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs index 9cf888d62b..4fee88b68c 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs @@ -66,6 +66,7 @@ namespace Jellyfin.Server.Migrations.Routines using (var connection = new SqliteConnection($"Filename={Path.Combine(dataPath, DbFilename)}")) { + connection.Open(); var dbContext = _provider.CreateDbContext(); var queryResult = connection.Query("SELECT * FROM LocalUsersv2"); diff --git a/Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs b/Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs index 6c34e1f5bb..7b0d9456dc 100644 --- a/Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs +++ b/Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs @@ -38,7 +38,8 @@ namespace Jellyfin.Server.Migrations.Routines { var dataPath = _paths.DataPath; var dbPath = Path.Combine(dataPath, DbFilename); - using (var connection = new SqliteConnection($"Filename={dbPath}")) + using var connection = new SqliteConnection($"Filename={dbPath}"); + connection.Open(); using (var transaction = connection.BeginTransaction()) { // Query the database for the ids of duplicate extras From 4fe641b55dd3157c5c56c0223a8a525b850f31da Mon Sep 17 00:00:00 2001 From: cvium Date: Sat, 16 Sep 2023 07:27:22 +0200 Subject: [PATCH 2/2] missed a spot --- Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs | 3 ++- .../Migrations/Routines/MigrateDisplayPreferencesDb.cs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs index f4456c215a..2f23cb1f8f 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateActivityLogDb.cs @@ -63,8 +63,9 @@ namespace Jellyfin.Server.Migrations.Routines var dataPath = _paths.DataPath; using (var connection = new SqliteConnection($"Filename={Path.Combine(dataPath, DbFilename)}")) { - using var userDbConnection = new SqliteConnection($"Filename={Path.Combine(dataPath, "users.db")}"); connection.Open(); + + using var userDbConnection = new SqliteConnection($"Filename={Path.Combine(dataPath, "users.db")}"); userDbConnection.Open(); _logger.LogWarning("Migrating the activity database may take a while, do not stop Jellyfin."); using var dbContext = _provider.CreateDbContext(); diff --git a/Jellyfin.Server/Migrations/Routines/MigrateDisplayPreferencesDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateDisplayPreferencesDb.cs index a036fe9bb5..249b39ae4b 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateDisplayPreferencesDb.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateDisplayPreferencesDb.cs @@ -86,6 +86,7 @@ namespace Jellyfin.Server.Migrations.Routines var dbFilePath = Path.Combine(_paths.DataPath, DbFilename); using (var connection = new SqliteConnection($"Filename={dbFilePath}")) { + connection.Open(); using var dbContext = _provider.CreateDbContext(); var results = connection.Query("SELECT * FROM userdisplaypreferences");