You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by so...@apache.org on 2023/10/02 15:17:23 UTC
[druid] branch master updated: Correct quotation in drill query files (#15044)
This is an automated email from the ASF dual-hosted git repository.
soumyava pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 2785e062d72 Correct quotation in drill query files (#15044)
2785e062d72 is described below
commit 2785e062d72858c5cb7d7042db38053efa49b1b8
Author: Zoltan Haindrich <zo...@imply.io>
AuthorDate: Mon Oct 2 17:17:15 2023 +0200
Correct quotation in drill query files (#15044)
---
sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_3.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_4.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_1.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_10.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_4.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_6.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_8.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/winFnQry_76.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/winFnQry_77.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_1.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_10.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_11.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_12.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_13.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_14.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_15.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_16.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_17.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_18.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_19.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_2.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_20.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_21.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_22.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_23.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_24.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_25.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_26.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_3.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_4.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_5.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_6.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_7.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_8.q | 2 +-
sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_9.q | 2 +-
sql/src/test/resources/drill/window/queries/first_val/firstValFn_18.q | 2 +-
sql/src/test/resources/drill/window/queries/first_val/firstValFn_19.q | 2 +-
sql/src/test/resources/drill/window/queries/first_val/firstValFn_21.q | 2 +-
sql/src/test/resources/drill/window/queries/first_val/firstValFn_22.q | 2 +-
sql/src/test/resources/drill/window/queries/first_val/firstValFn_24.q | 2 +-
sql/src/test/resources/drill/window/queries/first_val/firstValFn_25.q | 2 +-
sql/src/test/resources/drill/window/queries/first_val/firstValFn_32.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_26.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_27.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_28.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_41.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_42.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_43.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_44.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_45.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_46.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_47.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_48.q | 2 +-
.../drill/window/queries/frameclause/subQueries/frmInSubQry_49.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_100.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_102.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_103.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_109.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_111.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_112.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_17.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_41.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_42.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_45.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_62.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_63.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_64.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_65.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_70.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_71.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_77.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_96.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_97.q | 2 +-
sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_99.q | 2 +-
sql/src/test/resources/drill/window/queries/last_val/lastValFn_18.q | 2 +-
sql/src/test/resources/drill/window/queries/last_val/lastValFn_19.q | 2 +-
sql/src/test/resources/drill/window/queries/last_val/lastValFn_21.q | 2 +-
sql/src/test/resources/drill/window/queries/last_val/lastValFn_22.q | 2 +-
sql/src/test/resources/drill/window/queries/last_val/lastValFn_24.q | 2 +-
sql/src/test/resources/drill/window/queries/last_val/lastValFn_25.q | 2 +-
sql/src/test/resources/drill/window/queries/last_val/lastValFn_33.q | 2 +-
sql/src/test/resources/drill/window/queries/last_val/lastValFn_37.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_104.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_106.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_107.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_17.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_27.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_36.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_45.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_63.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_64.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_65.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_70.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_71.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_8.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_9.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_91.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_92.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_94.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_95.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_97.q | 2 +-
sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_98.q | 2 +-
sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_01.q | 2 +-
sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_02.q | 2 +-
sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_03.q | 2 +-
sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_04.q | 2 +-
sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_57.q | 2 +-
sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_58.q | 2 +-
108 files changed, 108 insertions(+), 108 deletions(-)
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_3.q b/sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_3.q
index 64ce6db2bda..42973e2b564 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_3.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_3.q
@@ -1 +1 @@
-SELECT * FROM (SELECT c1, c2, LEAD(c2) OVER ( PARTITION BY c2 ORDER BY c1) LEAD_c2, NTILE(3) OVER ( PARTITION BY c2 ORDER BY c1) tile FROM "tblWnulls.parquet") sub_query WHERE LEAD_c2 ="e" ORDER BY tile, c1
\ No newline at end of file
+SELECT * FROM (SELECT c1, c2, LEAD(c2) OVER ( PARTITION BY c2 ORDER BY c1) LEAD_c2, NTILE(3) OVER ( PARTITION BY c2 ORDER BY c1) tile FROM "tblWnulls.parquet") sub_query WHERE LEAD_c2 ='e' ORDER BY tile, c1
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_4.q b/sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_4.q
index 373e9426d8e..bb4a2628ee6 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_4.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/aggOWnFn_4.q
@@ -1 +1 @@
-SELECT * FROM (SELECT c1, c2, lag(c2) OVER ( PARTITION BY c2 ORDER BY c1) lag_c2, NTILE(3) OVER ( PARTITION BY c2 ORDER BY c1) tile FROM "tblWnulls.parquet") sub_query WHERE lag_c2 = "e" ORDER BY tile, c1
\ No newline at end of file
+SELECT * FROM (SELECT c1, c2, lag(c2) OVER ( PARTITION BY c2 ORDER BY c1) lag_c2, NTILE(3) OVER ( PARTITION BY c2 ORDER BY c1) tile FROM "tblWnulls.parquet") sub_query WHERE lag_c2 = 'e' ORDER BY tile, c1
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_1.q b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_1.q
index 6c2b29510ce..de46063dd9a 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_1.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_1.q
@@ -1 +1 @@
-SELECT col_vchar_52, col_int, RANK () OVER (PARTITION BY col_vchar_52 order by col_int) rnk FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT col_vchar_52, col_int, RANK () OVER (PARTITION BY col_vchar_52 order by col_int) rnk FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_10.q b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_10.q
index f69a97ab13b..e68f9afb88d 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_10.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_10.q
@@ -1 +1 @@
-SELECT col_vchar_52, col_int, CUME_DIST () OVER (PARTITION BY col_vchar_52 order by col_int) cumeDist FROM "smlTbl.parquet" WHERE col_vchar_52 = "GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI"
\ No newline at end of file
+SELECT col_vchar_52, col_int, CUME_DIST () OVER (PARTITION BY col_vchar_52 order by col_int) cumeDist FROM "smlTbl.parquet" WHERE col_vchar_52 = 'GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_4.q b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_4.q
index 033a6068155..bf9212d48bc 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_4.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_4.q
@@ -1 +1 @@
-SELECT col_vchar_52, col_int, ROW_NUMBER () OVER (PARTITION BY col_vchar_52 order by col_int) row_numbr FROM "smlTbl.parquet" WHERE col_vchar_52 = "DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF"
\ No newline at end of file
+SELECT col_vchar_52, col_int, ROW_NUMBER () OVER (PARTITION BY col_vchar_52 order by col_int) row_numbr FROM "smlTbl.parquet" WHERE col_vchar_52 = 'DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_6.q b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_6.q
index 7fd68cb2832..c2634122ace 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_6.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_6.q
@@ -1 +1 @@
-SELECT col_vchar_52, col_int, DENSE_RANK () OVER (PARTITION BY col_vchar_52 order by col_int) dense_rnk FROM "smlTbl.parquet" WHERE col_vchar_52 = "DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF"
\ No newline at end of file
+SELECT col_vchar_52, col_int, DENSE_RANK () OVER (PARTITION BY col_vchar_52 order by col_int) dense_rnk FROM "smlTbl.parquet" WHERE col_vchar_52 = 'DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_8.q b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_8.q
index 36610aac30a..967c81a2682 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_8.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wPrtnOrdrBy_8.q
@@ -1 +1 @@
-SELECT col_vchar_52, col_int, PERCENT_RANK () OVER (PARTITION BY col_vchar_52 order by col_int) prcnt_rank FROM "smlTbl.parquet" WHERE col_vchar_52 = "GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI"
\ No newline at end of file
+SELECT col_vchar_52, col_int, PERCENT_RANK () OVER (PARTITION BY col_vchar_52 order by col_int) prcnt_rank FROM "smlTbl.parquet" WHERE col_vchar_52 = 'GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/winFnQry_76.q b/sql/src/test/resources/drill/window/queries/aggregates/winFnQry_76.q
index 25fab14036d..95aa1ada779 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/winFnQry_76.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/winFnQry_76.q
@@ -1 +1 @@
-select c1, c2, count ( c1 ) over ( partition by c2 order by c1 asc nulls first ) w_count from "tblWnulls.parquet" where c2 not in ("a","b","c")
+select c1, c2, count ( c1 ) over ( partition by c2 order by c1 asc nulls first ) w_count from "tblWnulls.parquet" where c2 not in ('a','b','c')
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/winFnQry_77.q b/sql/src/test/resources/drill/window/queries/aggregates/winFnQry_77.q
index d98df373280..ef28ca2cda5 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/winFnQry_77.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/winFnQry_77.q
@@ -1 +1 @@
-select c1, c2, count ( c1 ) over ( partition by c2 order by c1 asc nulls first ) w_count from "tblWnulls.parquet" where c2 in ("a","b","c")
+select c1, c2, count ( c1 ) over ( partition by c2 order by c1 asc nulls first ) w_count from "tblWnulls.parquet" where c2 in ('a','b','c')
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_1.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_1.q
index 3adc813067e..ce0f78f7af3 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_1.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_1.q
@@ -1 +1 @@
-SELECT MAX(col_int) OVER(PARTITION BY col_vchar_52) max_int, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT MAX(col_int) OVER(PARTITION BY col_vchar_52) max_int, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_10.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_10.q
index 888619c02a0..d1424500da1 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_10.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_10.q
@@ -1 +1 @@
-SELECT COUNT(col_int) OVER (PARTITION BY col_char_2) count_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI"
\ No newline at end of file
+SELECT COUNT(col_int) OVER (PARTITION BY col_char_2) count_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_11.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_11.q
index 25c7332c656..594cbb86836 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_11.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_11.q
@@ -1 +1 @@
-SELECT AVG(col_int) OVER (PARTITION BY col_char_2) avg_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI"
\ No newline at end of file
+SELECT AVG(col_int) OVER (PARTITION BY col_char_2) avg_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_12.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_12.q
index 4fe298c0021..59017b020a1 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_12.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_12.q
@@ -1 +1 @@
-SELECT MAX(col_int) OVER (PARTITION BY col_tmstmp) max_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ"
\ No newline at end of file
+SELECT MAX(col_int) OVER (PARTITION BY col_tmstmp) max_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_13.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_13.q
index b5d67cbe50c..7fc2d3cab35 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_13.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_13.q
@@ -1 +1 @@
-SELECT MIN(col_int) OVER (PARTITION BY col_tmstmp) min_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ"
\ No newline at end of file
+SELECT MIN(col_int) OVER (PARTITION BY col_tmstmp) min_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_14.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_14.q
index 000820b3c70..674cbde0490 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_14.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_14.q
@@ -1 +1 @@
-SELECT SUM(col_int) OVER (PARTITION BY col_tmstmp) sum_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ"
\ No newline at end of file
+SELECT SUM(col_int) OVER (PARTITION BY col_tmstmp) sum_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_15.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_15.q
index 6ff96f7ae8e..6bc433208d4 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_15.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_15.q
@@ -1 +1 @@
-SELECT COUNT(col_int) OVER (PARTITION BY col_tmstmp) count_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ"
\ No newline at end of file
+SELECT COUNT(col_int) OVER (PARTITION BY col_tmstmp) count_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_16.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_16.q
index f183a0b6cd2..e1aa46e3367 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_16.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_16.q
@@ -1 +1 @@
-SELECT AVG(col_int) OVER (PARTITION BY col_tmstmp) avg_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ"
\ No newline at end of file
+SELECT AVG(col_int) OVER (PARTITION BY col_tmstmp) avg_int, col_tmstmp, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'HXXXXXXXXXXXXXXXXXXXXXXXXXIXXXXXXXXXXXXXXXXXXXXXXXXJ'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_17.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_17.q
index b3d7f7bc2a6..7ceb8a1114b 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_17.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_17.q
@@ -1 +1 @@
-SELECT MAX(col_int) OVER (PARTITION BY col_tm) max_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT MAX(col_int) OVER (PARTITION BY col_tm) max_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_18.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_18.q
index 4b905b88e9e..55d5f6c09e2 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_18.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_18.q
@@ -1 +1 @@
-SELECT MIN(col_int) OVER (PARTITION BY col_tm) min_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT MIN(col_int) OVER (PARTITION BY col_tm) min_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_19.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_19.q
index de7e2efdd34..24c1e5c3867 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_19.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_19.q
@@ -1 +1 @@
-SELECT SUM(col_int) OVER (PARTITION BY col_tm) sum_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT SUM(col_int) OVER (PARTITION BY col_tm) sum_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_2.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_2.q
index 1715c2f90a0..88b7034bd14 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_2.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_2.q
@@ -1 +1 @@
-SELECT MAX(col_int) OVER (PARTITION BY col_vchar_52) max_int, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF"
\ No newline at end of file
+SELECT MAX(col_int) OVER (PARTITION BY col_vchar_52) max_int, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_20.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_20.q
index fa8077b7ffb..07a407e7fab 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_20.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_20.q
@@ -1 +1 @@
-SELECT COUNT(col_int) OVER (PARTITION BY col_tm) count_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT COUNT(col_int) OVER (PARTITION BY col_tm) count_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_21.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_21.q
index f8cfed992a8..bd19b721086 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_21.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_21.q
@@ -1 +1 @@
-SELECT AVG(col_int) OVER (PARTITION BY col_tm) avg_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT AVG(col_int) OVER (PARTITION BY col_tm) avg_int, col_tm, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_22.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_22.q
index e0ce9ebf1ae..c46007086fd 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_22.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_22.q
@@ -1 +1 @@
-SELECT MAX(col_int) OVER (PARTITION BY col_dt) max_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT MAX(col_int) OVER (PARTITION BY col_dt) max_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_23.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_23.q
index 6705d797618..63798abbe5f 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_23.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_23.q
@@ -1 +1 @@
-SELECT MIN(col_int) OVER (PARTITION BY col_dt) min_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT MIN(col_int) OVER (PARTITION BY col_dt) min_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_24.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_24.q
index 9d3a151536b..696601b9e2a 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_24.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_24.q
@@ -1 +1 @@
-SELECT SUM(col_int) OVER (PARTITION BY col_dt) sum_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT SUM(col_int) OVER (PARTITION BY col_dt) sum_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_25.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_25.q
index 773ec577c75..cd0f1356bc4 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_25.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_25.q
@@ -1 +1 @@
-SELECT COUNT(col_int) OVER (PARTITION BY col_dt) count_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT COUNT(col_int) OVER (PARTITION BY col_dt) count_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_26.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_26.q
index ca275b17471..8de143ea599 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_26.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_26.q
@@ -1 +1 @@
-SELECT AVG(col_int) OVER (PARTITION BY col_dt) avg_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB"
\ No newline at end of file
+SELECT AVG(col_int) OVER (PARTITION BY col_dt) avg_int, col_dt, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_3.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_3.q
index f7b2bf9a51a..f1b85cad55b 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_3.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_3.q
@@ -1 +1 @@
-SELECT MIN(col_int) OVER (PARTITION BY col_vchar_52) min_int, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF"
\ No newline at end of file
+SELECT MIN(col_int) OVER (PARTITION BY col_vchar_52) min_int, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_4.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_4.q
index 57b844ab5bf..a0c1662e390 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_4.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_4.q
@@ -1 +1 @@
-SELECT SUM(col_int) OVER (PARTITION BY col_vchar_52) sum_int, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF"
\ No newline at end of file
+SELECT SUM(col_int) OVER (PARTITION BY col_vchar_52) sum_int, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_5.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_5.q
index 0d6d1ce55e6..e35abc45fa3 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_5.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_5.q
@@ -1 +1 @@
-SELECT COUNT(col_int) OVER (PARTITION BY col_vchar_52)count_int ,col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF"
\ No newline at end of file
+SELECT COUNT(col_int) OVER (PARTITION BY col_vchar_52)count_int ,col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_6.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_6.q
index b551f93b77a..838c0c38e43 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_6.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_6.q
@@ -1 +1 @@
-SELECT AVG(col_int) OVER (PARTITION BY col_vchar_52) count_avg, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF"
\ No newline at end of file
+SELECT AVG(col_int) OVER (PARTITION BY col_vchar_52) count_avg, col_vchar_52, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'DXXXXXXXXXXXXXXXXXXXXXXXXXEXXXXXXXXXXXXXXXXXXXXXXXXF'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_7.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_7.q
index 5d750a2b8d5..6ea33e206ab 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_7.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_7.q
@@ -1 +1 @@
-SELECT MAX(col_int) OVER (PARTITION BY col_char_2) max_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI"
\ No newline at end of file
+SELECT MAX(col_int) OVER (PARTITION BY col_char_2) max_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_8.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_8.q
index af94de43558..f2b96991964 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_8.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_8.q
@@ -1 +1 @@
-SELECT MIN(col_int) OVER (PARTITION BY col_char_2) min_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI"
\ No newline at end of file
+SELECT MIN(col_int) OVER (PARTITION BY col_char_2) min_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_9.q b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_9.q
index 142344ddf32..65b04a05a14 100644
--- a/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_9.q
+++ b/sql/src/test/resources/drill/window/queries/aggregates/wo_OrdrBy_9.q
@@ -1 +1 @@
-SELECT SUM(col_int) OVER (PARTITION BY col_char_2) sum_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = "GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI"
\ No newline at end of file
+SELECT SUM(col_int) OVER (PARTITION BY col_char_2) sum_int, col_char_2, col_int FROM "smlTbl.parquet" WHERE col_vchar_52 = 'GXXXXXXXXXXXXXXXXXXXXXXXXXHXXXXXXXXXXXXXXXXXXXXXXXXI'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_18.q b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_18.q
index d2f68c4b649..22e352b6b3b 100644
--- a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_18.q
+++ b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_18.q
@@ -1 +1 @@
-SELECT col7 , col4, FIRST_VALUE(col4) OVER(PARTITION BY col7 ORDER BY col4) FIRST_VALUE_col4 FROM "allTypsUniq.parquet" WHERE col4 IN ("20:20:20.300" , "19:24:45.200" , "23:45:35.120" , "23:23:30.222" , "16:35:45.100" , "10:59:58.119" , "15:20:30.230")
\ No newline at end of file
+SELECT col7 , col4, FIRST_VALUE(col4) OVER(PARTITION BY col7 ORDER BY col4) FIRST_VALUE_col4 FROM "allTypsUniq.parquet" WHERE col4 IN ('20:20:20.300' , '19:24:45.200' , '23:45:35.120' , '23:23:30.222' , '16:35:45.100' , '10:59:58.119' , '15:20:30.230')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_19.q b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_19.q
index e6e360c66e4..49d90aca76b 100644
--- a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_19.q
+++ b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_19.q
@@ -1 +1 @@
-SELECT col7 , col4, FIRST_VALUE(col4) OVER(PARTITION BY col7 ORDER BY col4) FIRST_VALUE_col4 FROM "allTypsUniq.parquet" WHERE col4 NOT IN ("20:20:20.300" , "19:24:45.200" , "23:45:35.120" , "23:23:30.222" , "16:35:45.100" , "10:59:58.119" , "15:20:30.230")
\ No newline at end of file
+SELECT col7 , col4, FIRST_VALUE(col4) OVER(PARTITION BY col7 ORDER BY col4) FIRST_VALUE_col4 FROM "allTypsUniq.parquet" WHERE col4 NOT IN ('20:20:20.300' , '19:24:45.200' , '23:45:35.120' , '23:23:30.222' , '16:35:45.100' , '10:59:58.119' , '15:20:30.230')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_21.q b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_21.q
index bae2c340b00..a1c109d04e6 100644
--- a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_21.q
+++ b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_21.q
@@ -1 +1 @@
-SELECT col7 , col5, FIRST_VALUE(col5) OVER(PARTITION BY col7 ORDER BY col5) FIRST_VALUE_col5 FROM "allTypsUniq.parquet" WHERE col5 >= "1947-07-02 00:28:02.418" AND col5 < "2011-06-02 00:28:02.218"
\ No newline at end of file
+SELECT col7 , col5, FIRST_VALUE(col5) OVER(PARTITION BY col7 ORDER BY col5) FIRST_VALUE_col5 FROM "allTypsUniq.parquet" WHERE col5 >= '1947-07-02 00:28:02.418' AND col5 < '2011-06-02 00:28:02.218'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_22.q b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_22.q
index e076f16e439..6a602215beb 100644
--- a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_22.q
+++ b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_22.q
@@ -1 +1 @@
-SELECT col7 , col5, FIRST_VALUE(col5) OVER(PARTITION BY col7 ORDER BY col5) FIRST_VALUE_col5 FROM "allTypsUniq.parquet" WHERE col5 IN ( "1947-07-02 00:28:02.418" , "2011-06-02 00:28:02.218" , "1950-08-02 00:28:02.111" , "2012-06-02 00:28:02.418" , "1985-04-02 00:28:02.638")
\ No newline at end of file
+SELECT col7 , col5, FIRST_VALUE(col5) OVER(PARTITION BY col7 ORDER BY col5) FIRST_VALUE_col5 FROM "allTypsUniq.parquet" WHERE col5 IN ( '1947-07-02 00:28:02.418' , '2011-06-02 00:28:02.218' , '1950-08-02 00:28:02.111' , '2012-06-02 00:28:02.418' , '1985-04-02 00:28:02.638')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_24.q b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_24.q
index 7e83fe7a0c6..c12506aceeb 100644
--- a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_24.q
+++ b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_24.q
@@ -1 +1 @@
-SELECT col7 , col6, FIRST_VALUE(col6) OVER(PARTITION BY col7 ORDER BY col6) FIRST_VALUE_col6 FROM "allTypsUniq.parquet" WHERE col6 > "1947-05-12" AND col6 < "2007-10-01"
\ No newline at end of file
+SELECT col7 , col6, FIRST_VALUE(col6) OVER(PARTITION BY col7 ORDER BY col6) FIRST_VALUE_col6 FROM "allTypsUniq.parquet" WHERE col6 > '1947-05-12' AND col6 < '2007-10-01'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_25.q b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_25.q
index 40a50d1bc4e..c70a2a430b6 100644
--- a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_25.q
+++ b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_25.q
@@ -1 +1 @@
-SELECT col7 , col6 , FIRST_VALUE(col6) OVER(PARTITION BY col7 ORDER BY col6) FIRST_VALUE_col6 FROM "allTypsUniq.parquet" WHERE col6 IN ("1952-08-14" , "1981-03-14" , "1947-05-12" , "1995-10-09" , "1968-02-03" , "1943-02-02" , "1957-12-10" , "2015-01-01" , "2013-01-03" , "1989-02-02" , "2007-10-01" , "1999-01-03" )
\ No newline at end of file
+SELECT col7 , col6 , FIRST_VALUE(col6) OVER(PARTITION BY col7 ORDER BY col6) FIRST_VALUE_col6 FROM "allTypsUniq.parquet" WHERE col6 IN ('1952-08-14' , '1981-03-14' , '1947-05-12' , '1995-10-09' , '1968-02-03' , '1943-02-02' , '1957-12-10' , '2015-01-01' , '2013-01-03' , '1989-02-02' , '2007-10-01' , '1999-01-03' )
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_32.q b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_32.q
index c1c82c70812..ae7c3211e91 100644
--- a/sql/src/test/resources/drill/window/queries/first_val/firstValFn_32.q
+++ b/sql/src/test/resources/drill/window/queries/first_val/firstValFn_32.q
@@ -1 +1 @@
-SELECT * FROM (SELECT c1, c2, lead(c2) OVER ( PARTITION BY c2 ORDER BY c1) lead_c2, lag(c2) OVER ( PARTITION BY c2 ORDER BY c1) lag_c2, ntile(3) OVER ( PARTITION BY c2 ORDER BY c1) tile, first_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) firstVal_c2, last_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) lastVal_c2 FROM "tblWnulls.parquet") sub_query where firstVal_c2 = "e" ORDER BY tile, c1
+SELECT * FROM (SELECT c1, c2, lead(c2) OVER ( PARTITION BY c2 ORDER BY c1) lead_c2, lag(c2) OVER ( PARTITION BY c2 ORDER BY c1) lag_c2, ntile(3) OVER ( PARTITION BY c2 ORDER BY c1) tile, first_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) firstVal_c2, last_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) lastVal_c2 FROM "tblWnulls.parquet") sub_query where firstVal_c2 = 'e' ORDER BY tile, c1
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_26.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_26.q
index 0b38b97f309..4d712c0165b 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_26.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_26.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING )
) subQry
-WHERE subQry.w_min >= "1920-05-14"
+WHERE subQry.w_min >= '1920-05-14'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_27.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_27.q
index 818c623ab5c..399eb4c5667 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_27.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_27.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW )
) subQry
-WHERE subQry.w_min > "1920-05-14"
+WHERE subQry.w_min > '1920-05-14'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_28.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_28.q
index 72dab24c2c6..b37b371e4e1 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_28.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_28.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 RANGE BETWEEN CURRENT ROW AND CURRENT ROW )
) subQry
-WHERE subQry.w_min = "1912-02-01"
+WHERE subQry.w_min = '1912-02-01'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_41.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_41.q
index c0aa1315e06..2730b590dfa 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_41.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_41.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING )
) subQry
-WHERE subQry.w_max = "yytBlhCMRSmV"
+WHERE subQry.w_max = 'yytBlhCMRSmV'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_42.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_42.q
index 46b295a8b40..a9e668af884 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_42.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_42.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW )
) subQry
-WHERE subQry.w_max > "k"
+WHERE subQry.w_max > 'k'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_43.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_43.q
index 1d6aade7e53..348046109c7 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_43.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_43.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 RANGE BETWEEN CURRENT ROW AND CURRENT ROW )
) subQry
-WHERE subQry.w_max > "m"
+WHERE subQry.w_max > 'm'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_44.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_44.q
index cd534df1991..f5772b5b04a 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_44.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_44.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING )
) subQry
-WHERE subQry.w_max > "h"
+WHERE subQry.w_max > 'h'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_45.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_45.q
index c9f9ac8c114..40899156f0b 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_45.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_45.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW )
) subQry
-WHERE subQry.w_max > "t"
+WHERE subQry.w_max > 't'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_46.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_46.q
index c3f7f7817c4..29f5496afe0 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_46.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_46.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 RANGE BETWEEN CURRENT ROW AND CURRENT ROW )
) subQry
-WHERE subQry.w_max > "t"
+WHERE subQry.w_max > 't'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_47.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_47.q
index ab16f747026..80aa5ba4e1d 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_47.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_47.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING )
) subQry
-WHERE subQry.sm > "1984-11-10"
+WHERE subQry.sm > '1984-11-10'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_48.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_48.q
index 180f753efea..5f6960b3146 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_48.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_48.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW )
) subQry
-WHERE subQry.w_max > "1992-11-11"
+WHERE subQry.w_max > '1992-11-11'
diff --git a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_49.q b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_49.q
index d9454552942..a00c220dc95 100644
--- a/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_49.q
+++ b/sql/src/test/resources/drill/window/queries/frameclause/subQueries/frmInSubQry_49.q
@@ -4,4 +4,4 @@ SELECT *
FROM "t_alltype.parquet"
WINDOW W AS ( PARTITION BY c8 ORDER BY c1 RANGE BETWEEN CURRENT ROW AND CURRENT ROW )
) subQry
-WHERE subQry.w_max > "1982-12-12"
+WHERE subQry.w_max > '1982-12-12'
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_100.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_100.q
index ea4cd661803..b42d0c11fe4 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_100.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_100.q
@@ -1 +1 @@
-SELECT col7 , col5, LAG(col5) OVER(PARTITION BY col7 ORDER BY col5) LAG_col5 FROM "allTypsUniq.parquet" WHERE col5 IN ( "1947-07-02 00:28:02.418" , "2011-06-02 00:28:02.218" , "1950-08-02 00:28:02.111" , "2012-06-02 00:28:02.418" , "1985-04-02 00:28:02.638")
\ No newline at end of file
+SELECT col7 , col5, LAG(col5) OVER(PARTITION BY col7 ORDER BY col5) LAG_col5 FROM "allTypsUniq.parquet" WHERE col5 IN ( '1947-07-02 00:28:02.418' , '2011-06-02 00:28:02.218' , '1950-08-02 00:28:02.111' , '2012-06-02 00:28:02.418' , '1985-04-02 00:28:02.638')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_102.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_102.q
index 324965b2aa9..ef94fc6ecfe 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_102.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_102.q
@@ -1 +1 @@
-SELECT col7 , col6, LAG(col6) OVER(PARTITION BY col7 ORDER BY col6) LAG_col6 FROM "allTypsUniq.parquet" WHERE col6 > "1947-05-12" and col6 < "2007-10-01"
\ No newline at end of file
+SELECT col7 , col6, LAG(col6) OVER(PARTITION BY col7 ORDER BY col6) LAG_col6 FROM "allTypsUniq.parquet" WHERE col6 > '1947-05-12' and col6 < '2007-10-01'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_103.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_103.q
index 4cb6019d137..e6b542d2586 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_103.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_103.q
@@ -1 +1 @@
-SELECT col7 , col6 , LAG(col6) OVER(PARTITION BY col7 ORDER BY col6) LAG_col6 FROM "allTypsUniq.parquet" WHERE col6 IN ("1952-08-14" , "1981-03-14" , "1947-05-12" , "1995-10-09" , "1968-02-03" , "1943-02-02" , "1957-12-10" , "2015-01-01" , "2013-01-03" , "1989-02-02" , "2007-10-01" , "1999-01-03" )
\ No newline at end of file
+SELECT col7 , col6 , LAG(col6) OVER(PARTITION BY col7 ORDER BY col6) LAG_col6 FROM "allTypsUniq.parquet" WHERE col6 IN ('1952-08-14' , '1981-03-14' , '1947-05-12' , '1995-10-09' , '1968-02-03' , '1943-02-02' , '1957-12-10' , '2015-01-01' , '2013-01-03' , '1989-02-02' , '2007-10-01' , '1999-01-03' )
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_109.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_109.q
index 4c430644595..915d3dc81c5 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_109.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_109.q
@@ -1 +1 @@
-SELECT col7 , col8 , LAG(col8) OVER(PARTITION BY col7 ORDER BY col8 desc) LAG_col8 FROM "allTypsUniq.parquet" WHERE col8 > "FL" and col8 < "VT"
\ No newline at end of file
+SELECT col7 , col8 , LAG(col8) OVER(PARTITION BY col7 ORDER BY col8 desc) LAG_col8 FROM "allTypsUniq.parquet" WHERE col8 > 'FL' and col8 < 'VT'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_111.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_111.q
index 662723c8dbc..06b5ce4fa00 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_111.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_111.q
@@ -1 +1 @@
-SELECT col7 , col9 , LAG(col9) OVER(PARTITION BY col7 ORDER BY col9) LAG_col9 FROM "allTypsUniq.parquet" WHERE col9 IN ("AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ","PXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXD","HXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ","LXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB","WXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB")
\ No newline at end of file
+SELECT col7 , col9 , LAG(col9) OVER(PARTITION BY col7 ORDER BY col9) LAG_col9 FROM "allTypsUniq.parquet" WHERE col9 IN ('AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ','PXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXD','HXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ','LXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB','WXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_112.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_112.q
index c799efdeae1..fab56f4c8ab 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_112.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_112.q
@@ -1 +1 @@
-SELECT col7 , col9 , LAG(col9) OVER(PARTITION BY col7 ORDER BY col9) LAG_col9 FROM "allTypsUniq.parquet" WHERE col9 NOT IN ("AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ","PXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXD","HXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ","LXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB","WXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB")
\ No newline at end of file
+SELECT col7 , col9 , LAG(col9) OVER(PARTITION BY col7 ORDER BY col9) LAG_col9 FROM "allTypsUniq.parquet" WHERE col9 NOT IN ('AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ','PXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXD','HXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ','LXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB','WXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_17.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_17.q
index bcb02d8469e..a813093c7e2 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_17.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_17.q
@@ -1 +1 @@
-SELECT col7 , LAG(col7 ) OVER ( PARTITION BY col2 ORDER BY col7 nulls FIRST ) LAG_col7 FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ("NY")
+SELECT col7 , LAG(col7 ) OVER ( PARTITION BY col2 ORDER BY col7 nulls FIRST ) LAG_col7 FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ('NY')
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_41.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_41.q
index 5f43e17fa37..9236c44003a 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_41.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_41.q
@@ -1 +1 @@
-SELECT col4 , LAG(col4) OVER (ORDER BY col4) LAG_col4 FROM "fewRowsAllData.parquet" WHERE col4 < "2012-06-02 00:28:02.433"
+SELECT col4 , LAG(col4) OVER (ORDER BY col4) LAG_col4 FROM "fewRowsAllData.parquet" WHERE col4 < '2012-06-02 00:28:02.433'
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_42.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_42.q
index dd99658832f..b5082e09c95 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_42.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_42.q
@@ -1 +1 @@
-SELECT col5 , LAG(col5) OVER (ORDER BY col5) LAG_col5 FROM "fewRowsAllData.parquet" WHERE col5 < "1968-06-06"
+SELECT col5 , LAG(col5) OVER (ORDER BY col5) LAG_col5 FROM "fewRowsAllData.parquet" WHERE col5 < '1968-06-06'
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_45.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_45.q
index fd451858684..300e35ba78a 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_45.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_45.q
@@ -1 +1 @@
-SELECT col8 , LAG(col8) OVER (ORDER BY col8 ) LAG_col8 FROM "fewRowsAllData.parquet" WHERE col8 < "07:10:06.550"
+SELECT col8 , LAG(col8) OVER (ORDER BY col8 ) LAG_col8 FROM "fewRowsAllData.parquet" WHERE col8 < '07:10:06.550'
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_62.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_62.q
index 40d1632de8f..f8edd32bafc 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_62.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_62.q
@@ -1 +1 @@
-SELECT c2 , c7 , LAG(c7) OVER( PARTITION BY c2 ORDER BY c7 ) LAG_c7 FROM ( SELECT col7 c7, col1 c1, col2 c2 FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ("NY")) sub_query
+SELECT c2 , c7 , LAG(c7) OVER( PARTITION BY c2 ORDER BY c7 ) LAG_c7 FROM ( SELECT col7 c7, col1 c1, col2 c2 FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ('NY')) sub_query
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_63.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_63.q
index 9ab270bf539..ba78d2ae6e8 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_63.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_63.q
@@ -1 +1 @@
-SELECT c8 , LAG(c8) OVER( PARTITION BY c2 ORDER BY c8 ) LAG_c8 FROM ( SELECT col8 c8, col1 c1, col2 c2 FROM "fewRowsAllData.parquet" WHERE col8 < "07:10:06.550" ORDER BY col8) sub_query
+SELECT c8 , LAG(c8) OVER( PARTITION BY c2 ORDER BY c8 ) LAG_c8 FROM ( SELECT col8 c8, col1 c1, col2 c2 FROM "fewRowsAllData.parquet" WHERE col8 < '07:10:06.550' ORDER BY col8) sub_query
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_64.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_64.q
index 66ab0cd713d..3f14481bbe8 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_64.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_64.q
@@ -1 +1 @@
-SELECT col1, col2, LAG ( col1 , 1) OVER ( PARTITION BY col2 ORDER BY col1 asc nulls FIRST ) w_LAG FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ("CA","WI","AZ")
+SELECT col1, col2, LAG ( col1 , 1) OVER ( PARTITION BY col2 ORDER BY col1 asc nulls FIRST ) w_LAG FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ('CA','WI','AZ')
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_65.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_65.q
index f2959a5c337..9dfdfa3941e 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_65.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_65.q
@@ -1 +1 @@
-SELECT col1, col2, LAG ( col1 , 1) OVER ( PARTITION BY col2 ORDER BY col1 asc nulls FIRST ) w_LAG FROM "fewRowsAllData.parquet" WHERE col2 IN ("AK","IA","SC")
+SELECT col1, col2, LAG ( col1 , 1) OVER ( PARTITION BY col2 ORDER BY col1 asc nulls FIRST ) w_LAG FROM "fewRowsAllData.parquet" WHERE col2 IN ('AK','IA','SC')
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_70.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_70.q
index 506cbf3e57e..d2ad1be03e2 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_70.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_70.q
@@ -1 +1 @@
-SELECT col2 , LAG_col2 FROM ( SELECT col2 , LAG(col2) OVER( PARTITION BY col3 ORDER BY col1 asc ) LAG_col2 FROM "fewRowsAllData.parquet") sub_query WHERE LAG_col2 IN ("CA","CO","LA","OR","NH")
\ No newline at end of file
+SELECT col2 , LAG_col2 FROM ( SELECT col2 , LAG(col2) OVER( PARTITION BY col3 ORDER BY col1 asc ) LAG_col2 FROM "fewRowsAllData.parquet") sub_query WHERE LAG_col2 IN ('CA','CO','LA','OR','NH')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_71.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_71.q
index ed130d2ddd4..ebbe6ec0564 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_71.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_71.q
@@ -1 +1 @@
-SELECT col2 , LAG_col2 FROM ( SELECT col2 , LAG(col2) OVER( PARTITION BY col3 ORDER BY col1 nulls FIRST ) LAG_col2 FROM "fewRowsAllData.parquet") sub_query WHERE LAG_col2 NOT IN ("CO","OR","NH","PA")
\ No newline at end of file
+SELECT col2 , LAG_col2 FROM ( SELECT col2 , LAG(col2) OVER( PARTITION BY col3 ORDER BY col1 nulls FIRST ) LAG_col2 FROM "fewRowsAllData.parquet") sub_query WHERE LAG_col2 NOT IN ('CO','OR','NH','PA')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_77.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_77.q
index 4656f1915eb..f95833c7ed9 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_77.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_77.q
@@ -1 +1 @@
-select * from (SELECT col2 , col4 , LEAD ( col4 ) OVER ( PARTITION BY col2 ORDER BY col2 , col4 ) lead_col4, col8 , LAG( col8 ) OVER ( PARTITION BY col2 ORDER BY col2 , col8 ) lag_col8 FROM "fewRowsAllData.parquet" ) sub_query where col2 IN ("CO","GA","MN","VT","WY")
+select * from (SELECT col2 , col4 , LEAD ( col4 ) OVER ( PARTITION BY col2 ORDER BY col2 , col4 ) lead_col4, col8 , LAG( col8 ) OVER ( PARTITION BY col2 ORDER BY col2 , col8 ) lag_col8 FROM "fewRowsAllData.parquet" ) sub_query where col2 IN ('CO','GA','MN','VT','WY')
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_96.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_96.q
index a3a8e234156..781dd2af156 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_96.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_96.q
@@ -1 +1 @@
-SELECT col7 , col4, LAG(col4) OVER(PARTITION BY col7 ORDER BY col4) LAG_col4 FROM "allTypsUniq.parquet" WHERE col4 IN ("20:20:20.300" , "19:24:45.200" , "23:45:35.120" , "23:23:30.222" , "16:35:45.100" , "10:59:58.119" , "15:20:30.230")
\ No newline at end of file
+SELECT col7 , col4, LAG(col4) OVER(PARTITION BY col7 ORDER BY col4) LAG_col4 FROM "allTypsUniq.parquet" WHERE col4 IN ('20:20:20.300' , '19:24:45.200' , '23:45:35.120' , '23:23:30.222' , '16:35:45.100' , '10:59:58.119' , '15:20:30.230')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_97.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_97.q
index b61c01527fe..b0ff5205191 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_97.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_97.q
@@ -1 +1 @@
-SELECT col7 , col4, LAG(col4) OVER(PARTITION BY col7 ORDER BY col4) LAG_col4 FROM "allTypsUniq.parquet" WHERE col4 NOT IN ("20:20:20.300" , "19:24:45.200" , "23:45:35.120" , "23:23:30.222" , "16:35:45.100" , "10:59:58.119" , "15:20:30.230")
\ No newline at end of file
+SELECT col7 , col4, LAG(col4) OVER(PARTITION BY col7 ORDER BY col4) LAG_col4 FROM "allTypsUniq.parquet" WHERE col4 NOT IN ('20:20:20.300' , '19:24:45.200' , '23:45:35.120' , '23:23:30.222' , '16:35:45.100' , '10:59:58.119' , '15:20:30.230')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_99.q b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_99.q
index b93d2a77d08..91886a2fff4 100644
--- a/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_99.q
+++ b/sql/src/test/resources/drill/window/queries/lag_func/lag_Fn_99.q
@@ -1 +1 @@
-SELECT col7 , col5, LAG(col5) OVER(PARTITION BY col7 ORDER BY col5) LAG_col5 FROM "allTypsUniq.parquet" WHERE col5 >= "1947-07-02 00:28:02.418" and col5 < "2011-06-02 00:28:02.218"
\ No newline at end of file
+SELECT col7 , col5, LAG(col5) OVER(PARTITION BY col7 ORDER BY col5) LAG_col5 FROM "allTypsUniq.parquet" WHERE col5 >= '1947-07-02 00:28:02.418' and col5 < '2011-06-02 00:28:02.218'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_18.q b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_18.q
index 3686af4fa0c..fffb8d57fae 100644
--- a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_18.q
+++ b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_18.q
@@ -1 +1 @@
-SELECT col7 , col4, LAST_VALUE(col4) OVER(PARTITION BY col7 ORDER BY col4) LAST_VALUE_col4 FROM "allTypsUniq.parquet" WHERE col4 IN ("20:20:20.300" , "19:24:45.200" , "23:45:35.120" , "23:23:30.222" , "16:35:45.100" , "10:59:58.119" , "15:20:30.230")
\ No newline at end of file
+SELECT col7 , col4, LAST_VALUE(col4) OVER(PARTITION BY col7 ORDER BY col4) LAST_VALUE_col4 FROM "allTypsUniq.parquet" WHERE col4 IN ('20:20:20.300' , '19:24:45.200' , '23:45:35.120' , '23:23:30.222' , '16:35:45.100' , '10:59:58.119' , '15:20:30.230')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_19.q b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_19.q
index 52577ee0825..b1f8dc965da 100644
--- a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_19.q
+++ b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_19.q
@@ -1 +1 @@
-SELECT col7 , col4, LAST_VALUE(col4) OVER(PARTITION BY col7 ORDER BY col4) LAST_VALUE_col4 FROM "allTypsUniq.parquet" WHERE col4 NOT IN ("20:20:20.300" , "19:24:45.200" , "23:45:35.120" , "23:23:30.222" , "16:35:45.100" , "10:59:58.119" , "15:20:30.230")
\ No newline at end of file
+SELECT col7 , col4, LAST_VALUE(col4) OVER(PARTITION BY col7 ORDER BY col4) LAST_VALUE_col4 FROM "allTypsUniq.parquet" WHERE col4 NOT IN ('20:20:20.300' , '19:24:45.200' , '23:45:35.120' , '23:23:30.222' , '16:35:45.100' , '10:59:58.119' , '15:20:30.230')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_21.q b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_21.q
index feba453b542..2b286ebf2f4 100644
--- a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_21.q
+++ b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_21.q
@@ -1 +1 @@
-SELECT col7 , col5, LAST_VALUE(col5) OVER(PARTITION BY col7 ORDER BY col5) LAST_VALUE_col5 FROM "allTypsUniq.parquet" WHERE col5 >= "1947-07-02 00:28:02.418" AND col5 < "2011-06-02 00:28:02.218"
\ No newline at end of file
+SELECT col7 , col5, LAST_VALUE(col5) OVER(PARTITION BY col7 ORDER BY col5) LAST_VALUE_col5 FROM "allTypsUniq.parquet" WHERE col5 >= '1947-07-02 00:28:02.418' AND col5 < '2011-06-02 00:28:02.218'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_22.q b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_22.q
index e83a3d4896c..619bc51f5a6 100644
--- a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_22.q
+++ b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_22.q
@@ -1 +1 @@
-SELECT col7 , col5, LAST_VALUE(col5) OVER(PARTITION BY col7 ORDER BY col5) LAST_VALUE_col5 FROM "allTypsUniq.parquet" WHERE col5 IN ( "1947-07-02 00:28:02.418" , "2011-06-02 00:28:02.218" , "1950-08-02 00:28:02.111" , "2012-06-02 00:28:02.418" , "1985-04-02 00:28:02.638")
\ No newline at end of file
+SELECT col7 , col5, LAST_VALUE(col5) OVER(PARTITION BY col7 ORDER BY col5) LAST_VALUE_col5 FROM "allTypsUniq.parquet" WHERE col5 IN ( '1947-07-02 00:28:02.418' , '2011-06-02 00:28:02.218' , '1950-08-02 00:28:02.111' , '2012-06-02 00:28:02.418' , '1985-04-02 00:28:02.638')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_24.q b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_24.q
index ea3d94240e3..e891e4040ff 100644
--- a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_24.q
+++ b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_24.q
@@ -1 +1 @@
-SELECT col7 , col6, LAST_VALUE(col6) OVER(PARTITION BY col7 ORDER BY col6) LAST_VALUE_col6 FROM "allTypsUniq.parquet" WHERE col6 > "1947-05-12" AND col6 < "2007-10-01"
\ No newline at end of file
+SELECT col7 , col6, LAST_VALUE(col6) OVER(PARTITION BY col7 ORDER BY col6) LAST_VALUE_col6 FROM "allTypsUniq.parquet" WHERE col6 > '1947-05-12' AND col6 < '2007-10-01'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_25.q b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_25.q
index fc532733b3a..62596f63a2e 100644
--- a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_25.q
+++ b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_25.q
@@ -1 +1 @@
-SELECT col7 , col6 , LAST_VALUE(col6) OVER(PARTITION BY col7 ORDER BY col6) LAST_VALUE_col6 FROM "allTypsUniq.parquet" WHERE col6 IN ("1952-08-14" , "1981-03-14" , "1947-05-12" , "1995-10-09" , "1968-02-03" , "1943-02-02" , "1957-12-10" , "2015-01-01" , "2013-01-03" , "1989-02-02" , "2007-10-01" , "1999-01-03" )
\ No newline at end of file
+SELECT col7 , col6 , LAST_VALUE(col6) OVER(PARTITION BY col7 ORDER BY col6) LAST_VALUE_col6 FROM "allTypsUniq.parquet" WHERE col6 IN ('1952-08-14' , '1981-03-14' , '1947-05-12' , '1995-10-09' , '1968-02-03' , '1943-02-02' , '1957-12-10' , '2015-01-01' , '2013-01-03' , '1989-02-02' , '2007-10-01' , '1999-01-03' )
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_33.q b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_33.q
index 0d48c0f5408..08f282cff0d 100644
--- a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_33.q
+++ b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_33.q
@@ -1 +1 @@
-SELECT * FROM (SELECT col7, col8 , LAST_VALUE(col8) OVER(PARTITION BY col7 ORDER BY col8) LAST_VALUE_col8 FROM "allTypsUniq.parquet" ) sub_query where LAST_VALUE_col8 IN ("CA","NE","IN","TX","GA")
+SELECT * FROM (SELECT col7, col8 , LAST_VALUE(col8) OVER(PARTITION BY col7 ORDER BY col8) LAST_VALUE_col8 FROM "allTypsUniq.parquet" ) sub_query where LAST_VALUE_col8 IN ('CA','NE','IN','TX','GA')
diff --git a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_37.q b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_37.q
index 2285be7cdb5..75918828f87 100644
--- a/sql/src/test/resources/drill/window/queries/last_val/lastValFn_37.q
+++ b/sql/src/test/resources/drill/window/queries/last_val/lastValFn_37.q
@@ -1 +1 @@
-SELECT * FROM (SELECT col7, col9 , LAST_VALUE(col9) OVER(PARTITION BY col7 ORDER BY col9) LAST_VALUE_col9 FROM "allTypsUniq.parquet" ) sub_query where LAST_VALUE_col9 IN ("CA","NE","IN","TX","GA")
+SELECT * FROM (SELECT col7, col9 , LAST_VALUE(col9) OVER(PARTITION BY col7 ORDER BY col9) LAST_VALUE_col9 FROM "allTypsUniq.parquet" ) sub_query where LAST_VALUE_col9 IN ('CA','NE','IN','TX','GA')
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_104.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_104.q
index 1f68fa60242..95f216db079 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_104.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_104.q
@@ -1 +1 @@
-select col8 , lead(col8) over(partition by col7 order by col8 desc) lead_col8 from "allTypsUniq.parquet" where col8 > "FL" and col8 < "VT"
\ No newline at end of file
+select col8 , lead(col8) over(partition by col7 order by col8 desc) lead_col8 from "allTypsUniq.parquet" where col8 > 'FL' and col8 < 'VT'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_106.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_106.q
index 73e17605010..64d421f07c8 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_106.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_106.q
@@ -1 +1 @@
-select col9 , lead(col9) over(partition by col7 order by col9) lead_col9 from "allTypsUniq.parquet" where col9 in ("AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ","PXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXD","HXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ","LXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB","WXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB")
\ No newline at end of file
+select col9 , lead(col9) over(partition by col7 order by col9) lead_col9 from "allTypsUniq.parquet" where col9 in ('AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ','PXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXD','HXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ','LXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB','WXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_107.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_107.q
index 4ec11806ffa..f9ad1b16bb6 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_107.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_107.q
@@ -1 +1 @@
-select col9 , lead(col9) over(partition by col7 order by col9) lead_col9 from "allTypsUniq.parquet" where col9 not in ("AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ","PXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXD","HXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ","LXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB","WXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB")
\ No newline at end of file
+select col9 , lead(col9) over(partition by col7 order by col9) lead_col9 from "allTypsUniq.parquet" where col9 not in ('AXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ','PXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXD','HXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXZ','LXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB','WXXXXXXXXXXXXXXXXXXXXXXXXXCXXXXXXXXXXXXXXXXXXXXXXXXB')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_17.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_17.q
index 4ab06a53b2a..b3156d0fec7 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_17.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_17.q
@@ -1 +1 @@
-SELECT col7, LEAD(col7 ) OVER ( PARTITION BY col2 ORDER BY col2,col7 nulls FIRST ) LEAD_col7, col2 FROM "fewRowsAllData.parquet" WHERE col2 IN ("VT","AZ","CO","GA","IN","MN","RI")
+SELECT col7, LEAD(col7 ) OVER ( PARTITION BY col2 ORDER BY col2,col7 nulls FIRST ) LEAD_col7, col2 FROM "fewRowsAllData.parquet" WHERE col2 IN ('VT','AZ','CO','GA','IN','MN','RI')
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_27.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_27.q
index 674774fe4de..8f74ac0e06f 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_27.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_27.q
@@ -1 +1 @@
-SELECT DISTINCT col8, LEAD(col8 ) OVER ( PARTITION BY col6 ORDER BY col8,col6 nulls LAST ) LEAD_col8, col6 FROM "fewRowsAllData.parquet" WHERE col6 = true and col8 < cast("10:13:15.330" as time) order by col8
+SELECT DISTINCT col8, LEAD(col8 ) OVER ( PARTITION BY col6 ORDER BY col8,col6 nulls LAST ) LEAD_col8, col6 FROM "fewRowsAllData.parquet" WHERE col6 = true and col8 < cast('10:13:15.330' as time) order by col8
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_36.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_36.q
index 7dd42f9fbbc..6cc9a2e1af7 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_36.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_36.q
@@ -1 +1 @@
-SELECT col8 , LEAD(col8,1) OVER ( PARTITION BY col2 ORDER BY col8 ) LEAD_col8, col2 FROM "fewRowsAllData.parquet" where col8 < "08:03:53.340" and col2 NOT IN ("WI","WY","OR","PA","RI","NE","IN","NC","MO","HI","GA","CO")
+SELECT col8 , LEAD(col8,1) OVER ( PARTITION BY col2 ORDER BY col8 ) LEAD_col8, col2 FROM "fewRowsAllData.parquet" where col8 < '08:03:53.340' and col2 NOT IN ('WI','WY','OR','PA','RI','NE','IN','NC','MO','HI','GA','CO')
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_45.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_45.q
index 6731f95fcc8..af2dcface26 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_45.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_45.q
@@ -1 +1 @@
-SELECT col8 , LEAD(col8) OVER (ORDER BY col8) LEAD_col8 FROM "fewRowsAllData.parquet" WHERE col8 < "07:10:06.550"
+SELECT col8 , LEAD(col8) OVER (ORDER BY col8) LEAD_col8 FROM "fewRowsAllData.parquet" WHERE col8 < '07:10:06.550'
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_63.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_63.q
index ad221e12ec9..7cd682f759d 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_63.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_63.q
@@ -1 +1 @@
-SELECT c8 , LEAD(c8) OVER( PARTITION BY c2 ORDER BY c2,c8 ) LEAD_c8,c2 FROM ( SELECT distinct col8 c8, col1 c1, col2 c2 FROM "fewRowsAllData.parquet" WHERE col2 IN ("CO","GA","IA","NH","MN","WY")) sub_query
+SELECT c8 , LEAD(c8) OVER( PARTITION BY c2 ORDER BY c2,c8 ) LEAD_c8,c2 FROM ( SELECT distinct col8 c8, col1 c1, col2 c2 FROM "fewRowsAllData.parquet" WHERE col2 IN ('CO','GA','IA','NH','MN','WY')) sub_query
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_64.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_64.q
index 777b16fd7df..0665da40dbd 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_64.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_64.q
@@ -1 +1 @@
-SELECT col1, col2, LEAD ( col1 , 1) OVER ( PARTITION BY col2 ORDER BY col1 asc nulls FIRST ) w_LEAD FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ("CA","WI","AZ")
+SELECT col1, col2, LEAD ( col1 , 1) OVER ( PARTITION BY col2 ORDER BY col1 asc nulls FIRST ) w_LEAD FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ('CA','WI','AZ')
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_65.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_65.q
index 26d05cb80c4..7f0463db639 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_65.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_65.q
@@ -1 +1 @@
-SELECT col1, col2, LEAD ( col1 , 1) OVER ( PARTITION BY col2 ORDER BY col1 asc nulls FIRST ) w_LEAD FROM "fewRowsAllData.parquet" WHERE col2 IN ("AK","IA","SC")
+SELECT col1, col2, LEAD ( col1 , 1) OVER ( PARTITION BY col2 ORDER BY col1 asc nulls FIRST ) w_LEAD FROM "fewRowsAllData.parquet" WHERE col2 IN ('AK','IA','SC')
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_70.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_70.q
index db9e17270d9..2167c866d5d 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_70.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_70.q
@@ -1 +1 @@
-SELECT LEAD_col2 FROM ( SELECT LEAD(col2) OVER( PARTITION BY col3 ORDER BY col1 asc ) LEAD_col2 FROM "fewRowsAllData.parquet") sub_query WHERE LEAD_col2 IN ("CA","CO","LA","OR","NH")
\ No newline at end of file
+SELECT LEAD_col2 FROM ( SELECT LEAD(col2) OVER( PARTITION BY col3 ORDER BY col1 asc ) LEAD_col2 FROM "fewRowsAllData.parquet") sub_query WHERE LEAD_col2 IN ('CA','CO','LA','OR','NH')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_71.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_71.q
index a73784f705c..adbbcf1c7a2 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_71.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_71.q
@@ -1 +1 @@
-SELECT LEAD_col2 FROM ( SELECT LEAD(col2) OVER( PARTITION BY col3 ORDER BY col1 nulls FIRST ) LEAD_col2 FROM "fewRowsAllData.parquet") sub_query WHERE LEAD_col2 NOT IN ("CO","OR","NH","PA")
\ No newline at end of file
+SELECT LEAD_col2 FROM ( SELECT LEAD(col2) OVER( PARTITION BY col3 ORDER BY col1 nulls FIRST ) LEAD_col2 FROM "fewRowsAllData.parquet") sub_query WHERE LEAD_col2 NOT IN ('CO','OR','NH','PA')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_8.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_8.q
index f8d2b7cb6c9..2c305f9af4f 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_8.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_8.q
@@ -1 +1 @@
-SELECT col7 , LEAD(col7 ) OVER ( PARTITION BY col2 ORDER BY col0 ) LEAD_col7 FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ("NY")
+SELECT col7 , LEAD(col7 ) OVER ( PARTITION BY col2 ORDER BY col0 ) LEAD_col7 FROM "fewRowsAllData.parquet" WHERE col2 NOT IN ('NY')
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_9.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_9.q
index dc951b8bb4f..d8ea1768f08 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_9.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_9.q
@@ -1 +1 @@
-SELECT col6, col8 , LEAD(col8 ) OVER ( PARTITION BY col6 ORDER BY col6,col8 ) LEAD_col8 FROM "fewRowsAllData.parquet" WHERE col2 IN ("IN","SD","MO","SD","KS")
+SELECT col6, col8 , LEAD(col8 ) OVER ( PARTITION BY col6 ORDER BY col6,col8 ) LEAD_col8 FROM "fewRowsAllData.parquet" WHERE col2 IN ('IN','SD','MO','SD','KS')
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_91.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_91.q
index d0e9fcdeae2..3612c1fb796 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_91.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_91.q
@@ -1 +1 @@
-select col4, lead(col4) over(partition by col7 order by col4) lead_col4 from "allTypsUniq.parquet" where col4 in ("20:20:20.300" , "19:24:45.200" , "23:45:35.120" , "23:23:30.222" , "16:35:45.100" , "10:59:58.119" , "15:20:30.230")
\ No newline at end of file
+select col4, lead(col4) over(partition by col7 order by col4) lead_col4 from "allTypsUniq.parquet" where col4 in ('20:20:20.300' , '19:24:45.200' , '23:45:35.120' , '23:23:30.222' , '16:35:45.100' , '10:59:58.119' , '15:20:30.230')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_92.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_92.q
index 6d92bd27df1..9098f861931 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_92.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_92.q
@@ -1 +1 @@
-select col4, lead(col4) over(partition by col7 order by col4) lead_col4 from "allTypsUniq.parquet" where col4 not in ("20:20:20.300" , "19:24:45.200" , "23:45:35.120" , "23:23:30.222" , "16:35:45.100" , "10:59:58.119" , "15:20:30.230")
\ No newline at end of file
+select col4, lead(col4) over(partition by col7 order by col4) lead_col4 from "allTypsUniq.parquet" where col4 not in ('20:20:20.300' , '19:24:45.200' , '23:45:35.120' , '23:23:30.222' , '16:35:45.100' , '10:59:58.119' , '15:20:30.230')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_94.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_94.q
index d7df7c40b85..fbeb4d32b40 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_94.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_94.q
@@ -1 +1 @@
-select col5, lead(col5) over(partition by col7 order by col5) lead_col5 from "allTypsUniq.parquet" where col5 >= "1947-07-02 00:28:02.418" and col5 < "2011-06-02 00:28:02.218"
\ No newline at end of file
+select col5, lead(col5) over(partition by col7 order by col5) lead_col5 from "allTypsUniq.parquet" where col5 >= '1947-07-02 00:28:02.418' and col5 < '2011-06-02 00:28:02.218'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_95.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_95.q
index 422c5163198..1f7e9619885 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_95.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_95.q
@@ -1 +1 @@
-select col5, lead(col5) over(partition by col7 order by col5) lead_col5 from "allTypsUniq.parquet" where col5 in ( "1947-07-02 00:28:02.418" , "2011-06-02 00:28:02.218" , "1950-08-02 00:28:02.111" , "2012-06-02 00:28:02.418" , "1985-04-02 00:28:02.638")
\ No newline at end of file
+select col5, lead(col5) over(partition by col7 order by col5) lead_col5 from "allTypsUniq.parquet" where col5 in ( '1947-07-02 00:28:02.418' , '2011-06-02 00:28:02.218' , '1950-08-02 00:28:02.111' , '2012-06-02 00:28:02.418' , '1985-04-02 00:28:02.638')
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_97.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_97.q
index 0a53915f366..14f766eae21 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_97.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_97.q
@@ -1 +1 @@
-select col6, lead(col6) over(partition by col7 order by col6) lead_col6 from "allTypsUniq.parquet" where col6 > "1947-05-12" and col6 < "2007-10-01"
\ No newline at end of file
+select col6, lead(col6) over(partition by col7 order by col6) lead_col6 from "allTypsUniq.parquet" where col6 > '1947-05-12' and col6 < '2007-10-01'
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_98.q b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_98.q
index ce666e61bcc..a76d8945655 100644
--- a/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_98.q
+++ b/sql/src/test/resources/drill/window/queries/lead_func/lead_Fn_98.q
@@ -1 +1 @@
-select col6 , lead(col6) over(partition by col7 order by col6) lead_col6 from "allTypsUniq.parquet" where col6 IN ("1952-08-14" , "1981-03-14" , "1947-05-12" , "1995-10-09" , "1968-02-03" , "1943-02-02" , "1957-12-10" , "2015-01-01" , "2013-01-03" , "1989-02-02" , "2007-10-01" , "1999-01-03" )
\ No newline at end of file
+select col6 , lead(col6) over(partition by col7 order by col6) lead_col6 from "allTypsUniq.parquet" where col6 IN ('1952-08-14' , '1981-03-14' , '1947-05-12' , '1995-10-09' , '1968-02-03' , '1943-02-02' , '1957-12-10' , '2015-01-01' , '2013-01-03' , '1989-02-02' , '2007-10-01' , '1999-01-03' )
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_01.q b/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_01.q
index c412fa8aadc..f5d1ecff7e8 100644
--- a/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_01.q
+++ b/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_01.q
@@ -2,4 +2,4 @@ WITH v1 ( a, b, c ) AS
(
SELECT col0, col8, MAX(col8) over (PARTITION BY col7 ORDER BY col8) as MAX_col8 from "allTypsUniq.parquet"
)
-SELECT a, b, c from v1 where c > "IN" ORDER BY a,b
+SELECT a, b, c from v1 where c > 'IN' ORDER BY a,b
diff --git a/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_02.q b/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_02.q
index da5ce9a3fd4..20ebc5fca07 100644
--- a/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_02.q
+++ b/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_02.q
@@ -2,4 +2,4 @@ WITH v1 ( a, b, c, d ) AS
(
SELECT col0, col8, MAX(MIN(col8)) over (PARTITION BY col7 ORDER BY col8) as max_col8, col7 from "allTypsUniq.parquet" GROUP BY col0,col7,col8
)
-SELECT a, b, c, d from v1 where c > "IN" GROUP BY a,b,c,d ORDER BY a,b,c,d
+SELECT a, b, c, d from v1 where c > 'IN' GROUP BY a,b,c,d ORDER BY a,b,c,d
diff --git a/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_03.q b/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_03.q
index 3c392569a4f..88ede731fa2 100644
--- a/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_03.q
+++ b/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_03.q
@@ -2,4 +2,4 @@ WITH v1 ( a, b, c, d ) AS
(
SELECT col0, col8, MAX(MIN(col8)) over (PARTITION BY col7 ORDER BY col8) as max_col8, col7 from "allTypsUniq.parquet" GROUP BY col0,col7,col8
)
-SELECT a, b, c, d from v1 where c IN ( "IN","OR","SC","NJ","TX","MA" ) GROUP BY a,b,c,d ORDER BY a,b,c,d
+SELECT a, b, c, d from v1 where c IN ( 'IN','OR','SC','NJ','TX','MA' ) GROUP BY a,b,c,d ORDER BY a,b,c,d
diff --git a/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_04.q b/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_04.q
index f9c230b1d7b..407af74c9d8 100644
--- a/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_04.q
+++ b/sql/src/test/resources/drill/window/queries/nestedAggs/cte_win_04.q
@@ -2,4 +2,4 @@ WITH v1 ( a, b, c, d ) AS
(
SELECT col0, col8, MAX(MIN(col8)) over (PARTITION BY col7 ORDER BY col8) as max_col8, col7 from "allTypsUniq.parquet" GROUP BY col0,col7,col8
)
-SELECT a, b, c, d from ( SELECT * from v1 ) where c > "IN" GROUP BY a,b,c,d ORDER BY a,b,c,d
+SELECT a, b, c, d from ( SELECT * from v1 ) where c > 'IN' GROUP BY a,b,c,d ORDER BY a,b,c,d
diff --git a/sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_57.q b/sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_57.q
index ae8f705e55f..4a94999c605 100644
--- a/sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_57.q
+++ b/sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_57.q
@@ -1 +1 @@
-SELECT * FROM (SELECT c1, c2, lead(c2) OVER ( PARTITION BY c2 ORDER BY c1) lead_c2, lag(c2) OVER ( PARTITION BY c2 ORDER BY c1) lag_c2, ntile(3) OVER ( PARTITION BY c2 ORDER BY c1) tile, first_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) firstVal_c2, last_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) lastVal_c2 FROM "tblWnulls.parquet") sub_query WHERE c2 in ("a","c","e") ORDER BY tile, c1
\ No newline at end of file
+SELECT * FROM (SELECT c1, c2, lead(c2) OVER ( PARTITION BY c2 ORDER BY c1) lead_c2, lag(c2) OVER ( PARTITION BY c2 ORDER BY c1) lag_c2, ntile(3) OVER ( PARTITION BY c2 ORDER BY c1) tile, first_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) firstVal_c2, last_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) lastVal_c2 FROM "tblWnulls.parquet") sub_query WHERE c2 in ('a','c','e') ORDER BY tile, c1
\ No newline at end of file
diff --git a/sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_58.q b/sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_58.q
index 6d8a28c39a5..0f65cc7eb08 100644
--- a/sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_58.q
+++ b/sql/src/test/resources/drill/window/queries/ntile_func/ntileFn_58.q
@@ -1 +1 @@
-SELECT * FROM (SELECT c1, c2, lead(c2) OVER ( PARTITION BY c2 ORDER BY c1) lead_c2, lag(c2) OVER ( PARTITION BY c2 ORDER BY c1) lag_c2, ntile(3) OVER ( PARTITION BY c2 ORDER BY c1) tile, first_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) firstVal_c2, last_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) lastVal_c2 FROM "tblWnulls.parquet") sub_query WHERE c2 >= "b" and c2 <= "d" ORDER BY tile, c1
+SELECT * FROM (SELECT c1, c2, lead(c2) OVER ( PARTITION BY c2 ORDER BY c1) lead_c2, lag(c2) OVER ( PARTITION BY c2 ORDER BY c1) lag_c2, ntile(3) OVER ( PARTITION BY c2 ORDER BY c1) tile, first_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) firstVal_c2, last_value(c2) OVER ( PARTITION BY c2 ORDER BY c1) lastVal_c2 FROM "tblWnulls.parquet") sub_query WHERE c2 >= 'b' and c2 <= 'd' ORDER BY tile, c1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org