Adding upstream version 23.7.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>

tests/fixtures/optimizer/tpc-ds/tpc-ds.sql

@@ -62,6 +62,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 2
 --------------------------------------
+# execute: true
 WITH wscs
      AS (SELECT sold_date_sk,
                 sales_price
@@ -107,13 +108,13 @@ WITH wscs
          WHERE  d_date_sk = sold_date_sk
          GROUP  BY d_week_seq)
 SELECT d_week_seq1,
-       Round(sun_sales1 / sun_sales2, 2),
-       Round(mon_sales1 / mon_sales2, 2),
-       Round(tue_sales1 / tue_sales2, 2),
-       Round(wed_sales1 / wed_sales2, 2),
-       Round(thu_sales1 / thu_sales2, 2),
-       Round(fri_sales1 / fri_sales2, 2),
-       Round(sat_sales1 / sat_sales2, 2)
+       Round(sun_sales1 / sun_sales2, 2) AS "_col_1",
+       Round(mon_sales1 / mon_sales2, 2) AS "_col_2",
+       Round(tue_sales1 / tue_sales2, 2) AS "_col_3",
+       Round(wed_sales1 / wed_sales2, 2) AS "_col_4",
+       Round(thu_sales1 / thu_sales2, 2) AS "_col_5",
+       Round(fri_sales1 / fri_sales2, 2) AS "_col_6",
+       Round(sat_sales1 / sat_sales2, 2) AS "_col_7"
 FROM   (SELECT wswscs.d_week_seq d_week_seq1,
                sun_sales         sun_sales1,
                mon_sales         mon_sales1,
@@ -213,7 +214,8 @@ JOIN "date_dim" AS "date_dim"
 JOIN "wswscs" AS "wswscs_2"
   ON "wswscs"."d_week_seq" = "wswscs_2"."d_week_seq" - 53
 JOIN "date_dim" AS "date_dim_2"
-  ON "date_dim_2"."d_week_seq" = "wswscs_2"."d_week_seq" AND "date_dim_2"."d_year" = 1999
+  ON "date_dim_2"."d_week_seq" = "wswscs_2"."d_week_seq"
+  AND "date_dim_2"."d_year" = 1999
 ORDER BY
   "d_week_seq1";
 
@@ -264,6 +266,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 4
 --------------------------------------
+# execute: true
 WITH year_total
      AS (SELECT c_customer_id                       customer_id,
                 c_first_name                        customer_first_name,
@@ -733,8 +736,8 @@ WITH "salesreturns" AS (
     "date_dim"."d_date" AS "d_date"
   FROM "date_dim" AS "date_dim"
   WHERE
-    CAST("date_dim"."d_date" AS DATE) <= CAST('2002-09-05' AS DATE)
-    AND CAST("date_dim"."d_date" AS DATE) >= CAST('2002-08-22' AS DATE)
+    CAST("date_dim"."d_date" AS DATETIME) <= CAST('2002-09-05' AS DATE)
+    AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('2002-08-22' AS DATE)
 ), "ssr" AS (
   SELECT
     "store"."s_store_id" AS "s_store_id",
@@ -1628,6 +1631,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 11
 --------------------------------------
+# execute: true
 WITH year_total
      AS (SELECT c_customer_id                                customer_id,
                 c_first_name                                 customer_first_name
@@ -1869,8 +1873,8 @@ SELECT
 FROM "web_sales" AS "web_sales"
 JOIN "date_dim" AS "date_dim"
   ON "date_dim"."d_date_sk" = "web_sales"."ws_sold_date_sk"
-  AND CAST("date_dim"."d_date" AS DATE) <= CAST('2000-06-10' AS DATE)
-  AND CAST("date_dim"."d_date" AS DATE) >= CAST('2000-05-11' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) <= CAST('2000-06-10' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('2000-05-11' AS DATE)
 JOIN "item" AS "item"
   ON "item"."i_category" IN ('Home', 'Men', 'Women')
   AND "item"."i_item_sk" = "web_sales"."ws_item_sk"
@@ -2326,8 +2330,9 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 15
 --------------------------------------
+# execute: true
 SELECT ca_zip,
-               Sum(cs_sales_price)
+               Sum(cs_sales_price) AS "_col_1"
 FROM   catalog_sales,
        customer,
        customer_address,
@@ -2437,11 +2442,11 @@ JOIN "date_dim" AS "date_dim"
   AND "date_dim"."d_date" >= '2002-3-01'
   AND (
     CAST('2002-3-01' AS DATE) + INTERVAL '60' DAY
-  ) >= CAST("date_dim"."d_date" AS DATE)
+  ) >= CAST("date_dim"."d_date" AS DATETIME)
 WHERE
   "_u_3"."_u_4" IS NULL
-  AND NOT "_u_0"."_u_1" IS NULL
   AND ARRAY_ANY("_u_0"."_u_2", "_x" -> "cs1"."cs_warehouse_sk" <> "_x")
+  AND NOT "_u_0"."_u_1" IS NULL
 ORDER BY
   COUNT(DISTINCT "cs1"."cs_order_number")
 LIMIT 100;
@@ -2449,6 +2454,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 17
 --------------------------------------
+# execute: true
 SELECT i_item_id,
                i_item_desc,
                s_state,
@@ -2638,6 +2644,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 19
 --------------------------------------
+# execute: true
 SELECT i_brand_id              brand_id,
                i_brand                 brand,
                i_manufact_id,
@@ -2744,8 +2751,8 @@ SELECT
 FROM "catalog_sales" AS "catalog_sales"
 JOIN "date_dim" AS "date_dim"
   ON "catalog_sales"."cs_sold_date_sk" = "date_dim"."d_date_sk"
-  AND CAST("date_dim"."d_date" AS DATE) <= CAST('2001-03-05' AS DATE)
-  AND CAST("date_dim"."d_date" AS DATE) >= CAST('2001-02-03' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) <= CAST('2001-03-05' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('2001-02-03' AS DATE)
 JOIN "item" AS "item"
   ON "catalog_sales"."cs_item_sk" = "item"."i_item_sk"
   AND "item"."i_category" IN ('Children', 'Women', 'Electronics')
@@ -2824,8 +2831,8 @@ WITH "x" AS (
   FROM "inventory" AS "inventory"
   JOIN "date_dim" AS "date_dim"
     ON "date_dim"."d_date_sk" = "inventory"."inv_date_sk"
-    AND CAST("date_dim"."d_date" AS DATE) <= CAST('2000-06-12' AS DATE)
-    AND CAST("date_dim"."d_date" AS DATE) >= CAST('2000-04-13' AS DATE)
+    AND CAST("date_dim"."d_date" AS DATETIME) <= CAST('2000-06-12' AS DATE)
+    AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('2000-04-13' AS DATE)
   JOIN "item" AS "item"
     ON "inventory"."inv_item_sk" = "item"."i_item_sk"
     AND "item"."i_current_price" <= 1.49
@@ -2906,6 +2913,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 23
 --------------------------------------
+# execute: true
 WITH frequent_ss_items
      AS (SELECT Substr(i_item_desc, 1, 30) itemdesc,
                 i_item_sk                  item_sk,
@@ -2942,7 +2950,7 @@ WITH frequent_ss_items
          HAVING Sum(ss_quantity * ss_sales_price) >
                 ( 95 / 100.0 ) * (SELECT *
                                   FROM   max_store_sales))
-SELECT Sum(sales)
+SELECT Sum(sales) AS "_col_0"
 FROM   (SELECT cs_quantity * cs_list_price sales
         FROM   catalog_sales,
                date_dim
@@ -3372,49 +3380,49 @@ LIMIT 100;
 -- TPC-DS 28
 --------------------------------------
 SELECT *
-FROM   (SELECT Avg(ss_list_price)            B1_LP,
-               Count(ss_list_price)          B1_CNT,
-               Count(DISTINCT ss_list_price) B1_CNTD
+FROM   (SELECT Avg(ss_list_price)            b1_lp,
+               Count(ss_list_price)          b1_cnt,
+               Count(DISTINCT ss_list_price) b1_cntd
         FROM   store_sales
         WHERE  ss_quantity BETWEEN 0 AND 5
                AND ( ss_list_price BETWEEN 18 AND 18 + 10
                       OR ss_coupon_amt BETWEEN 1939 AND 1939 + 1000
                       OR ss_wholesale_cost BETWEEN 34 AND 34 + 20 )) B1,
-       (SELECT Avg(ss_list_price)            B2_LP,
-               Count(ss_list_price)          B2_CNT,
-               Count(DISTINCT ss_list_price) B2_CNTD
+       (SELECT Avg(ss_list_price)            b2_lp,
+               Count(ss_list_price)          b2_cnt,
+               Count(DISTINCT ss_list_price) b2_cntd
         FROM   store_sales
         WHERE  ss_quantity BETWEEN 6 AND 10
                AND ( ss_list_price BETWEEN 1 AND 1 + 10
                       OR ss_coupon_amt BETWEEN 35 AND 35 + 1000
                       OR ss_wholesale_cost BETWEEN 50 AND 50 + 20 )) B2,
-       (SELECT Avg(ss_list_price)            B3_LP,
-               Count(ss_list_price)          B3_CNT,
-               Count(DISTINCT ss_list_price) B3_CNTD
+       (SELECT Avg(ss_list_price)            b3_lp,
+               Count(ss_list_price)          b3_cnt,
+               Count(DISTINCT ss_list_price) b3_cntd
         FROM   store_sales
         WHERE  ss_quantity BETWEEN 11 AND 15
                AND ( ss_list_price BETWEEN 91 AND 91 + 10
                       OR ss_coupon_amt BETWEEN 1412 AND 1412 + 1000
                       OR ss_wholesale_cost BETWEEN 17 AND 17 + 20 )) B3,
-       (SELECT Avg(ss_list_price)            B4_LP,
-               Count(ss_list_price)          B4_CNT,
-               Count(DISTINCT ss_list_price) B4_CNTD
+       (SELECT Avg(ss_list_price)            b4_lp,
+               Count(ss_list_price)          b4_cnt,
+               Count(DISTINCT ss_list_price) b4_cntd
         FROM   store_sales
         WHERE  ss_quantity BETWEEN 16 AND 20
                AND ( ss_list_price BETWEEN 9 AND 9 + 10
                       OR ss_coupon_amt BETWEEN 5270 AND 5270 + 1000
                       OR ss_wholesale_cost BETWEEN 29 AND 29 + 20 )) B4,
-       (SELECT Avg(ss_list_price)            B5_LP,
-               Count(ss_list_price)          B5_CNT,
-               Count(DISTINCT ss_list_price) B5_CNTD
+       (SELECT Avg(ss_list_price)            b5_lp,
+               Count(ss_list_price)          b5_cnt,
+               Count(DISTINCT ss_list_price) b5_cntd
         FROM   store_sales
         WHERE  ss_quantity BETWEEN 21 AND 25
                AND ( ss_list_price BETWEEN 45 AND 45 + 10
                       OR ss_coupon_amt BETWEEN 826 AND 826 + 1000
                       OR ss_wholesale_cost BETWEEN 5 AND 5 + 20 )) B5,
-       (SELECT Avg(ss_list_price)            B6_LP,
-               Count(ss_list_price)          B6_CNT,
-               Count(DISTINCT ss_list_price) B6_CNTD
+       (SELECT Avg(ss_list_price)            b6_lp,
+               Count(ss_list_price)          b6_cnt,
+               Count(DISTINCT ss_list_price) b6_cntd
         FROM   store_sales
         WHERE  ss_quantity BETWEEN 26 AND 30
                AND ( ss_list_price BETWEEN 174 AND 174 + 10
@@ -3429,9 +3437,12 @@ WITH "b1" AS (
   FROM "store_sales" AS "store_sales"
   WHERE
     (
-      "store_sales"."ss_coupon_amt" <= 2939 AND "store_sales"."ss_coupon_amt" >= 1939
-      OR "store_sales"."ss_list_price" <= 28 AND "store_sales"."ss_list_price" >= 18
-      OR "store_sales"."ss_wholesale_cost" <= 54 AND "store_sales"."ss_wholesale_cost" >= 34
+      "store_sales"."ss_coupon_amt" <= 2939
+      AND "store_sales"."ss_coupon_amt" >= 1939
+      OR "store_sales"."ss_list_price" <= 28
+      AND "store_sales"."ss_list_price" >= 18
+      OR "store_sales"."ss_wholesale_cost" <= 54
+      AND "store_sales"."ss_wholesale_cost" >= 34
     )
     AND "store_sales"."ss_quantity" <= 5
     AND "store_sales"."ss_quantity" >= 0
@@ -3443,9 +3454,12 @@ WITH "b1" AS (
   FROM "store_sales" AS "store_sales"
   WHERE
     (
-      "store_sales"."ss_coupon_amt" <= 1035 AND "store_sales"."ss_coupon_amt" >= 35
-      OR "store_sales"."ss_list_price" <= 11 AND "store_sales"."ss_list_price" >= 1
-      OR "store_sales"."ss_wholesale_cost" <= 70 AND "store_sales"."ss_wholesale_cost" >= 50
+      "store_sales"."ss_coupon_amt" <= 1035
+      AND "store_sales"."ss_coupon_amt" >= 35
+      OR "store_sales"."ss_list_price" <= 11
+      AND "store_sales"."ss_list_price" >= 1
+      OR "store_sales"."ss_wholesale_cost" <= 70
+      AND "store_sales"."ss_wholesale_cost" >= 50
     )
     AND "store_sales"."ss_quantity" <= 10
     AND "store_sales"."ss_quantity" >= 6
@@ -3457,9 +3471,12 @@ WITH "b1" AS (
   FROM "store_sales" AS "store_sales"
   WHERE
     (
-      "store_sales"."ss_coupon_amt" <= 2412 AND "store_sales"."ss_coupon_amt" >= 1412
-      OR "store_sales"."ss_list_price" <= 101 AND "store_sales"."ss_list_price" >= 91
-      OR "store_sales"."ss_wholesale_cost" <= 37 AND "store_sales"."ss_wholesale_cost" >= 17
+      "store_sales"."ss_coupon_amt" <= 2412
+      AND "store_sales"."ss_coupon_amt" >= 1412
+      OR "store_sales"."ss_list_price" <= 101
+      AND "store_sales"."ss_list_price" >= 91
+      OR "store_sales"."ss_wholesale_cost" <= 37
+      AND "store_sales"."ss_wholesale_cost" >= 17
     )
     AND "store_sales"."ss_quantity" <= 15
     AND "store_sales"."ss_quantity" >= 11
@@ -3471,9 +3488,12 @@ WITH "b1" AS (
   FROM "store_sales" AS "store_sales"
   WHERE
     (
-      "store_sales"."ss_coupon_amt" <= 6270 AND "store_sales"."ss_coupon_amt" >= 5270
-      OR "store_sales"."ss_list_price" <= 19 AND "store_sales"."ss_list_price" >= 9
-      OR "store_sales"."ss_wholesale_cost" <= 49 AND "store_sales"."ss_wholesale_cost" >= 29
+      "store_sales"."ss_coupon_amt" <= 6270
+      AND "store_sales"."ss_coupon_amt" >= 5270
+      OR "store_sales"."ss_list_price" <= 19
+      AND "store_sales"."ss_list_price" >= 9
+      OR "store_sales"."ss_wholesale_cost" <= 49
+      AND "store_sales"."ss_wholesale_cost" >= 29
     )
     AND "store_sales"."ss_quantity" <= 20
     AND "store_sales"."ss_quantity" >= 16
@@ -3485,9 +3505,12 @@ WITH "b1" AS (
   FROM "store_sales" AS "store_sales"
   WHERE
     (
-      "store_sales"."ss_coupon_amt" <= 1826 AND "store_sales"."ss_coupon_amt" >= 826
-      OR "store_sales"."ss_list_price" <= 55 AND "store_sales"."ss_list_price" >= 45
-      OR "store_sales"."ss_wholesale_cost" <= 25 AND "store_sales"."ss_wholesale_cost" >= 5
+      "store_sales"."ss_coupon_amt" <= 1826
+      AND "store_sales"."ss_coupon_amt" >= 826
+      OR "store_sales"."ss_list_price" <= 55
+      AND "store_sales"."ss_list_price" >= 45
+      OR "store_sales"."ss_wholesale_cost" <= 25
+      AND "store_sales"."ss_wholesale_cost" >= 5
     )
     AND "store_sales"."ss_quantity" <= 25
     AND "store_sales"."ss_quantity" >= 21
@@ -3499,9 +3522,12 @@ WITH "b1" AS (
   FROM "store_sales" AS "store_sales"
   WHERE
     (
-      "store_sales"."ss_coupon_amt" <= 6548 AND "store_sales"."ss_coupon_amt" >= 5548
-      OR "store_sales"."ss_list_price" <= 184 AND "store_sales"."ss_list_price" >= 174
-      OR "store_sales"."ss_wholesale_cost" <= 62 AND "store_sales"."ss_wholesale_cost" >= 42
+      "store_sales"."ss_coupon_amt" <= 6548
+      AND "store_sales"."ss_coupon_amt" >= 5548
+      OR "store_sales"."ss_list_price" <= 184
+      AND "store_sales"."ss_list_price" >= 174
+      OR "store_sales"."ss_wholesale_cost" <= 62
+      AND "store_sales"."ss_wholesale_cost" >= 42
     )
     AND "store_sales"."ss_quantity" <= 30
     AND "store_sales"."ss_quantity" >= 26
@@ -3860,11 +3886,17 @@ SELECT
   "ss3"."store_sales" / "ss2"."store_sales" AS "store_q2_q3_increase"
 FROM "ss" AS "ss1"
 JOIN "ss" AS "ss2"
-  ON "ss1"."ca_county" = "ss2"."ca_county" AND "ss2"."d_qoy" = 2 AND "ss2"."d_year" = 2001
+  ON "ss1"."ca_county" = "ss2"."ca_county"
+  AND "ss2"."d_qoy" = 2
+  AND "ss2"."d_year" = 2001
 JOIN "ws" AS "ws1"
-  ON "ss1"."ca_county" = "ws1"."ca_county" AND "ws1"."d_qoy" = 1 AND "ws1"."d_year" = 2001
+  ON "ss1"."ca_county" = "ws1"."ca_county"
+  AND "ws1"."d_qoy" = 1
+  AND "ws1"."d_year" = 2001
 JOIN "ss" AS "ss3"
-  ON "ss2"."ca_county" = "ss3"."ca_county" AND "ss3"."d_qoy" = 3 AND "ss3"."d_year" = 2001
+  ON "ss2"."ca_county" = "ss3"."ca_county"
+  AND "ss3"."d_qoy" = 3
+  AND "ss3"."d_year" = 2001
 JOIN "ws" AS "ws2"
   ON "ws1"."ca_county" = "ws2"."ca_county"
   AND "ws2"."d_qoy" = 2
@@ -3932,7 +3964,7 @@ WITH "catalog_sales_2" AS (
   FROM "date_dim" AS "date_dim"
   WHERE
     "date_dim"."d_date" >= '2001-03-04'
-    AND CAST("date_dim"."d_date" AS DATE) <= CAST('2001-06-02' AS DATE)
+    AND CAST("date_dim"."d_date" AS DATETIME) <= CAST('2001-06-02' AS DATE)
 ), "_u_0" AS (
   SELECT
     1.3 * AVG("catalog_sales"."cs_ext_discount_amt") AS "_col_0",
@@ -3949,7 +3981,8 @@ FROM "catalog_sales_2" AS "catalog_sales"
 JOIN "date_dim_2" AS "date_dim"
   ON "catalog_sales"."cs_sold_date_sk" = "date_dim"."d_date_sk"
 JOIN "item" AS "item"
-  ON "catalog_sales"."cs_item_sk" = "item"."i_item_sk" AND "item"."i_manufact_id" = 610
+  ON "catalog_sales"."cs_item_sk" = "item"."i_item_sk"
+  AND "item"."i_manufact_id" = 610
 LEFT JOIN "_u_0" AS "_u_0"
   ON "_u_0"."_u_1" = "item"."i_item_sk"
 WHERE
@@ -4132,6 +4165,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 34
 --------------------------------------
+# execute: true
 SELECT c_last_name,
        c_first_name,
        c_salutation,
@@ -4234,24 +4268,25 @@ ORDER BY
 --------------------------------------
 -- TPC-DS 35
 --------------------------------------
+# execute: true
 SELECT ca_state,
                cd_gender,
                cd_marital_status,
                cd_dep_count,
                Count(*) cnt1,
-               Stddev_samp(cd_dep_count),
-               Avg(cd_dep_count),
-               Max(cd_dep_count),
+               Stddev_samp(cd_dep_count) AS "_col_5",
+               Avg(cd_dep_count) AS "_col_6",
+               Max(cd_dep_count) AS "_col_7",
                cd_dep_employed_count,
                Count(*) cnt2,
-               Stddev_samp(cd_dep_employed_count),
-               Avg(cd_dep_employed_count),
-               Max(cd_dep_employed_count),
+               Stddev_samp(cd_dep_employed_count) AS "_col_10",
+               Avg(cd_dep_employed_count) AS "_col_11",
+               Max(cd_dep_employed_count) AS "_col_12",
                cd_dep_college_count,
                Count(*) cnt3,
-               Stddev_samp(cd_dep_college_count),
-               Avg(cd_dep_college_count),
-               Max(cd_dep_college_count)
+               Stddev_samp(cd_dep_college_count) AS "_col_15",
+               Avg(cd_dep_college_count) AS "_col_16",
+               Max(cd_dep_college_count) AS "_col_17"
 FROM   customer c,
        customer_address ca,
        customer_demographics
@@ -4495,8 +4530,8 @@ JOIN "inventory" AS "inventory"
   AND "inventory"."inv_quantity_on_hand" >= 100
 JOIN "date_dim" AS "date_dim"
   ON "date_dim"."d_date_sk" = "inventory"."inv_date_sk"
-  AND CAST("date_dim"."d_date" AS DATE) <= CAST('1999-05-05' AS DATE)
-  AND CAST("date_dim"."d_date" AS DATE) >= CAST('1999-03-06' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) <= CAST('1999-05-05' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('1999-03-06' AS DATE)
 WHERE
   "item"."i_current_price" <= 50
   AND "item"."i_current_price" >= 20
@@ -4512,7 +4547,8 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 38
 --------------------------------------
-SELECT Count(*)
+# execute: true
+SELECT Count(*) AS "_col_0"
 FROM   (SELECT DISTINCT c_last_name,
                         c_first_name,
                         d_date
@@ -4771,8 +4807,8 @@ LEFT JOIN "catalog_returns" AS "catalog_returns"
   AND "catalog_returns"."cr_order_number" = "catalog_sales"."cs_order_number"
 JOIN "date_dim" AS "date_dim"
   ON "catalog_sales"."cs_sold_date_sk" = "date_dim"."d_date_sk"
-  AND CAST("date_dim"."d_date" AS DATE) <= CAST('2002-07-01' AS DATE)
-  AND CAST("date_dim"."d_date" AS DATE) >= CAST('2002-05-02' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) <= CAST('2002-07-01' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('2002-05-02' AS DATE)
 JOIN "item" AS "item"
   ON "catalog_sales"."cs_item_sk" = "item"."i_item_sk"
   AND "item"."i_current_price" <= 1.49
@@ -4980,10 +5016,11 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 42
 --------------------------------------
+# execute: true
 SELECT dt.d_year,
                item.i_category_id,
                item.i_category,
-               Sum(ss_ext_sales_price)
+               Sum(ss_ext_sales_price) AS "_col_3"
 FROM   date_dim dt,
        store_sales,
        item
@@ -5132,7 +5169,8 @@ FROM "date_dim" AS "date_dim"
 JOIN "store_sales" AS "store_sales"
   ON "date_dim"."d_date_sk" = "store_sales"."ss_sold_date_sk"
 JOIN "store" AS "store"
-  ON "store"."s_gmt_offset" = -5 AND "store"."s_store_sk" = "store_sales"."ss_store_sk"
+  ON "store"."s_gmt_offset" = -5
+  AND "store"."s_store_sk" = "store_sales"."ss_store_sk"
 WHERE
   "date_dim"."d_year" = 2002
 GROUP BY
@@ -5266,9 +5304,10 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 45
 --------------------------------------
+# execute: true
 SELECT ca_zip,
                ca_state,
-               Sum(ws_sales_price)
+               Sum(ws_sales_price) AS "_col_2"
 FROM   web_sales,
        customer,
        customer_address,
@@ -5333,6 +5372,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 46
 --------------------------------------
+# execute: true
 SELECT c_last_name,
                c_first_name,
                ca_city,
@@ -5524,10 +5564,14 @@ WITH "v1" AS (
       "date_dim"."d_moy" = 1 OR "date_dim"."d_year" = 1998 OR "date_dim"."d_year" = 1999
     )
     AND (
-      "date_dim"."d_moy" = 12 OR "date_dim"."d_year" = 1999 OR "date_dim"."d_year" = 2000
+      "date_dim"."d_moy" = 12
+      OR "date_dim"."d_year" = 1999
+      OR "date_dim"."d_year" = 2000
     )
     AND (
-      "date_dim"."d_year" = 1998 OR "date_dim"."d_year" = 1999 OR "date_dim"."d_year" = 2000
+      "date_dim"."d_year" = 1998
+      OR "date_dim"."d_year" = 1999
+      OR "date_dim"."d_year" = 2000
     )
   JOIN "store" AS "store"
     ON "store"."s_store_sk" = "store_sales"."ss_store_sk"
@@ -5576,7 +5620,8 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 48
 --------------------------------------
-SELECT Sum (ss_quantity)
+# execute: true
+SELECT Sum (ss_quantity) AS "_col_0"
 FROM   store_sales,
        store,
        customer_demographics,
@@ -5919,6 +5964,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 50
 --------------------------------------
+# execute: true
 SELECT s_store_name,
                s_company_id,
                s_street_number,
@@ -6811,10 +6857,14 @@ WITH "v1" AS (
       "date_dim"."d_moy" = 1 OR "date_dim"."d_year" = 1999 OR "date_dim"."d_year" = 2000
     )
     AND (
-      "date_dim"."d_moy" = 12 OR "date_dim"."d_year" = 2000 OR "date_dim"."d_year" = 2001
+      "date_dim"."d_moy" = 12
+      OR "date_dim"."d_year" = 2000
+      OR "date_dim"."d_year" = 2001
     )
     AND (
-      "date_dim"."d_year" = 1999 OR "date_dim"."d_year" = 2000 OR "date_dim"."d_year" = 2001
+      "date_dim"."d_year" = 1999
+      OR "date_dim"."d_year" = 2000
+      OR "date_dim"."d_year" = 2001
     )
   GROUP BY
     "item"."i_category",
@@ -7056,6 +7106,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 59
 --------------------------------------
+# execute: true
 WITH wss
      AS (SELECT d_week_seq,
                 ss_store_sk,
@@ -7095,13 +7146,13 @@ WITH wss
 SELECT s_store_name1,
                s_store_id1,
                d_week_seq1,
-               sun_sales1 / sun_sales2,
-               mon_sales1 / mon_sales2,
-               tue_sales1 / tue_sales2,
-               wed_sales1 / wed_sales2,
-               thu_sales1 / thu_sales2,
-               fri_sales1 / fri_sales2,
-               sat_sales1 / sat_sales2
+               sun_sales1 / sun_sales2 AS "_col_3",
+               mon_sales1 / mon_sales2 AS "_col_4",
+               tue_sales1 / tue_sales2 AS "_col_5",
+               wed_sales1 / wed_sales2 AS "_col_6",
+               thu_sales1 / thu_sales2 AS "_col_7",
+               fri_sales1 / fri_sales2 AS "_col_8",
+               sat_sales1 / sat_sales2 AS "_col_9"
 FROM   (SELECT s_store_name   s_store_name1,
                wss.d_week_seq d_week_seq1,
                s_store_id     s_store_id1,
@@ -7553,7 +7604,8 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 62
 --------------------------------------
-SELECT Substr(w_warehouse_name, 1, 20),
+# execute: true
+SELECT Substr(w_warehouse_name, 1, 20) AS "_col_0",
                sm_type,
                web_name,
                Sum(CASE
@@ -8132,6 +8184,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 66
 --------------------------------------
+# execute: true
 SELECT w_warehouse_name,
                w_warehouse_sq_ft,
                w_city,
@@ -9038,6 +9091,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 68
 --------------------------------------
+# execute: true
 SELECT c_last_name,
                c_first_name,
                ca_city,
@@ -9580,6 +9634,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 73
 --------------------------------------
+# execute: true
 SELECT c_last_name,
        c_first_name,
        c_salutation,
@@ -9667,6 +9722,7 @@ ORDER BY
 --------------------------------------
 -- TPC-DS 74
 --------------------------------------
+# execute: true
 WITH year_total
      AS (SELECT c_customer_id    customer_id,
                 c_first_name     customer_first_name,
@@ -9826,6 +9882,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 75
 --------------------------------------
+# execute: true
 WITH all_sales
      AS (SELECT d_year,
                 i_brand_id,
@@ -10030,6 +10087,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 76
 --------------------------------------
+# execute: true
 SELECT channel,
                col_name,
                d_year,
@@ -10280,8 +10338,8 @@ WITH "date_dim_2" AS (
     "date_dim"."d_date" AS "d_date"
   FROM "date_dim" AS "date_dim"
   WHERE
-    CAST("date_dim"."d_date" AS DATE) <= CAST('2001-09-15' AS DATE)
-    AND CAST("date_dim"."d_date" AS DATE) >= CAST('2001-08-16' AS DATE)
+    CAST("date_dim"."d_date" AS DATETIME) <= CAST('2001-09-15' AS DATE)
+    AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('2001-08-16' AS DATE)
 ), "store_2" AS (
   SELECT
     "store"."s_store_sk" AS "s_store_sk"
@@ -10407,6 +10465,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 78
 --------------------------------------
+# execute: true
 WITH ws
      AS (SELECT d_year                 AS ws_sold_year,
                 ws_item_sk,
@@ -10596,9 +10655,10 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 79
 --------------------------------------
+# execute: true
 SELECT c_last_name,
                c_first_name,
-               Substr(s_city, 1, 30),
+               Substr(s_city, 1, 30) AS "_col_2",
                ss_ticket_number,
                amt,
                profit
@@ -10788,8 +10848,8 @@ WITH "date_dim_2" AS (
     "date_dim"."d_date" AS "d_date"
   FROM "date_dim" AS "date_dim"
   WHERE
-    CAST("date_dim"."d_date" AS DATE) <= CAST('2000-09-25' AS DATE)
-    AND CAST("date_dim"."d_date" AS DATE) >= CAST('2000-08-26' AS DATE)
+    CAST("date_dim"."d_date" AS DATETIME) <= CAST('2000-09-25' AS DATE)
+    AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('2000-08-26' AS DATE)
 ), "item_2" AS (
   SELECT
     "item"."i_item_sk" AS "i_item_sk",
@@ -10909,6 +10969,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 81
 --------------------------------------
+# execute: true
 WITH customer_total_return
      AS (SELECT cr_returning_customer_sk   AS ctr_customer_sk,
                 ca_state                   AS ctr_state,
@@ -11068,8 +11129,8 @@ JOIN "store_sales" AS "store_sales"
   ON "item"."i_item_sk" = "store_sales"."ss_item_sk"
 JOIN "date_dim" AS "date_dim"
   ON "date_dim"."d_date_sk" = "inventory"."inv_date_sk"
-  AND CAST("date_dim"."d_date" AS DATE) <= CAST('1998-06-26' AS DATE)
-  AND CAST("date_dim"."d_date" AS DATE) >= CAST('1998-04-27' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) <= CAST('1998-06-26' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('1998-04-27' AS DATE)
 WHERE
   "item"."i_current_price" <= 93
   AND "item"."i_current_price" >= 63
@@ -11329,10 +11390,11 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 85
 --------------------------------------
-SELECT Substr(r_reason_desc, 1, 20),
-               Avg(ws_quantity),
-               Avg(wr_refunded_cash),
-               Avg(wr_fee)
+# execute: true
+SELECT Substr(r_reason_desc, 1, 20) AS "_col_0",
+               Avg(ws_quantity) AS "_col_1",
+               Avg(wr_refunded_cash) AS "_col_2",
+               Avg(wr_fee) AS "_col_3"
 FROM   web_sales,
        web_returns,
        web_page,
@@ -11387,7 +11449,8 @@ SELECT
   AVG("web_returns"."wr_fee") AS "_col_3"
 FROM "web_sales" AS "web_sales"
 JOIN "date_dim" AS "date_dim"
-  ON "date_dim"."d_date_sk" = "web_sales"."ws_sold_date_sk" AND "date_dim"."d_year" = 2001
+  ON "date_dim"."d_date_sk" = "web_sales"."ws_sold_date_sk"
+  AND "date_dim"."d_year" = 2001
 JOIN "web_page" AS "web_page"
   ON "web_page"."wp_web_page_sk" = "web_sales"."ws_web_page_sk"
 JOIN "web_returns" AS "web_returns"
@@ -11509,7 +11572,8 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 87
 --------------------------------------
-select count(*)
+# execute: true
+select count(*) as "_col_0"
 from ((select distinct c_last_name, c_first_name, d_date
        from store_sales, date_dim, customer
        where store_sales.ss_sold_date_sk = date_dim.d_date_sk
@@ -12020,10 +12084,11 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 91
 --------------------------------------
-SELECT cc_call_center_id Call_Center,
-       cc_name           Call_Center_Name,
-       cc_manager        Manager,
-       Sum(cr_net_loss)  Returns_Loss
+# execute: true
+SELECT cc_call_center_id call_center,
+       cc_name           call_center_name,
+       cc_manager        manager,
+       Sum(cr_net_loss)  returns_loss
 FROM   call_center,
        catalog_returns,
        date_dim,
@@ -12135,7 +12200,7 @@ WITH "web_sales_2" AS (
   FROM "date_dim" AS "date_dim"
   WHERE
     "date_dim"."d_date" >= '2002-03-29'
-    AND CAST("date_dim"."d_date" AS DATE) <= CAST('2002-06-27' AS DATE)
+    AND CAST("date_dim"."d_date" AS DATETIME) <= CAST('2002-06-27' AS DATE)
 ), "_u_0" AS (
   SELECT
     1.3 * AVG("web_sales"."ws_ext_discount_amt") AS "_col_0",
@@ -12276,14 +12341,14 @@ JOIN "date_dim" AS "date_dim"
   AND "date_dim"."d_date_sk" = "ws1"."ws_ship_date_sk"
   AND (
     CAST('2000-3-01' AS DATE) + INTERVAL '60' DAY
-  ) >= CAST("date_dim"."d_date" AS DATE)
+  ) >= CAST("date_dim"."d_date" AS DATETIME)
 JOIN "web_site" AS "web_site"
   ON "web_site"."web_company_name" = 'pri'
   AND "web_site"."web_site_sk" = "ws1"."ws_web_site_sk"
 WHERE
   "_u_3"."_u_4" IS NULL
-  AND NOT "_u_0"."_u_1" IS NULL
   AND ARRAY_ANY("_u_0"."_u_2", "_x" -> "ws1"."ws_warehouse_sk" <> "_x")
+  AND NOT "_u_0"."_u_1" IS NULL
 ORDER BY
   COUNT(DISTINCT "ws1"."ws_order_number")
 LIMIT 100;
@@ -12366,7 +12431,7 @@ JOIN "date_dim" AS "date_dim"
   AND "date_dim"."d_date_sk" = "ws1"."ws_ship_date_sk"
   AND (
     CAST('2000-4-01' AS DATE) + INTERVAL '60' DAY
-  ) >= CAST("date_dim"."d_date" AS DATE)
+  ) >= CAST("date_dim"."d_date" AS DATETIME)
 JOIN "web_site" AS "web_site"
   ON "web_site"."web_company_name" = 'pri'
   AND "web_site"."web_site_sk" = "ws1"."ws_web_site_sk"
@@ -12379,7 +12444,8 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 96
 --------------------------------------
-SELECT Count(*)
+# execute: true
+SELECT Count(*) AS "_col_0"
 FROM   store_sales,
        household_demographics,
        time_dim,
@@ -12400,7 +12466,8 @@ JOIN "household_demographics" AS "household_demographics"
   ON "household_demographics"."hd_demo_sk" = "store_sales"."ss_hdemo_sk"
   AND "household_demographics"."hd_dep_count" = 7
 JOIN "store" AS "store"
-  ON "store"."s_store_name" = 'ese' AND "store"."s_store_sk" = "store_sales"."ss_store_sk"
+  ON "store"."s_store_name" = 'ese'
+  AND "store"."s_store_sk" = "store_sales"."ss_store_sk"
 JOIN "time_dim" AS "time_dim"
   ON "store_sales"."ss_sold_time_sk" = "time_dim"."t_time_sk"
   AND "time_dim"."t_hour" = 15
@@ -12412,6 +12479,7 @@ LIMIT 100;
 --------------------------------------
 -- TPC-DS 97
 --------------------------------------
+# execute: true
 WITH ssci
      AS (SELECT ss_customer_sk customer_sk,
                 ss_item_sk     item_sk
@@ -12502,7 +12570,8 @@ SELECT
   ) AS "store_and_catalog"
 FROM "ssci" AS "ssci"
 FULL JOIN "csci" AS "csci"
-  ON "csci"."customer_sk" = "ssci"."customer_sk" AND "csci"."item_sk" = "ssci"."item_sk"
+  ON "csci"."customer_sk" = "ssci"."customer_sk"
+  AND "csci"."item_sk" = "ssci"."item_sk"
 LIMIT 100;
 
 --------------------------------------
@@ -12546,8 +12615,8 @@ SELECT
 FROM "store_sales" AS "store_sales"
 JOIN "date_dim" AS "date_dim"
   ON "date_dim"."d_date_sk" = "store_sales"."ss_sold_date_sk"
-  AND CAST("date_dim"."d_date" AS DATE) <= CAST('2000-06-17' AS DATE)
-  AND CAST("date_dim"."d_date" AS DATE) >= CAST('2000-05-18' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) <= CAST('2000-06-17' AS DATE)
+  AND CAST("date_dim"."d_date" AS DATETIME) >= CAST('2000-05-18' AS DATE)
 JOIN "item" AS "item"
   ON "item"."i_category" IN ('Men', 'Home', 'Electronics')
   AND "item"."i_item_sk" = "store_sales"."ss_item_sk"
@@ -12567,7 +12636,8 @@ ORDER BY
 --------------------------------------
 -- TPC-DS 99
 --------------------------------------
-SELECT Substr(w_warehouse_name, 1, 20),
+# execute: true
+SELECT Substr(w_warehouse_name, 1, 20) AS "_col_0",
                sm_type,
                cc_name,
                Sum(CASE