From f8a1649298433136cd84725c0fba4fad33b88b0c Mon Sep 17 00:00:00 2001
From: andigandhi <andi@grasserisen.de>
Date: Thu, 4 Sep 2025 09:47:42 +0200
Subject: [PATCH] Fix database queries for usage in HTML report

---
 src/smbcrawler/queries.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/smbcrawler/queries.py b/src/smbcrawler/queries.py
index f9be0fb..5096399 100644
--- a/src/smbcrawler/queries.py
+++ b/src/smbcrawler/queries.py
@@ -122,12 +122,15 @@
     )
 
 -- Final selection from the recursive CTE
-SELECT
-    secret, line, line_number, target_name, share_name, path, content_hash
-FROM
-    FullPath
-ORDER BY
-    secret, target_name, share_name, path
+SELECT *
+FROM (
+    SELECT
+        secret, line, line_number, target_name, share_name, path, content_hash
+    FROM
+        FullPath
+    ORDER BY
+        secret, target_name, share_name, path
+)
 """,
     serialized_paths="""
 WITH RECURSIVE FullPath AS (
@@ -166,12 +169,15 @@
         FullPath AS fp ON p.parent_id = fp.id
 )
 -- Final selection from the recursive CTE
-SELECT DISTINCT
-    target_name, share_name, full_path, size, high_value
-FROM
-    FullPath
-ORDER BY
-    target_name, share_name, full_path
+SELECT *
+FROM (
+    SELECT DISTINCT
+        target_name, share_name, full_path, size, high_value
+    FROM
+        FullPath
+    ORDER BY
+        target_name, share_name, full_path
+)
 """,
     shares_listable_root="SELECT * FROM share WHERE read_level > 0 ORDER BY target_id, name",
     shares_listable_root_as_guest='SELECT * FROM share WHERE read_level > 0 AND guest_access = "1" ORDER BY target_id, name',