Undo decimal indentifier

Signed-off-by: Adam Gutglick <adamgsal@gmail.com>

Author: AdamGS

datafusion/sqllogictest/README.md

@@ -397,7 +397,6 @@ query <type_string> <sort_mode>
   - 'P' - timestam**P**,
   - 'R' - floating-point results,
   - 'T' - **T**ext,
-  - 'L' - decima**L**,
   - "?" - any other types
 - `expected_result`: In the results section, some values are converted according to some rules:
   - floating point values are rounded to the scale of "12",

datafusion/sqllogictest/src/engines/datafusion_engine/normalize.rs

@@ -284,7 +284,7 @@ pub fn convert_schema_to_types(columns: &Fields) -> Vec<DFColumnType> {
             DataType::Decimal32(_, _)
             | DataType::Decimal64(_, _)
             | DataType::Decimal128(_, _)
-            | DataType::Decimal256(_, _) => DFColumnType::Decimal,
+            | DataType::Decimal256(_, _) => DFColumnType::Float,
             DataType::Utf8 | DataType::LargeUtf8 | DataType::Utf8View => {
                 DFColumnType::Text
             }

datafusion/sqllogictest/src/engines/output.rs

@@ -23,7 +23,6 @@ pub enum DFColumnType {
     DateTime,
     Integer,
     Float,
-    Decimal,
     Text,
     Timestamp,
     Another,
@@ -38,7 +37,6 @@ impl ColumnType for DFColumnType {
             'P' => Some(Self::Timestamp),
             'R' => Some(Self::Float),
             'T' => Some(Self::Text),
-            'L' => Some(Self::Decimal),
             _ => Some(Self::Another),
         }
     }
@@ -51,7 +49,6 @@ impl ColumnType for DFColumnType {
             Self::Timestamp => 'P',
             Self::Float => 'R',
             Self::Text => 'T',
-            Self::Decimal => 'L',
             Self::Another => '?',
         }
     }

datafusion/sqllogictest/src/engines/postgres_engine/mod.rs

