From 32f44a1ea76eb30452ec6ddfa421d6d4c70b6911 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Fri, 25 Apr 2025 17:21:39 +0200 Subject: [PATCH] Fixed issues with compile after merges --- Duplicati/CommandLine/DatabaseTool/Commands/Downgrade.cs | 2 +- Duplicati/CommandLine/DatabaseTool/Commands/Execute.cs | 2 +- Duplicati/CommandLine/DatabaseTool/Commands/List.cs | 2 +- Duplicati/CommandLine/DatabaseTool/Commands/Upgrade.cs | 2 +- Duplicati/CommandLine/DatabaseTool/Helper.cs | 4 ++-- Duplicati/UnitTest/DatabaseToolTests.cs | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Duplicati/CommandLine/DatabaseTool/Commands/Downgrade.cs b/Duplicati/CommandLine/DatabaseTool/Commands/Downgrade.cs index bfe27f435..6d1b0c37c 100644 --- a/Duplicati/CommandLine/DatabaseTool/Commands/Downgrade.cs +++ b/Duplicati/CommandLine/DatabaseTool/Commands/Downgrade.cs @@ -158,7 +158,7 @@ public static class Downgrade if (!nobackups) Helper.CreateFileBackup(db); - using var con = SQLiteLoader.LoadConnection(db); + using var con = SQLiteLoader.LoadConnection(db, 0); using var tr = con.BeginTransaction(); using var cmd = con.CreateCommand(tr); foreach (var script in downgradeScripts) diff --git a/Duplicati/CommandLine/DatabaseTool/Commands/Execute.cs b/Duplicati/CommandLine/DatabaseTool/Commands/Execute.cs index c6e982090..d2f57df6a 100644 --- a/Duplicati/CommandLine/DatabaseTool/Commands/Execute.cs +++ b/Duplicati/CommandLine/DatabaseTool/Commands/Execute.cs @@ -48,7 +48,7 @@ public static class Execute if (createbackup) Helper.CreateFileBackup(database); - using var connection = SQLiteLoader.LoadConnection(database); + using var connection = SQLiteLoader.LoadConnection(database, 0); try { if (command.IndexOfAny(Path.GetInvalidPathChars()) < 0 && File.Exists(command)) diff --git a/Duplicati/CommandLine/DatabaseTool/Commands/List.cs b/Duplicati/CommandLine/DatabaseTool/Commands/List.cs index 5171b0d33..5b9429251 100644 --- a/Duplicati/CommandLine/DatabaseTool/Commands/List.cs +++ b/Duplicati/CommandLine/DatabaseTool/Commands/List.cs @@ -54,7 +54,7 @@ public static class List return; } - using var con = SQLiteLoader.LoadConnection(database); + using var con = SQLiteLoader.LoadConnection(database, 0); using var cmd = con.CreateCommand(); if (tables == null || tables.Length == 0) diff --git a/Duplicati/CommandLine/DatabaseTool/Commands/Upgrade.cs b/Duplicati/CommandLine/DatabaseTool/Commands/Upgrade.cs index df4d90d48..5454ffcf0 100644 --- a/Duplicati/CommandLine/DatabaseTool/Commands/Upgrade.cs +++ b/Duplicati/CommandLine/DatabaseTool/Commands/Upgrade.cs @@ -170,7 +170,7 @@ public static class Upgrade if (!nobackups) Helper.CreateFileBackup(db); - using var con = SQLiteLoader.LoadConnection(db); + using var con = SQLiteLoader.LoadConnection(db, 0); using var tr = con.BeginTransaction(); using var cmd = con.CreateCommand(tr); foreach (var script in upgradeScripts) diff --git a/Duplicati/CommandLine/DatabaseTool/Helper.cs b/Duplicati/CommandLine/DatabaseTool/Helper.cs index 3d512772f..bba1578c8 100644 --- a/Duplicati/CommandLine/DatabaseTool/Helper.cs +++ b/Duplicati/CommandLine/DatabaseTool/Helper.cs @@ -60,7 +60,7 @@ public static class Helper { try { - using var con = SQLiteLoader.LoadConnection(serverdb); + using var con = SQLiteLoader.LoadConnection(serverdb, 0); using var cmd = con.CreateCommand(); foreach (var rd in cmd.ExecuteReaderEnumerable(@"SELECT ""DBPath"" FROM ""Backup""")) dbpaths.Add(rd.ConvertValueToString(0) ?? ""); @@ -89,7 +89,7 @@ public static class Helper /// A tuple containing the version and whether it is a server database public static (int Version, bool isserver) ExamineDatabase(string db) { - using (var con = SQLiteLoader.LoadConnection(db)) + using (var con = SQLiteLoader.LoadConnection(db, 0)) { using var cmd = con.CreateCommand(); var isserverdb = cmd.ExecuteScalarInt64("SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='Backup' OR name='Schedule'") == 2; diff --git a/Duplicati/UnitTest/DatabaseToolTests.cs b/Duplicati/UnitTest/DatabaseToolTests.cs index cabc8aa15..4d78a45be 100644 --- a/Duplicati/UnitTest/DatabaseToolTests.cs +++ b/Duplicati/UnitTest/DatabaseToolTests.cs @@ -34,7 +34,7 @@ namespace Duplicati.UnitTest public async Task TestLocalDbMethods() { using var dbfile = new TempFile(); - using var db = SQLiteLoader.LoadConnection(dbfile); + using var db = SQLiteLoader.LoadConnection(dbfile, 0); using var cmd = db.CreateCommand(); cmd.CommandText = LocalSchemaV12; cmd.ExecuteNonQuery(); @@ -54,7 +54,7 @@ namespace Duplicati.UnitTest public async Task TestServerDbMethods() { using var dbfile = new TempFile(); - using var db = SQLiteLoader.LoadConnection(dbfile); + using var db = SQLiteLoader.LoadConnection(dbfile, 0); using var cmd = db.CreateCommand(); cmd.CommandText = ServerSchemaV6; cmd.ExecuteNonQuery();