Add errors from BaseTableExpr's to the evaluator

CHANGELOG.md

@@ -9,13 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Adds quotes to the attributes of PartiQL tuple's debug output so it can be read and transformed using Kotlin `partiql-cli`
 - [breaking] Changes the interface to `EvalPlan` to accept an `EvalContext`
+- [breaking] Changes `EvaluationError` to not implement `Clone` 
 
 ### Added
 - Add `partiql-extension-visualize` for visualizing AST and logical plan
 - Add a `SessionContext` containing both a system-level and a user-level context object usable by expression evaluation 
 
 ### Fixed
 - Fixed `ORDER BY`'s ability to see into projection aliases
+- Fixed errors in `BaseTableExpr`s get added to the evaluation context
 
 ## [0.6.0] - 2023-10-31
 ### Changed

partiql-catalog/src/lib.rs

@@ -46,6 +46,7 @@ pub struct ObjectId {
 }
 
 pub type BaseTableExprResultError = Box<dyn Error>;
+
 pub type BaseTableExprResultValueIter<'a> =
     Box<dyn 'a + Iterator<Item = Result<Value, BaseTableExprResultError>>>;
 pub type BaseTableExprResult<'a> =

partiql-eval/src/error.rs

@@ -1,6 +1,7 @@
 use crate::eval::evaluable::Evaluable;
 use crate::eval::expr::EvalExpr;
 use crate::eval::EvalContext;
+use partiql_catalog::BaseTableExprResultError;
 use partiql_value::{Tuple, Value};
 use std::borrow::Cow;
 use thiserror::Error;
@@ -30,7 +31,7 @@ pub struct EvalErr {
 }
 
 /// An error that can happen during evaluation.
-#[derive(Error, Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Error, Debug)]
 #[non_exhaustive]
 pub enum EvaluationError {
     /// Internal error that was not due to user input or API violation.
@@ -42,6 +43,16 @@ pub enum EvaluationError {
     /// Feature has not yet been implemented.
     #[error("Not yet implemented: {0}")]
     NotYetImplemented(String),
+
+    /// Error originating in an extension
+    #[error("Base Table Expression Error: {0}")]
+    ExtensionBaseTableExprResultError(BaseTableExprResultError),
+}
+
+impl From<BaseTableExprResultError> for EvaluationError {
+    fn from(e: BaseTableExprResultError) -> Self {
+        EvaluationError::ExtensionBaseTableExprResultError(e)
+    }
 }
 
 /// Used when an error occurs during the the logical to eval plan conversion. Allows the conversion

partiql-eval/src/eval/expr/base_table.rs

@@ -37,14 +37,14 @@ impl EvalExpr for EvalFnBaseTableExpr {
                 let bag: Result<Bag, _> = it.collect();
                 match bag {
                     Ok(b) => Value::from(b),
-                    Err(_) => {
-                        // TODO hook into pending eval errors
+                    Err(err) => {
+                        ctx.add_error(err.into());
                         Missing
                     }
                 }
             }
-            Err(_) => {
-                // TODO hook into pending eval errors
+            Err(err) => {
+                ctx.add_error(err.into());
                 Missing
             }
         };