between tests

Author: nickgerrets

src/to_substrait.cpp

@@ -561,9 +561,9 @@ void DuckDBToSubstrait::TransformExpr(Expression &dexpr, substrait::Expression &
 	case ExpressionType::COMPARE_NOT_DISTINCT_FROM:
 		TransformComparisonExpression(dexpr, sexpr);
 		break;
-	case ExpressionType::COMPARE_BETWEEN:
-		TransformBetweenExpression(dexpr, sexpr);
-		break;
+	// case ExpressionType::COMPARE_BETWEEN:
+	// 	TransformBetweenExpression(dexpr, sexpr);
+	// 	break;
 	case ExpressionType::CONJUNCTION_AND:
 	case ExpressionType::CONJUNCTION_OR:
 		TransformConjunctionExpression(dexpr, sexpr, col_offset);

test/sql/test_between.test

@@ -4,6 +4,14 @@
 
 require substrait
 
+require tpcds
+
+statement ok
+PRAGMA enable_verification
+
+statement ok
+CALL dsdgen(sf=0.01)
+
 statement ok
 PRAGMA enable_verification
 
@@ -12,3 +20,11 @@ create table t as select * from range(100) as t(x)
 
 statement ok
 CALL get_substrait('select * from t where x BETWEEN 4 AND 6');
+
+#Q 5 WITHOUT BETWEEN
+statement ok
+CALL get_substrait('SELECT Avg(ss_quantity), Avg(ss_ext_sales_price), Avg(ss_ext_wholesale_cost), Sum(ss_ext_wholesale_cost) FROM store_sales, store, customer_demographics, household_demographics, customer_address, date_dim WHERE s_store_sk = ss_store_sk AND ss_sold_date_sk = d_date_sk AND d_year = 2001 AND ( ( ss_hdemo_sk = hd_demo_sk AND cd_demo_sk = ss_cdemo_sk AND cd_marital_status = ''U'' AND cd_education_status = ''Advanced Degree'' AND ss_sales_price AND hd_dep_count = 3 ) OR ( ss_hdemo_sk = hd_demo_sk AND cd_demo_sk = ss_cdemo_sk AND cd_marital_status = ''M'' AND cd_education_status = ''Primary'' AND ss_sales_price AND hd_dep_count = 1 ) OR ( ss_hdemo_sk = hd_demo_sk AND cd_demo_sk = ss_cdemo_sk AND cd_marital_status = ''D'' AND cd_education_status = ''Secondary'' AND ss_sales_price AND hd_dep_count = 1 ) ) AND ( ( ss_addr_sk = ca_address_sk AND ca_country = ''United States'' AND ca_state IN ( ''AZ'', ''NE'', ''IA'' ) AND ss_net_profit ) OR ( ss_addr_sk = ca_address_sk AND ca_country = ''United States'' AND ca_state IN ( ''MS'', ''CA'', ''NV'' ) AND ss_net_profit ) OR ( ss_addr_sk = ca_address_sk AND ca_country = ''United States'' AND ca_state IN ( ''GA'', ''TX'', ''NJ'' ) AND ss_net_profit) ); ')
+
+#Q 5 WITH BETWEEN
+statement ok
+CALL get_substrait('SELECT Avg(ss_quantity), Avg(ss_ext_sales_price), Avg(ss_ext_wholesale_cost), Sum(ss_ext_wholesale_cost) FROM store_sales, store, customer_demographics, household_demographics, customer_address, date_dim WHERE s_store_sk = ss_store_sk AND ss_sold_date_sk = d_date_sk AND d_year = 2001 AND ( ( ss_hdemo_sk = hd_demo_sk AND cd_demo_sk = ss_cdemo_sk AND cd_marital_status = ''U'' AND cd_education_status = ''Advanced Degree'' AND ss_sales_price BETWEEN 100.00 AND 150.00 AND hd_dep_count = 3 ) OR ( ss_hdemo_sk = hd_demo_sk AND cd_demo_sk = ss_cdemo_sk AND cd_marital_status = ''M'' AND cd_education_status = ''Primary'' AND ss_sales_price BETWEEN 50.00 AND 100.00 AND hd_dep_count = 1 ) OR ( ss_hdemo_sk = hd_demo_sk AND cd_demo_sk = ss_cdemo_sk AND cd_marital_status = ''D'' AND cd_education_status = ''Secondary'' AND ss_sales_price BETWEEN 150.00 AND 200.00 AND hd_dep_count = 1 ) ) AND ( ( ss_addr_sk = ca_address_sk AND ca_country = ''United States'' AND ca_state IN ( ''AZ'', ''NE'', ''IA'' ) AND ss_net_profit BETWEEN 100 AND 200 ) OR ( ss_addr_sk = ca_address_sk AND ca_country = ''United States'' AND ca_state IN ( ''MS'', ''CA'', ''NV'' ) AND ss_net_profit BETWEEN 150 AND 300 ) OR ( ss_addr_sk = ca_address_sk AND ca_country = ''United States'' AND ca_state IN ( ''GA'', ''TX'', ''NJ'' ) AND ss_net_profit BETWEEN 50 AND 250 ) ); ')