@@ -417,8 +417,7 @@ fn convert_types(types: Vec<Type>) -> Vec<DFColumnType> {
             Type::BOOL => DFColumnType::Boolean,
             Type::INT2 | Type::INT4 | Type::INT8 => DFColumnType::Integer,
             Type::BPCHAR | Type::VARCHAR | Type::TEXT => DFColumnType::Text,
-            Type::FLOAT4 | Type::FLOAT8 => DFColumnType::Float,
-            Type::NUMERIC => DFColumnType::Decimal,
+            Type::FLOAT4 | Type::FLOAT8 | Type::NUMERIC => DFColumnType::Float,
             Type::DATE | Type::TIME => DFColumnType::DateTime,
             Type::TIMESTAMP => DFColumnType::Timestamp,
             _ => DFColumnType::Another,

datafusion/sqllogictest/test_files/aggregate.slt

@@ -1427,7 +1427,7 @@ NULL Null
 statement ok
 create table t(c decimal(10, 4)) as values (0.0001), (0.0002), (0.0003), (0.0004), (0.0005), (0.0006);
 
-query LT
+query RT
 select median(c), arrow_typeof(median(c)) from t;
 ----
 0.0003 Decimal128(10, 4)
@@ -1444,7 +1444,7 @@ drop table t;
 statement ok
 create table t(c decimal(10, 4)) as values (0.0001), (null), (0.0003), (0.0004), (0.0005);
 
-query LT
+query RT
 select median(c), arrow_typeof(median(c)) from t;
 ----
 0.0003 Decimal128(10, 4)
@@ -1456,7 +1456,7 @@ drop table t;
 statement ok
 create table t(c decimal(10, 4)) as values (null), (null), (null);
 
-query LT
+query RT
 select median(c), arrow_typeof(median(c)) from t;
 ----
 NULL Decimal128(10, 4)
@@ -1540,7 +1540,7 @@ drop table t;
 statement ok
 create table t(c decimal(10, 4)) as values (0.0001), (0.0001), (0.0001), (0.0001), (0.0002), (0.0002), (0.0003), (0.0003);
 
-query L
+query R
 select median(distinct c) from t;
 ----
 0.0002
@@ -1552,7 +1552,7 @@ drop table t;
 statement ok
 create table t(c decimal(10, 4)) as values (0.0001), (0.0001), (0.0001), (null), (null), (0.0002), (0.0003), (0.0003);
 
-query L
+query R
 select median(distinct c) from t;
 ----
 0.0002
@@ -3291,7 +3291,7 @@ select avg(c1) from test
 statement ok
 create table t (c1 decimal(10, 0)) as values (1), (2), (3), (4), (5), (6);
 
-query LT
+query RT
 select avg(c1), arrow_typeof(avg(c1)) from t;
 ----
 3.5 Decimal128(14, 4)
@@ -3303,7 +3303,7 @@ drop table t;
 statement ok
 create table t (c1 decimal(10, 0)) as values (1), (NULL), (3), (4), (5);
 
-query LT
+query RT
 select avg(c1), arrow_typeof(avg(c1)) from t;
 ----
 3.25 Decimal128(14, 4)
@@ -3315,7 +3315,7 @@ drop table t;
 statement ok
 create table t (c1 decimal(10, 0)) as values (NULL), (NULL), (NULL), (NULL), (NULL), (NULL);
 
-query LT
+query RT
 select avg(c1), arrow_typeof(avg(c1)) from t;
 ----
 NULL Decimal128(14, 4)
@@ -4019,7 +4019,7 @@ drop table t;
 statement ok
 create table t (c decimal(35, 0)) as values (1), (2), (1), (3), (null), (null), (3), (-2);
 
-query LT
+query RT
 select sum(distinct c), arrow_typeof(sum(distinct c)) from t;
 ----
 4 Decimal128(38, 0)
@@ -4983,7 +4983,7 @@ CREATE TABLE decimals (value DECIMAL(10, 2));
 statement ok
 INSERT INTO decimals VALUES (123.0001), (124.00);
 
-query LL
+query RR
 SELECT MIN(value), MAX(value) FROM decimals;
 ----
 123 124
@@ -4997,7 +4997,7 @@ CREATE TABLE decimals_batch (value DECIMAL(10, 0));
 statement ok
 INSERT INTO decimals_batch VALUES (1), (2), (3), (4), (5);
 
-query LL
+query RR
 SELECT MIN(value), MAX(value) FROM decimals_batch;
 ----
 1 5
@@ -5008,7 +5008,7 @@ DROP TABLE decimals_batch;
 statement ok
 CREATE TABLE decimals_empty (value DECIMAL(10, 0));
 
-query LL
+query RR
 SELECT MIN(value), MAX(value) FROM decimals_empty;
 ----
 NULL NULL
@@ -5023,7 +5023,7 @@ CREATE TABLE decimals_all_nulls (value DECIMAL(10, 0));
 statement ok
 INSERT INTO decimals_all_nulls VALUES (NULL), (NULL), (NULL), (NULL), (NULL), (NULL);
 
-query LL
+query RR
 SELECT MIN(value), MAX(value) FROM decimals_all_nulls;
 ----
 NULL NULL
@@ -5038,7 +5038,7 @@ CREATE TABLE decimals_with_nulls (value DECIMAL(10, 0));
 statement ok
 INSERT INTO decimals_with_nulls VALUES (1), (NULL), (3), (4), (5);
 
-query LL
+query RR
 SELECT MIN(value), MAX(value) FROM decimals_with_nulls;
 ----
 1 5
@@ -5052,7 +5052,7 @@ CREATE TABLE decimals_error (value DECIMAL(10, 2));
 statement ok
 INSERT INTO decimals_error VALUES (123.00), (arrow_cast(124.001, 'Decimal128(10, 3)'));
 
-query LL
+query RR
 SELECT MIN(value), MAX(value) FROM decimals_error;
 ----
 123 124
@@ -5066,7 +5066,7 @@ CREATE TABLE decimals_agg (value DECIMAL(10, 0));
 statement ok
 INSERT INTO decimals_agg VALUES (1), (2), (3), (4), (5);
 
-query LL
+query RR
 SELECT MIN(value), MAX(value) FROM decimals_agg;
 ----
 1 5
@@ -6202,7 +6202,7 @@ select approx_median(a) from (select 1 as a where 1=0);
 NULL
 
 # aggregate_decimal_sum
-query LT
+query RT
 select sum(c1), arrow_typeof(sum(c1)) from d_table;
 ----
 100 Decimal128(20, 3)
@@ -6211,7 +6211,7 @@ select sum(c1), arrow_typeof(sum(c1)) from d_table;
 statement ok
 create table t (c decimal(35, 3)) as values (10), (null), (20);
 
-query LT
+query RT
 select sum(c), arrow_typeof(sum(c)) from t;
 ----
 30 Decimal128(38, 3)
@@ -6235,7 +6235,7 @@ drop table t;
 statement ok
 create table t (c1 decimal(10, 0), c2 int) as values (null, null), (null, null), (null, null);
 
-query LTIT
+query RTIT
 select
   sum(c1), arrow_typeof(sum(c1)),
   sum(c2), arrow_typeof(sum(c2))
@@ -6282,20 +6282,20 @@ select sum(c), arrow_typeof(sum(c)) from t;
 statement ok
 drop table t;
 
-query TLT
+query TRT
 select c2, sum(c1), arrow_typeof(sum(c1)) from d_table GROUP BY c2 ORDER BY c2;
 ----
 A 1100.045 Decimal128(20, 3)
 B -1000.045 Decimal128(20, 3)
 
 
 # aggregate_decimal_avg
-query LT
+query RT
 select avg(c1), arrow_typeof(avg(c1)) from d_table
 ----
 5 Decimal128(14, 7)
 
-query TLT
+query TRT
 select c2, avg(c1), arrow_typeof(avg(c1)) from d_table GROUP BY c2 ORDER BY c2
 ----
 A 110.0045 Decimal128(14, 7)
@@ -6468,15 +6468,15 @@ statement ok
 INSERT INTO test_decimal_table VALUES (1, 10.10, 100.1, NULL), (1, 20.20, 200.2, NULL), (2, 10.10, 700.1, NULL), (2, 20.20, 700.1, NULL), (3, 10.1, 100.1, NULL), (3, 10.1, NULL, NULL)
 
 # aggregate_decimal_with_group_by
-query IILLLLIILL rowsort
+query IIRRRRIIRR rowsort
 select c1, count(c2), avg(c2), sum(c2), min(c2), max(c2), count(c3), count(c4), sum(c4), avg(c4) from test_decimal_table group by c1
 ----
 1 2 15.15 30.3 10.1 20.2 2 0 NULL NULL
 2 2 15.15 30.3 10.1 20.2 2 0 NULL NULL
 3 2 10.1 20.2 10.1 10.1 1 0 NULL NULL
 
 # aggregate_decimal_with_group_by_decimal
-query LILLLLIL rowsort
+query RIRRRRIR rowsort
 select c3, count(c2), avg(c2), sum(c2), min(c2), max(c2), count(c4), sum(c4) from test_decimal_table group by c3
 ----
 100.1 2 10.1 20.2 10.1 10.1 0 NULL
@@ -8519,14 +8519,14 @@ group0 NaN
 group1 NaN
 
 # group median decimal128 non-nullable
-query TL rowsort
+query TR rowsort
 SELECT col_group, median(col_decimal128) FROM group_median_table_non_nullable GROUP BY col_group
 ----
 group0 0.0002
 group1 0.0003
 
 # group median decimal256 non-nullable
-query TL rowsort
+query TR rowsort
 SELECT col_group, median(col_decimal256) FROM group_median_table_non_nullable GROUP BY col_group
 ----
 group0 0.0002
@@ -8610,14 +8610,14 @@ group0 NaN
 group1 NaN
 
 # group median decimal128 nullable
-query TL rowsort
+query TR rowsort
 SELECT col_group, median(col_decimal128) FROM group_median_table_nullable GROUP BY col_group
 ----
 group0 0.0002
 group1 0.0003
 
 # group median decimal256 nullable
-query TL rowsort
+query TR rowsort
 SELECT col_group, median(col_decimal256) FROM group_median_table_nullable GROUP BY col_group
 ----
 group0 0.0002
@@ -8646,7 +8646,7 @@ statement ok
 create table t_decimal (c decimal(10, 4)) as values (100.00), (125.00), (175.00), (200.00), (200.00), (300.00), (null), (null);
 
 # Test avg_distinct for Decimal128
-query LT
+query RT
 select avg(distinct c), arrow_typeof(avg(distinct c)) from t_decimal;
 ----
 180 Decimal128(14, 8)
@@ -8666,7 +8666,7 @@ create table t_decimal256 (c decimal(50, 2)) as values
   (null),
   (null);
 
-query LT
+query RT
 select avg(distinct c), arrow_typeof(avg(distinct c)) from t_decimal256;
 ----
 180 Decimal256(54, 6)
@@ -8810,7 +8810,7 @@ create table distinct_avg (a int, b double, c decimal(10, 4), d decimal(50, 2))
 ;
 
 # Need two columns to ensure single_distinct_to_group_by rule doesn't kick in, so we know our actual avg(distinct) code is being tested
-query RTRTLTLTRRLL
+query RTRTRTRTRRRR
 select
     avg(distinct a),
     arrow_typeof(avg(distinct a)),
@@ -8828,7 +8828,7 @@ from distinct_avg;
 ----
 3 Float64 37.4255 Float64 698.56005 Decimal128(14, 8) 15041.868333 Decimal256(54, 6) 4 56.52525 957.11074444 1272562.81625
 
-query RRLL rowsort
+query RRRR rowsort
 select
     avg(distinct a),
     avg(distinct b),
@@ -8843,7 +8843,7 @@ group by b;
 5 100.5 -49.5781 0.333333
 5 44.112 -132.12 NULL
 
-query RRLL
+query RRRR
 select
     avg(distinct a),
     avg(distinct b),

datafusion/sqllogictest/test_files/aggregate_skip_partial.slt

@@ -698,7 +698,7 @@ VALUES (1, 1.1), (2, 2.2), (3, 3.3), (2, 4.4), (1, 5.5);
 statement ok
 CREATE TABLE t(id int) as values (1), (2), (3), (4), (5), (6), (7), (8), (9), (10);
 
-query IL
+query IR
 SELECT i, sum(d)
 FROM decimal_table CROSS JOIN t
 GROUP BY i

datafusion/sqllogictest/test_files/aggregates_simplify.slt

@@ -332,7 +332,7 @@ physical_plan
 05)--------DataSourceExec: partitions=1, partition_sizes=[2]
 
 # Checks equivalent rewritten form (SUM + COUNT terms) matches transformed SUM semantics.
-query LL
+query RR
 SELECT SUM(val) + 1 * COUNT(val), SUM(val) + 2 * COUNT(val) FROM tbl;
 ----
 8589934592 8589934594

datafusion/sqllogictest/test_files/array/array_min_max.slt

@@ -293,7 +293,7 @@ from (
 ----
 1970-01-01T00:00:00.000000010Z 1970-01-01T00:00:00.000000030Z Timestamp(ns, "UTC") Timestamp(ns, "UTC")
 
-query LLTT
+query RRTT
 select
   array_min(dec_list),
   array_max(dec_list),

datafusion/sqllogictest/test_files/arrow_typeof.slt

@@ -198,7 +198,7 @@ SELECT
 Decimal128(5, 2) Decimal256(5, 2)
 
 
-query LL
+query RR
 SELECT
   col_d128,
   col_d256