From 7ba66d7c35aa574554bfdff20311d084337d34a8 Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Mon, 19 Aug 2024 07:25:20 -0700
Subject: [PATCH] Fix int casting in SqlQuerySource Fix #16580

---
 .../OrchardCore.Queries/Sql/SqlQuerySource.cs   | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQuerySource.cs b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQuerySource.cs
index ee948c39d25..64c6b7699e8 100644
--- a/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQuerySource.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQuerySource.cs
@@ -88,9 +88,20 @@ public async Task<IQueryResults> ExecuteQueryAsync(Query query, IDictionary<stri
                     }
                 }
 
-                return rowDictionary.TryGetValue(column, out var documentIdObject) && documentIdObject is long documentId
-                    ? documentId
-                    : 0;
+                if (rowDictionary.TryGetValue(column, out var documentIdObject))
+                {
+                    if (documentIdObject is long longDocumentId)
+                    {
+                        return longDocumentId;
+                    }
+
+                    if (documentIdObject is int intDocumentId)
+                    {
+                        return intDocumentId;
+                    }
+                }
+
+                return 0;
             }).ToArray();
 
             sqlQueryResults.Items = await _session.GetAsync<ContentItem>(documentIds);