Merge branch 'main' into refactor/remove-get-test-accessor-and-rename…

…-vars
spaceandtimelabs · Oct 21, 2024 · 8076fda · 8076fda
2 parents e0ee44c + a225c08
commit 8076fda
Show file tree

Hide file tree

Showing 16 changed files with 270 additions and 499 deletions.
diff --git a/crates/proof-of-sql-parser/src/intermediate_ast.rs b/crates/proof-of-sql-parser/src/intermediate_ast.rs
@@ -4,8 +4,9 @@
 * https://docs.rs/vervolg/latest/vervolg/ast/enum.Statement.html
 ***/
 
-use crate::{intermediate_decimal::IntermediateDecimal, posql_time::PoSQLTimestamp, Identifier};
+use crate::{posql_time::PoSQLTimestamp, Identifier};
 use alloc::{boxed::Box, string::String, vec::Vec};
+use bigdecimal::BigDecimal;
 use core::{
     fmt,
     fmt::{Display, Formatter},
@@ -345,7 +346,7 @@ pub enum Literal {
     /// String Literal
     VarChar(String),
     /// Decimal Literal
-    Decimal(IntermediateDecimal),
+    Decimal(BigDecimal),
     /// Timestamp Literal
     Timestamp(PoSQLTimestamp),
 }
@@ -395,8 +396,8 @@ macro_rules! impl_string_to_literal {
 impl_string_to_literal!(&str);
 impl_string_to_literal!(String);
 
-impl From<IntermediateDecimal> for Literal {
-    fn from(val: IntermediateDecimal) -> Self {
+impl From<BigDecimal> for Literal {
+    fn from(val: BigDecimal) -> Self {
         Literal::Decimal(val)
     }
 }

diff --git a/crates/proof-of-sql-parser/src/intermediate_ast_tests.rs b/crates/proof-of-sql-parser/src/intermediate_ast_tests.rs
@@ -1,6 +1,5 @@
 use crate::{
     intermediate_ast::OrderByDirection::{Asc, Desc},
-    intermediate_decimal::IntermediateDecimal,
     sql::*,
     utility::*,
     SelectStatement,
@@ -10,6 +9,7 @@ use alloc::{
     string::{String, ToString},
     vec,
 };
+use bigdecimal::BigDecimal;
 
 // Sting parser tests
 #[test]
@@ -143,10 +143,7 @@ fn we_can_parse_a_query_with_constants() {
                 col_res(lit(3), "bigint"),
                 col_res(lit(true), "boolean"),
                 col_res(lit("proof"), "varchar"),
-                col_res(
-                    lit(IntermediateDecimal::try_from("-2.34").unwrap()),
-                    "decimal",
-                ),
+                col_res(lit("-2.34".parse::<BigDecimal>().unwrap()), "decimal"),
             ],
             tab(None, "sxt_tab"),
             vec![],
@@ -220,10 +217,7 @@ fn we_can_parse_a_query_with_a_column_equals_a_decimal() {
         query(
             cols_res(&["a"]),
             tab(None, "sxt_tab"),
-            equal(
-                col("a"),
-                lit(IntermediateDecimal::try_from("-0.32").unwrap()),
-            ),
+            equal(col("a"), lit("-0.32".parse::<BigDecimal>().unwrap())),
             vec![],
         ),
         vec![],
@@ -441,10 +435,7 @@ fn we_can_parse_a_query_with_one_logical_or_filter_expression() {
             tab(None, "sxt_tab"),
             or(
                 equal(col("b"), lit(3)),
-                equal(
-                    col("c"),
-                    lit(IntermediateDecimal::try_from("-2.34").unwrap()),
-                ),
+                equal(col("c"), lit("-2.34".parse::<BigDecimal>().unwrap())),
             ),
             vec![],
         ),

diff --git a/crates/proof-of-sql-parser/src/intermediate_decimal.rs b/crates/proof-of-sql-parser/src/intermediate_decimal.rs
diff --git a/crates/proof-of-sql-parser/src/lib.rs b/crates/proof-of-sql-parser/src/lib.rs
@@ -3,8 +3,6 @@
 #![cfg_attr(test, allow(clippy::missing_panics_doc))]
 extern crate alloc;
 
-/// Module for handling an intermediate decimal type received from the lexer.
-pub mod intermediate_decimal;
 /// Module for handling an intermediate timestamp type received from the lexer.
 pub mod posql_time;
 #[macro_use]

diff --git a/crates/proof-of-sql-parser/src/sql.lalrpop b/crates/proof-of-sql-parser/src/sql.lalrpop
@@ -2,11 +2,12 @@ use crate::intermediate_ast;
 use crate::select_statement;
 use crate::identifier;
 use lalrpop_util::ParseError::User;
-use crate::{intermediate_decimal::IntermediateDecimal, posql_time::PoSQLTimestamp};
+use crate::posql_time::PoSQLTimestamp;
 use alloc::boxed::Box;
 use alloc::string::String;
 use alloc::vec;
 use alloc::vec::Vec;
+use bigdecimal::BigDecimal;
 
 grammar;
 
@@ -356,8 +357,8 @@ Int128UnaryNumericLiteral: i128 = {
     "-" <expr: Int128UnaryNumericLiteral> =>? expr.checked_neg().ok_or(User {error: "Integer overflow"}),
 };
 
-DecimalNumericLiteral: IntermediateDecimal = {
-    <lit:DECIMAL_LIT> =>? IntermediateDecimal::try_from(lit).map_err(|e| User {error: "decimal out of range"}),
+DecimalNumericLiteral: BigDecimal = {
+    <lit:DECIMAL_LIT> =>? <>.parse::<BigDecimal>().map_err(|e| User {error: "decimal out of range"}),
 };
 
 Int128NumericLiteral: i128 = {