-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add validation for comparison operations
- Loading branch information
Showing
9 changed files
with
274 additions
and
155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| use partiql_ast_passes::error::AstTransformationError; | ||
| use partiql_catalog::catalog::{Catalog, PartiqlCatalog}; | ||
| use partiql_catalog::context::SystemContext; | ||
| use partiql_eval as eval; | ||
| use partiql_eval::env::basic::MapBindings; | ||
| use partiql_eval::error::{EvalErr, PlanErr}; | ||
| use partiql_eval::eval::{BasicContext, EvalPlan, EvalResult, Evaluated}; | ||
| use partiql_eval::plan::EvaluationMode; | ||
| use partiql_logical as logical; | ||
| use partiql_parser::{Parsed, ParserError, ParserResult}; | ||
| use partiql_value::{DateTime, Value}; | ||
| use std::error::Error; | ||
| use thiserror::Error; | ||
|
|
||
| #[derive(Error, Debug)] | ||
| pub enum TestError<'a> { | ||
| #[error("Parse error: {0:?}")] | ||
| Parse(ParserError<'a>), | ||
| #[error("Lower error: {0:?}")] | ||
| Lower(AstTransformationError), | ||
| #[error("Plan error: {0:?}")] | ||
| Plan(PlanErr), | ||
| #[error("Evaluation error: {0:?}")] | ||
| Eval(EvalErr), | ||
| #[error("Other: {0:?}")] | ||
| Other(Box<dyn Error>), | ||
| } | ||
|
|
||
| impl<'a> From<ParserError<'a>> for TestError<'a> { | ||
| fn from(err: ParserError<'a>) -> Self { | ||
| TestError::Parse(err) | ||
| } | ||
| } | ||
|
|
||
| impl From<AstTransformationError> for TestError<'_> { | ||
| fn from(err: AstTransformationError) -> Self { | ||
| TestError::Lower(err) | ||
| } | ||
| } | ||
|
|
||
| impl From<PlanErr> for TestError<'_> { | ||
| fn from(err: PlanErr) -> Self { | ||
| TestError::Plan(err) | ||
| } | ||
| } | ||
|
|
||
| impl From<EvalErr> for TestError<'_> { | ||
| fn from(err: EvalErr) -> Self { | ||
| TestError::Eval(err) | ||
| } | ||
| } | ||
|
|
||
| impl From<Box<dyn Error>> for TestError<'_> { | ||
| fn from(err: Box<dyn Error>) -> Self { | ||
| TestError::Other(err) | ||
| } | ||
| } | ||
|
|
||
| #[track_caller] | ||
| #[inline] | ||
| pub fn parse(statement: &str) -> ParserResult<'_> { | ||
| partiql_parser::Parser::default().parse(statement) | ||
| } | ||
|
|
||
| #[track_caller] | ||
| #[inline] | ||
| pub fn lower( | ||
| catalog: &dyn Catalog, | ||
| parsed: &Parsed<'_>, | ||
| ) -> Result<logical::LogicalPlan<logical::BindingsOp>, AstTransformationError> { | ||
| let planner = partiql_logical_planner::LogicalPlanner::new(catalog); | ||
| planner.lower(parsed) | ||
| } | ||
|
|
||
| #[track_caller] | ||
| #[inline] | ||
| pub fn compile( | ||
| mode: EvaluationMode, | ||
| catalog: &dyn Catalog, | ||
| logical: logical::LogicalPlan<logical::BindingsOp>, | ||
| ) -> Result<EvalPlan, PlanErr> { | ||
| let mut planner = eval::plan::EvaluatorPlanner::new(mode, catalog); | ||
| planner.compile(&logical) | ||
| } | ||
|
|
||
| #[track_caller] | ||
| #[inline] | ||
| pub fn evaluate(mut plan: EvalPlan, bindings: MapBindings<Value>) -> EvalResult { | ||
| let sys = SystemContext { | ||
| now: DateTime::from_system_now_utc(), | ||
| }; | ||
| let ctx = BasicContext::new(bindings, sys); | ||
| plan.execute_mut(&ctx) | ||
| } | ||
|
|
||
| #[track_caller] | ||
| #[inline] | ||
| pub fn eval_query_with_catalog<'a, 'b>( | ||
| statement: &'a str, | ||
| catalog: &'b dyn Catalog, | ||
| mode: EvaluationMode, | ||
| ) -> Result<Evaluated, TestError<'a>> { | ||
| let parsed = parse(statement)?; | ||
| let lowered = lower(catalog, &parsed)?; | ||
| let bindings = Default::default(); | ||
| let plan = compile(mode, catalog, lowered)?; | ||
| Ok(evaluate(plan, bindings)?) | ||
| } | ||
|
|
||
| #[track_caller] | ||
| #[inline] | ||
| pub fn eval_query(statement: &str, mode: EvaluationMode) -> Result<Evaluated, TestError<'_>> { | ||
| let catalog = PartiqlCatalog::default(); | ||
| eval_query_with_catalog(statement, &catalog, mode) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| use crate::common::{ | ||
| compile, eval_query, eval_query_with_catalog, evaluate, lower, parse, TestError, | ||
| }; | ||
| use assert_matches::assert_matches; | ||
| use partiql_catalog::catalog::{Catalog, PartiqlCatalog}; | ||
| use partiql_catalog::extension::Extension; | ||
| use partiql_eval::eval::Evaluated; | ||
| use partiql_eval::plan::EvaluationMode; | ||
| use partiql_extension_value_functions::PartiqlValueFnExtension; | ||
| use partiql_value::Value; | ||
| use std::os::macos::raw::stat; | ||
|
|
||
| mod common; | ||
|
|
||
| #[track_caller] | ||
| #[inline] | ||
| pub fn eval<'a>(statement: &'a str) { | ||
| dbg!(&statement); | ||
| let res = eval_query(statement, EvaluationMode::Permissive); | ||
| assert_matches!(res, Ok(_)); | ||
| let res = res.unwrap().result; | ||
| assert_matches!(res, Value::Missing); | ||
|
|
||
| let res = eval_query(statement, EvaluationMode::Strict); | ||
| assert_matches!(res, Err(_)); | ||
| let err = res.unwrap_err(); | ||
| assert_matches!(err, TestError::Eval(_)); | ||
| } | ||
|
|
||
| #[track_caller] | ||
| #[inline] | ||
| pub fn eval_op<'a>(op: &'a str) { | ||
| eval(&format!("1 {op} 'foo'")) | ||
| } | ||
|
|
||
| #[test] | ||
| fn lt() { | ||
| eval_op("<") | ||
| } | ||
|
|
||
| #[test] | ||
| fn gt() { | ||
| eval_op(">") | ||
| } | ||
|
|
||
| #[test] | ||
| fn lte() { | ||
| eval_op("<=") | ||
| } | ||
|
|
||
| #[test] | ||
| fn gte() { | ||
| eval_op(">=") | ||
| } |
Oops, something went wrong.