Make SQL query source more forgiving for returning content items

src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQuerySource.cs

@@ -9,6 +9,7 @@
 using Fluid.Values;
 using Microsoft.Extensions.Options;
 using OrchardCore.ContentManagement;
+using OrchardCore.ContentManagement.Records;
 using OrchardCore.Data;
 using OrchardCore.Json;
 using OrchardCore.Liquid;
@@ -71,7 +72,20 @@ public async Task<IQueryResults> ExecuteQueryAsync(Query query, IDictionary<stri
                 IEnumerable<long> documentIds;
 
                 using var transaction = await connection.BeginTransactionAsync(_session.Store.Configuration.IsolationLevel);
-                documentIds = await connection.QueryAsync<long>(rawQuery, parameters, transaction);
+                var queryResult = await connection.QueryAsync(rawQuery, parameters, transaction);
+
+                documentIds = queryResult.Select(row =>
+                {
+                    var rowDict = (IDictionary<string, object>)row;
+
+                    if (rowDict.TryGetValue(nameof(ContentItemIndex.DocumentId), out var docIdObj) &&
+                        docIdObj is long docId)
+                    {
+                        return docId;
+                    }
+
+                    return rowDict.FirstOrDefault(kv => kv.Value is long).Value as long? ?? 0;
+                });
 
                 sqlQueryResults.Items = await _session.GetAsync<ContentItem>(documentIds.ToArray());
 

src/OrchardCore.Themes/TheBlogTheme/Recipes/blog.recipe.json

@@ -1177,9 +1177,9 @@
         {
           "Source": "Sql",
           "Name": "RecentBlogPosts",
-          "Template": "SELECT * FROM ContentItemIndex WHERE ContentType='BlogPost' ORDER BY CreatedUtc DESC LIMIT 3",
+          "Template": "SELECT DocumentId FROM ContentItemIndex WHERE ContentType='BlogPost' ORDER BY CreatedUtc DESC LIMIT 3",
           "Schema": "[js:base64('ew0KICAgICJ0eXBlIjogIkNvbnRlbnRJdGVtL0Jsb2dQb3N0Ig0KfQ==')]",
-          "ReturnContentItems": true
+          "ReturnDocuments": true
         }
       ]
     },

src/OrchardCore.Themes/TheBlogTheme/Recipes/blog.sql.query.recipe.json

@@ -24,9 +24,9 @@
         {
           "Source": "Sql",
           "Name": "RecentBlogPosts",
-          "Template": "SELECT * FROM ContentItemIndex WHERE ContentType='BlogPost' ORDER BY CreatedUtc DESC LIMIT 3",
+          "Template": "SELECT DocumentId FROM ContentItemIndex WHERE ContentType='BlogPost' ORDER BY CreatedUtc DESC LIMIT 3",
           "Schema": "[js:base64('ew0KICAgICJ0eXBlIjogIkNvbnRlbnRJdGVtL0Jsb2dQb3N0Ig0KfQ==')]",
-          "ReturnContentItems": true
+          "ReturnDocuments": true
         }
       ]
     }

src/docs/reference/modules/Queries/README.md

@@ -100,6 +100,10 @@ For Lucene queries with custom object schema, you are limited to elements stored
 
 For SQL queries, you can expose any column where property name is a column alias from the query.
 
+!!! note
+    When returning documents from a SQL query, make sure your query returns a list of document IDs.
+
+
 Here is an example of a custom Query from a manually added table in a database :
 
 ```sql