Added the separated big_decimal_ext

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["crates/proof-of-sql", "crates/proof-of-sql-parser"]
+members = ["crates/proof-of-sql", "crates/proof-of-sql-parser","crates/proof-of-sql-utils"]
 
 [workspace.package]
 edition = "2021"

crates/proof-of-sql-parser/Cargo.toml

@@ -21,6 +21,7 @@ chrono = { workspace = true, features = ["serde"] }
 lalrpop-util = { workspace = true, features = ["lexer", "unicode"] }
 serde = { workspace = true, features = ["serde_derive", "alloc"] }
 snafu = { workspace = true }
+proof_of_sql_utils = { path = "../proof-of-sql-utils" }
 
 [build-dependencies]
 lalrpop = { workspace = true }

crates/proof-of-sql-parser/src/intermediate_ast.rs

@@ -4,14 +4,15 @@
 * 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 core::{
     fmt,
     fmt::{Display, Formatter},
     hash::Hash,
 };
 use serde::{Deserialize, Serialize};
+use bigdecimal::BigDecimal; 
 
 /// Representation of a SetExpression, a collection of rows, each having one or more columns.
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
@@ -333,7 +334,7 @@ pub enum Literal {
     /// String Literal
     VarChar(String),
     /// Decimal Literal
-    Decimal(IntermediateDecimal),
+    Decimal(BigDecimal),
     /// Timestamp Literal
     Timestamp(PoSQLTimestamp),
 }
@@ -383,8 +384,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)
     }
 }

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,
@@ -139,7 +138,7 @@ fn we_can_parse_a_query_with_constants() {
                 col_res(lit(true), "boolean"),
                 col_res(lit("proof"), "varchar"),
                 col_res(
-                    lit(IntermediateDecimal::try_from("-2.34").unwrap()),
+                    lit(BigDecimal::try_from("-2.34").unwrap()),
                     "decimal",
                 ),
             ],
@@ -217,7 +216,7 @@ fn we_can_parse_a_query_with_a_column_equals_a_decimal() {
             tab(None, "sxt_tab"),
             equal(
                 col("a"),
-                lit(IntermediateDecimal::try_from("-0.32").unwrap()),
+                lit(BigDecimal::try_from("-0.32").unwrap()),
             ),
             vec![],
         ),
@@ -425,7 +424,7 @@ fn we_can_parse_a_query_with_one_logical_and_filter_expression_with_both_left_an
     assert_eq!(ast, expected_ast);
 }
 
-#[test]
+ #[test]
 fn we_can_parse_a_query_with_one_logical_or_filter_expression() {
     let ast = "select a from sxt_tab where (b = 3) or (c = -2.34);"
         .parse::<SelectStatement>()
@@ -438,7 +437,7 @@ fn we_can_parse_a_query_with_one_logical_or_filter_expression() {
                 equal(col("b"), lit(3)),
                 equal(
                     col("c"),
-                    lit(IntermediateDecimal::try_from("-2.34").unwrap()),
+                    lit(BigDecimal::try_from("-2.34").unwrap()),
                 ),
             ),
             vec![],

crates/proof-of-sql-parser/src/lib.rs

@@ -2,9 +2,8 @@
 #![no_std]
 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]
 extern crate lalrpop_util;

crates/proof-of-sql-parser/src/sql.lalrpop

@@ -2,7 +2,9 @@ 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 proof_of_sql_utils::big_decimal_ext::BigDecimalExt;
+use bigdecimal::BigDecimal;
 use alloc::boxed::Box;
 use alloc::string::String;
 use alloc::vec;
@@ -356,8 +358,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> =>? BigDecimal::try_from(lit).map_err(|e| User {error: "decimal out of range"}),
 };
 
 Int128NumericLiteral: i128 = {