From 429bcd1f2d732ac930b2dd6735b444256e502e57 Mon Sep 17 00:00:00 2001
From: Kenneth Skovhede <kenneth@duplicati.com>
Date: Fri, 11 Jul 2025 15:55:36 +0200
Subject: [PATCH] Include deleted blocks when recreating dindex files.

This fixes #6339
---
 Duplicati/Library/Main/Database/LocalDatabase.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Duplicati/Library/Main/Database/LocalDatabase.cs b/Duplicati/Library/Main/Database/LocalDatabase.cs
index 70d47b4b1..23c824a3b 100644
--- a/Duplicati/Library/Main/Database/LocalDatabase.cs
+++ b/Duplicati/Library/Main/Database/LocalDatabase.cs
@@ -2046,11 +2046,12 @@ namespace Duplicati.Library.Main.Database
         public async IAsyncEnumerable<IBlock> GetBlocks(long volumeid, [EnumeratorCancellation] CancellationToken token)
         {
             await using var cmd = await m_connection.CreateCommandAsync(@"
-                SELECT DISTINCT
-                    ""Hash"",
-                    ""Size""
-                FROM ""Block""
-                WHERE ""VolumeID"" = @VolumeId
+                WITH AllBlocks AS (
+                    SELECT ""Hash"", ""Size"" FROM ""Block"" WHERE ""VolumeID"" = @VolumeId
+                    UNION ALL
+                    SELECT ""Hash"", ""Size"" FROM ""DeletedBlock"" WHERE ""VolumeID"" = @VolumeId
+                )
+                SELECT DISTINCT ""Hash"", ""Size"" FROM AllBlocks
             ", token)
                 .ConfigureAwait(false);