fix(errors): keep recursive inclusion errors concise

Author: lovasoa

src/webserver/database/error_highlighting.rs

@@ -95,6 +95,10 @@ impl std::error::Error for NicePositionedError {
     }
 }
 
+pub(super) fn is_positioned_error(error: &anyhow::Error) -> bool {
+    error.downcast_ref::<NicePositionedError>().is_some()
+}
+
 /// Display a database error without any position information
 #[must_use]
 pub(super) fn display_db_error(

src/webserver/database/execute_queries.rs

@@ -8,7 +8,7 @@ use std::pin::Pin;
 use tracing::Instrument;
 
 use super::csv_import::run_csv_import;
-use super::error_highlighting::{display_stmt_db_error, display_stmt_error};
+use super::error_highlighting::{display_stmt_db_error, display_stmt_error, is_positioned_error};
 use super::sql::{
     DatabaseQuery, FileStatement, OutputColumn, Query, QueryBody, SingleRowQuery, SourceSpan,
     SqlFile,
@@ -301,7 +301,7 @@ fn with_stmt_position(
     query_position: SourceSpan,
     error: anyhow::Error,
 ) -> anyhow::Error {
-    if error.downcast_ref::<ErrorWithStatus>().is_some() {
+    if error.downcast_ref::<ErrorWithStatus>().is_some() || is_positioned_error(&error) {
         error
     } else {
         display_stmt_error(source_file, query_position, error)

src/webserver/database/sqlpage_functions/functions/run_sql.rs

@@ -75,7 +75,7 @@ pub(super) async fn run_sql<'a>(
             }
             FinishedQuery => log::trace!("run_sql: Finished query"),
             Error(err) => {
-                return Err(err.context(format!("run_sql: unable to run {sql_file_path:?}")));
+                return Err(err);
             }
         }
     }

tests/sql_test_files/mod.rs

@@ -257,6 +257,13 @@ fn assert_html_test(body: &str, test_file: &std::path::Path, stem: &str) {
             expected,
             test_file.display()
         );
+        if stem == "error_too_many_nested_inclusions" {
+            assert!(
+                !body.contains("run_sql: unable to run"),
+                "Recursive inclusion error should not repeat run_sql context: {}",
+                test_file.display()
+            );
+        }
     } else {
         if let Some(error) = extract_error(body) {
             panic!("Error in {}: {}", test_file.display(), error);