Commit 6751071
committed
Support trailing commas in expression lists
ClickHouse allows trailing commas before clauses like FROM, WHERE, etc.
For example: SELECT a, b, FROM table
Add isClauseKeyword function to detect when a token is a clause keyword
that should terminate an expression list, vs when it's being used as
an identifier (which ClickHouse allows for many keywords).
The detection is context-aware - keywords followed by (, [, or = are
treated as expression continuations rather than clause terminators.1 parent 2e1c16b commit 6751071
File tree
21 files changed
+47
-120
lines changed- parser
- testdata
- 02354_vector_search_binary_quantization
- 02813_optimize_lazy_materialization
- 02842_mutations_replace_non_deterministic
- 03008_deduplication_remote_insert_select
- 03035_argMinMax_numeric_non_extreme_bug
- 03040_dynamic_type_alters_2_compact_merge_tree
- 03040_dynamic_type_alters_2_wide_merge_tree
- 03047_on_fly_mutations_non_deterministic_replace
- 03156_tuple_map_low_cardinality
- 03165_round_scale_as_column
- 03221_merge_profile_events
- 03279_join_choose_build_table_auto_statistics
- 03279_join_choose_build_table_statistics
- 03279_join_choose_build_table
- 03362_join_on_filterpushdown
- 03408_cte_self_reference
- 03513_simple_aggregate_function_any_respect_nulls_in_aggregating_merge_tree
- 03513_simple_aggregate_function_any_respect_nulls_in_summing_merge_tree
- 03521_long_statistics_name
- 03599_lightweight_delete_vertical_merge
21 files changed
+47
-120
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
102 | 106 | | |
103 | 107 | | |
104 | 108 | | |
| |||
110 | 114 | | |
111 | 115 | | |
112 | 116 | | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
113 | 140 | | |
114 | 141 | | |
115 | 142 | | |
| |||
Lines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
| 1 | + | |
Lines changed: 1 addition & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
| 1 | + | |
Lines changed: 1 addition & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
| 1 | + | |
Lines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
| 1 | + | |
Lines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
| 1 | + | |
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
5 | 4 | | |
6 | 5 | | |
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
5 | 4 | | |
6 | 5 | | |
Lines changed: 1 addition & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
| 1 | + | |
Lines changed: 1 addition & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
| 1 | + | |
0 commit comments