Changeset: d74e69958fcf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d74e69958fcf
Modified Files:
sql/backends/monet5/UDF/capi/Tests/capi11.test
sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
sql/backends/monet5/generator/Tests/execute-privilege-for-public.test
sql/backends/monet5/generator/Tests/generator02.test
sql/benchmarks/ATIS/Tests/one.test
sql/benchmarks/moa/Tests/one.test
sql/benchmarks/tpcds/Tests/check.test
sql/benchmarks/tpcds/Tests/q12.test
sql/benchmarks/tpcds/Tests/q13.test
sql/benchmarks/tpcds/Tests/q14-1.test
sql/benchmarks/tpcds/Tests/q14-2.test
sql/benchmarks/tpcds/Tests/q14a-1.test
sql/benchmarks/tpcds/Tests/q14a-2.test
sql/benchmarks/tpcds/Tests/q15.test
sql/benchmarks/tpcds/Tests/q16.test
sql/benchmarks/tpcds/Tests/q18.test
sql/benchmarks/tpcds/Tests/q18a.test
sql/benchmarks/tpcds/Tests/q19.test
sql/benchmarks/tpcds/Tests/q2.test
sql/benchmarks/tpcds/Tests/q20.test
sql/benchmarks/tpcds/Tests/q23-1.test
sql/benchmarks/tpcds/Tests/q23-2.test
sql/benchmarks/tpcds/Tests/q24-1.test
sql/benchmarks/tpcds/Tests/q24-2.test
sql/benchmarks/tpcds/Tests/q25.test
sql/benchmarks/tpcds/Tests/q26.test
sql/benchmarks/tpcds/Tests/q27.test
sql/benchmarks/tpcds/Tests/q27a.test
sql/benchmarks/tpcds/Tests/q28.test
sql/benchmarks/tpcds/Tests/q3.test
sql/benchmarks/tpcds/Tests/q30.test
sql/benchmarks/tpcds/Tests/q31.test
sql/benchmarks/tpcds/Tests/q32.test
sql/benchmarks/tpcds/Tests/q33.test
sql/benchmarks/tpcds/Tests/q36.test
sql/benchmarks/tpcds/Tests/q36a.test
sql/benchmarks/tpcds/Tests/q37.test
sql/benchmarks/tpcds/Tests/q40.test
sql/benchmarks/tpcds/Tests/q42.test
sql/benchmarks/tpcds/Tests/q43.test
sql/benchmarks/tpcds/Tests/q45.test
sql/benchmarks/tpcds/Tests/q46.test
sql/benchmarks/tpcds/Tests/q47.test
sql/benchmarks/tpcds/Tests/q49.test
sql/benchmarks/tpcds/Tests/q5.test
sql/benchmarks/tpcds/Tests/q51.test
sql/benchmarks/tpcds/Tests/q51a.test
sql/benchmarks/tpcds/Tests/q52.test
sql/benchmarks/tpcds/Tests/q53.test
sql/benchmarks/tpcds/Tests/q55.test
sql/benchmarks/tpcds/Tests/q56.test
sql/benchmarks/tpcds/Tests/q57.test
sql/benchmarks/tpcds/Tests/q58.test
sql/benchmarks/tpcds/Tests/q59.test
sql/benchmarks/tpcds/Tests/q5a.test
sql/benchmarks/tpcds/Tests/q60.test
sql/benchmarks/tpcds/Tests/q61.test
sql/benchmarks/tpcds/Tests/q63.test
sql/benchmarks/tpcds/Tests/q64.test
sql/benchmarks/tpcds/Tests/q65.test
sql/benchmarks/tpcds/Tests/q66.test
sql/benchmarks/tpcds/Tests/q67.test
sql/benchmarks/tpcds/Tests/q67a.test
sql/benchmarks/tpcds/Tests/q68.test
sql/benchmarks/tpcds/Tests/q7.test
sql/benchmarks/tpcds/Tests/q70.test
sql/benchmarks/tpcds/Tests/q70a.test
sql/benchmarks/tpcds/Tests/q71.test
sql/benchmarks/tpcds/Tests/q75.test
sql/benchmarks/tpcds/Tests/q76.test
sql/benchmarks/tpcds/Tests/q77.test
sql/benchmarks/tpcds/Tests/q77a.test
sql/benchmarks/tpcds/Tests/q78.test
sql/benchmarks/tpcds/Tests/q79.test
sql/benchmarks/tpcds/Tests/q8.test
sql/benchmarks/tpcds/Tests/q80.test
sql/benchmarks/tpcds/Tests/q80a.test
sql/benchmarks/tpcds/Tests/q81.test
sql/benchmarks/tpcds/Tests/q82.test
sql/benchmarks/tpcds/Tests/q83.test
sql/benchmarks/tpcds/Tests/q85.test
sql/benchmarks/tpcds/Tests/q86.test
sql/benchmarks/tpcds/Tests/q86a.test
sql/benchmarks/tpcds/Tests/q89.test
sql/benchmarks/tpcds/Tests/q9.test
sql/benchmarks/tpcds/Tests/q90.test
sql/benchmarks/tpcds/Tests/q91.test
sql/benchmarks/tpcds/Tests/q92.test
sql/benchmarks/tpcds/Tests/q93.test
sql/benchmarks/tpcds/Tests/q94.test
sql/benchmarks/tpcds/Tests/q95.test
sql/benchmarks/tpcds/Tests/q98.test
sql/benchmarks/tpch/Tests/compress.test
sql/benchmarks/tpch/Tests/create.test
sql/benchmarks/tpch/Tests/q1.test
sql/benchmarks/tpch/Tests/q10.test
sql/benchmarks/tpch/Tests/q11.test
sql/benchmarks/tpch/Tests/q14.test
sql/benchmarks/tpch/Tests/q15.test
sql/benchmarks/tpch/Tests/q15a.test
sql/benchmarks/tpch/Tests/q17.test
sql/benchmarks/tpch/Tests/q18.test
sql/benchmarks/tpch/Tests/q19.test
sql/benchmarks/tpch/Tests/q2.test
sql/benchmarks/tpch/Tests/q22.test
sql/benchmarks/tpch/Tests/q3.test
sql/benchmarks/tpch/Tests/q5.test
sql/benchmarks/tpch/Tests/q6.test
sql/benchmarks/tpch/Tests/q7.test
sql/benchmarks/tpch/Tests/q8.test
sql/benchmarks/tpch/Tests/q9.test
sql/benchmarks/tpch/Tests/rest.test
sql/test/2023/Tests/literals.test
sql/test/BugDay_2005-11-09_2.8/Tests/overflow_checking.SF-1089334.test
sql/test/BugDay_2005-11-09_2.9.3/Tests/empty_avg.SF-1207887.test
sql/test/BugTracker-2008/Tests/decimal_cast_in_view.SF-2075223.test
sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.test
sql/test/BugTracker-2008/Tests/incorrect_default_value_inserted.SF-2075075.test
sql/test/BugTracker-2008/Tests/mul_div_bug.SF-2075135.test
sql/test/BugTracker-2008/Tests/update_set_negative.SF-2075197.test
sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.test
sql/test/BugTracker-2010/Tests/cast-varchar.Bug-2682.test
sql/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.test
sql/test/BugTracker-2010/Tests/decimal-function.BUG-2624.test
sql/test/BugTracker-2010/Tests/decimal_div_whole_nrs.Bug-2579.test
sql/test/BugTracker-2010/Tests/order_by_on_single_row_view.SF-2950453.test
sql/test/BugTracker-2011/Tests/and-power.Bug-3013.test
sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.test
sql/test/BugTracker-2011/Tests/extract_seconds.Bug-2793.test
sql/test/BugTracker-2011/Tests/non-stable-select-bug.Bug-2894.test
sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.test
sql/test/BugTracker-2011/Tests/supertype.Bug-2830.test
sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.test
sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.test
sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.test
sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.test
sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.test
sql/test/BugTracker-2012/Tests/sticky-precision.Bug-2969.test
sql/test/BugTracker-2012/Tests/time-export-bug.Bug-2963.test
sql/test/BugTracker-2013/Tests/bogus_aggregation_casts.Bug-3342.test
sql/test/BugTracker-2013/Tests/copy-into-decimal.Bug-3265.test
sql/test/BugTracker-2013/Tests/correlated_subquery.Bug-3317.test
sql/test/BugTracker-2013/Tests/median.Bug-3352.test
sql/test/BugTracker-2014/Tests/copy_decimal_into.Bug-3596.test
sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.test
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.test
sql/test/BugTracker-2014/Tests/number_4_4.Bug-3543.test
sql/test/BugTracker-2014/Tests/round-properties.Bug-3515.test
sql/test/BugTracker-2014/Tests/round.Bug-3542.test
sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.test
sql/test/BugTracker-2015/Tests/ukey_check_unaligned.Bug-3669.test
sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.test
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.test
sql/test/BugTracker-2016/Tests/update_crash.Bug-3954.test
sql/test/BugTracker-2017/Tests/case.Bug-6386.test
sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.test
sql/test/BugTracker-2017/Tests/crash_function_returning_sample.Bug-6291.test
sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.test
sql/test/BugTracker-2017/Tests/sqlitelogictest-cast-decimal.Bug-6445.test
sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.test
sql/test/BugTracker-2017/Tests/too-large-decimals.Bug-6192.test
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.test
sql/test/BugTracker-2018/Tests/insert-null-second-interval-0.Bug-6515.test
sql/test/BugTracker-2019/Tests/cte-union.Bug-6755.test
sql/test/BugTracker-2019/Tests/sum-over-hge.Bug.6738.test
sql/test/BugTracker-2020/Tests/copy-decimal-with-space.Bug-6917.test
sql/test/BugTracker-2020/Tests/decimal-multiplication.Bug-7003.test
sql/test/BugTracker-2020/Tests/integers-intervals.Bug-6979.test
sql/test/BugTracker-2020/Tests/interval-math.Bug-6935.test
sql/test/BugTracker-2020/Tests/round.Bug-6955.test
sql/test/BugTracker-2020/Tests/tpch-cube.Bug-6938.test
sql/test/BugTracker-2022/Tests/values.Bug-7336.test
sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test
sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
sql/test/BugTracker-2024/Tests/7473-SQLunionfunc.test
sql/test/BugTracker-2024/Tests/7488-orderby-max-over-rows.test
sql/test/BugTracker-2024/Tests/7538-reduce-cast.test
sql/test/BugTracker-2025/Tests/7637_str_to_decimal.test
sql/test/BugTracker/Tests/convert_dec2varchar.SF-1774312.test
sql/test/BugTracker/Tests/convert_dec2varchar_crash.SF-1775550.test
sql/test/BugTracker/Tests/copy_decimal.SF-1582957.test
sql/test/BugTracker/Tests/decimal.SF-1718253.test
sql/test/BugTracker/Tests/select_mod.SF-1838813.test
sql/test/SQLancer/Tests/sqlancer01.test
sql/test/SQLancer/Tests/sqlancer02.test
sql/test/SQLancer/Tests/sqlancer03.test
sql/test/SQLancer/Tests/sqlancer04.test
sql/test/SQLancer/Tests/sqlancer05.test
sql/test/SQLancer/Tests/sqlancer07.test
sql/test/SQLancer/Tests/sqlancer09.test
sql/test/SQLancer/Tests/sqlancer10.test
sql/test/SQLancer/Tests/sqlancer13.test
sql/test/SQLancer/Tests/sqlancer14.test
sql/test/SQLancer/Tests/sqlancer19.test.in
sql/test/Tests/decimal.test
sql/test/Tests/decimal2.test
sql/test/Tests/median_stdev.test
sql/test/Tests/round.test
sql/test/Tests/window_functions.test
sql/test/Users/Tests/view_privs_chain.test
sql/test/analytics/Tests/analytics00.test
sql/test/bugs/Tests/arith-bug-sf-949228.test
sql/test/bugs/Tests/decimal_copy_into_bug.test
sql/test/bugs/Tests/float2dec.test
sql/test/copy/Tests/columns.test
sql/test/copy/Tests/decimal_separators.test
sql/test/copy/Tests/null_as_string.test
sql/test/copy/Tests/null_as_string_errors.test
sql/test/mapi/Tests/sql_dec38.test
sql/test/mergetables/Tests/forex.test
sql/test/miscellaneous/Tests/groupby_error.test
sql/test/miscellaneous/Tests/groupings.test
sql/test/miscellaneous/Tests/simple_selects.test
sql/test/odbc-escape-sequences/Tests/convert-functions.test
sql/test/odbc-escape-sequences/Tests/system-functions.test
sql/test/odbc-escape-sequences/Tests/time-date-interval-functions.test
sql/test/orderidx/Tests/imprints_all_types.test
sql/test/orderidx/Tests/imprints_hge_type.test
sql/test/orderidx/Tests/oidx_all_types.test
sql/test/orderidx/Tests/oidx_hge_type.test
sql/test/pg_regress/Tests/date.test
sql/test/pg_regress/Tests/numeric.test
sql/test/pg_regress/Tests/time.test
sql/test/pg_regress/Tests/timestamp.test
sql/test/pg_regress/Tests/timestamptz.test
sql/test/pg_regress/Tests/timetz.test
sql/test/prepare/Tests/decimal_needs_truncation.SF-2605686.test
sql/test/prepare/Tests/round-or-truncate.Bug-6193.test
sql/test/proto_loader/odbc/Tests/monetodbc_bigdec.test
sql/test/proto_loader/odbc/Tests/monetodbc_datatypes.test
sql/test/quantiles/Tests/quantiles.test
sql/test/sys-schema/Tests/webExamplesCastFunctionsOperators.test
sql/test/sys-schema/Tests/webExamplesDateTimeFunctionsOperators.test
sql/test/sys-schema/Tests/webExamplesMathematicalFunctionsOperators.test
testing/sqllogictest.py
Branch: Mar2025
Log Message:
Implemented column type D for .test files to represent decimals.
This is an extension to the sqllogic format. Before, decimals were
converted to floating point by the test framework.
diffs (truncated from 17448 to 300 lines):
diff --git a/sql/backends/monet5/UDF/capi/Tests/capi11.test
b/sql/backends/monet5/UDF/capi/Tests/capi11.test
--- a/sql/backends/monet5/UDF/capi/Tests/capi11.test
+++ b/sql/backends/monet5/UDF/capi/Tests/capi11.test
@@ -42,12 +42,12 @@ CREATE TABLE decimals(d DECIMAL(18,3))
statement ok
INSERT INTO decimals VALUES (10.3), (10.5), (NULL), (10.7)
-query R rowsort
+query D rowsort
SELECT capi11(d) FROM decimals
----
-10.300
-10.500
-10.700
+10.3
+10.5
+10.7
NULL
statement ok
@@ -95,7 +95,7 @@ CREATE TABLE doubles(d DOUBLE)
statement ok
INSERT INTO doubles VALUES (10.3), (10.5), (10.7)
-query R rowsort
+query D rowsort
SELECT _dbl2dec(d) FROM doubles
----
10.300
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.test
@@ -138,7 +138,7 @@ LANGUAGE PYTHON
return result
}
-query R rowsort
+query D rowsort
SELECT * FROM pyapi_ret_decimal()
----
100.330
diff --git
a/sql/backends/monet5/generator/Tests/execute-privilege-for-public.test
b/sql/backends/monet5/generator/Tests/execute-privilege-for-public.test
--- a/sql/backends/monet5/generator/Tests/execute-privilege-for-public.test
+++ b/sql/backends/monet5/generator/Tests/execute-privilege-for-public.test
@@ -150,25 +150,25 @@ 5.000
3.000
@connection(id=c2, username=test, password=test)
-query R nosort
+query D nosort
SELECT * from generate_series(cast(1 as decimal(9)),3,1)
----
-1.000
-2.000
+1.00
+2.00
@connection(id=c2, username=test, password=test)
-query R nosort
+query D nosort
SELECT * from generate_series(1,cast(4 as decimal(9)),2)
----
-1.000
-3.000
+1.00
+3.00
@connection(id=c2, username=test, password=test)
-query R nosort
+query D nosort
SELECT * from generate_series(5,1,cast(-2 as decimal(9)))
----
-5.000
-3.000
+5.00
+3.00
@connection(id=c2, username=test, password=test)
query T nosort
diff --git a/sql/backends/monet5/generator/Tests/generator02.test
b/sql/backends/monet5/generator/Tests/generator02.test
--- a/sql/backends/monet5/generator/Tests/generator02.test
+++ b/sql/backends/monet5/generator/Tests/generator02.test
@@ -1,13 +1,13 @@
-query R rowsort
+query D rowsort
select * from generate_series(0.0,10.0,1.6)
----
-0.000
-1.600
-3.200
-4.800
-6.400
-8.000
-9.600
+0.00
+1.60
+3.20
+4.80
+6.40
+8.00
+9.60
query R rowsort
select * from generate_series(cast(0.0 as real),cast(10.0 as real),cast(1.6 as
real))
@@ -31,24 +31,24 @@ 6.400
8.000
9.600
-query R rowsort
+query D rowsort
select * from generate_series(cast(0.0 as decimal(10,2)),cast(10.0 as
decimal(10,2)),cast(1.6 as decimal(10,2)))
----
-0.000
-1.600
-3.200
-4.800
-6.400
-8.000
-9.600
+0.00
+1.60
+3.20
+4.80
+6.40
+8.00
+9.60
-query R rowsort
+query D rowsort
select * from generate_series(0.1,10.0,1.77)
where value <5.0
----
-0.100
-1.870
-3.640
+0.10
+1.87
+3.64
query R rowsort
select * from generate_series(cast(0.1 as real),cast(10.0 as real),cast(1.77
as real))
@@ -66,20 +66,20 @@ 0.100
1.870
3.640
-query R rowsort
+query D rowsort
select * from generate_series(cast(0.1 as decimal(10,2)),cast(10.0 as
decimal(10,2)),cast(1.77 as decimal(10,2)))
where value <5.0
----
-0.100
-1.870
-3.640
+0.10
+1.87
+3.64
-query R rowsort
+query D rowsort
select * from generate_series(0.2,10.0,1.9) as v
where value <7.0 and value >3.0
----
-4.000
-5.900
+4.00
+5.90
query R rowsort
select * from generate_series(cast(0.2 as real),cast(10.0 as real),cast(1.9 as
real)) as v
@@ -95,12 +95,12 @@ where value <7.0 and value >3.0
4.000
5.900
-query R rowsort
+query D rowsort
select * from generate_series(cast(0.2 as decimal(10,2)),cast(10.0 as
decimal(10,2)),cast(1.9 as decimal(10,2))) as v
where value <7.0 and value >3.0
----
-4.000
-5.900
+4.00
+5.90
query R rowsort
select * from generate_series(0.0e0,10.0e0,1.6e0)
diff --git a/sql/benchmarks/ATIS/Tests/one.test
b/sql/benchmarks/ATIS/Tests/one.test
--- a/sql/benchmarks/ATIS/Tests/one.test
+++ b/sql/benchmarks/ATIS/Tests/one.test
@@ -412,29 +412,29 @@ SHORTS 330 PASSENGER
USAIR
SHORTS 360
-query TRI nosort
+query TDI nosort
select day_name.day_name,day_name.day_code,count(*) from flight_day,day_name
where day_name.day_code=flight_day.day_code group by
day_name.day_name,day_name.day_code order by day_code
----
MONDAY
-1.000
+1
64
TUESDAY
-2.000
+2
64
WEDNESDAY
-3.000
+3
64
THURSDAY
-4.000
+4
64
FRIDAY
-5.000
+5
64
SATURDAY
-6.000
+6
64
SUNDAY
-7.000
+7
64
query TI rowsort
@@ -467,45 +467,45 @@ SATURDAY
MAY
FRIDAY
-query TRI nosort
+query TDI nosort
select day_name.day_name,flight_day.day_code,count(*) from flight_day,day_name
where day_name.day_code=flight_day.day_code group by
flight_day.day_code,day_name.day_name order by day_code
----
MONDAY
-1.000
+1
64
TUESDAY
-2.000
+2
64
WEDNESDAY
-3.000
+3
64
THURSDAY
-4.000
+4
64
FRIDAY
-5.000
+5
64
SATURDAY
-6.000
+6
64
SUNDAY
-7.000
+7
64
-query R rowsort
+query D rowsort
select sum(engines) from aircraft
----
-278.000
+278
-query R rowsort
+query D rowsort
select avg(engines) from aircraft
----
-2.000
+2
-query R rowsort
+query D rowsort
select avg(engines) from aircraft where engines>0
----
-2.000
+2
query III rowsort
select count(*),min(pay_load),max(pay_load) from aircraft where pay_load>0
@@ -541,12 +541,12 @@ select count(*) from flight where flight
----
279
-query TTR rowsort
+query TTD rowsort
SELECT from_airport,to_airport,avg(time_elapsed) FROM flight WHERE
from_airport='ATL' AND to_airport='BOS' group by from_airport,to_airport
----
ATL
BOS
-154.000
+154
query TR rowsort
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
