From 77eb541e712f20771963486b0a76a6c1de79601d Mon Sep 17 00:00:00 2001 From: wanghao Date: Sat, 11 Oct 2025 10:20:25 +0800 Subject: [PATCH 1/3] fix: Adjust the printing order of the EngineExpr.String() method, as placing Settings before Order BY can result in SQL execution errors --- parser/ast.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/parser/ast.go b/parser/ast.go index 0d3c777..bb660fe 100644 --- a/parser/ast.go +++ b/parser/ast.go @@ -4817,14 +4817,18 @@ func (e *EngineExpr) String() string { if e.Params != nil { builder.WriteString(e.Params.String()) } - if e.PrimaryKey != nil { + if e.OrderBy != nil { builder.WriteString(" ") - builder.WriteString(e.PrimaryKey.String()) + builder.WriteString(e.OrderBy.String()) } if e.PartitionBy != nil { builder.WriteString(" ") builder.WriteString(e.PartitionBy.String()) } + if e.PrimaryKey != nil { + builder.WriteString(" ") + builder.WriteString(e.PrimaryKey.String()) + } if e.SampleBy != nil { builder.WriteString(" ") builder.WriteString(e.SampleBy.String()) @@ -4837,10 +4841,6 @@ func (e *EngineExpr) String() string { builder.WriteString(" ") builder.WriteString(e.Settings.String()) } - if e.OrderBy != nil { - builder.WriteString(" ") - builder.WriteString(e.OrderBy.String()) - } return builder.String() } From a33068af543e073b6981ee1d1934d8dbb7353128 Mon Sep 17 00:00:00 2001 From: wanghao Date: Sat, 11 Oct 2025 11:23:59 +0800 Subject: [PATCH 2/3] fix: update testdata --- .../ddl/format/attach_table_basic.sql | 2 +- ...erialized_view_with_empty_table_schema.sql | 2 +- .../ddl/format/create_mv_with_order_by.sql | 2 +- .../testdata/ddl/format/create_or_replace.sql | 2 +- .../ddl/format/create_table_basic.sql | 2 +- .../format/create_table_with_codec_delta.sql | 2 +- .../format/create_table_with_enum_fields.sql | 2 +- .../ddl/format/create_table_with_index.sql | 2 +- ...create_table_with_keyword_partition_by.sql | 2 +- .../ddl/format/create_table_with_nullable.sql | 2 +- .../format/create_table_with_on_clsuter.sql | 2 +- .../format/create_table_with_sample_by.sql | 2 +- .../format/create_table_with_ttl_policy.sql | 6 +- .../ddl/format/create_table_with_uuid.sql | 2 +- .../ddl/output/alter_role.sql.golden.json | 418 +++++++-------- .../alter_table_add_index.sql.golden.json | 212 ++++---- ...alter_table_add_projection.sql.golden.json | 54 +- ...ter_table_attach_partition.sql.golden.json | 36 +- .../output/attach_table_basic.sql.golden.json | 212 ++++---- .../ddl/output/bug_001.sql.golden.json | 280 +++++----- .../testdata/ddl/output/check.sql.golden.json | 12 +- .../create_dictionary_basic.sql.golden.json | 200 +++---- ...e_dictionary_comprehensive.sql.golden.json | 222 ++++---- .../create_distributed_table.sql.golden.json | 70 +-- .../create_live_view_basic.sql.golden.json | 50 +- ...te_materialized_view_basic.sql.golden.json | 256 ++++----- ...rialized_view_with_definer.sql.golden.json | 164 +++--- ...ew_with_empty_table_schema.sql.golden.json | 250 ++++----- ...rialized_view_with_refresh.sql.golden.json | 96 ++-- .../create_mv_with_not_op.sql.golden.json | 274 +++++----- .../create_mv_with_order_by.sql.golden.json | 120 ++--- .../output/create_or_replace.sql.golden.json | 256 ++++----- .../ddl/output/create_role.sql.golden.json | 404 +++++++------- .../output/create_table_basic.sql.golden.json | 442 +++++++-------- ...reate_table_json_typehints.sql.golden.json | 74 +-- ...ate_table_with_codec_delta.sql.golden.json | 414 +++++++------- ...ate_table_with_enum_fields.sql.golden.json | 254 ++++----- .../create_table_with_index.sql.golden.json | 500 ++++++++--------- ..._with_keyword_partition_by.sql.golden.json | 102 ++-- ...ate_table_with_null_engine.sql.golden.json | 68 +-- ...create_table_with_nullable.sql.golden.json | 204 +++---- ...eate_table_with_on_clsuter.sql.golden.json | 212 ++++---- ...eate_table_with_projection.sql.golden.json | 112 ++-- ...reate_table_with_sample_by.sql.golden.json | 142 ++--- ...eate_table_with_ttl_policy.sql.golden.json | 440 +++++++-------- .../create_table_with_uuid.sql.golden.json | 212 ++++---- .../ddl/output/create_user.sql.golden.json | 504 +++++++++--------- .../output/create_view_basic.sql.golden.json | 26 +- ..._view_on_cluster_with_uuid.sql.golden.json | 36 +- .../ddl/output/drop_role.sql.golden.json | 24 +- .../output/grant_privilege.sql.golden.json | 328 ++++++------ .../ddl/output/optimize.sql.golden.json | 226 ++++---- .../ddl/output/rename.sql.golden.json | 228 ++++---- .../ddl/output/systems.sql.golden.json | 12 +- .../alter_table_with_comment.sql.golden.json | 38 +- .../create_column_with_ttl.sql.golden.json | 102 ++-- .../dml/output/insert_values.sql.golden.json | 116 ++-- .../output/insert_with_format.sql.golden.json | 86 +-- .../insert_with_placeholder.sql.golden.json | 128 ++--- .../output/insert_with_select.sql.golden.json | 36 +- .../access_tuple_with_dot.sql.golden.json | 256 ++++----- .../query_with_expr_compare.sql.golden.json | 94 ++-- .../select_case_when_exists.sql.golden.json | 90 ++-- .../query/output/select_cast.sql.golden.json | 60 +-- ...select_column_alias_string.sql.golden.json | 16 +- ...select_item_with_modifiers.sql.golden.json | 120 ++--- .../output/select_json_type.sql.golden.json | 128 ++--- .../output/select_simple.sql.golden.json | 212 ++++---- ...th_cte_with_column_aliases.sql.golden.json | 94 ++-- ...ct_simple_with_is_not_null.sql.golden.json | 80 +-- ...select_simple_with_is_null.sql.golden.json | 74 +-- ...ct_simple_with_with_clause.sql.golden.json | 116 ++-- ..._table_function_with_query.sql.golden.json | 54 +- .../select_with_group_by.sql.golden.json | 150 +++--- ...t_with_keyword_in_group_by.sql.golden.json | 110 ++-- .../select_with_left_join.sql.golden.json | 80 +-- .../select_with_multi_join.sql.golden.json | 170 +++--- ...ct_with_multi_line_comment.sql.golden.json | 18 +- ...elect_with_query_parameter.sql.golden.json | 198 +++---- ...elect_with_window_function.sql.golden.json | 196 +++---- 80 files changed, 5500 insertions(+), 5500 deletions(-) diff --git a/parser/testdata/ddl/format/attach_table_basic.sql b/parser/testdata/ddl/format/attach_table_basic.sql index c98e5f7..09b3c12 100644 --- a/parser/testdata/ddl/format/attach_table_basic.sql +++ b/parser/testdata/ddl/format/attach_table_basic.sql @@ -14,4 +14,4 @@ PARTITION BY toYYYYMMDD(f3) ORDER BY (f0,f1,f2); -- Format SQL: -CREATE TABLE IF NOT EXISTS test.events_local ON CLUSTER 'default_cluster' (f0 String, f1 String, f2 String, f3 Datetime, f4 Datetime, f5 Map(String, String), f6 String, f7 Datetime DEFAULT now()) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/test/events_local', '{replica}') PARTITION BY toYYYYMMDD(f3) TTL f3 + INTERVAL 6 MONTH ORDER BY (f0, f1, f2); +CREATE TABLE IF NOT EXISTS test.events_local ON CLUSTER 'default_cluster' (f0 String, f1 String, f2 String, f3 Datetime, f4 Datetime, f5 Map(String, String), f6 String, f7 Datetime DEFAULT now()) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/test/events_local', '{replica}') ORDER BY (f0, f1, f2) PARTITION BY toYYYYMMDD(f3) TTL f3 + INTERVAL 6 MONTH; diff --git a/parser/testdata/ddl/format/create_materialized_view_with_empty_table_schema.sql b/parser/testdata/ddl/format/create_materialized_view_with_empty_table_schema.sql index 481f9a0..3170b66 100644 --- a/parser/testdata/ddl/format/create_materialized_view_with_empty_table_schema.sql +++ b/parser/testdata/ddl/format/create_materialized_view_with_empty_table_schema.sql @@ -16,4 +16,4 @@ from where rn = 1; -- Format SQL: -CREATE MATERIALIZED VIEW test.t0 ON CLUSTER default_cluster ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/{layer}-{shard}/test/t0', '{replica}') PARTITION BY toYYYYMM(f0) ORDER BY (f0) POPULATE AS SELECT f0, f1, f2, coalesce(f0, f1) AS f333 FROM (SELECT f0, f1, f2, ROW_NUMBER() OVER (PARTITION BY f0 ORDER BY coalesce(f1, f2)) AS rn FROM test.t WHERE f3 IN ('foo', 'bar', 'test') AND env = 'test') AS tmp WHERE rn = 1; +CREATE MATERIALIZED VIEW test.t0 ON CLUSTER default_cluster ENGINE = ReplicatedAggregatingMergeTree('/clickhouse/{layer}-{shard}/test/t0', '{replica}') ORDER BY (f0) PARTITION BY toYYYYMM(f0) POPULATE AS SELECT f0, f1, f2, coalesce(f0, f1) AS f333 FROM (SELECT f0, f1, f2, ROW_NUMBER() OVER (PARTITION BY f0 ORDER BY coalesce(f1, f2)) AS rn FROM test.t WHERE f3 IN ('foo', 'bar', 'test') AND env = 'test') AS tmp WHERE rn = 1; diff --git a/parser/testdata/ddl/format/create_mv_with_order_by.sql b/parser/testdata/ddl/format/create_mv_with_order_by.sql index 8c40585..004d56e 100644 --- a/parser/testdata/ddl/format/create_mv_with_order_by.sql +++ b/parser/testdata/ddl/format/create_mv_with_order_by.sql @@ -13,5 +13,5 @@ AS SELECT * FROM test_table; -- Format SQL: -CREATE MATERIALIZED VIEW IF NOT EXISTS test_mv ENGINE = ReplacingMergeTree() PRIMARY KEY (id) ORDER BY (id) AS SELECT * FROM test_table; +CREATE MATERIALIZED VIEW IF NOT EXISTS test_mv ENGINE = ReplacingMergeTree() ORDER BY (id) PRIMARY KEY (id) AS SELECT * FROM test_table; CREATE MATERIALIZED VIEW IF NOT EXISTS test_mv ENGINE = ReplacingMergeTree() PRIMARY KEY (id) AS SELECT * FROM test_table; diff --git a/parser/testdata/ddl/format/create_or_replace.sql b/parser/testdata/ddl/format/create_or_replace.sql index 714c070..aa38dbe 100644 --- a/parser/testdata/ddl/format/create_or_replace.sql +++ b/parser/testdata/ddl/format/create_or_replace.sql @@ -26,6 +26,6 @@ FROM CREATE OR REPLACE FUNCTION IF NOT EXISTS my_function AS (x, y) -> x + y; -- Format SQL: -CREATE OR REPLACE TABLE IF NOT EXISTS test.events_local (f0 String, f1 String CODEC(ZSTD(1)), f2 VARCHAR(255)) ENGINE = MergeTree PRIMARY KEY (f0, f1, f2) PARTITION BY toYYYYMMDD(f1) TTL f1 + INTERVAL 6 MONTH ORDER BY (f1, f2) COMMENT 'Comment for table'; +CREATE OR REPLACE TABLE IF NOT EXISTS test.events_local (f0 String, f1 String CODEC(ZSTD(1)), f2 VARCHAR(255)) ENGINE = MergeTree ORDER BY (f1, f2) PARTITION BY toYYYYMMDD(f1) PRIMARY KEY (f0, f1, f2) TTL f1 + INTERVAL 6 MONTH COMMENT 'Comment for table'; CREATE OR REPLACE VIEW IF NOT EXISTS my_view (col1 String, col2 String) AS SELECT id, name FROM my_table; CREATE OR REPLACE FUNCTION IF NOT EXISTS my_function AS (x, y) -> x + y; diff --git a/parser/testdata/ddl/format/create_table_basic.sql b/parser/testdata/ddl/format/create_table_basic.sql index dcf71a4..0a9f2f3 100644 --- a/parser/testdata/ddl/format/create_table_basic.sql +++ b/parser/testdata/ddl/format/create_table_basic.sql @@ -32,4 +32,4 @@ ORDER BY (f1,f2,f3) COMMENT 'Comment for table'; -- Format SQL: -CREATE TABLE IF NOT EXISTS test.events_local (f0 String, f1 String CODEC(ZSTD(1)), f2 VARCHAR(255), f3 Datetime, f4 Datetime, f5 Map(String, String), f6 String, f7 Nested(f70 UInt32, f71 UInt32, f72 DateTime, f73 Int64, f74 Int64, f75 String), f8 Datetime DEFAULT now(), f9 String MATERIALIZED toString(f7['f70']), f10 String ALIAS f11, f12 JSON(max_dynamic_types=10, max_dynamic_paths=3, SKIP a, SKIP a.b.c, SKIP REGEXP 'hello')) ENGINE = MergeTree PRIMARY KEY (f0, f1, f2) PARTITION BY toYYYYMMDD(f3) TTL f3 + INTERVAL 6 MONTH ORDER BY (f1, f2, f3) COMMENT 'Comment for table'; +CREATE TABLE IF NOT EXISTS test.events_local (f0 String, f1 String CODEC(ZSTD(1)), f2 VARCHAR(255), f3 Datetime, f4 Datetime, f5 Map(String, String), f6 String, f7 Nested(f70 UInt32, f71 UInt32, f72 DateTime, f73 Int64, f74 Int64, f75 String), f8 Datetime DEFAULT now(), f9 String MATERIALIZED toString(f7['f70']), f10 String ALIAS f11, f12 JSON(max_dynamic_types=10, max_dynamic_paths=3, SKIP a, SKIP a.b.c, SKIP REGEXP 'hello')) ENGINE = MergeTree ORDER BY (f1, f2, f3) PARTITION BY toYYYYMMDD(f3) PRIMARY KEY (f0, f1, f2) TTL f3 + INTERVAL 6 MONTH COMMENT 'Comment for table'; diff --git a/parser/testdata/ddl/format/create_table_with_codec_delta.sql b/parser/testdata/ddl/format/create_table_with_codec_delta.sql index 6d2a5ac..6122af4 100644 --- a/parser/testdata/ddl/format/create_table_with_codec_delta.sql +++ b/parser/testdata/ddl/format/create_table_with_codec_delta.sql @@ -18,4 +18,4 @@ SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity -- Format SQL: -CREATE TABLE IF NOT EXISTS test_local (`id` UInt64 CODEC(Delta, ZSTD(1)), `api_id` UInt64 CODEC(ZSTD(1)), `app_id` UInt64 CODEC(Delta(9), ZSTD(1)), `device_id` UInt64 CODEC(DoubleDelta, ZSTD(1)), `guage` Float64 CODEC(Gorilla, LZ4), `value` UInt64 CODEC(T64, LZ4), `timestamp` DateTime64(9) CODEC(ZSTD(1)), INDEX timestamp_index(timestamp) TYPE minmax GRANULARITY 4) ENGINE = ReplicatedMergeTree('/root/test_local', '{replica}') PARTITION BY toStartOfHour(`timestamp`) TTL toStartOfHour(`timestamp`) + INTERVAL 7 DAY, toStartOfHour(`timestamp`) + INTERVAL 2 DAY SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity=16384, max_bytes_to_merge_at_max_space_in_pool=64424509440, storage_policy='main', ttl_only_drop_parts=1 ORDER BY (toUnixTimestamp64Nano(`timestamp`), `api_id`); +CREATE TABLE IF NOT EXISTS test_local (`id` UInt64 CODEC(Delta, ZSTD(1)), `api_id` UInt64 CODEC(ZSTD(1)), `app_id` UInt64 CODEC(Delta(9), ZSTD(1)), `device_id` UInt64 CODEC(DoubleDelta, ZSTD(1)), `guage` Float64 CODEC(Gorilla, LZ4), `value` UInt64 CODEC(T64, LZ4), `timestamp` DateTime64(9) CODEC(ZSTD(1)), INDEX timestamp_index(timestamp) TYPE minmax GRANULARITY 4) ENGINE = ReplicatedMergeTree('/root/test_local', '{replica}') ORDER BY (toUnixTimestamp64Nano(`timestamp`), `api_id`) PARTITION BY toStartOfHour(`timestamp`) TTL toStartOfHour(`timestamp`) + INTERVAL 7 DAY, toStartOfHour(`timestamp`) + INTERVAL 2 DAY SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity=16384, max_bytes_to_merge_at_max_space_in_pool=64424509440, storage_policy='main', ttl_only_drop_parts=1; diff --git a/parser/testdata/ddl/format/create_table_with_enum_fields.sql b/parser/testdata/ddl/format/create_table_with_enum_fields.sql index 220adf3..54f6a83 100644 --- a/parser/testdata/ddl/format/create_table_with_enum_fields.sql +++ b/parser/testdata/ddl/format/create_table_with_enum_fields.sql @@ -11,4 +11,4 @@ TTL toDate(timestamp) + toIntervalDay(3) SETTINGS index_granularity = 8192; -- Format SQL: -CREATE TABLE t0 ON CLUSTER default_cluster (`method` Enum8('GET'=1, 'POST'=2, 'HEAD'=3, 'PUT'=4, 'PATCH'=5, 'DELETE'=6, 'CONNECT'=7, 'OPTIONS'=8, 'TRACE'=9) CODEC(ZSTD(1)), `timestamp` DateTime64(3) CODEC(DoubleDelta, ZSTD)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}', '{replica}') PARTITION BY toDate(timestamp) TTL toDate(timestamp) + toIntervalDay(3) SETTINGS index_granularity=8192 ORDER BY (method, timestamp); +CREATE TABLE t0 ON CLUSTER default_cluster (`method` Enum8('GET'=1, 'POST'=2, 'HEAD'=3, 'PUT'=4, 'PATCH'=5, 'DELETE'=6, 'CONNECT'=7, 'OPTIONS'=8, 'TRACE'=9) CODEC(ZSTD(1)), `timestamp` DateTime64(3) CODEC(DoubleDelta, ZSTD)) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}', '{replica}') ORDER BY (method, timestamp) PARTITION BY toDate(timestamp) TTL toDate(timestamp) + toIntervalDay(3) SETTINGS index_granularity=8192; diff --git a/parser/testdata/ddl/format/create_table_with_index.sql b/parser/testdata/ddl/format/create_table_with_index.sql index 5bf1df6..4d48125 100644 --- a/parser/testdata/ddl/format/create_table_with_index.sql +++ b/parser/testdata/ddl/format/create_table_with_index.sql @@ -22,4 +22,4 @@ SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity -- Format SQL: -CREATE TABLE IF NOT EXISTS test_local (`common.id` String CODEC(ZSTD(1)), `id` UInt64 CODEC(Delta, ZSTD(1)), `api_id` UInt64 CODEC(ZSTD(1)), `arr` Array(Int64), `content` String CODEC(ZSTD(1)), `output` String, INDEX id_common_id_bloom_filter common.id TYPE bloom_filter(0.001) GRANULARITY 1, INDEX id_idx id TYPE minmax GRANULARITY 10, INDEX api_id_idx api_id TYPE set(100) GRANULARITY 2, INDEX arr_idx arr TYPE bloom_filter(0.01) GRANULARITY 3, INDEX content_idx content TYPE tokenbf_v1(30720, 2, 0) GRANULARITY 1, INDEX output_idx output TYPE ngrambf_v1(3, 10000, 2, 1) GRANULARITY 2) ENGINE = ReplicatedMergeTree('/root/test_local', '{replica}') PARTITION BY toStartOfHour(`timestamp`) TTL toStartOfHour(`timestamp`) + INTERVAL 7 DAY, toStartOfHour(`timestamp`) + INTERVAL 2 DAY SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity=16384, max_bytes_to_merge_at_max_space_in_pool=64424509440, storage_policy='main', ttl_only_drop_parts=1 ORDER BY (toUnixTimestamp64Nano(`timestamp`), `api_id`); +CREATE TABLE IF NOT EXISTS test_local (`common.id` String CODEC(ZSTD(1)), `id` UInt64 CODEC(Delta, ZSTD(1)), `api_id` UInt64 CODEC(ZSTD(1)), `arr` Array(Int64), `content` String CODEC(ZSTD(1)), `output` String, INDEX id_common_id_bloom_filter common.id TYPE bloom_filter(0.001) GRANULARITY 1, INDEX id_idx id TYPE minmax GRANULARITY 10, INDEX api_id_idx api_id TYPE set(100) GRANULARITY 2, INDEX arr_idx arr TYPE bloom_filter(0.01) GRANULARITY 3, INDEX content_idx content TYPE tokenbf_v1(30720, 2, 0) GRANULARITY 1, INDEX output_idx output TYPE ngrambf_v1(3, 10000, 2, 1) GRANULARITY 2) ENGINE = ReplicatedMergeTree('/root/test_local', '{replica}') ORDER BY (toUnixTimestamp64Nano(`timestamp`), `api_id`) PARTITION BY toStartOfHour(`timestamp`) TTL toStartOfHour(`timestamp`) + INTERVAL 7 DAY, toStartOfHour(`timestamp`) + INTERVAL 2 DAY SETTINGS execute_merges_on_single_replica_time_threshold=1200, index_granularity=16384, max_bytes_to_merge_at_max_space_in_pool=64424509440, storage_policy='main', ttl_only_drop_parts=1; diff --git a/parser/testdata/ddl/format/create_table_with_keyword_partition_by.sql b/parser/testdata/ddl/format/create_table_with_keyword_partition_by.sql index af3956c..f288046 100644 --- a/parser/testdata/ddl/format/create_table_with_keyword_partition_by.sql +++ b/parser/testdata/ddl/format/create_table_with_keyword_partition_by.sql @@ -10,4 +10,4 @@ CREATE TABLE test.events_local UUID 'dad17568-b070-49d0-9ad1-7568b07029d0' ( SETTINGS index_granularity = 8192; -- Format SQL: -CREATE TABLE test.events_local UUID 'dad17568-b070-49d0-9ad1-7568b07029d0' (`date` Date, `f1` String, `f2` String, `f3` UInt64) ENGINE = ReplacingMergeTree PARTITION BY date SETTINGS index_granularity=8192 ORDER BY (f1, f2); +CREATE TABLE test.events_local UUID 'dad17568-b070-49d0-9ad1-7568b07029d0' (`date` Date, `f1` String, `f2` String, `f3` UInt64) ENGINE = ReplacingMergeTree ORDER BY (f1, f2) PARTITION BY date SETTINGS index_granularity=8192; diff --git a/parser/testdata/ddl/format/create_table_with_nullable.sql b/parser/testdata/ddl/format/create_table_with_nullable.sql index f2b9df9..73f1e4c 100644 --- a/parser/testdata/ddl/format/create_table_with_nullable.sql +++ b/parser/testdata/ddl/format/create_table_with_nullable.sql @@ -15,4 +15,4 @@ SETTINGS index_granularity = 8192; -- Format SQL: -CREATE TABLE test.`.inner.752391fb-44cc-4dd5-b523-91fb44cc9dd5` UUID '27673372-7973-44f5-a767-33727973c4f5' (`f0` String, `f1` String, `f2` LowCardinality(String), `f3` LowCardinality(String), `f4` DateTime64(3), `f5` Nullable(DateTime64(3)), `succeed_at` Nullable(DateTime64(3))) ENGINE = MergeTree PARTITION BY xxHash32(tag_id) % 20 SETTINGS index_granularity=8192 ORDER BY label_id; +CREATE TABLE test.`.inner.752391fb-44cc-4dd5-b523-91fb44cc9dd5` UUID '27673372-7973-44f5-a767-33727973c4f5' (`f0` String, `f1` String, `f2` LowCardinality(String), `f3` LowCardinality(String), `f4` DateTime64(3), `f5` Nullable(DateTime64(3)), `succeed_at` Nullable(DateTime64(3))) ENGINE = MergeTree ORDER BY label_id PARTITION BY xxHash32(tag_id) % 20 SETTINGS index_granularity=8192; diff --git a/parser/testdata/ddl/format/create_table_with_on_clsuter.sql b/parser/testdata/ddl/format/create_table_with_on_clsuter.sql index d7eb0c3..71fbcad 100644 --- a/parser/testdata/ddl/format/create_table_with_on_clsuter.sql +++ b/parser/testdata/ddl/format/create_table_with_on_clsuter.sql @@ -14,4 +14,4 @@ PARTITION BY toYYYYMMDD(f3) ORDER BY (f0,f1,f2); -- Format SQL: -CREATE TABLE IF NOT EXISTS test.events_local ON CLUSTER 'default_cluster' (f0 String, f1 String, f2 String, f3 Datetime, f4 Datetime, f5 Map(String, String), f6 String, f7 Datetime DEFAULT now()) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/test/events_local', '{replica}') PARTITION BY toYYYYMMDD(f3) TTL f3 + INTERVAL 6 MONTH ORDER BY (f0, f1, f2); +CREATE TABLE IF NOT EXISTS test.events_local ON CLUSTER 'default_cluster' (f0 String, f1 String, f2 String, f3 Datetime, f4 Datetime, f5 Map(String, String), f6 String, f7 Datetime DEFAULT now()) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/test/events_local', '{replica}') ORDER BY (f0, f1, f2) PARTITION BY toYYYYMMDD(f3) TTL f3 + INTERVAL 6 MONTH; diff --git a/parser/testdata/ddl/format/create_table_with_sample_by.sql b/parser/testdata/ddl/format/create_table_with_sample_by.sql index d61b119..cbc4ae0 100644 --- a/parser/testdata/ddl/format/create_table_with_sample_by.sql +++ b/parser/testdata/ddl/format/create_table_with_sample_by.sql @@ -12,4 +12,4 @@ SAMPLE BY userid SETTINGS index_granularity = 8192; -- Format SQL: -CREATE TABLE default.test UUID '87887901-e33c-497e-8788-7901e33c997e' (`f0` DateTime, `f1` UInt32, `f3` UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}/{shard}/default/test', '{replica}') PARTITION BY toYYYYMM(timestamp) SAMPLE BY userid SETTINGS index_granularity=8192 ORDER BY (contractid, toDate(timestamp), userid); +CREATE TABLE default.test UUID '87887901-e33c-497e-8788-7901e33c997e' (`f0` DateTime, `f1` UInt32, `f3` UInt32) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}/{shard}/default/test', '{replica}') ORDER BY (contractid, toDate(timestamp), userid) PARTITION BY toYYYYMM(timestamp) SAMPLE BY userid SETTINGS index_granularity=8192; diff --git a/parser/testdata/ddl/format/create_table_with_ttl_policy.sql b/parser/testdata/ddl/format/create_table_with_ttl_policy.sql index 160da67..8e2287d 100644 --- a/parser/testdata/ddl/format/create_table_with_ttl_policy.sql +++ b/parser/testdata/ddl/format/create_table_with_ttl_policy.sql @@ -35,6 +35,6 @@ SETTINGS min_rows_for_wide_part = 0, min_bytes_for_wide_part = 0; -- Format SQL: -CREATE TABLE tab (d DateTime, a Int) ENGINE = MergeTree PARTITION BY toYYYYMM(d) TTL d + INTERVAL 1 MONTH DELETE, d + INTERVAL 1 WEEK TO VOLUME 'aaa', d + INTERVAL 2 WEEK TO DISK 'bbb' ORDER BY d; -CREATE TABLE table_with_where (d DateTime, a Int) ENGINE = MergeTree PARTITION BY toYYYYMM(d) TTL d + INTERVAL 1 MONTH DELETE WHERE toDayOfWeek(d) = 1 ORDER BY d; -CREATE TABLE table_for_recompression (d DateTime, key UInt64, value String) ENGINE = MergeTree() PARTITION BY key TTL d + INTERVAL 1 MONTH RECOMPRESS CODEC(ZSTD(17)), d + INTERVAL 1 YEAR RECOMPRESS CODEC(LZ4HC(10)) SETTINGS min_rows_for_wide_part=0, min_bytes_for_wide_part=0 ORDER BY tuple(); +CREATE TABLE tab (d DateTime, a Int) ENGINE = MergeTree ORDER BY d PARTITION BY toYYYYMM(d) TTL d + INTERVAL 1 MONTH DELETE, d + INTERVAL 1 WEEK TO VOLUME 'aaa', d + INTERVAL 2 WEEK TO DISK 'bbb'; +CREATE TABLE table_with_where (d DateTime, a Int) ENGINE = MergeTree ORDER BY d PARTITION BY toYYYYMM(d) TTL d + INTERVAL 1 MONTH DELETE WHERE toDayOfWeek(d) = 1; +CREATE TABLE table_for_recompression (d DateTime, key UInt64, value String) ENGINE = MergeTree() ORDER BY tuple() PARTITION BY key TTL d + INTERVAL 1 MONTH RECOMPRESS CODEC(ZSTD(17)), d + INTERVAL 1 YEAR RECOMPRESS CODEC(LZ4HC(10)) SETTINGS min_rows_for_wide_part=0, min_bytes_for_wide_part=0; diff --git a/parser/testdata/ddl/format/create_table_with_uuid.sql b/parser/testdata/ddl/format/create_table_with_uuid.sql index ec2e27b..b5f2141 100644 --- a/parser/testdata/ddl/format/create_table_with_uuid.sql +++ b/parser/testdata/ddl/format/create_table_with_uuid.sql @@ -14,4 +14,4 @@ PARTITION BY toYYYYMMDD(f3) ORDER BY (f0,f1,f2); -- Format SQL: -CREATE TABLE IF NOT EXISTS test.events_local UUID '1234' ON CLUSTER 'default_cluster' (f0 String, f1 String, f2 String, f3 Datetime, f4 Datetime, f5 Map(String, String), f6 String, f7 Datetime DEFAULT now()) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/test/events_local', '{replica}') PARTITION BY toYYYYMMDD(f3) TTL f3 + INTERVAL 6 MONTH ORDER BY (f0, f1, f2); +CREATE TABLE IF NOT EXISTS test.events_local UUID '1234' ON CLUSTER 'default_cluster' (f0 String, f1 String, f2 String, f3 Datetime, f4 Datetime, f5 Map(String, String), f6 String, f7 Datetime DEFAULT now()) ENGINE = ReplicatedMergeTree('/clickhouse/tables/{layer}-{shard}/test/events_local', '{replica}') ORDER BY (f0, f1, f2) PARTITION BY toYYYYMMDD(f3) TTL f3 + INTERVAL 6 MONTH; diff --git a/parser/testdata/ddl/output/alter_role.sql.golden.json b/parser/testdata/ddl/output/alter_role.sql.golden.json index 2c945ca..fb87f8c 100644 --- a/parser/testdata/ddl/output/alter_role.sql.golden.json +++ b/parser/testdata/ddl/output/alter_role.sql.golden.json @@ -1,7 +1,7 @@ [ { - "AlterPos": 22, - "StatementEnd": 41, + "AlterPos": 24, + "StatementEnd": 43, "IfExists": false, "RoleRenamePairs": [ { @@ -9,21 +9,21 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 33, - "NameEnd": 41 + "NamePos": 35, + "NameEnd": 43 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 41 + "StatementEnd": 43 } ], "Settings": null }, { - "AlterPos": 43, - "StatementEnd": 102, + "AlterPos": 46, + "StatementEnd": 105, "IfExists": false, "RoleRenamePairs": [ { @@ -31,34 +31,34 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 54, - "NameEnd": 62 + "NamePos": 57, + "NameEnd": 65 }, "Scope": null, "OnCluster": { - "OnPos": 63, + "OnPos": 66, "Expr": { "Name": "cluster_1", "QuoteType": 1, - "NamePos": 74, - "NameEnd": 83 + "NamePos": 77, + "NameEnd": 86 } } }, "NewName": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 94, - "NameEnd": 102 + "NamePos": 97, + "NameEnd": 105 }, - "StatementEnd": 102 + "StatementEnd": 105 } ], "Settings": null }, { - "AlterPos": 104, - "StatementEnd": 171, + "AlterPos": 108, + "StatementEnd": 175, "IfExists": false, "RoleRenamePairs": [ { @@ -66,8 +66,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 115, - "NameEnd": 123 + "NamePos": 119, + "NameEnd": 127 }, "Scope": null, "OnCluster": null @@ -75,18 +75,18 @@ "NewName": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 134, - "NameEnd": 142 + "NamePos": 138, + "NameEnd": 146 }, - "StatementEnd": 142 + "StatementEnd": 146 }, { "RoleName": { "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 144, - "NameEnd": 152 + "NamePos": 148, + "NameEnd": 156 }, "Scope": null, "OnCluster": null @@ -94,17 +94,17 @@ "NewName": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 163, - "NameEnd": 171 + "NamePos": 167, + "NameEnd": 175 }, - "StatementEnd": 171 + "StatementEnd": 175 } ], "Settings": null }, { - "AlterPos": 173, - "StatementEnd": 206, + "AlterPos": 178, + "StatementEnd": 211, "IfExists": false, "RoleRenamePairs": [ { @@ -112,14 +112,14 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 192 + "NamePos": 189, + "NameEnd": 197 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 192 + "StatementEnd": 197 } ], "Settings": [ @@ -128,15 +128,15 @@ "Modifier": { "Name": "NONE", "QuoteType": 1, - "NamePos": 202, - "NameEnd": 206 + "NamePos": 207, + "NameEnd": 211 } } ] }, { - "AlterPos": 208, - "StatementEnd": 253, + "AlterPos": 214, + "StatementEnd": 259, "IfExists": false, "RoleRenamePairs": [ { @@ -144,14 +144,14 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 219, - "NameEnd": 227 + "NamePos": 225, + "NameEnd": 233 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 227 + "StatementEnd": 233 } ], "Settings": [ @@ -161,13 +161,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 237, - "NameEnd": 244 + "NamePos": 243, + "NameEnd": 250 }, "Operation": "", "Value": { - "LiteralPos": 246, - "LiteralEnd": 253, + "LiteralPos": 252, + "LiteralEnd": 259, "Literal": "default" } } @@ -177,8 +177,8 @@ ] }, { - "AlterPos": 256, - "StatementEnd": 309, + "AlterPos": 263, + "StatementEnd": 316, "IfExists": false, "RoleRenamePairs": [ { @@ -186,14 +186,14 @@ "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 267, - "NameEnd": 275 + "NamePos": 274, + "NameEnd": 282 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 275 + "StatementEnd": 282 } ], "Settings": [ @@ -203,13 +203,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 285, - "NameEnd": 301 + "NamePos": 292, + "NameEnd": 308 }, "Operation": "=", "Value": { - "NumPos": 302, - "NumEnd": 309, + "NumPos": 309, + "NumEnd": 316, "Literal": "5000000", "Base": 10 } @@ -220,8 +220,8 @@ ] }, { - "AlterPos": 311, - "StatementEnd": 368, + "AlterPos": 319, + "StatementEnd": 376, "IfExists": false, "RoleRenamePairs": [ { @@ -229,14 +229,14 @@ "Name": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 322, - "NameEnd": 330 + "NamePos": 330, + "NameEnd": 338 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 330 + "StatementEnd": 338 } ], "Settings": [ @@ -246,8 +246,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 340, - "NameEnd": 356 + "NamePos": 348, + "NameEnd": 364 }, "Operation": "", "Value": null @@ -256,13 +256,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 357, - "NameEnd": 360 + "NamePos": 365, + "NameEnd": 368 }, "Operation": "=", "Value": { - "NumPos": 361, - "NumEnd": 368, + "NumPos": 369, + "NumEnd": 376, "Literal": "5000000", "Base": 10 } @@ -273,8 +273,8 @@ ] }, { - "AlterPos": 370, - "StatementEnd": 427, + "AlterPos": 379, + "StatementEnd": 436, "IfExists": false, "RoleRenamePairs": [ { @@ -282,14 +282,14 @@ "Name": { "Name": "r5_01293", "QuoteType": 1, - "NamePos": 381, - "NameEnd": 389 + "NamePos": 390, + "NameEnd": 398 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 389 + "StatementEnd": 398 } ], "Settings": [ @@ -299,8 +299,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 399, - "NameEnd": 415 + "NamePos": 408, + "NameEnd": 424 }, "Operation": "", "Value": null @@ -309,13 +309,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 416, - "NameEnd": 419 + "NamePos": 425, + "NameEnd": 428 }, "Operation": "=", "Value": { - "NumPos": 420, - "NumEnd": 427, + "NumPos": 429, + "NumEnd": 436, "Literal": "5000000", "Base": 10 } @@ -326,8 +326,8 @@ ] }, { - "AlterPos": 429, - "StatementEnd": 480, + "AlterPos": 439, + "StatementEnd": 490, "IfExists": false, "RoleRenamePairs": [ { @@ -335,14 +335,14 @@ "Name": { "Name": "r6_01293", "QuoteType": 1, - "NamePos": 440, - "NameEnd": 448 + "NamePos": 450, + "NameEnd": 458 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 448 + "StatementEnd": 458 } ], "Settings": [ @@ -352,8 +352,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 458, - "NameEnd": 474 + "NamePos": 468, + "NameEnd": 484 }, "Operation": "", "Value": null @@ -362,15 +362,15 @@ "Modifier": { "Name": "CONST", "QuoteType": 1, - "NamePos": 475, - "NameEnd": 480 + "NamePos": 485, + "NameEnd": 490 } } ] }, { - "AlterPos": 482, - "StatementEnd": 536, + "AlterPos": 493, + "StatementEnd": 547, "IfExists": false, "RoleRenamePairs": [ { @@ -378,14 +378,14 @@ "Name": { "Name": "r7_01293", "QuoteType": 1, - "NamePos": 493, - "NameEnd": 501 + "NamePos": 504, + "NameEnd": 512 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 501 + "StatementEnd": 512 } ], "Settings": [ @@ -395,8 +395,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 511, - "NameEnd": 527 + "NamePos": 522, + "NameEnd": 538 }, "Operation": "", "Value": null @@ -405,15 +405,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 528, - "NameEnd": 536 + "NamePos": 539, + "NameEnd": 547 } } ] }, { - "AlterPos": 538, - "StatementEnd": 621, + "AlterPos": 550, + "StatementEnd": 633, "IfExists": false, "RoleRenamePairs": [ { @@ -421,14 +421,14 @@ "Name": { "Name": "r8_01293", "QuoteType": 1, - "NamePos": 549, - "NameEnd": 557 + "NamePos": 561, + "NameEnd": 569 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 557 + "StatementEnd": 569 } ], "Settings": [ @@ -438,13 +438,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 567, - "NameEnd": 583 + "NamePos": 579, + "NameEnd": 595 }, "Operation": "=", "Value": { - "NumPos": 584, - "NumEnd": 591, + "NumPos": 596, + "NumEnd": 603, "Literal": "5000000", "Base": 10 } @@ -453,13 +453,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 592, - "NameEnd": 595 + "NamePos": 604, + "NameEnd": 607 }, "Operation": "", "Value": { - "NumPos": 596, - "NumEnd": 603, + "NumPos": 608, + "NumEnd": 615, "Literal": "4000000", "Base": 10 } @@ -468,13 +468,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 604, - "NameEnd": 607 + "NamePos": 616, + "NameEnd": 619 }, "Operation": "", "Value": { - "NumPos": 608, - "NumEnd": 615, + "NumPos": 620, + "NumEnd": 627, "Literal": "6000000", "Base": 10 } @@ -483,15 +483,15 @@ "Modifier": { "Name": "CONST", "QuoteType": 1, - "NamePos": 616, - "NameEnd": 621 + "NamePos": 628, + "NameEnd": 633 } } ] }, { - "AlterPos": 623, - "StatementEnd": 704, + "AlterPos": 636, + "StatementEnd": 717, "IfExists": false, "RoleRenamePairs": [ { @@ -499,14 +499,14 @@ "Name": { "Name": "r9_01293", "QuoteType": 1, - "NamePos": 634, - "NameEnd": 642 + "NamePos": 647, + "NameEnd": 655 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 642 + "StatementEnd": 655 } ], "Settings": [ @@ -516,13 +516,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 652, - "NameEnd": 659 + "NamePos": 665, + "NameEnd": 672 }, "Operation": "", "Value": { - "LiteralPos": 661, - "LiteralEnd": 668, + "LiteralPos": 674, + "LiteralEnd": 681, "Literal": "default" } } @@ -535,13 +535,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 671, - "NameEnd": 687 + "NamePos": 684, + "NameEnd": 700 }, "Operation": "=", "Value": { - "NumPos": 688, - "NumEnd": 695, + "NumPos": 701, + "NumEnd": 708, "Literal": "5000000", "Base": 10 } @@ -550,15 +550,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 696, - "NameEnd": 704 + "NamePos": 709, + "NameEnd": 717 } } ] }, { - "AlterPos": 706, - "StatementEnd": 735, + "AlterPos": 720, + "StatementEnd": 749, "IfExists": false, "RoleRenamePairs": [ { @@ -566,35 +566,35 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 717, - "NameEnd": 725 + "NamePos": 731, + "NameEnd": 739 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 725 + "StatementEnd": 739 }, { "RoleName": { "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 727, - "NameEnd": 735 + "NamePos": 741, + "NameEnd": 749 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 735 + "StatementEnd": 749 } ], "Settings": null }, { - "AlterPos": 737, - "StatementEnd": 776, + "AlterPos": 752, + "StatementEnd": 791, "IfExists": false, "RoleRenamePairs": [ { @@ -602,14 +602,14 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 748, - "NameEnd": 756 + "NamePos": 763, + "NameEnd": 771 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 756 + "StatementEnd": 771 } ], "Settings": [ @@ -619,13 +619,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 766, - "NameEnd": 774 + "NamePos": 781, + "NameEnd": 789 }, "Operation": "=", "Value": { - "NumPos": 775, - "NumEnd": 776, + "NumPos": 790, + "NumEnd": 791, "Literal": "1", "Base": 10 } @@ -636,8 +636,8 @@ ] }, { - "AlterPos": 778, - "StatementEnd": 823, + "AlterPos": 794, + "StatementEnd": 839, "IfExists": false, "RoleRenamePairs": [ { @@ -645,14 +645,14 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 789, - "NameEnd": 797 + "NamePos": 805, + "NameEnd": 813 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 797 + "StatementEnd": 813 } ], "Settings": [ @@ -662,13 +662,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 807, - "NameEnd": 814 + "NamePos": 823, + "NameEnd": 830 }, "Operation": "", "Value": { - "LiteralPos": 816, - "LiteralEnd": 823, + "LiteralPos": 832, + "LiteralEnd": 839, "Literal": "default" } } @@ -678,8 +678,8 @@ ] }, { - "AlterPos": 826, - "StatementEnd": 912, + "AlterPos": 843, + "StatementEnd": 929, "IfExists": false, "RoleRenamePairs": [ { @@ -687,14 +687,14 @@ "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 837, - "NameEnd": 845 + "NamePos": 854, + "NameEnd": 862 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 845 + "StatementEnd": 862 } ], "Settings": [ @@ -704,13 +704,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 855, - "NameEnd": 871 + "NamePos": 872, + "NameEnd": 888 }, "Operation": "=", "Value": { - "NumPos": 872, - "NumEnd": 879, + "NumPos": 889, + "NumEnd": 896, "Literal": "5000000", "Base": 10 } @@ -719,13 +719,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 880, - "NameEnd": 883 + "NamePos": 897, + "NameEnd": 900 }, "Operation": "", "Value": { - "NumPos": 884, - "NumEnd": 891, + "NumPos": 901, + "NumEnd": 908, "Literal": "4000000", "Base": 10 } @@ -734,13 +734,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 892, - "NameEnd": 895 + "NamePos": 909, + "NameEnd": 912 }, "Operation": "", "Value": { - "NumPos": 896, - "NumEnd": 903, + "NumPos": 913, + "NumEnd": 920, "Literal": "6000000", "Base": 10 } @@ -749,15 +749,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 904, - "NameEnd": 912 + "NamePos": 921, + "NameEnd": 929 } } ] }, { - "AlterPos": 914, - "StatementEnd": 998, + "AlterPos": 932, + "StatementEnd": 1016, "IfExists": false, "RoleRenamePairs": [ { @@ -765,14 +765,14 @@ "Name": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 925, - "NameEnd": 933 + "NamePos": 943, + "NameEnd": 951 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 933 + "StatementEnd": 951 } ], "Settings": [ @@ -782,13 +782,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 943, - "NameEnd": 950 + "NamePos": 961, + "NameEnd": 968 }, "Operation": "", "Value": { - "LiteralPos": 952, - "LiteralEnd": 959, + "LiteralPos": 970, + "LiteralEnd": 977, "Literal": "default" } } @@ -801,13 +801,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 962, - "NameEnd": 978 + "NamePos": 980, + "NameEnd": 996 }, "Operation": "=", "Value": { - "NumPos": 979, - "NumEnd": 986, + "NumPos": 997, + "NumEnd": 1004, "Literal": "5000000", "Base": 10 } @@ -821,13 +821,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 988, - "NameEnd": 996 + "NamePos": 1006, + "NameEnd": 1014 }, "Operation": "=", "Value": { - "NumPos": 997, - "NumEnd": 998, + "NumPos": 1015, + "NumEnd": 1016, "Literal": "1", "Base": 10 } @@ -838,8 +838,8 @@ ] }, { - "AlterPos": 1000, - "StatementEnd": 1033, + "AlterPos": 1019, + "StatementEnd": 1052, "IfExists": false, "RoleRenamePairs": [ { @@ -847,14 +847,14 @@ "Name": { "Name": "r5_01293", "QuoteType": 1, - "NamePos": 1011, - "NameEnd": 1019 + "NamePos": 1030, + "NameEnd": 1038 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 1019 + "StatementEnd": 1038 } ], "Settings": [ @@ -863,15 +863,15 @@ "Modifier": { "Name": "NONE", "QuoteType": 1, - "NamePos": 1029, - "NameEnd": 1033 + "NamePos": 1048, + "NameEnd": 1052 } } ] }, { - "AlterPos": 1035, - "StatementEnd": 1057, + "AlterPos": 1055, + "StatementEnd": 1077, "IfExists": false, "RoleRenamePairs": [ { @@ -879,25 +879,25 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 1046, - "NameEnd": 1054 + "NamePos": 1066, + "NameEnd": 1074 }, "Scope": { - "LiteralPos": 1056, - "LiteralEnd": 1057, + "LiteralPos": 1076, + "LiteralEnd": 1077, "Literal": "%" }, "OnCluster": null }, "NewName": null, - "StatementEnd": 1057 + "StatementEnd": 1077 } ], "Settings": null }, { - "AlterPos": 1060, - "StatementEnd": 1093, + "AlterPos": 1081, + "StatementEnd": 1114, "IfExists": false, "RoleRenamePairs": [ { @@ -905,18 +905,18 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 1071, - "NameEnd": 1079 + "NamePos": 1092, + "NameEnd": 1100 }, "Scope": { - "LiteralPos": 1081, - "LiteralEnd": 1093, + "LiteralPos": 1102, + "LiteralEnd": 1114, "Literal": "%.myhost.com" }, "OnCluster": null }, "NewName": null, - "StatementEnd": 1093 + "StatementEnd": 1114 } ], "Settings": null diff --git a/parser/testdata/ddl/output/alter_table_add_index.sql.golden.json b/parser/testdata/ddl/output/alter_table_add_index.sql.golden.json index 569f618..7e1efde 100644 --- a/parser/testdata/ddl/output/alter_table_add_index.sql.golden.json +++ b/parser/testdata/ddl/output/alter_table_add_index.sql.golden.json @@ -84,42 +84,42 @@ ] }, { - "AlterPos": 112, - "StatementEnd": 226, + "AlterPos": 113, + "StatementEnd": 227, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 124, - "NameEnd": 128 + "NamePos": 125, + "NameEnd": 129 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 141 + "NamePos": 130, + "NameEnd": 142 } }, "OnCluster": { - "OnPos": 142, + "OnPos": 143, "Expr": { - "LiteralPos": 154, - "LiteralEnd": 169, + "LiteralPos": 155, + "LiteralEnd": 170, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 171, - "StatementEnd": 226, + "AddPos": 172, + "StatementEnd": 227, "Index": { - "IndexPos": 175, + "IndexPos": 176, "Name": { "Ident": { "Name": "api_id_idx", "QuoteType": 1, - "NamePos": 181, - "NameEnd": 191 + "NamePos": 182, + "NameEnd": 192 }, "DotIdent": null }, @@ -127,32 +127,32 @@ "Expr": { "Name": "api_id", "QuoteType": 1, - "NamePos": 192, - "NameEnd": 198 + "NamePos": 193, + "NameEnd": 199 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 208, - "RightParenPos": 211, + "LeftParenPos": 209, + "RightParenPos": 212, "Name": { "Name": "set", "QuoteType": 1, - "NamePos": 204, - "NameEnd": 207 + "NamePos": 205, + "NameEnd": 208 }, "Params": [ { - "NumPos": 208, - "NumEnd": 211, + "NumPos": 209, + "NumEnd": 212, "Literal": "100", "Base": 10 } ] }, "Granularity": { - "NumPos": 225, - "NumEnd": 226, + "NumPos": 226, + "NumEnd": 227, "Literal": "2", "Base": 10 } @@ -163,42 +163,42 @@ ] }, { - "AlterPos": 228, - "StatementEnd": 346, + "AlterPos": 230, + "StatementEnd": 348, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 240, - "NameEnd": 244 + "NamePos": 242, + "NameEnd": 246 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 245, - "NameEnd": 257 + "NamePos": 247, + "NameEnd": 259 } }, "OnCluster": { - "OnPos": 258, + "OnPos": 260, "Expr": { - "LiteralPos": 270, - "LiteralEnd": 285, + "LiteralPos": 272, + "LiteralEnd": 287, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 287, - "StatementEnd": 346, + "AddPos": 289, + "StatementEnd": 348, "Index": { - "IndexPos": 291, + "IndexPos": 293, "Name": { "Ident": { "Name": "arr_idx", "QuoteType": 1, - "NamePos": 297, - "NameEnd": 304 + "NamePos": 299, + "NameEnd": 306 }, "DotIdent": null }, @@ -206,32 +206,32 @@ "Expr": { "Name": "arr", "QuoteType": 1, - "NamePos": 305, - "NameEnd": 308 + "NamePos": 307, + "NameEnd": 310 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 327, - "RightParenPos": 331, + "LeftParenPos": 329, + "RightParenPos": 333, "Name": { "Name": "bloom_filter", "QuoteType": 1, - "NamePos": 314, - "NameEnd": 326 + "NamePos": 316, + "NameEnd": 328 }, "Params": [ { - "NumPos": 327, - "NumEnd": 331, + "NumPos": 329, + "NumEnd": 333, "Literal": "0.01", "Base": 10 } ] }, "Granularity": { - "NumPos": 345, - "NumEnd": 346, + "NumPos": 347, + "NumEnd": 348, "Literal": "3", "Base": 10 } @@ -242,42 +242,42 @@ ] }, { - "AlterPos": 348, - "StatementEnd": 479, + "AlterPos": 351, + "StatementEnd": 482, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 360, - "NameEnd": 364 + "NamePos": 363, + "NameEnd": 367 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 365, - "NameEnd": 377 + "NamePos": 368, + "NameEnd": 380 } }, "OnCluster": { - "OnPos": 378, + "OnPos": 381, "Expr": { - "LiteralPos": 390, - "LiteralEnd": 405, + "LiteralPos": 393, + "LiteralEnd": 408, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 407, - "StatementEnd": 479, + "AddPos": 410, + "StatementEnd": 482, "Index": { - "IndexPos": 411, + "IndexPos": 414, "Name": { "Ident": { "Name": "content_idx", "QuoteType": 1, - "NamePos": 417, - "NameEnd": 428 + "NamePos": 420, + "NameEnd": 431 }, "DotIdent": null }, @@ -285,44 +285,44 @@ "Expr": { "Name": "content", "QuoteType": 1, - "NamePos": 429, - "NameEnd": 436 + "NamePos": 432, + "NameEnd": 439 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 453, - "RightParenPos": 464, + "LeftParenPos": 456, + "RightParenPos": 467, "Name": { "Name": "tokenbf_v1", "QuoteType": 1, - "NamePos": 442, - "NameEnd": 452 + "NamePos": 445, + "NameEnd": 455 }, "Params": [ { - "NumPos": 453, - "NumEnd": 458, + "NumPos": 456, + "NumEnd": 461, "Literal": "30720", "Base": 10 }, { - "NumPos": 460, - "NumEnd": 461, + "NumPos": 463, + "NumEnd": 464, "Literal": "2", "Base": 10 }, { - "NumPos": 463, - "NumEnd": 464, + "NumPos": 466, + "NumEnd": 467, "Literal": "0", "Base": 10 } ] }, "Granularity": { - "NumPos": 478, - "NumEnd": 479, + "NumPos": 481, + "NumEnd": 482, "Literal": "1", "Base": 10 } @@ -333,42 +333,42 @@ ] }, { - "AlterPos": 481, - "StatementEnd": 613, + "AlterPos": 485, + "StatementEnd": 617, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 493, - "NameEnd": 497 + "NamePos": 497, + "NameEnd": 501 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 498, - "NameEnd": 510 + "NamePos": 502, + "NameEnd": 514 } }, "OnCluster": { - "OnPos": 511, + "OnPos": 515, "Expr": { - "LiteralPos": 523, - "LiteralEnd": 538, + "LiteralPos": 527, + "LiteralEnd": 542, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 540, - "StatementEnd": 613, + "AddPos": 544, + "StatementEnd": 617, "Index": { - "IndexPos": 544, + "IndexPos": 548, "Name": { "Ident": { "Name": "output_idx", "QuoteType": 1, - "NamePos": 550, - "NameEnd": 560 + "NamePos": 554, + "NameEnd": 564 }, "DotIdent": null }, @@ -376,50 +376,50 @@ "Expr": { "Name": "output", "QuoteType": 1, - "NamePos": 561, - "NameEnd": 567 + "NamePos": 565, + "NameEnd": 571 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 584, - "RightParenPos": 598, + "LeftParenPos": 588, + "RightParenPos": 602, "Name": { "Name": "ngrambf_v1", "QuoteType": 1, - "NamePos": 573, - "NameEnd": 583 + "NamePos": 577, + "NameEnd": 587 }, "Params": [ { - "NumPos": 584, - "NumEnd": 585, + "NumPos": 588, + "NumEnd": 589, "Literal": "3", "Base": 10 }, { - "NumPos": 587, - "NumEnd": 592, + "NumPos": 591, + "NumEnd": 596, "Literal": "10000", "Base": 10 }, { - "NumPos": 594, - "NumEnd": 595, + "NumPos": 598, + "NumEnd": 599, "Literal": "2", "Base": 10 }, { - "NumPos": 597, - "NumEnd": 598, + "NumPos": 601, + "NumEnd": 602, "Literal": "1", "Base": 10 } ] }, "Granularity": { - "NumPos": 612, - "NumEnd": 613, + "NumPos": 616, + "NumEnd": 617, "Literal": "2", "Base": 10 } diff --git a/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json b/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json index fbe03cf..2f23a00 100644 --- a/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json +++ b/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json @@ -1,7 +1,7 @@ [ { "AlterPos": 0, - "StatementEnd": 140, + "StatementEnd": 142, "TableIdentifier": { "Database": null, "Table": { @@ -14,56 +14,56 @@ "OnCluster": null, "AlterExprs": [ { - "AddPos": 25, - "StatementEnd": 140, + "AddPos": 26, + "StatementEnd": 142, "IfNotExists": true, "TableProjection": { "IncludeProjectionKeyword": false, - "ProjectionPos": 55, + "ProjectionPos": 56, "Identifier": { "Ident": { "Name": "user_name_projection", "QuoteType": 1, - "NamePos": 55, - "NameEnd": 75 + "NamePos": 56, + "NameEnd": 76 }, "DotIdent": null }, "Select": { - "LeftParenPos": 76, - "RightParenPos": 123, + "LeftParenPos": 78, + "RightParenPos": 125, "With": null, "SelectColumns": { - "ListPos": 84, - "ListEnd": 84, + "ListPos": 86, + "ListEnd": 86, "HasDistinct": false, "Items": [ { "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 84, - "NameEnd": 84 + "NamePos": 86, + "NameEnd": 86 }, "Alias": null } ] }, "GroupBy": { - "GroupByPos": 86, - "GroupByEnd": 105, + "GroupByPos": 88, + "GroupByEnd": 107, "AggregateType": "", "Expr": { - "ListPos": 95, - "ListEnd": 104, + "ListPos": 97, + "ListEnd": 106, "HasDistinct": false, "Items": [ { "Expr": { "Name": "user_name", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 104 + "NamePos": 97, + "NameEnd": 106 }, "Alias": null } @@ -74,18 +74,18 @@ "WithTotals": false }, "OrderBy": { - "OrderByPos": 105, + "OrderByPos": 107, "Columns": { - "ListPos": 114, - "ListEnd": 123, + "ListPos": 116, + "ListEnd": 125, "HasDistinct": false, "Items": [ { "Expr": { "Name": "user_name", "QuoteType": 1, - "NamePos": 114, - "NameEnd": 123 + "NamePos": 116, + "NameEnd": 125 }, "Alias": null } @@ -98,14 +98,14 @@ "Ident": { "Name": "a", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 132 + "NamePos": 133, + "NameEnd": 134 }, "DotIdent": { "Name": "user_id", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 140 + "NamePos": 135, + "NameEnd": 142 } } } diff --git a/parser/testdata/ddl/output/alter_table_attach_partition.sql.golden.json b/parser/testdata/ddl/output/alter_table_attach_partition.sql.golden.json index dc0f400..7dbf6ea 100644 --- a/parser/testdata/ddl/output/alter_table_attach_partition.sql.golden.json +++ b/parser/testdata/ddl/output/alter_table_attach_partition.sql.golden.json @@ -30,26 +30,26 @@ ] }, { - "AlterPos": 46, - "StatementEnd": 101, + "AlterPos": 47, + "StatementEnd": 102, "TableIdentifier": { "Database": null, "Table": { "Name": "test", "QuoteType": 1, - "NamePos": 58, - "NameEnd": 62 + "NamePos": 59, + "NameEnd": 63 } }, "OnCluster": null, "AlterExprs": [ { - "AttachPos": 63, + "AttachPos": 64, "Partition": { - "PartitionPos": 70, + "PartitionPos": 71, "Expr": { - "LiteralPos": 81, - "LiteralEnd": 89, + "LiteralPos": 82, + "LiteralEnd": 90, "Literal": "20210114" }, "ID": null, @@ -60,35 +60,35 @@ "Table": { "Name": "test1", "QuoteType": 1, - "NamePos": 96, - "NameEnd": 101 + "NamePos": 97, + "NameEnd": 102 } } } ] }, { - "AlterPos": 103, - "StatementEnd": 149, + "AlterPos": 105, + "StatementEnd": 151, "TableIdentifier": { "Database": null, "Table": { "Name": "test", "QuoteType": 1, - "NamePos": 115, - "NameEnd": 119 + "NamePos": 117, + "NameEnd": 121 } }, "OnCluster": null, "AlterExprs": [ { - "AttachPos": 120, + "AttachPos": 122, "Partition": { - "PartitionPos": 127, + "PartitionPos": 129, "Expr": null, "ID": { - "LiteralPos": 141, - "LiteralEnd": 149, + "LiteralPos": 143, + "LiteralEnd": 151, "Literal": "20210114" }, "All": false diff --git a/parser/testdata/ddl/output/attach_table_basic.sql.golden.json b/parser/testdata/ddl/output/attach_table_basic.sql.golden.json index 6c5024f..be8d6c6 100644 --- a/parser/testdata/ddl/output/attach_table_basic.sql.golden.json +++ b/parser/testdata/ddl/output/attach_table_basic.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 399, + "StatementEnd": 411, "OrReplace": false, "Name": { "Database": { @@ -29,17 +29,17 @@ }, "TableSchema": { "SchemaPos": 74, - "SchemaEnd": 227, + "SchemaEnd": 236, "Columns": [ { - "NamePos": 80, - "ColumnEnd": 89, + "NamePos": 81, + "ColumnEnd": 90, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 80, - "NameEnd": 82 + "NamePos": 81, + "NameEnd": 83 }, "DotIdent": null }, @@ -47,8 +47,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 89 + "NamePos": 84, + "NameEnd": 90 } }, "NotNull": null, @@ -62,14 +62,14 @@ "CompressionCodec": null }, { - "NamePos": 95, - "ColumnEnd": 104, + "NamePos": 97, + "ColumnEnd": 106, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 97 + "NamePos": 97, + "NameEnd": 99 }, "DotIdent": null }, @@ -77,8 +77,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 98, - "NameEnd": 104 + "NamePos": 100, + "NameEnd": 106 } }, "NotNull": null, @@ -92,14 +92,14 @@ "CompressionCodec": null }, { - "NamePos": 110, - "ColumnEnd": 119, + "NamePos": 113, + "ColumnEnd": 122, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 110, - "NameEnd": 112 + "NamePos": 113, + "NameEnd": 115 }, "DotIdent": null }, @@ -107,8 +107,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 113, - "NameEnd": 119 + "NamePos": 116, + "NameEnd": 122 } }, "NotNull": null, @@ -122,14 +122,14 @@ "CompressionCodec": null }, { - "NamePos": 125, - "ColumnEnd": 136, + "NamePos": 129, + "ColumnEnd": 140, "Name": { "Ident": { "Name": "f3", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 127 + "NamePos": 129, + "NameEnd": 131 }, "DotIdent": null }, @@ -137,8 +137,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 128, - "NameEnd": 136 + "NamePos": 132, + "NameEnd": 140 } }, "NotNull": null, @@ -152,14 +152,14 @@ "CompressionCodec": null }, { - "NamePos": 142, - "ColumnEnd": 153, + "NamePos": 147, + "ColumnEnd": 158, "Name": { "Ident": { "Name": "f4", "QuoteType": 1, - "NamePos": 142, - "NameEnd": 144 + "NamePos": 147, + "NameEnd": 149 }, "DotIdent": null }, @@ -167,8 +167,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 145, - "NameEnd": 153 + "NamePos": 150, + "NameEnd": 158 } }, "NotNull": null, @@ -182,41 +182,41 @@ "CompressionCodec": null }, { - "NamePos": 159, - "ColumnEnd": 179, + "NamePos": 165, + "ColumnEnd": 185, "Name": { "Ident": { "Name": "f5", "QuoteType": 1, - "NamePos": 159, - "NameEnd": 161 + "NamePos": 165, + "NameEnd": 167 }, "DotIdent": null }, "Type": { - "LeftParenPos": 166, - "RightParenPos": 179, + "LeftParenPos": 172, + "RightParenPos": 185, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 162, - "NameEnd": 165 + "NamePos": 168, + "NameEnd": 171 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 166, - "NameEnd": 172 + "NamePos": 172, + "NameEnd": 178 } }, { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 173, - "NameEnd": 179 + "NamePos": 179, + "NameEnd": 185 } } ] @@ -232,14 +232,14 @@ "CompressionCodec": null }, { - "NamePos": 186, - "ColumnEnd": 195, + "NamePos": 193, + "ColumnEnd": 202, "Name": { "Ident": { "Name": "f6", "QuoteType": 1, - "NamePos": 186, - "NameEnd": 188 + "NamePos": 193, + "NameEnd": 195 }, "DotIdent": null }, @@ -247,8 +247,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 189, - "NameEnd": 195 + "NamePos": 196, + "NameEnd": 202 } }, "NotNull": null, @@ -262,14 +262,14 @@ "CompressionCodec": null }, { - "NamePos": 201, - "ColumnEnd": 225, + "NamePos": 209, + "ColumnEnd": 233, "Name": { "Ident": { "Name": "f7", "QuoteType": 1, - "NamePos": 201, - "NameEnd": 203 + "NamePos": 209, + "NameEnd": 211 }, "DotIdent": null }, @@ -277,8 +277,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 204, - "NameEnd": 212 + "NamePos": 212, + "NameEnd": 220 } }, "NotNull": null, @@ -287,15 +287,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 221, - "NameEnd": 224 + "NamePos": 229, + "NameEnd": 232 }, "Params": { - "LeftParenPos": 224, - "RightParenPos": 225, + "LeftParenPos": 232, + "RightParenPos": 233, "Items": { - "ListPos": 225, - "ListEnd": 225, + "ListPos": 233, + "ListEnd": 233, "HasDistinct": false, "Items": [] }, @@ -314,29 +314,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 229, - "EngineEnd": 399, + "EnginePos": 238, + "EngineEnd": 411, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 257, - "RightParenPos": 325, + "LeftParenPos": 266, + "RightParenPos": 334, "Items": { - "ListPos": 259, - "ListEnd": 324, + "ListPos": 268, + "ListEnd": 333, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 259, - "LiteralEnd": 311, + "LiteralPos": 268, + "LiteralEnd": 320, "Literal": "/clickhouse/tables/{layer}-{shard}/test/events_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 315, - "LiteralEnd": 324, + "LiteralPos": 324, + "LiteralEnd": 333, "Literal": "{replica}" }, "Alias": null @@ -347,10 +347,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 353, + "PartitionPos": 364, "Expr": { - "ListPos": 366, - "ListEnd": 379, + "ListPos": 377, + "ListEnd": 390, "HasDistinct": false, "Items": [ { @@ -358,23 +358,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 366, - "NameEnd": 376 + "NamePos": 377, + "NameEnd": 387 }, "Params": { - "LeftParenPos": 376, - "RightParenPos": 379, + "LeftParenPos": 387, + "RightParenPos": 390, "Items": { - "ListPos": 377, - "ListEnd": 379, + "ListPos": 388, + "ListEnd": 390, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 377, - "NameEnd": 379 + "NamePos": 388, + "NameEnd": 390 }, "Alias": null } @@ -390,32 +390,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 327, - "ListEnd": 352, + "TTLPos": 337, + "ListEnd": 362, "Items": [ { - "TTLPos": 327, + "TTLPos": 337, "Expr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 331, - "NameEnd": 333 + "NamePos": 341, + "NameEnd": 343 }, "Operation": "+", "RightExpr": { - "IntervalPos": 336, + "IntervalPos": 346, "Expr": { - "NumPos": 345, - "NumEnd": 346, + "NumPos": 355, + "NumEnd": 356, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 347, - "NameEnd": 352 + "NamePos": 357, + "NameEnd": 362 } }, "HasGlobal": false, @@ -427,25 +427,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 381, - "ListEnd": 399, + "OrderPos": 393, + "ListEnd": 411, "Items": [ { - "OrderPos": 381, + "OrderPos": 393, "Expr": { - "LeftParenPos": 390, - "RightParenPos": 399, + "LeftParenPos": 402, + "RightParenPos": 411, "Items": { - "ListPos": 391, - "ListEnd": 399, + "ListPos": 403, + "ListEnd": 411, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 391, - "NameEnd": 393 + "NamePos": 403, + "NameEnd": 405 }, "Alias": null }, @@ -453,8 +453,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 394, - "NameEnd": 396 + "NamePos": 406, + "NameEnd": 408 }, "Alias": null }, @@ -462,8 +462,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 397, - "NameEnd": 399 + "NamePos": 409, + "NameEnd": 411 }, "Alias": null } diff --git a/parser/testdata/ddl/output/bug_001.sql.golden.json b/parser/testdata/ddl/output/bug_001.sql.golden.json index 2668bdd..1d3276b 100644 --- a/parser/testdata/ddl/output/bug_001.sql.golden.json +++ b/parser/testdata/ddl/output/bug_001.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 635, + "StatementEnd": 651, "Name": { "Database": { "Name": "db", @@ -18,10 +18,10 @@ }, "IfNotExists": true, "OnCluster": { - "OnPos": 60, + "OnPos": 61, "Expr": { - "LiteralPos": 72, - "LiteralEnd": 87, + "LiteralPos": 73, + "LiteralEnd": 88, "Literal": "default_cluster" } }, @@ -33,19 +33,19 @@ "Engine": null, "HasEmpty": false, "Destination": { - "ToPos": 89, + "ToPos": 90, "TableIdentifier": { "Database": { "Name": "db", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 94 + "NamePos": 93, + "NameEnd": 95 }, "Table": { "Name": "table_mv", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 103 + "NamePos": 96, + "NameEnd": 104 } }, "TableSchema": null @@ -53,8 +53,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 107, - "StatementEnd": 635, + "SelectPos": 110, + "StatementEnd": 651, "With": null, "Top": null, "HasDistinct": false, @@ -64,8 +64,8 @@ "Expr": { "Name": "event_ts", "QuoteType": 1, - "NamePos": 118, - "NameEnd": 126 + "NamePos": 122, + "NameEnd": 130 }, "Modifiers": [], "Alias": null @@ -74,8 +74,8 @@ "Expr": { "Name": "org_id", "QuoteType": 1, - "NamePos": 132, - "NameEnd": 138 + "NamePos": 137, + "NameEnd": 143 }, "Modifiers": [], "Alias": null @@ -85,30 +85,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 144, - "NameEnd": 167 + "NamePos": 150, + "NameEnd": 173 }, "Params": { - "LeftParenPos": 167, - "RightParenPos": 183, + "LeftParenPos": 173, + "RightParenPos": 189, "Items": { - "ListPos": 168, - "ListEnd": 182, + "ListPos": 174, + "ListEnd": 188, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 168, - "NameEnd": 178 + "NamePos": 174, + "NameEnd": 184 }, "Alias": null }, { "Expr": { - "LiteralPos": 181, - "LiteralEnd": 182, + "LiteralPos": 187, + "LiteralEnd": 188, "Literal": "x" }, "Alias": null @@ -122,8 +122,8 @@ "Alias": { "Name": "x", "QuoteType": 1, - "NamePos": 188, - "NameEnd": 189 + "NamePos": 194, + "NameEnd": 195 } }, { @@ -131,30 +131,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 195, - "NameEnd": 218 + "NamePos": 202, + "NameEnd": 225 }, "Params": { - "LeftParenPos": 218, - "RightParenPos": 234, + "LeftParenPos": 225, + "RightParenPos": 241, "Items": { - "ListPos": 219, - "ListEnd": 233, + "ListPos": 226, + "ListEnd": 240, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 219, - "NameEnd": 229 + "NamePos": 226, + "NameEnd": 236 }, "Alias": null }, { "Expr": { - "LiteralPos": 232, - "LiteralEnd": 233, + "LiteralPos": 239, + "LiteralEnd": 240, "Literal": "y" }, "Alias": null @@ -168,8 +168,8 @@ "Alias": { "Name": "y", "QuoteType": 1, - "NamePos": 239, - "NameEnd": 240 + "NamePos": 246, + "NameEnd": 247 } }, { @@ -177,30 +177,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 246, - "NameEnd": 269 + "NamePos": 254, + "NameEnd": 277 }, "Params": { - "LeftParenPos": 269, - "RightParenPos": 285, + "LeftParenPos": 277, + "RightParenPos": 293, "Items": { - "ListPos": 270, - "ListEnd": 284, + "ListPos": 278, + "ListEnd": 292, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 270, - "NameEnd": 280 + "NamePos": 278, + "NameEnd": 288 }, "Alias": null }, { "Expr": { - "LiteralPos": 283, - "LiteralEnd": 284, + "LiteralPos": 291, + "LiteralEnd": 292, "Literal": "z" }, "Alias": null @@ -214,8 +214,8 @@ "Alias": { "Name": "z", "QuoteType": 1, - "NamePos": 290, - "NameEnd": 291 + "NamePos": 298, + "NameEnd": 299 } }, { @@ -223,30 +223,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 297, - "NameEnd": 320 + "NamePos": 306, + "NameEnd": 329 }, "Params": { - "LeftParenPos": 320, - "RightParenPos": 336, + "LeftParenPos": 329, + "RightParenPos": 345, "Items": { - "ListPos": 321, - "ListEnd": 335, + "ListPos": 330, + "ListEnd": 344, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 321, - "NameEnd": 331 + "NamePos": 330, + "NameEnd": 340 }, "Alias": null }, { "Expr": { - "LiteralPos": 334, - "LiteralEnd": 335, + "LiteralPos": 343, + "LiteralEnd": 344, "Literal": "a" }, "Alias": null @@ -260,8 +260,8 @@ "Alias": { "Name": "a", "QuoteType": 1, - "NamePos": 341, - "NameEnd": 342 + "NamePos": 350, + "NameEnd": 351 } }, { @@ -269,30 +269,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 348, - "NameEnd": 371 + "NamePos": 358, + "NameEnd": 381 }, "Params": { - "LeftParenPos": 371, - "RightParenPos": 387, + "LeftParenPos": 381, + "RightParenPos": 397, "Items": { - "ListPos": 372, - "ListEnd": 386, + "ListPos": 382, + "ListEnd": 396, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 372, - "NameEnd": 382 + "NamePos": 382, + "NameEnd": 392 }, "Alias": null }, { "Expr": { - "LiteralPos": 385, - "LiteralEnd": 386, + "LiteralPos": 395, + "LiteralEnd": 396, "Literal": "b" }, "Alias": null @@ -306,8 +306,8 @@ "Alias": { "Name": "b", "QuoteType": 1, - "NamePos": 392, - "NameEnd": 393 + "NamePos": 402, + "NameEnd": 403 } }, { @@ -315,30 +315,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 399, - "NameEnd": 422 + "NamePos": 410, + "NameEnd": 433 }, "Params": { - "LeftParenPos": 422, - "RightParenPos": 438, + "LeftParenPos": 433, + "RightParenPos": 449, "Items": { - "ListPos": 423, - "ListEnd": 437, + "ListPos": 434, + "ListEnd": 448, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 423, - "NameEnd": 433 + "NamePos": 434, + "NameEnd": 444 }, "Alias": null }, { "Expr": { - "LiteralPos": 436, - "LiteralEnd": 437, + "LiteralPos": 447, + "LiteralEnd": 448, "Literal": "c" }, "Alias": null @@ -352,8 +352,8 @@ "Alias": { "Name": "c", "QuoteType": 1, - "NamePos": 443, - "NameEnd": 444 + "NamePos": 454, + "NameEnd": 455 } }, { @@ -361,30 +361,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 450, - "NameEnd": 473 + "NamePos": 462, + "NameEnd": 485 }, "Params": { - "LeftParenPos": 473, - "RightParenPos": 489, + "LeftParenPos": 485, + "RightParenPos": 501, "Items": { - "ListPos": 474, - "ListEnd": 488, + "ListPos": 486, + "ListEnd": 500, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 474, - "NameEnd": 484 + "NamePos": 486, + "NameEnd": 496 }, "Alias": null }, { "Expr": { - "LiteralPos": 487, - "LiteralEnd": 488, + "LiteralPos": 499, + "LiteralEnd": 500, "Literal": "d" }, "Alias": null @@ -398,8 +398,8 @@ "Alias": { "Name": "d", "QuoteType": 1, - "NamePos": 494, - "NameEnd": 495 + "NamePos": 506, + "NameEnd": 507 } }, { @@ -407,30 +407,30 @@ "Name": { "Name": "visitParamExtractInt", "QuoteType": 1, - "NamePos": 501, - "NameEnd": 521 + "NamePos": 514, + "NameEnd": 534 }, "Params": { - "LeftParenPos": 521, - "RightParenPos": 537, + "LeftParenPos": 534, + "RightParenPos": 550, "Items": { - "ListPos": 522, - "ListEnd": 536, + "ListPos": 535, + "ListEnd": 549, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 522, - "NameEnd": 532 + "NamePos": 535, + "NameEnd": 545 }, "Alias": null }, { "Expr": { - "LiteralPos": 535, - "LiteralEnd": 536, + "LiteralPos": 548, + "LiteralEnd": 549, "Literal": "e" }, "Alias": null @@ -444,8 +444,8 @@ "Alias": { "Name": "e", "QuoteType": 1, - "NamePos": 542, - "NameEnd": 543 + "NamePos": 555, + "NameEnd": 556 } }, { @@ -453,30 +453,30 @@ "Name": { "Name": "visitParamExtractInt", "QuoteType": 1, - "NamePos": 549, - "NameEnd": 569 + "NamePos": 563, + "NameEnd": 583 }, "Params": { - "LeftParenPos": 569, - "RightParenPos": 585, + "LeftParenPos": 583, + "RightParenPos": 599, "Items": { - "ListPos": 570, - "ListEnd": 584, + "ListPos": 584, + "ListEnd": 598, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 570, - "NameEnd": 580 + "NamePos": 584, + "NameEnd": 594 }, "Alias": null }, { "Expr": { - "LiteralPos": 583, - "LiteralEnd": 584, + "LiteralPos": 597, + "LiteralEnd": 598, "Literal": "f" }, "Alias": null @@ -490,35 +490,35 @@ "Alias": { "Name": "f", "QuoteType": 1, - "NamePos": 590, - "NameEnd": 591 + "NamePos": 604, + "NameEnd": 605 } } ], "From": { - "FromPos": 592, + "FromPos": 607, "Expr": { "Table": { - "TablePos": 597, - "TableEnd": 605, + "TablePos": 612, + "TableEnd": 620, "Alias": null, "Expr": { "Database": { "Name": "db", "QuoteType": 1, - "NamePos": 597, - "NameEnd": 599 + "NamePos": 612, + "NameEnd": 614 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 600, - "NameEnd": 605 + "NamePos": 615, + "NameEnd": 620 } }, "HasFinal": false }, - "StatementEnd": 605, + "StatementEnd": 620, "SampleRatio": null, "HasFinal": false } @@ -527,34 +527,34 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 606, + "WherePos": 622, "Expr": { "LeftExpr": { "Fields": [ { "Name": "db", "QuoteType": 1, - "NamePos": 612, - "NameEnd": 614 + "NamePos": 628, + "NameEnd": 630 }, { "Name": "table", "QuoteType": 1, - "NamePos": 615, - "NameEnd": 620 + "NamePos": 631, + "NameEnd": 636 }, { "Name": "event", "QuoteType": 1, - "NamePos": 621, - "NameEnd": 626 + "NamePos": 637, + "NameEnd": 642 } ] }, "Operation": "=", "RightExpr": { - "LiteralPos": 630, - "LiteralEnd": 635, + "LiteralPos": 646, + "LiteralEnd": 651, "Literal": "hello" }, "HasGlobal": false, diff --git a/parser/testdata/ddl/output/check.sql.golden.json b/parser/testdata/ddl/output/check.sql.golden.json index f09030e..c778fb4 100644 --- a/parser/testdata/ddl/output/check.sql.golden.json +++ b/parser/testdata/ddl/output/check.sql.golden.json @@ -13,21 +13,21 @@ "Partition": null }, { - "CheckPos": 24, + "CheckPos": 25, "Table": { "Database": null, "Table": { "Name": "test_table", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 46 + "NamePos": 37, + "NameEnd": 47 } }, "Partition": { - "PartitionPos": 47, + "PartitionPos": 48, "Expr": { - "LiteralPos": 58, - "LiteralEnd": 61, + "LiteralPos": 59, + "LiteralEnd": 62, "Literal": "col" }, "ID": null, diff --git a/parser/testdata/ddl/output/create_dictionary_basic.sql.golden.json b/parser/testdata/ddl/output/create_dictionary_basic.sql.golden.json index b3a1018..669febc 100644 --- a/parser/testdata/ddl/output/create_dictionary_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_dictionary_basic.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 444, + "StatementEnd": 463, "OrReplace": false, "Name": { "Database": { @@ -24,19 +24,19 @@ "SchemaPos": 31, "Attributes": [ { - "NamePos": 37, + "NamePos": 38, "Name": { "Name": "id", "QuoteType": 1, - "NamePos": 37, - "NameEnd": 39 + "NamePos": 38, + "NameEnd": 40 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 40, - "NameEnd": 46 + "NamePos": 41, + "NameEnd": 47 } }, "Default": null, @@ -46,24 +46,24 @@ "IsObjectId": false }, { - "NamePos": 52, + "NamePos": 54, "Name": { "Name": "name", "QuoteType": 1, - "NamePos": 52, - "NameEnd": 56 + "NamePos": 54, + "NameEnd": 58 }, "Type": { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 57, - "NameEnd": 63 + "NamePos": 59, + "NameEnd": 65 } }, "Default": { - "LiteralPos": 73, - "LiteralEnd": 73, + "LiteralPos": 75, + "LiteralEnd": 75, "Literal": "" }, "Expression": null, @@ -72,19 +72,19 @@ "IsObjectId": false }, { - "NamePos": 80, + "NamePos": 83, "Name": { "Name": "value", "QuoteType": 1, - "NamePos": 80, - "NameEnd": 85 + "NamePos": 83, + "NameEnd": 88 }, "Type": { "Name": { "Name": "Float64", "QuoteType": 1, - "NamePos": 86, - "NameEnd": 93 + "NamePos": 89, + "NameEnd": 96 } }, "Default": null, @@ -92,23 +92,23 @@ "Name": { "Name": "toFloat64OrZero", "QuoteType": 1, - "NamePos": 105, - "NameEnd": 120 + "NamePos": 108, + "NameEnd": 123 }, "Params": { - "LeftParenPos": 120, - "RightParenPos": 125, + "LeftParenPos": 123, + "RightParenPos": 128, "Items": { - "ListPos": 121, - "ListEnd": 125, + "ListPos": 124, + "ListEnd": 128, "HasDistinct": false, "Items": [ { "Expr": { "Name": "name", "QuoteType": 1, - "NamePos": 121, - "NameEnd": 125 + "NamePos": 124, + "NameEnd": 128 }, "Alias": null } @@ -122,19 +122,19 @@ "IsObjectId": false }, { - "NamePos": 132, + "NamePos": 136, "Name": { "Name": "parent_id", "QuoteType": 1, - "NamePos": 132, - "NameEnd": 141 + "NamePos": 136, + "NameEnd": 145 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 142, - "NameEnd": 148 + "NamePos": 146, + "NameEnd": 152 } }, "Default": null, @@ -144,19 +144,19 @@ "IsObjectId": false }, { - "NamePos": 167, + "NamePos": 172, "Name": { "Name": "is_active", "QuoteType": 1, - "NamePos": 167, - "NameEnd": 176 + "NamePos": 172, + "NameEnd": 181 }, "Type": { "Name": { "Name": "UInt8", "QuoteType": 1, - "NamePos": 177, - "NameEnd": 182 + "NamePos": 182, + "NameEnd": 187 } }, "Default": null, @@ -166,19 +166,19 @@ "IsObjectId": false }, { - "NamePos": 198, + "NamePos": 204, "Name": { "Name": "object_id", "QuoteType": 1, - "NamePos": 198, - "NameEnd": 207 + "NamePos": 204, + "NameEnd": 213 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 208, - "NameEnd": 214 + "NamePos": 214, + "NameEnd": 220 } }, "Default": null, @@ -188,171 +188,171 @@ "IsObjectId": true } ], - "RParenPos": 228 + "RParenPos": 235 }, "Engine": { - "EnginePos": 230, + "EnginePos": 238, "PrimaryKey": { - "PrimaryKeyPos": 230, + "PrimaryKeyPos": 238, "Keys": { - "ListPos": 242, - "ListEnd": 244, + "ListPos": 250, + "ListEnd": 252, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 242, - "NameEnd": 244 + "NamePos": 250, + "NameEnd": 252 }, "Alias": null } ] }, - "RParenPos": 243 + "RParenPos": 251 }, "Source": { - "SourcePos": 245, + "SourcePos": 254, "Source": { "Name": "MYSQL", "QuoteType": 1, - "NamePos": 252, - "NameEnd": 257 + "NamePos": 261, + "NameEnd": 266 }, "Args": [ { - "ArgPos": 263, + "ArgPos": 273, "Name": { "Name": "host", "QuoteType": 1, - "NamePos": 263, - "NameEnd": 267 + "NamePos": 273, + "NameEnd": 277 }, "Value": { - "LiteralPos": 269, - "LiteralEnd": 278, + "LiteralPos": 279, + "LiteralEnd": 288, "Literal": "localhost" } }, { - "ArgPos": 284, + "ArgPos": 295, "Name": { "Name": "port", "QuoteType": 1, - "NamePos": 284, - "NameEnd": 288 + "NamePos": 295, + "NameEnd": 299 }, "Value": { - "NumPos": 289, - "NumEnd": 293, + "NumPos": 300, + "NumEnd": 304, "Literal": "3306", "Base": 10 } }, { - "ArgPos": 298, + "ArgPos": 310, "Name": { "Name": "user", "QuoteType": 1, - "NamePos": 298, - "NameEnd": 302 + "NamePos": 310, + "NameEnd": 314 }, "Value": { - "LiteralPos": 304, - "LiteralEnd": 311, + "LiteralPos": 316, + "LiteralEnd": 323, "Literal": "default" } }, { - "ArgPos": 317, + "ArgPos": 330, "Name": { "Name": "password", "QuoteType": 1, - "NamePos": 317, - "NameEnd": 325 + "NamePos": 330, + "NameEnd": 338 }, "Value": { - "LiteralPos": 327, - "LiteralEnd": 327, + "LiteralPos": 340, + "LiteralEnd": 340, "Literal": "" } }, { - "ArgPos": 333, + "ArgPos": 347, "Name": { "Name": "db", "QuoteType": 1, - "NamePos": 333, - "NameEnd": 335 + "NamePos": 347, + "NameEnd": 349 }, "Value": { - "LiteralPos": 337, - "LiteralEnd": 341, + "LiteralPos": 351, + "LiteralEnd": 355, "Literal": "test" } }, { - "ArgPos": 347, + "ArgPos": 362, "Name": { "Name": "table", "QuoteType": 1, - "NamePos": 347, - "NameEnd": 352 + "NamePos": 362, + "NameEnd": 367 }, "Value": { - "LiteralPos": 354, - "LiteralEnd": 364, + "LiteralPos": 369, + "LiteralEnd": 379, "Literal": "dict_table" } } ], - "RParenPos": 367 + "RParenPos": 383 }, "Lifetime": { - "LifetimePos": 369, + "LifetimePos": 386, "Min": { - "NumPos": 382, - "NumEnd": 386, + "NumPos": 399, + "NumEnd": 403, "Literal": "1000", "Base": 10 }, "Max": { - "NumPos": 391, - "NumEnd": 395, + "NumPos": 408, + "NumEnd": 412, "Literal": "2000", "Base": 10 }, "Value": null, - "RParenPos": 395 + "RParenPos": 412 }, "Layout": { - "LayoutPos": 397, + "LayoutPos": 415, "Layout": { "Name": "HASHED", "QuoteType": 1, - "NamePos": 404, - "NameEnd": 410 + "NamePos": 422, + "NameEnd": 428 }, "Args": null, - "RParenPos": 412 + "RParenPos": 430 }, "Range": null, "Settings": { - "SettingsPos": 414, - "ListEnd": 444, + "SettingsPos": 433, + "ListEnd": 463, "Items": [ { - "SettingsPos": 423, + "SettingsPos": 442, "Name": { "Name": "max_block_size", "QuoteType": 1, - "NamePos": 423, - "NameEnd": 437 + "NamePos": 442, + "NameEnd": 456 }, "Expr": { - "NumPos": 440, - "NumEnd": 444, + "NumPos": 459, + "NumEnd": 463, "Literal": "8192", "Base": 10 } diff --git a/parser/testdata/ddl/output/create_dictionary_comprehensive.sql.golden.json b/parser/testdata/ddl/output/create_dictionary_comprehensive.sql.golden.json index 4e463bf..5523ea2 100644 --- a/parser/testdata/ddl/output/create_dictionary_comprehensive.sql.golden.json +++ b/parser/testdata/ddl/output/create_dictionary_comprehensive.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 586, + "StatementEnd": 608, "OrReplace": true, "Name": { "Database": { @@ -20,37 +20,37 @@ "IfNotExists": false, "UUID": { "Value": { - "LiteralPos": 60, - "LiteralEnd": 96, + "LiteralPos": 61, + "LiteralEnd": 97, "Literal": "12345678-1234-1234-1234-123456789012" } }, "OnCluster": { - "OnPos": 98, + "OnPos": 100, "Expr": { "Name": "production_cluster", "QuoteType": 1, - "NamePos": 109, - "NameEnd": 127 + "NamePos": 111, + "NameEnd": 129 } }, "Schema": { - "SchemaPos": 128, + "SchemaPos": 131, "Attributes": [ { - "NamePos": 134, + "NamePos": 138, "Name": { "Name": "id", "QuoteType": 1, - "NamePos": 134, - "NameEnd": 136 + "NamePos": 138, + "NameEnd": 140 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 137, - "NameEnd": 143 + "NamePos": 141, + "NameEnd": 147 } }, "Default": null, @@ -60,24 +60,24 @@ "IsObjectId": false }, { - "NamePos": 149, + "NamePos": 154, "Name": { "Name": "name", "QuoteType": 1, - "NamePos": 149, - "NameEnd": 153 + "NamePos": 154, + "NameEnd": 158 }, "Type": { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 154, - "NameEnd": 160 + "NamePos": 159, + "NameEnd": 165 } }, "Default": { - "LiteralPos": 170, - "LiteralEnd": 170, + "LiteralPos": 175, + "LiteralEnd": 175, "Literal": "" }, "Expression": null, @@ -86,19 +86,19 @@ "IsObjectId": false }, { - "NamePos": 177, + "NamePos": 183, "Name": { "Name": "value", "QuoteType": 1, - "NamePos": 177, - "NameEnd": 182 + "NamePos": 183, + "NameEnd": 188 }, "Type": { "Name": { "Name": "Float64", "QuoteType": 1, - "NamePos": 183, - "NameEnd": 190 + "NamePos": 189, + "NameEnd": 196 } }, "Default": null, @@ -106,23 +106,23 @@ "Name": { "Name": "toFloat64OrZero", "QuoteType": 1, - "NamePos": 202, - "NameEnd": 217 + "NamePos": 208, + "NameEnd": 223 }, "Params": { - "LeftParenPos": 217, - "RightParenPos": 222, + "LeftParenPos": 223, + "RightParenPos": 228, "Items": { - "ListPos": 218, - "ListEnd": 222, + "ListPos": 224, + "ListEnd": 228, "HasDistinct": false, "Items": [ { "Expr": { "Name": "name", "QuoteType": 1, - "NamePos": 218, - "NameEnd": 222 + "NamePos": 224, + "NameEnd": 228 }, "Alias": null } @@ -136,19 +136,19 @@ "IsObjectId": false }, { - "NamePos": 229, + "NamePos": 236, "Name": { "Name": "parent_id", "QuoteType": 1, - "NamePos": 229, - "NameEnd": 238 + "NamePos": 236, + "NameEnd": 245 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 239, - "NameEnd": 245 + "NamePos": 246, + "NameEnd": 252 } }, "Default": null, @@ -158,19 +158,19 @@ "IsObjectId": false }, { - "NamePos": 264, + "NamePos": 272, "Name": { "Name": "is_active", "QuoteType": 1, - "NamePos": 264, - "NameEnd": 273 + "NamePos": 272, + "NameEnd": 281 }, "Type": { "Name": { "Name": "UInt8", "QuoteType": 1, - "NamePos": 274, - "NameEnd": 279 + "NamePos": 282, + "NameEnd": 287 } }, "Default": null, @@ -180,19 +180,19 @@ "IsObjectId": false }, { - "NamePos": 295, + "NamePos": 304, "Name": { "Name": "object_id", "QuoteType": 1, - "NamePos": 295, - "NameEnd": 304 + "NamePos": 304, + "NameEnd": 313 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 305, - "NameEnd": 311 + "NamePos": 314, + "NameEnd": 320 } }, "Default": null, @@ -202,186 +202,186 @@ "IsObjectId": true } ], - "RParenPos": 325 + "RParenPos": 335 }, "Engine": { - "EnginePos": 327, + "EnginePos": 338, "PrimaryKey": { - "PrimaryKeyPos": 327, + "PrimaryKeyPos": 338, "Keys": { - "ListPos": 339, - "ListEnd": 341, + "ListPos": 350, + "ListEnd": 352, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 339, - "NameEnd": 341 + "NamePos": 350, + "NameEnd": 352 }, "Alias": null } ] }, - "RParenPos": 340 + "RParenPos": 351 }, "Source": { - "SourcePos": 342, + "SourcePos": 354, "Source": { "Name": "MYSQL", "QuoteType": 1, - "NamePos": 349, - "NameEnd": 354 + "NamePos": 361, + "NameEnd": 366 }, "Args": [ { - "ArgPos": 360, + "ArgPos": 373, "Name": { "Name": "host", "QuoteType": 1, - "NamePos": 360, - "NameEnd": 364 + "NamePos": 373, + "NameEnd": 377 }, "Value": { - "LiteralPos": 366, - "LiteralEnd": 375, + "LiteralPos": 379, + "LiteralEnd": 388, "Literal": "localhost" } }, { - "ArgPos": 381, + "ArgPos": 395, "Name": { "Name": "port", "QuoteType": 1, - "NamePos": 381, - "NameEnd": 385 + "NamePos": 395, + "NameEnd": 399 }, "Value": { - "NumPos": 386, - "NumEnd": 390, + "NumPos": 400, + "NumEnd": 404, "Literal": "3306", "Base": 10 } }, { - "ArgPos": 395, + "ArgPos": 410, "Name": { "Name": "user", "QuoteType": 1, - "NamePos": 395, - "NameEnd": 399 + "NamePos": 410, + "NameEnd": 414 }, "Value": { - "LiteralPos": 401, - "LiteralEnd": 405, + "LiteralPos": 416, + "LiteralEnd": 420, "Literal": "root" } }, { - "ArgPos": 411, + "ArgPos": 427, "Name": { "Name": "password", "QuoteType": 1, - "NamePos": 411, - "NameEnd": 419 + "NamePos": 427, + "NameEnd": 435 }, "Value": { - "LiteralPos": 421, - "LiteralEnd": 427, + "LiteralPos": 437, + "LiteralEnd": 443, "Literal": "secret" } }, { - "ArgPos": 433, + "ArgPos": 450, "Name": { "Name": "db", "QuoteType": 1, - "NamePos": 433, - "NameEnd": 435 + "NamePos": 450, + "NameEnd": 452 }, "Value": { - "LiteralPos": 437, - "LiteralEnd": 444, + "LiteralPos": 454, + "LiteralEnd": 461, "Literal": "test_db" } }, { - "ArgPos": 450, + "ArgPos": 468, "Name": { "Name": "table", "QuoteType": 1, - "NamePos": 450, - "NameEnd": 455 + "NamePos": 468, + "NameEnd": 473 }, "Value": { - "LiteralPos": 457, - "LiteralEnd": 473, + "LiteralPos": 475, + "LiteralEnd": 491, "Literal": "dictionary_table" } } ], - "RParenPos": 476 + "RParenPos": 495 }, "Lifetime": { - "LifetimePos": 478, + "LifetimePos": 498, "Min": { - "NumPos": 491, - "NumEnd": 495, + "NumPos": 511, + "NumEnd": 515, "Literal": "1000", "Base": 10 }, "Max": { - "NumPos": 500, - "NumEnd": 504, + "NumPos": 520, + "NumEnd": 524, "Literal": "2000", "Base": 10 }, "Value": null, - "RParenPos": 504 + "RParenPos": 524 }, "Layout": { - "LayoutPos": 506, + "LayoutPos": 527, "Layout": { "Name": "HASHED", "QuoteType": 1, - "NamePos": 513, - "NameEnd": 519 + "NamePos": 534, + "NameEnd": 540 }, "Args": null, - "RParenPos": 521 + "RParenPos": 542 }, "Range": null, "Settings": { - "SettingsPos": 523, - "ListEnd": 586, + "SettingsPos": 545, + "ListEnd": 608, "Items": [ { - "SettingsPos": 532, + "SettingsPos": 554, "Name": { "Name": "max_block_size", "QuoteType": 1, - "NamePos": 532, - "NameEnd": 546 + "NamePos": 554, + "NameEnd": 568 }, "Expr": { - "NumPos": 549, - "NumEnd": 553, + "NumPos": 571, + "NumEnd": 575, "Literal": "8192", "Base": 10 } }, { - "SettingsPos": 555, + "SettingsPos": 577, "Name": { "Name": "max_insert_block_size", "QuoteType": 1, - "NamePos": 555, - "NameEnd": 576 + "NamePos": 577, + "NameEnd": 598 }, "Expr": { - "NumPos": 579, - "NumEnd": 586, + "NumPos": 601, + "NumEnd": 608, "Literal": "1048576", "Base": 10 } diff --git a/parser/testdata/ddl/output/create_distributed_table.sql.golden.json b/parser/testdata/ddl/output/create_distributed_table.sql.golden.json index fa6352b..697dece 100644 --- a/parser/testdata/ddl/output/create_distributed_table.sql.golden.json +++ b/parser/testdata/ddl/output/create_distributed_table.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 191, + "StatementEnd": 199, "OrReplace": false, "Name": { "Database": { @@ -20,51 +20,51 @@ "IfNotExists": false, "UUID": null, "OnCluster": { - "OnPos": 28, + "OnPos": 29, "Expr": { - "LiteralPos": 40, - "LiteralEnd": 55, + "LiteralPos": 41, + "LiteralEnd": 56, "Literal": "default_cluster" } }, "TableSchema": { - "SchemaPos": 57, - "SchemaEnd": 77, + "SchemaPos": 59, + "SchemaEnd": 79, "Columns": null, "AliasTable": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 60, - "NameEnd": 64 + "NamePos": 62, + "NameEnd": 66 }, "Table": { "Name": "evnets_local", "QuoteType": 1, - "NamePos": 65, - "NameEnd": 77 + "NamePos": 67, + "NameEnd": 79 } }, "TableFunction": null }, "Engine": { - "EnginePos": 78, - "EngineEnd": 191, + "EnginePos": 81, + "EngineEnd": 199, "Name": "Distributed", "Params": { - "LeftParenPos": 98, - "RightParenPos": 160, + "LeftParenPos": 101, + "RightParenPos": 168, "Items": { - "ListPos": 104, - "ListEnd": 158, + "ListPos": 108, + "ListEnd": 165, "HasDistinct": false, "Items": [ { "Expr": { "Name": "default_cluster", "QuoteType": 1, - "NamePos": 104, - "NameEnd": 119 + "NamePos": 108, + "NameEnd": 123 }, "Alias": null }, @@ -72,8 +72,8 @@ "Expr": { "Name": "test", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 129 + "NamePos": 130, + "NameEnd": 134 }, "Alias": null }, @@ -81,8 +81,8 @@ "Expr": { "Name": "events_local", "QuoteType": 1, - "NamePos": 135, - "NameEnd": 147 + "NamePos": 141, + "NameEnd": 153 }, "Alias": null }, @@ -91,15 +91,15 @@ "Name": { "Name": "rand", "QuoteType": 1, - "NamePos": 153, - "NameEnd": 157 + "NamePos": 160, + "NameEnd": 164 }, "Params": { - "LeftParenPos": 157, - "RightParenPos": 158, + "LeftParenPos": 164, + "RightParenPos": 165, "Items": { - "ListPos": 158, - "ListEnd": 158, + "ListPos": 165, + "ListEnd": 165, "HasDistinct": false, "Items": [] }, @@ -117,20 +117,20 @@ "SampleBy": null, "TTL": null, "Settings": { - "SettingsPos": 162, - "ListEnd": 191, + "SettingsPos": 170, + "ListEnd": 199, "Items": [ { - "SettingsPos": 171, + "SettingsPos": 179, "Name": { "Name": "fsync_after_insert", "QuoteType": 1, - "NamePos": 171, - "NameEnd": 189 + "NamePos": 179, + "NameEnd": 197 }, "Expr": { - "NumPos": 190, - "NumEnd": 191, + "NumPos": 198, + "NumEnd": 199, "Literal": "0", "Base": 10 } diff --git a/parser/testdata/ddl/output/create_live_view_basic.sql.golden.json b/parser/testdata/ddl/output/create_live_view_basic.sql.golden.json index 9daf472..7a437ca 100644 --- a/parser/testdata/ddl/output/create_live_view_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_live_view_basic.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 101, + "StatementEnd": 103, "Name": { "Database": null, "Table": { @@ -15,31 +15,31 @@ "UUID": null, "OnCluster": null, "Destination": { - "ToPos": 46, + "ToPos": 47, "TableIdentifier": { "Database": null, "Table": { "Name": "my_destination", "QuoteType": 1, - "NamePos": 49, - "NameEnd": 63 + "NamePos": 50, + "NameEnd": 64 } }, "TableSchema": null }, "TableSchema": { - "SchemaPos": 63, - "SchemaEnd": 73, + "SchemaPos": 64, + "SchemaEnd": 74, "Columns": [ { - "NamePos": 64, - "ColumnEnd": 73, + "NamePos": 65, + "ColumnEnd": 74, "Name": { "Ident": { "Name": "id", "QuoteType": 1, - "NamePos": 64, - "NameEnd": 66 + "NamePos": 65, + "NameEnd": 67 }, "DotIdent": null }, @@ -47,8 +47,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 67, - "NameEnd": 73 + "NamePos": 68, + "NameEnd": 74 } }, "NotNull": null, @@ -66,11 +66,11 @@ "TableFunction": null }, "WithTimeout": { - "WithTimeoutPos": 30, + "WithTimeoutPos": 31, "Expr": null, "Number": { - "NumPos": 43, - "NumEnd": 45, + "NumPos": 44, + "NumEnd": 46, "Literal": "10", "Base": 10 } @@ -78,8 +78,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 78, - "StatementEnd": 101, + "SelectPos": 80, + "StatementEnd": 103, "With": null, "Top": null, "HasDistinct": false, @@ -89,32 +89,32 @@ "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 85, - "NameEnd": 87 + "NamePos": 87, + "NameEnd": 89 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 88, + "FromPos": 90, "Expr": { "Table": { - "TablePos": 93, - "TableEnd": 101, + "TablePos": 95, + "TableEnd": 103, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "my_table", "QuoteType": 1, - "NamePos": 93, - "NameEnd": 101 + "NamePos": 95, + "NameEnd": 103 } }, "HasFinal": false }, - "StatementEnd": 101, + "StatementEnd": 103, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/ddl/output/create_materialized_view_basic.sql.golden.json b/parser/testdata/ddl/output/create_materialized_view_basic.sql.golden.json index cee5c64..8e60dd8 100644 --- a/parser/testdata/ddl/output/create_materialized_view_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_materialized_view_basic.sql.golden.json @@ -1,27 +1,27 @@ [ { "CreatePos": 0, - "StatementEnd": 537, + "StatementEnd": 557, "Name": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 25, - "NameEnd": 33 + "NamePos": 26, + "NameEnd": 34 }, "Table": { "Name": "view_name", "QuoteType": 1, - "NamePos": 34, - "NameEnd": 43 + "NamePos": 35, + "NameEnd": 44 } }, "IfNotExists": false, "OnCluster": { - "OnPos": 49, + "OnPos": 51, "Expr": { - "LiteralPos": 61, - "LiteralEnd": 76, + "LiteralPos": 63, + "LiteralEnd": 78, "Literal": "default_cluster" } }, @@ -33,50 +33,50 @@ "Engine": null, "HasEmpty": false, "Destination": { - "ToPos": 78, + "ToPos": 80, "TableIdentifier": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 81, - "NameEnd": 89 + "NamePos": 83, + "NameEnd": 91 }, "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 100 + "NamePos": 92, + "NameEnd": 102 } }, "TableSchema": { - "SchemaPos": 101, - "SchemaEnd": 203, + "SchemaPos": 104, + "SchemaEnd": 213, "Columns": [ { - "NamePos": 106, - "ColumnEnd": 122, + "NamePos": 110, + "ColumnEnd": 126, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 106, - "NameEnd": 108 + "NamePos": 110, + "NameEnd": 112 }, "DotIdent": null }, "Type": { - "LeftParenPos": 121, - "RightParenPos": 122, + "LeftParenPos": 125, + "RightParenPos": 126, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 110, - "NameEnd": 120 + "NamePos": 114, + "NameEnd": 124 }, "Params": [ { - "NumPos": 121, - "NumEnd": 122, + "NumPos": 125, + "NumEnd": 126, "Literal": "3", "Base": 10 } @@ -93,14 +93,14 @@ "CompressionCodec": null }, { - "NamePos": 129, - "ColumnEnd": 139, + "NamePos": 134, + "ColumnEnd": 144, "Name": { "Ident": { "Name": "f2", "QuoteType": 3, - "NamePos": 129, - "NameEnd": 131 + "NamePos": 134, + "NameEnd": 136 }, "DotIdent": null }, @@ -108,8 +108,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 139 + "NamePos": 138, + "NameEnd": 144 } }, "NotNull": null, @@ -123,14 +123,14 @@ "CompressionCodec": null }, { - "NamePos": 145, - "ColumnEnd": 155, + "NamePos": 151, + "ColumnEnd": 161, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 145, - "NameEnd": 147 + "NamePos": 151, + "NameEnd": 153 }, "DotIdent": null }, @@ -138,8 +138,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 149, - "NameEnd": 155 + "NamePos": 155, + "NameEnd": 161 } }, "NotNull": null, @@ -153,14 +153,14 @@ "CompressionCodec": null }, { - "NamePos": 161, - "ColumnEnd": 171, + "NamePos": 168, + "ColumnEnd": 178, "Name": { "Ident": { "Name": "f4", "QuoteType": 3, - "NamePos": 161, - "NameEnd": 163 + "NamePos": 168, + "NameEnd": 170 }, "DotIdent": null }, @@ -168,8 +168,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 171 + "NamePos": 172, + "NameEnd": 178 } }, "NotNull": null, @@ -183,14 +183,14 @@ "CompressionCodec": null }, { - "NamePos": 177, - "ColumnEnd": 187, + "NamePos": 185, + "ColumnEnd": 195, "Name": { "Ident": { "Name": "f5", "QuoteType": 3, - "NamePos": 177, - "NameEnd": 179 + "NamePos": 185, + "NameEnd": 187 }, "DotIdent": null }, @@ -198,8 +198,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 181, - "NameEnd": 187 + "NamePos": 189, + "NameEnd": 195 } }, "NotNull": null, @@ -213,14 +213,14 @@ "CompressionCodec": null }, { - "NamePos": 193, - "ColumnEnd": 202, + "NamePos": 202, + "ColumnEnd": 211, "Name": { "Ident": { "Name": "f6", "QuoteType": 3, - "NamePos": 193, - "NameEnd": 195 + "NamePos": 202, + "NameEnd": 204 }, "DotIdent": null }, @@ -228,8 +228,8 @@ "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 197, - "NameEnd": 202 + "NamePos": 206, + "NameEnd": 211 } }, "NotNull": null, @@ -250,8 +250,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 208, - "StatementEnd": 537, + "SelectPos": 219, + "StatementEnd": 557, "With": null, "Top": null, "HasDistinct": false, @@ -261,8 +261,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 215, - "NameEnd": 217 + "NamePos": 226, + "NameEnd": 228 }, "Modifiers": [], "Alias": null @@ -271,8 +271,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 226, - "NameEnd": 228 + "NamePos": 238, + "NameEnd": 240 }, "Modifiers": [], "Alias": null @@ -282,30 +282,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 237, - "NameEnd": 260 + "NamePos": 250, + "NameEnd": 273 }, "Params": { - "LeftParenPos": 260, - "RightParenPos": 277, + "LeftParenPos": 273, + "RightParenPos": 290, "Items": { - "ListPos": 261, - "ListEnd": 276, + "ListPos": 274, + "ListEnd": 289, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 261, - "NameEnd": 271 + "NamePos": 274, + "NameEnd": 284 }, "Alias": null }, { "Expr": { - "LiteralPos": 274, - "LiteralEnd": 276, + "LiteralPos": 287, + "LiteralEnd": 289, "Literal": "f3" }, "Alias": null @@ -319,8 +319,8 @@ "Alias": { "Name": "f3", "QuoteType": 1, - "NamePos": 284, - "NameEnd": 286 + "NamePos": 297, + "NameEnd": 299 } }, { @@ -328,30 +328,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 295, - "NameEnd": 318 + "NamePos": 309, + "NameEnd": 332 }, "Params": { - "LeftParenPos": 318, - "RightParenPos": 335, + "LeftParenPos": 332, + "RightParenPos": 349, "Items": { - "ListPos": 319, - "ListEnd": 334, + "ListPos": 333, + "ListEnd": 348, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 319, - "NameEnd": 329 + "NamePos": 333, + "NameEnd": 343 }, "Alias": null }, { "Expr": { - "LiteralPos": 332, - "LiteralEnd": 334, + "LiteralPos": 346, + "LiteralEnd": 348, "Literal": "f4" }, "Alias": null @@ -365,8 +365,8 @@ "Alias": { "Name": "f4", "QuoteType": 1, - "NamePos": 345, - "NameEnd": 347 + "NamePos": 359, + "NameEnd": 361 } }, { @@ -374,30 +374,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 356, - "NameEnd": 379 + "NamePos": 371, + "NameEnd": 394 }, "Params": { - "LeftParenPos": 379, - "RightParenPos": 396, + "LeftParenPos": 394, + "RightParenPos": 411, "Items": { - "ListPos": 380, - "ListEnd": 395, + "ListPos": 395, + "ListEnd": 410, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 380, - "NameEnd": 390 + "NamePos": 395, + "NameEnd": 405 }, "Alias": null }, { "Expr": { - "LiteralPos": 393, - "LiteralEnd": 395, + "LiteralPos": 408, + "LiteralEnd": 410, "Literal": "f5" }, "Alias": null @@ -411,8 +411,8 @@ "Alias": { "Name": "f5", "QuoteType": 1, - "NamePos": 404, - "NameEnd": 406 + "NamePos": 419, + "NameEnd": 421 } }, { @@ -420,30 +420,30 @@ "Name": { "Name": "visitParamExtractInt", "QuoteType": 1, - "NamePos": 412, - "NameEnd": 432 + "NamePos": 428, + "NameEnd": 448 }, "Params": { - "LeftParenPos": 432, - "RightParenPos": 449, + "LeftParenPos": 448, + "RightParenPos": 465, "Items": { - "ListPos": 433, - "ListEnd": 448, + "ListPos": 449, + "ListEnd": 464, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 433, - "NameEnd": 443 + "NamePos": 449, + "NameEnd": 459 }, "Alias": null }, { "Expr": { - "LiteralPos": 446, - "LiteralEnd": 448, + "LiteralPos": 462, + "LiteralEnd": 464, "Literal": "f6" }, "Alias": null @@ -457,35 +457,35 @@ "Alias": { "Name": "f6", "QuoteType": 1, - "NamePos": 454, - "NameEnd": 456 + "NamePos": 470, + "NameEnd": 472 } } ], "From": { - "FromPos": 457, + "FromPos": 474, "Expr": { "Table": { - "TablePos": 466, - "TableEnd": 486, + "TablePos": 484, + "TableEnd": 504, "Alias": null, "Expr": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 466, - "NameEnd": 474 + "NamePos": 484, + "NameEnd": 492 }, "Table": { "Name": "table_name1", "QuoteType": 1, - "NamePos": 475, - "NameEnd": 486 + "NamePos": 493, + "NameEnd": 504 } }, "HasFinal": false }, - "StatementEnd": 486, + "StatementEnd": 504, "SampleRatio": null, "HasFinal": false } @@ -494,34 +494,34 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 487, + "WherePos": 506, "Expr": { "LeftExpr": { "Fields": [ { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 497, - "NameEnd": 505 + "NamePos": 517, + "NameEnd": 525 }, { "Name": "table_name1", "QuoteType": 1, - "NamePos": 506, - "NameEnd": 517 + "NamePos": 526, + "NameEnd": 537 }, { "Name": "event", "QuoteType": 1, - "NamePos": 518, - "NameEnd": 523 + "NamePos": 538, + "NameEnd": 543 } ] }, "Operation": "=", "RightExpr": { - "LiteralPos": 527, - "LiteralEnd": 537, + "LiteralPos": 547, + "LiteralEnd": 557, "Literal": "test-event" }, "HasGlobal": false, @@ -543,8 +543,8 @@ }, "Populate": false, "Comment": { - "LiteralPos": 548, - "LiteralEnd": 565, + "LiteralPos": 569, + "LiteralEnd": 586, "Literal": "Comment for table" }, "Definer": null, diff --git a/parser/testdata/ddl/output/create_materialized_view_with_definer.sql.golden.json b/parser/testdata/ddl/output/create_materialized_view_with_definer.sql.golden.json index 2200154..79ca911 100644 --- a/parser/testdata/ddl/output/create_materialized_view_with_definer.sql.golden.json +++ b/parser/testdata/ddl/output/create_materialized_view_with_definer.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 355, + "StatementEnd": 368, "Name": { "Database": null, "Table": { @@ -14,36 +14,36 @@ "IfNotExists": false, "OnCluster": null, "Refresh": { - "RefreshPos": 34, + "RefreshPos": 35, "Frequency": "EVERY", "Interval": { "IntervalPos": 0, "Expr": { - "NumPos": 48, - "NumEnd": 49, + "NumPos": 49, + "NumEnd": 50, "Literal": "1", "Base": 10 }, "Unit": { "Name": "HOUR", "QuoteType": 1, - "NamePos": 50, - "NameEnd": 54 + "NamePos": 51, + "NameEnd": 55 } }, "Offset": { "IntervalPos": 0, "Expr": { - "NumPos": 62, - "NumEnd": 64, + "NumPos": 63, + "NumEnd": 65, "Literal": "10", "Base": 10 }, "Unit": { "Name": "MINUTE", "QuoteType": 1, - "NamePos": 65, - "NameEnd": 71 + "NamePos": 66, + "NameEnd": 72 } } }, @@ -54,45 +54,45 @@ "Engine": null, "HasEmpty": false, "Destination": { - "ToPos": 79, + "ToPos": 80, "TableIdentifier": { "Database": null, "Table": { "Name": "events_export", "QuoteType": 1, - "NamePos": 82, - "NameEnd": 95 + "NamePos": 83, + "NameEnd": 96 } }, "TableSchema": { - "SchemaPos": 96, - "SchemaEnd": 173, + "SchemaPos": 98, + "SchemaEnd": 179, "Columns": [ { - "NamePos": 103, - "ColumnEnd": 126, + "NamePos": 106, + "ColumnEnd": 129, "Name": { "Ident": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 103, - "NameEnd": 112 + "NamePos": 106, + "NameEnd": 115 }, "DotIdent": null }, "Type": { - "LeftParenPos": 125, - "RightParenPos": 126, + "LeftParenPos": 128, + "RightParenPos": 129, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 114, - "NameEnd": 124 + "NamePos": 117, + "NameEnd": 127 }, "Params": [ { - "NumPos": 125, - "NumEnd": 126, + "NumPos": 128, + "NumEnd": 129, "Literal": "9", "Base": 10 } @@ -109,14 +109,14 @@ "CompressionCodec": null }, { - "NamePos": 134, - "ColumnEnd": 149, + "NamePos": 138, + "ColumnEnd": 153, "Name": { "Ident": { "Name": "field_1", "QuoteType": 3, - "NamePos": 134, - "NameEnd": 141 + "NamePos": 138, + "NameEnd": 145 }, "DotIdent": null }, @@ -124,8 +124,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 143, - "NameEnd": 149 + "NamePos": 147, + "NameEnd": 153 } }, "NotNull": null, @@ -139,14 +139,14 @@ "CompressionCodec": null }, { - "NamePos": 156, - "ColumnEnd": 171, + "NamePos": 161, + "ColumnEnd": 176, "Name": { "Ident": { "Name": "field_2", "QuoteType": 3, - "NamePos": 156, - "NameEnd": 163 + "NamePos": 161, + "NameEnd": 168 }, "DotIdent": null }, @@ -154,8 +154,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 171 + "NamePos": 170, + "NameEnd": 176 } }, "NotNull": null, @@ -176,8 +176,8 @@ "SubQuery": { "HasParen": true, "Select": { - "SelectPos": 218, - "StatementEnd": 355, + "SelectPos": 226, + "StatementEnd": 368, "With": null, "Top": null, "HasDistinct": false, @@ -187,8 +187,8 @@ "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 229, - "NameEnd": 238 + "NamePos": 238, + "NameEnd": 247 }, "Modifiers": [], "Alias": null @@ -197,8 +197,8 @@ "Expr": { "Name": "field_1", "QuoteType": 1, - "NamePos": 244, - "NameEnd": 251 + "NamePos": 254, + "NameEnd": 261 }, "Modifiers": [], "Alias": null @@ -207,8 +207,8 @@ "Expr": { "Name": "field_2", "QuoteType": 1, - "NamePos": 257, - "NameEnd": 264 + "NamePos": 268, + "NameEnd": 275 }, "Modifiers": [], "Alias": null @@ -217,15 +217,15 @@ "Expr": { "Name": "FROM", "QuoteType": 1, - "NamePos": 266, - "NameEnd": 270 + "NamePos": 278, + "NameEnd": 282 }, "Modifiers": [], "Alias": { "Name": "event_table", "QuoteType": 1, - "NamePos": 271, - "NameEnd": 282 + "NamePos": 283, + "NameEnd": 294 } } ], @@ -234,29 +234,29 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 283, + "WherePos": 296, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 289, - "NameEnd": 302 + "NamePos": 302, + "NameEnd": 315 }, "Params": { - "LeftParenPos": 302, - "RightParenPos": 312, + "LeftParenPos": 315, + "RightParenPos": 325, "Items": { - "ListPos": 303, - "ListEnd": 312, + "ListPos": 316, + "ListEnd": 325, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 303, - "NameEnd": 312 + "NamePos": 316, + "NameEnd": 325 }, "Alias": null } @@ -270,15 +270,15 @@ "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 316, - "NameEnd": 329 + "NamePos": 329, + "NameEnd": 342 }, "Params": { - "LeftParenPos": 329, - "RightParenPos": 355, + "LeftParenPos": 342, + "RightParenPos": 368, "Items": { - "ListPos": 330, - "ListEnd": 354, + "ListPos": 343, + "ListEnd": 367, "HasDistinct": false, "Items": [ { @@ -287,15 +287,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 330, - "NameEnd": 333 + "NamePos": 343, + "NameEnd": 346 }, "Params": { - "LeftParenPos": 333, - "RightParenPos": 334, + "LeftParenPos": 346, + "RightParenPos": 347, "Items": { - "ListPos": 334, - "ListEnd": 334, + "ListPos": 347, + "ListEnd": 347, "HasDistinct": false, "Items": [] }, @@ -307,21 +307,21 @@ "Name": { "Name": "toIntervalHour", "QuoteType": 1, - "NamePos": 338, - "NameEnd": 352 + "NamePos": 351, + "NameEnd": 365 }, "Params": { - "LeftParenPos": 352, - "RightParenPos": 354, + "LeftParenPos": 365, + "RightParenPos": 367, "Items": { - "ListPos": 353, - "ListEnd": 354, + "ListPos": 366, + "ListEnd": 367, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 353, - "NumEnd": 354, + "NumPos": 366, + "NumEnd": 367, "Literal": "1", "Base": 10 }, @@ -361,15 +361,15 @@ }, "Populate": false, "Comment": { - "LiteralPos": 367, - "LiteralEnd": 379, + "LiteralPos": 381, + "LiteralEnd": 393, "Literal": "Test comment" }, "Definer": { "Name": "default", "QuoteType": 1, - "NamePos": 185, - "NameEnd": 192 + "NamePos": 192, + "NameEnd": 199 }, "SQLSecurity": "DEFINER" } diff --git a/parser/testdata/ddl/output/create_materialized_view_with_empty_table_schema.sql.golden.json b/parser/testdata/ddl/output/create_materialized_view_with_empty_table_schema.sql.golden.json index a5dfc85..306b4d5 100644 --- a/parser/testdata/ddl/output/create_materialized_view_with_empty_table_schema.sql.golden.json +++ b/parser/testdata/ddl/output/create_materialized_view_with_empty_table_schema.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 460, + "StatementEnd": 474, "Name": { "Database": { "Name": "test", @@ -32,29 +32,29 @@ "Settings": null, "HasAppend": false, "Engine": { - "EnginePos": 60, - "EngineEnd": 190, + "EnginePos": 61, + "EngineEnd": 193, "Name": "ReplicatedAggregatingMergeTree", "Params": { - "LeftParenPos": 99, - "RightParenPos": 150, + "LeftParenPos": 100, + "RightParenPos": 151, "Items": { - "ListPos": 101, - "ListEnd": 149, + "ListPos": 102, + "ListEnd": 150, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 101, - "LiteralEnd": 136, + "LiteralPos": 102, + "LiteralEnd": 137, "Literal": "/clickhouse/{layer}-{shard}/test/t0" }, "Alias": null }, { "Expr": { - "LiteralPos": 140, - "LiteralEnd": 149, + "LiteralPos": 141, + "LiteralEnd": 150, "Literal": "{replica}" }, "Alias": null @@ -65,10 +65,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 152, + "PartitionPos": 154, "Expr": { - "ListPos": 165, - "ListEnd": 176, + "ListPos": 167, + "ListEnd": 178, "HasDistinct": false, "Items": [ { @@ -76,23 +76,23 @@ "Name": { "Name": "toYYYYMM", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 173 + "NamePos": 167, + "NameEnd": 175 }, "Params": { - "LeftParenPos": 173, - "RightParenPos": 176, + "LeftParenPos": 175, + "RightParenPos": 178, "Items": { - "ListPos": 174, - "ListEnd": 176, + "ListPos": 176, + "ListEnd": 178, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 174, - "NameEnd": 176 + "NamePos": 176, + "NameEnd": 178 }, "Alias": null } @@ -110,25 +110,25 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 178, - "ListEnd": 190, + "OrderPos": 181, + "ListEnd": 193, "Items": [ { - "OrderPos": 178, + "OrderPos": 181, "Expr": { - "LeftParenPos": 187, - "RightParenPos": 190, + "LeftParenPos": 190, + "RightParenPos": 193, "Items": { - "ListPos": 188, - "ListEnd": 190, + "ListPos": 191, + "ListEnd": 193, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 188, - "NameEnd": 190 + "NamePos": 191, + "NameEnd": 193 }, "Alias": null } @@ -147,8 +147,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 204, - "StatementEnd": 460, + "SelectPos": 209, + "StatementEnd": 474, "With": null, "Top": null, "HasDistinct": false, @@ -158,8 +158,8 @@ "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 211, - "NameEnd": 213 + "NamePos": 216, + "NameEnd": 218 }, "Modifiers": [], "Alias": null @@ -168,8 +168,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 214, - "NameEnd": 216 + "NamePos": 219, + "NameEnd": 221 }, "Modifiers": [], "Alias": null @@ -178,8 +178,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 217, - "NameEnd": 219 + "NamePos": 222, + "NameEnd": 224 }, "Modifiers": [], "Alias": null @@ -189,23 +189,23 @@ "Name": { "Name": "coalesce", "QuoteType": 1, - "NamePos": 220, - "NameEnd": 228 + "NamePos": 225, + "NameEnd": 233 }, "Params": { - "LeftParenPos": 228, - "RightParenPos": 234, + "LeftParenPos": 233, + "RightParenPos": 239, "Items": { - "ListPos": 229, - "ListEnd": 234, + "ListPos": 234, + "ListEnd": 239, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 229, - "NameEnd": 231 + "NamePos": 234, + "NameEnd": 236 }, "Alias": null }, @@ -213,8 +213,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 232, - "NameEnd": 234 + "NamePos": 237, + "NameEnd": 239 }, "Alias": null } @@ -227,24 +227,24 @@ "Alias": { "Name": "f333", "QuoteType": 1, - "NamePos": 239, - "NameEnd": 243 + "NamePos": 244, + "NameEnd": 248 } } ], "From": { - "FromPos": 244, + "FromPos": 250, "Expr": { "Table": { - "TablePos": 253, - "TableEnd": 447, + "TablePos": 260, + "TableEnd": 460, "Alias": null, "Expr": { "Expr": { "HasParen": true, "Select": { - "SelectPos": 254, - "StatementEnd": 433, + "SelectPos": 261, + "StatementEnd": 445, "With": null, "Top": null, "HasDistinct": false, @@ -254,8 +254,8 @@ "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 270, - "NameEnd": 272 + "NamePos": 278, + "NameEnd": 280 }, "Modifiers": [], "Alias": null @@ -264,8 +264,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 273, - "NameEnd": 275 + "NamePos": 281, + "NameEnd": 283 }, "Modifiers": [], "Alias": null @@ -274,8 +274,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 276, - "NameEnd": 278 + "NamePos": 284, + "NameEnd": 286 }, "Modifiers": [], "Alias": null @@ -286,38 +286,38 @@ "Name": { "Name": "ROW_NUMBER", "QuoteType": 1, - "NamePos": 289, - "NameEnd": 299 + "NamePos": 298, + "NameEnd": 308 }, "Params": { - "LeftParenPos": 299, - "RightParenPos": 300, + "LeftParenPos": 308, + "RightParenPos": 309, "Items": { - "ListPos": 300, - "ListEnd": 300, + "ListPos": 309, + "ListEnd": 309, "HasDistinct": false, "Items": [] }, "ColumnArgList": null } }, - "OverPos": 302, + "OverPos": 311, "OverExpr": { - "LeftParenPos": 306, - "RightParenPos": 347, + "LeftParenPos": 315, + "RightParenPos": 356, "PartitionBy": { - "PartitionPos": 306, + "PartitionPos": 315, "Expr": { - "ListPos": 320, - "ListEnd": 322, + "ListPos": 329, + "ListEnd": 331, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 320, - "NameEnd": 322 + "NamePos": 329, + "NameEnd": 331 }, "Alias": null } @@ -325,32 +325,32 @@ } }, "OrderBy": { - "OrderPos": 323, - "ListEnd": 346, + "OrderPos": 332, + "ListEnd": 355, "Items": [ { - "OrderPos": 323, + "OrderPos": 332, "Expr": { "Name": { "Name": "coalesce", "QuoteType": 1, - "NamePos": 332, - "NameEnd": 340 + "NamePos": 341, + "NameEnd": 349 }, "Params": { - "LeftParenPos": 340, - "RightParenPos": 346, + "LeftParenPos": 349, + "RightParenPos": 355, "Items": { - "ListPos": 341, - "ListEnd": 346, + "ListPos": 350, + "ListEnd": 355, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 341, - "NameEnd": 343 + "NamePos": 350, + "NameEnd": 352 }, "Alias": null }, @@ -358,8 +358,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 344, - "NameEnd": 346 + "NamePos": 353, + "NameEnd": 355 }, "Alias": null } @@ -380,35 +380,35 @@ "Alias": { "Name": "rn", "QuoteType": 1, - "NamePos": 352, - "NameEnd": 354 + "NamePos": 361, + "NameEnd": 363 } } ], "From": { - "FromPos": 360, + "FromPos": 370, "Expr": { "Table": { - "TablePos": 365, - "TableEnd": 371, + "TablePos": 375, + "TableEnd": 381, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 365, - "NameEnd": 369 + "NamePos": 375, + "NameEnd": 379 }, "Table": { "Name": "t", "QuoteType": 1, - "NamePos": 370, - "NameEnd": 371 + "NamePos": 380, + "NameEnd": 381 } }, "HasFinal": false }, - "StatementEnd": 371, + "StatementEnd": 381, "SampleRatio": null, "HasFinal": false } @@ -417,44 +417,44 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 377, + "WherePos": 388, "Expr": { "LeftExpr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 383, - "NameEnd": 385 + "NamePos": 394, + "NameEnd": 396 }, "Operation": "IN", "RightExpr": { - "LeftParenPos": 389, - "RightParenPos": 410, + "LeftParenPos": 400, + "RightParenPos": 421, "Items": { - "ListPos": 391, - "ListEnd": 409, + "ListPos": 402, + "ListEnd": 420, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 391, - "LiteralEnd": 394, + "LiteralPos": 402, + "LiteralEnd": 405, "Literal": "foo" }, "Alias": null }, { "Expr": { - "LiteralPos": 398, - "LiteralEnd": 401, + "LiteralPos": 409, + "LiteralEnd": 412, "Literal": "bar" }, "Alias": null }, { "Expr": { - "LiteralPos": 405, - "LiteralEnd": 409, + "LiteralPos": 416, + "LiteralEnd": 420, "Literal": "test" }, "Alias": null @@ -471,13 +471,13 @@ "LeftExpr": { "Name": "env", "QuoteType": 1, - "NamePos": 423, - "NameEnd": 426 + "NamePos": 435, + "NameEnd": 438 }, "Operation": "=", "RightExpr": { - "LiteralPos": 429, - "LiteralEnd": 433, + "LiteralPos": 441, + "LiteralEnd": 445, "Literal": "test" }, "HasGlobal": false, @@ -500,17 +500,17 @@ "Except": null } }, - "AliasPos": 444, + "AliasPos": 457, "Alias": { "Name": "tmp", "QuoteType": 1, - "NamePos": 444, - "NameEnd": 447 + "NamePos": 457, + "NameEnd": 460 } }, "HasFinal": false }, - "StatementEnd": 447, + "StatementEnd": 460, "SampleRatio": null, "HasFinal": false } @@ -519,18 +519,18 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 448, + "WherePos": 462, "Expr": { "LeftExpr": { "Name": "rn", "QuoteType": 1, - "NamePos": 454, - "NameEnd": 456 + "NamePos": 468, + "NameEnd": 470 }, "Operation": "=", "RightExpr": { - "NumPos": 459, - "NumEnd": 460, + "NumPos": 473, + "NumEnd": 474, "Literal": "1", "Base": 10 }, diff --git a/parser/testdata/ddl/output/create_materialized_view_with_refresh.sql.golden.json b/parser/testdata/ddl/output/create_materialized_view_with_refresh.sql.golden.json index 0d54ed8..5ca4f95 100644 --- a/parser/testdata/ddl/output/create_materialized_view_with_refresh.sql.golden.json +++ b/parser/testdata/ddl/output/create_materialized_view_with_refresh.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 302, + "StatementEnd": 316, "Name": { "Database": null, "Table": { @@ -14,52 +14,52 @@ "IfNotExists": false, "OnCluster": null, "Refresh": { - "RefreshPos": 34, + "RefreshPos": 35, "Frequency": "EVERY", "Interval": { "IntervalPos": 0, "Expr": { - "NumPos": 48, - "NumEnd": 49, + "NumPos": 49, + "NumEnd": 50, "Literal": "1", "Base": 10 }, "Unit": { "Name": "HOUR", "QuoteType": 1, - "NamePos": 50, - "NameEnd": 54 + "NamePos": 51, + "NameEnd": 55 } }, "Offset": { "IntervalPos": 0, "Expr": { - "NumPos": 62, - "NumEnd": 64, + "NumPos": 63, + "NumEnd": 65, "Literal": "10", "Base": 10 }, "Unit": { "Name": "MINUTE", "QuoteType": 1, - "NamePos": 65, - "NameEnd": 71 + "NamePos": 66, + "NameEnd": 72 } } }, "RandomizeFor": { "IntervalPos": 0, "Expr": { - "NumPos": 86, - "NumEnd": 87, + "NumPos": 88, + "NumEnd": 89, "Literal": "1", "Base": 10 }, "Unit": { "Name": "SECOND", "QuoteType": 1, - "NamePos": 88, - "NameEnd": 94 + "NamePos": 90, + "NameEnd": 96 } }, "DependsOn": [ @@ -68,56 +68,56 @@ "Table": { "Name": "table_v5", "QuoteType": 1, - "NamePos": 107, - "NameEnd": 115 + "NamePos": 110, + "NameEnd": 118 } } ], "Settings": { - "SettingsPos": 116, - "ListEnd": 199, + "SettingsPos": 120, + "ListEnd": 206, "Items": [ { - "SettingsPos": 129, + "SettingsPos": 134, "Name": { "Name": "randomize_for", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 142 + "NamePos": 134, + "NameEnd": 147 }, "Expr": { - "NumPos": 145, - "NumEnd": 146, + "NumPos": 150, + "NumEnd": 151, "Literal": "1", "Base": 10 } }, { - "SettingsPos": 152, + "SettingsPos": 158, "Name": { "Name": "randomize_offset", "QuoteType": 1, - "NamePos": 152, - "NameEnd": 168 + "NamePos": 158, + "NameEnd": 174 }, "Expr": { - "NumPos": 171, - "NumEnd": 173, + "NumPos": 177, + "NumEnd": 179, "Literal": "10", "Base": 10 } }, { - "SettingsPos": 179, + "SettingsPos": 186, "Name": { "Name": "randomize_period", "QuoteType": 1, - "NamePos": 179, - "NameEnd": 195 + "NamePos": 186, + "NameEnd": 202 }, "Expr": { - "NumPos": 198, - "NumEnd": 199, + "NumPos": 205, + "NumEnd": 206, "Literal": "1", "Base": 10 } @@ -128,14 +128,14 @@ "Engine": null, "HasEmpty": true, "Destination": { - "ToPos": 207, + "ToPos": 215, "TableIdentifier": { "Database": null, "Table": { "Name": "target_table_name", "QuoteType": 1, - "NamePos": 210, - "NameEnd": 227 + "NamePos": 218, + "NameEnd": 235 } }, "TableSchema": null @@ -143,8 +143,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 237, - "StatementEnd": 302, + "SelectPos": 247, + "StatementEnd": 316, "With": null, "Top": null, "HasDistinct": false, @@ -154,8 +154,8 @@ "Expr": { "Name": "field_1", "QuoteType": 3, - "NamePos": 249, - "NameEnd": 256 + "NamePos": 260, + "NameEnd": 267 }, "Modifiers": [], "Alias": null @@ -164,8 +164,8 @@ "Expr": { "Name": "field_2", "QuoteType": 3, - "NamePos": 264, - "NameEnd": 271 + "NamePos": 276, + "NameEnd": 283 }, "Modifiers": [], "Alias": null @@ -174,8 +174,8 @@ "Expr": { "Name": "field_3", "QuoteType": 3, - "NamePos": 279, - "NameEnd": 286 + "NamePos": 292, + "NameEnd": 299 }, "Modifiers": [], "Alias": null @@ -184,15 +184,15 @@ "Expr": { "Name": "FROM", "QuoteType": 1, - "NamePos": 289, - "NameEnd": 293 + "NamePos": 303, + "NameEnd": 307 }, "Modifiers": [], "Alias": { "Name": "table_v5", "QuoteType": 1, - "NamePos": 294, - "NameEnd": 302 + "NamePos": 308, + "NameEnd": 316 } } ], diff --git a/parser/testdata/ddl/output/create_mv_with_not_op.sql.golden.json b/parser/testdata/ddl/output/create_mv_with_not_op.sql.golden.json index 2420185..27515b8 100644 --- a/parser/testdata/ddl/output/create_mv_with_not_op.sql.golden.json +++ b/parser/testdata/ddl/output/create_mv_with_not_op.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 559, + "StatementEnd": 577, "Name": { "Database": { "Name": "infra_bm", @@ -18,10 +18,10 @@ }, "IfNotExists": false, "OnCluster": { - "OnPos": 48, + "OnPos": 49, "Expr": { - "LiteralPos": 60, - "LiteralEnd": 75, + "LiteralPos": 61, + "LiteralEnd": 76, "Literal": "default_cluster" } }, @@ -33,50 +33,50 @@ "Engine": null, "HasEmpty": false, "Destination": { - "ToPos": 77, + "ToPos": 78, "TableIdentifier": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 80, - "NameEnd": 88 + "NamePos": 81, + "NameEnd": 89 }, "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 89, - "NameEnd": 99 + "NamePos": 90, + "NameEnd": 100 } }, "TableSchema": { - "SchemaPos": 100, - "SchemaEnd": 197, + "SchemaPos": 102, + "SchemaEnd": 206, "Columns": [ { - "NamePos": 105, - "ColumnEnd": 121, + "NamePos": 108, + "ColumnEnd": 124, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 105, - "NameEnd": 107 + "NamePos": 108, + "NameEnd": 110 }, "DotIdent": null }, "Type": { - "LeftParenPos": 120, - "RightParenPos": 121, + "LeftParenPos": 123, + "RightParenPos": 124, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 109, - "NameEnd": 119 + "NamePos": 112, + "NameEnd": 122 }, "Params": [ { - "NumPos": 120, - "NumEnd": 121, + "NumPos": 123, + "NumEnd": 124, "Literal": "3", "Base": 10 } @@ -93,14 +93,14 @@ "CompressionCodec": null }, { - "NamePos": 127, - "ColumnEnd": 137, + "NamePos": 131, + "ColumnEnd": 141, "Name": { "Ident": { "Name": "f2", "QuoteType": 3, - "NamePos": 127, - "NameEnd": 129 + "NamePos": 131, + "NameEnd": 133 }, "DotIdent": null }, @@ -108,8 +108,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 137 + "NamePos": 135, + "NameEnd": 141 } }, "NotNull": null, @@ -123,14 +123,14 @@ "CompressionCodec": null }, { - "NamePos": 142, - "ColumnEnd": 152, + "NamePos": 147, + "ColumnEnd": 157, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 142, - "NameEnd": 144 + "NamePos": 147, + "NameEnd": 149 }, "DotIdent": null }, @@ -138,8 +138,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 146, - "NameEnd": 152 + "NamePos": 151, + "NameEnd": 157 } }, "NotNull": null, @@ -153,14 +153,14 @@ "CompressionCodec": null }, { - "NamePos": 157, - "ColumnEnd": 167, + "NamePos": 163, + "ColumnEnd": 173, "Name": { "Ident": { "Name": "f4", "QuoteType": 3, - "NamePos": 157, - "NameEnd": 159 + "NamePos": 163, + "NameEnd": 165 }, "DotIdent": null }, @@ -168,8 +168,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 161, - "NameEnd": 167 + "NamePos": 167, + "NameEnd": 173 } }, "NotNull": null, @@ -183,14 +183,14 @@ "CompressionCodec": null }, { - "NamePos": 172, - "ColumnEnd": 182, + "NamePos": 179, + "ColumnEnd": 189, "Name": { "Ident": { "Name": "f5", "QuoteType": 3, - "NamePos": 172, - "NameEnd": 174 + "NamePos": 179, + "NameEnd": 181 }, "DotIdent": null }, @@ -198,8 +198,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 176, - "NameEnd": 182 + "NamePos": 183, + "NameEnd": 189 } }, "NotNull": null, @@ -213,14 +213,14 @@ "CompressionCodec": null }, { - "NamePos": 187, - "ColumnEnd": 196, + "NamePos": 195, + "ColumnEnd": 204, "Name": { "Ident": { "Name": "f6", "QuoteType": 3, - "NamePos": 187, - "NameEnd": 189 + "NamePos": 195, + "NameEnd": 197 }, "DotIdent": null }, @@ -228,8 +228,8 @@ "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 191, - "NameEnd": 196 + "NamePos": 199, + "NameEnd": 204 } }, "NotNull": null, @@ -250,8 +250,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 202, - "StatementEnd": 559, + "SelectPos": 212, + "StatementEnd": 577, "With": null, "Top": null, "HasDistinct": false, @@ -261,8 +261,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 209, - "NameEnd": 211 + "NamePos": 219, + "NameEnd": 221 }, "Modifiers": [], "Alias": null @@ -271,8 +271,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 220, - "NameEnd": 222 + "NamePos": 231, + "NameEnd": 233 }, "Modifiers": [], "Alias": null @@ -282,30 +282,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 231, - "NameEnd": 254 + "NamePos": 243, + "NameEnd": 266 }, "Params": { - "LeftParenPos": 254, - "RightParenPos": 271, + "LeftParenPos": 266, + "RightParenPos": 283, "Items": { - "ListPos": 255, - "ListEnd": 270, + "ListPos": 267, + "ListEnd": 282, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 255, - "NameEnd": 265 + "NamePos": 267, + "NameEnd": 277 }, "Alias": null }, { "Expr": { - "LiteralPos": 268, - "LiteralEnd": 270, + "LiteralPos": 280, + "LiteralEnd": 282, "Literal": "f3" }, "Alias": null @@ -319,8 +319,8 @@ "Alias": { "Name": "f3", "QuoteType": 1, - "NamePos": 276, - "NameEnd": 278 + "NamePos": 288, + "NameEnd": 290 } }, { @@ -328,30 +328,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 287, - "NameEnd": 310 + "NamePos": 300, + "NameEnd": 323 }, "Params": { - "LeftParenPos": 310, - "RightParenPos": 327, + "LeftParenPos": 323, + "RightParenPos": 340, "Items": { - "ListPos": 311, - "ListEnd": 326, + "ListPos": 324, + "ListEnd": 339, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 311, - "NameEnd": 321 + "NamePos": 324, + "NameEnd": 334 }, "Alias": null }, { "Expr": { - "LiteralPos": 324, - "LiteralEnd": 326, + "LiteralPos": 337, + "LiteralEnd": 339, "Literal": "f4" }, "Alias": null @@ -365,8 +365,8 @@ "Alias": { "Name": "f4", "QuoteType": 1, - "NamePos": 332, - "NameEnd": 334 + "NamePos": 345, + "NameEnd": 347 } }, { @@ -374,30 +374,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 343, - "NameEnd": 366 + "NamePos": 357, + "NameEnd": 380 }, "Params": { - "LeftParenPos": 366, - "RightParenPos": 383, + "LeftParenPos": 380, + "RightParenPos": 397, "Items": { - "ListPos": 367, - "ListEnd": 382, + "ListPos": 381, + "ListEnd": 396, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 367, - "NameEnd": 377 + "NamePos": 381, + "NameEnd": 391 }, "Alias": null }, { "Expr": { - "LiteralPos": 380, - "LiteralEnd": 382, + "LiteralPos": 394, + "LiteralEnd": 396, "Literal": "f5" }, "Alias": null @@ -411,8 +411,8 @@ "Alias": { "Name": "f5", "QuoteType": 1, - "NamePos": 388, - "NameEnd": 390 + "NamePos": 402, + "NameEnd": 404 } }, { @@ -420,30 +420,30 @@ "Name": { "Name": "visitParamExtractInt", "QuoteType": 1, - "NamePos": 399, - "NameEnd": 419 + "NamePos": 414, + "NameEnd": 434 }, "Params": { - "LeftParenPos": 419, - "RightParenPos": 436, + "LeftParenPos": 434, + "RightParenPos": 451, "Items": { - "ListPos": 420, - "ListEnd": 435, + "ListPos": 435, + "ListEnd": 450, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 420, - "NameEnd": 430 + "NamePos": 435, + "NameEnd": 445 }, "Alias": null }, { "Expr": { - "LiteralPos": 433, - "LiteralEnd": 435, + "LiteralPos": 448, + "LiteralEnd": 450, "Literal": "f6" }, "Alias": null @@ -457,35 +457,35 @@ "Alias": { "Name": "f6", "QuoteType": 1, - "NamePos": 441, - "NameEnd": 443 + "NamePos": 456, + "NameEnd": 458 } } ], "From": { - "FromPos": 444, + "FromPos": 460, "Expr": { "Table": { - "TablePos": 449, - "TableEnd": 469, + "TablePos": 465, + "TableEnd": 485, "Alias": null, "Expr": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 449, - "NameEnd": 457 + "NamePos": 465, + "NameEnd": 473 }, "Table": { "Name": "table_name1", "QuoteType": 1, - "NamePos": 458, - "NameEnd": 469 + "NamePos": 474, + "NameEnd": 485 } }, "HasFinal": false }, - "StatementEnd": 469, + "StatementEnd": 485, "SampleRatio": null, "HasFinal": false } @@ -494,7 +494,7 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 470, + "WherePos": 487, "Expr": { "LeftExpr": { "LeftExpr": { @@ -503,27 +503,27 @@ { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 476, - "NameEnd": 484 + "NamePos": 493, + "NameEnd": 501 }, { "Name": "table_name1", "QuoteType": 1, - "NamePos": 485, - "NameEnd": 496 + "NamePos": 502, + "NameEnd": 513 }, { "Name": "event", "QuoteType": 1, - "NamePos": 497, - "NameEnd": 502 + "NamePos": 514, + "NameEnd": 519 } ] }, "Operation": "=", "RightExpr": { - "LiteralPos": 506, - "LiteralEnd": 516, + "LiteralPos": 523, + "LiteralEnd": 533, "Literal": "test-event" }, "HasGlobal": false, @@ -531,29 +531,29 @@ }, "Operation": "AND", "RightExpr": { - "UnaryPos": 526, + "UnaryPos": 544, "Kind": "NOT", "Expr": { "Name": { "Name": "isZeroOrNull", "QuoteType": 1, - "NamePos": 530, - "NameEnd": 542 + "NamePos": 548, + "NameEnd": 560 }, "Params": { - "LeftParenPos": 542, - "RightParenPos": 545, + "LeftParenPos": 560, + "RightParenPos": 563, "Items": { - "ListPos": 543, - "ListEnd": 545, + "ListPos": 561, + "ListEnd": 563, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 543, - "NameEnd": 545 + "NamePos": 561, + "NameEnd": 563 }, "Alias": null } @@ -572,13 +572,13 @@ "LeftExpr": { "Name": "f6", "QuoteType": 1, - "NamePos": 551, - "NameEnd": 553 + "NamePos": 569, + "NameEnd": 571 }, "Operation": "-", "RightExpr": { - "NumPos": 554, - "NumEnd": 555, + "NumPos": 572, + "NumEnd": 573, "Literal": "2", "Base": 10 }, @@ -587,8 +587,8 @@ }, "Operation": "\u003e", "RightExpr": { - "NumPos": 558, - "NumEnd": 559, + "NumPos": 576, + "NumEnd": 577, "Literal": "0", "Base": 10 }, diff --git a/parser/testdata/ddl/output/create_mv_with_order_by.sql.golden.json b/parser/testdata/ddl/output/create_mv_with_order_by.sql.golden.json index d9ce15d..e5bdae5 100644 --- a/parser/testdata/ddl/output/create_mv_with_order_by.sql.golden.json +++ b/parser/testdata/ddl/output/create_mv_with_order_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 135, + "StatementEnd": 140, "Name": { "Database": null, "Table": { @@ -19,36 +19,36 @@ "Settings": null, "HasAppend": false, "Engine": { - "EnginePos": 47, - "EngineEnd": 106, + "EnginePos": 48, + "EngineEnd": 109, "Name": "ReplacingMergeTree", "Params": { - "LeftParenPos": 74, - "RightParenPos": 75, + "LeftParenPos": 75, + "RightParenPos": 76, "Items": { - "ListPos": 75, - "ListEnd": 75, + "ListPos": 76, + "ListEnd": 76, "HasDistinct": false, "Items": [] }, "ColumnArgList": null }, "PrimaryKey": { - "PrimaryPos": 77, + "PrimaryPos": 79, "Expr": { - "LeftParenPos": 89, - "RightParenPos": 92, + "LeftParenPos": 91, + "RightParenPos": 94, "Items": { - "ListPos": 90, - "ListEnd": 92, + "ListPos": 92, + "ListEnd": 94, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 92 + "NamePos": 92, + "NameEnd": 94 }, "Alias": null } @@ -62,25 +62,25 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 94, - "ListEnd": 106, + "OrderPos": 97, + "ListEnd": 109, "Items": [ { - "OrderPos": 94, + "OrderPos": 97, "Expr": { - "LeftParenPos": 103, - "RightParenPos": 106, + "LeftParenPos": 106, + "RightParenPos": 109, "Items": { - "ListPos": 104, - "ListEnd": 106, + "ListPos": 107, + "ListEnd": 109, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 104, - "NameEnd": 106 + "NamePos": 107, + "NameEnd": 109 }, "Alias": null } @@ -99,8 +99,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 111, - "StatementEnd": 135, + "SelectPos": 116, + "StatementEnd": 140, "With": null, "Top": null, "HasDistinct": false, @@ -110,32 +110,32 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 118, - "NameEnd": 118 + "NamePos": 123, + "NameEnd": 123 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 120, + "FromPos": 125, "Expr": { "Table": { - "TablePos": 125, - "TableEnd": 135, + "TablePos": 130, + "TableEnd": 140, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "test_table", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 135 + "NamePos": 130, + "NameEnd": 140 } }, "HasFinal": false }, - "StatementEnd": 135, + "StatementEnd": 140, "SampleRatio": null, "HasFinal": false } @@ -163,15 +163,15 @@ "SQLSecurity": "" }, { - "CreatePos": 138, - "StatementEnd": 259, + "CreatePos": 145, + "StatementEnd": 270, "Name": { "Database": null, "Table": { "Name": "test_mv", "QuoteType": 1, - "NamePos": 177, - "NameEnd": 184 + "NamePos": 184, + "NameEnd": 191 } }, "IfNotExists": true, @@ -182,36 +182,36 @@ "Settings": null, "HasAppend": false, "Engine": { - "EnginePos": 185, - "EngineEnd": 230, + "EnginePos": 193, + "EngineEnd": 239, "Name": "ReplacingMergeTree", "Params": { - "LeftParenPos": 212, - "RightParenPos": 213, + "LeftParenPos": 220, + "RightParenPos": 221, "Items": { - "ListPos": 213, - "ListEnd": 213, + "ListPos": 221, + "ListEnd": 221, "HasDistinct": false, "Items": [] }, "ColumnArgList": null }, "PrimaryKey": { - "PrimaryPos": 215, + "PrimaryPos": 224, "Expr": { - "LeftParenPos": 227, - "RightParenPos": 230, + "LeftParenPos": 236, + "RightParenPos": 239, "Items": { - "ListPos": 228, - "ListEnd": 230, + "ListPos": 237, + "ListEnd": 239, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 228, - "NameEnd": 230 + "NamePos": 237, + "NameEnd": 239 }, "Alias": null } @@ -231,8 +231,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 235, - "StatementEnd": 259, + "SelectPos": 246, + "StatementEnd": 270, "With": null, "Top": null, "HasDistinct": false, @@ -242,32 +242,32 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 242, - "NameEnd": 242 + "NamePos": 253, + "NameEnd": 253 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 244, + "FromPos": 255, "Expr": { "Table": { - "TablePos": 249, - "TableEnd": 259, + "TablePos": 260, + "TableEnd": 270, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "test_table", "QuoteType": 1, - "NamePos": 249, - "NameEnd": 259 + "NamePos": 260, + "NameEnd": 270 } }, "HasFinal": false }, - "StatementEnd": 259, + "StatementEnd": 270, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/ddl/output/create_or_replace.sql.golden.json b/parser/testdata/ddl/output/create_or_replace.sql.golden.json index 52389ca..533bae7 100644 --- a/parser/testdata/ddl/output/create_or_replace.sql.golden.json +++ b/parser/testdata/ddl/output/create_or_replace.sql.golden.json @@ -1,38 +1,38 @@ [ { - "CreatePos": 122, - "StatementEnd": 361, + "CreatePos": 127, + "StatementEnd": 374, "OrReplace": true, "Name": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 160, - "NameEnd": 164 + "NamePos": 165, + "NameEnd": 169 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 177 + "NamePos": 170, + "NameEnd": 182 } }, "IfNotExists": true, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 178, - "SchemaEnd": 246, + "SchemaPos": 183, + "SchemaEnd": 255, "Columns": [ { - "NamePos": 184, - "ColumnEnd": 193, + "NamePos": 190, + "ColumnEnd": 199, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 186 + "NamePos": 190, + "NameEnd": 192 }, "DotIdent": null }, @@ -40,8 +40,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 187, - "NameEnd": 193 + "NamePos": 193, + "NameEnd": 199 } }, "NotNull": null, @@ -55,14 +55,14 @@ "CompressionCodec": null }, { - "NamePos": 199, - "ColumnEnd": 223, + "NamePos": 206, + "ColumnEnd": 230, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 199, - "NameEnd": 201 + "NamePos": 206, + "NameEnd": 208 }, "DotIdent": null }, @@ -70,8 +70,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 202, - "NameEnd": 208 + "NamePos": 209, + "NameEnd": 215 } }, "NotNull": null, @@ -80,19 +80,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 209, - "RightParenPos": 223, + "CodecPos": 216, + "RightParenPos": 230, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 215, - "NameEnd": 219 + "NamePos": 222, + "NameEnd": 226 }, "Level": { - "NumPos": 219, - "NumEnd": 221, + "NumPos": 226, + "NumEnd": 228, "Literal": "1", "Base": 10 } @@ -102,30 +102,30 @@ "CompressionCodec": null }, { - "NamePos": 229, - "ColumnEnd": 243, + "NamePos": 237, + "ColumnEnd": 251, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 229, - "NameEnd": 231 + "NamePos": 237, + "NameEnd": 239 }, "DotIdent": null }, "Type": { - "LeftParenPos": 240, - "RightParenPos": 243, + "LeftParenPos": 248, + "RightParenPos": 251, "Name": { "Name": "VARCHAR", "QuoteType": 1, - "NamePos": 232, - "NameEnd": 239 + "NamePos": 240, + "NameEnd": 247 }, "Params": [ { - "NumPos": 240, - "NumEnd": 243, + "NumPos": 248, + "NumEnd": 251, "Literal": "255", "Base": 10 } @@ -146,26 +146,26 @@ "TableFunction": null }, "Engine": { - "EnginePos": 248, - "EngineEnd": 361, + "EnginePos": 257, + "EngineEnd": 374, "Name": "MergeTree", "Params": null, "PrimaryKey": { - "PrimaryPos": 267, + "PrimaryPos": 277, "Expr": { - "LeftParenPos": 279, - "RightParenPos": 290, + "LeftParenPos": 289, + "RightParenPos": 300, "Items": { - "ListPos": 280, - "ListEnd": 290, + "ListPos": 290, + "ListEnd": 300, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 280, - "NameEnd": 282 + "NamePos": 290, + "NameEnd": 292 }, "Alias": null }, @@ -173,8 +173,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 284, - "NameEnd": 286 + "NamePos": 294, + "NameEnd": 296 }, "Alias": null }, @@ -182,8 +182,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 288, - "NameEnd": 290 + "NamePos": 298, + "NameEnd": 300 }, "Alias": null } @@ -193,10 +193,10 @@ } }, "PartitionBy": { - "PartitionPos": 292, + "PartitionPos": 303, "Expr": { - "ListPos": 305, - "ListEnd": 318, + "ListPos": 316, + "ListEnd": 329, "HasDistinct": false, "Items": [ { @@ -204,23 +204,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 305, - "NameEnd": 315 + "NamePos": 316, + "NameEnd": 326 }, "Params": { - "LeftParenPos": 315, - "RightParenPos": 318, + "LeftParenPos": 326, + "RightParenPos": 329, "Items": { - "ListPos": 316, - "ListEnd": 318, + "ListPos": 327, + "ListEnd": 329, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 316, - "NameEnd": 318 + "NamePos": 327, + "NameEnd": 329 }, "Alias": null } @@ -236,32 +236,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 320, - "ListEnd": 345, + "TTLPos": 332, + "ListEnd": 357, "Items": [ { - "TTLPos": 320, + "TTLPos": 332, "Expr": { "LeftExpr": { "Name": "f1", "QuoteType": 1, - "NamePos": 324, - "NameEnd": 326 + "NamePos": 336, + "NameEnd": 338 }, "Operation": "+", "RightExpr": { - "IntervalPos": 329, + "IntervalPos": 341, "Expr": { - "NumPos": 338, - "NumEnd": 339, + "NumPos": 350, + "NumEnd": 351, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 340, - "NameEnd": 345 + "NamePos": 352, + "NameEnd": 357 } }, "HasGlobal": false, @@ -273,25 +273,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 346, - "ListEnd": 361, + "OrderPos": 359, + "ListEnd": 374, "Items": [ { - "OrderPos": 346, + "OrderPos": 359, "Expr": { - "LeftParenPos": 355, - "RightParenPos": 361, + "LeftParenPos": 368, + "RightParenPos": 374, "Items": { - "ListPos": 356, - "ListEnd": 361, + "ListPos": 369, + "ListEnd": 374, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 356, - "NameEnd": 358 + "NamePos": 369, + "NameEnd": 371 }, "Alias": null }, @@ -299,8 +299,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 359, - "NameEnd": 361 + "NamePos": 372, + "NameEnd": 374 }, "Alias": null } @@ -317,40 +317,40 @@ "SubQuery": null, "HasTemporary": false, "Comment": { - "LiteralPos": 372, - "LiteralEnd": 389, + "LiteralPos": 386, + "LiteralEnd": 403, "Literal": "Comment for table" } }, { - "CreatePos": 393, - "StatementEnd": 508, + "CreatePos": 409, + "StatementEnd": 530, "OrReplace": true, "Name": { "Database": null, "Table": { "Name": "my_view", "QuoteType": 1, - "NamePos": 430, - "NameEnd": 437 + "NamePos": 446, + "NameEnd": 453 } }, "IfNotExists": true, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 437, - "SchemaEnd": 462, + "SchemaPos": 453, + "SchemaEnd": 478, "Columns": [ { - "NamePos": 438, - "ColumnEnd": 449, + "NamePos": 454, + "ColumnEnd": 465, "Name": { "Ident": { "Name": "col1", "QuoteType": 1, - "NamePos": 438, - "NameEnd": 442 + "NamePos": 454, + "NameEnd": 458 }, "DotIdent": null }, @@ -358,8 +358,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 443, - "NameEnd": 449 + "NamePos": 459, + "NameEnd": 465 } }, "NotNull": null, @@ -373,14 +373,14 @@ "CompressionCodec": null }, { - "NamePos": 451, - "ColumnEnd": 462, + "NamePos": 467, + "ColumnEnd": 478, "Name": { "Ident": { "Name": "col2", "QuoteType": 1, - "NamePos": 451, - "NameEnd": 455 + "NamePos": 467, + "NameEnd": 471 }, "DotIdent": null }, @@ -388,8 +388,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 456, - "NameEnd": 462 + "NamePos": 472, + "NameEnd": 478 } }, "NotNull": null, @@ -409,8 +409,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 467, - "StatementEnd": 508, + "SelectPos": 485, + "StatementEnd": 530, "With": null, "Top": null, "HasDistinct": false, @@ -420,8 +420,8 @@ "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 478, - "NameEnd": 480 + "NamePos": 497, + "NameEnd": 499 }, "Modifiers": [], "Alias": null @@ -430,32 +430,32 @@ "Expr": { "Name": "name", "QuoteType": 1, - "NamePos": 486, - "NameEnd": 490 + "NamePos": 506, + "NameEnd": 510 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 491, + "FromPos": 512, "Expr": { "Table": { - "TablePos": 500, - "TableEnd": 508, + "TablePos": 522, + "TableEnd": 530, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "my_table", "QuoteType": 1, - "NamePos": 500, - "NameEnd": 508 + "NamePos": 522, + "NameEnd": 530 } }, "HasFinal": false }, - "StatementEnd": 508, + "StatementEnd": 530, "SampleRatio": null, "HasFinal": false } @@ -479,30 +479,30 @@ } }, { - "CreatePos": 511, + "CreatePos": 535, "OrReplace": true, "IfNotExists": true, "FunctionName": { "Name": "my_function", "QuoteType": 1, - "NamePos": 552, - "NameEnd": 563 + "NamePos": 576, + "NameEnd": 587 }, "OnCluster": null, "Params": { - "LeftParenPos": 567, - "RightParenPos": 572, + "LeftParenPos": 591, + "RightParenPos": 596, "Items": { - "ListPos": 568, - "ListEnd": 572, + "ListPos": 592, + "ListEnd": 596, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 568, - "NameEnd": 569 + "NamePos": 592, + "NameEnd": 593 }, "Alias": null }, @@ -510,8 +510,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 571, - "NameEnd": 572 + "NamePos": 595, + "NameEnd": 596 }, "Alias": null } @@ -523,15 +523,15 @@ "LeftExpr": { "Name": "x", "QuoteType": 1, - "NamePos": 577, - "NameEnd": 578 + "NamePos": 601, + "NameEnd": 602 }, "Operation": "+", "RightExpr": { "Name": "y", "QuoteType": 1, - "NamePos": 581, - "NameEnd": 582 + "NamePos": 605, + "NameEnd": 606 }, "HasGlobal": false, "HasNot": false diff --git a/parser/testdata/ddl/output/create_role.sql.golden.json b/parser/testdata/ddl/output/create_role.sql.golden.json index d0d6449..675fb36 100644 --- a/parser/testdata/ddl/output/create_role.sql.golden.json +++ b/parser/testdata/ddl/output/create_role.sql.golden.json @@ -1,7 +1,7 @@ [ { - "CreatePos": 22, - "StatementEnd": 42, + "CreatePos": 24, + "StatementEnd": 44, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -9,8 +9,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 34, - "NameEnd": 42 + "NamePos": 36, + "NameEnd": 44 }, "Scope": null, "OnCluster": null @@ -20,8 +20,8 @@ "Settings": null }, { - "CreatePos": 44, - "StatementEnd": 85, + "CreatePos": 47, + "StatementEnd": 88, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -29,17 +29,17 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 56, - "NameEnd": 64 + "NamePos": 59, + "NameEnd": 67 }, "Scope": null, "OnCluster": { - "OnPos": 65, + "OnPos": 68, "Expr": { "Name": "cluster_1", "QuoteType": 1, - "NamePos": 76, - "NameEnd": 85 + "NamePos": 79, + "NameEnd": 88 } } } @@ -48,8 +48,8 @@ "Settings": null }, { - "CreatePos": 87, - "StatementEnd": 117, + "CreatePos": 91, + "StatementEnd": 121, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -57,8 +57,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 99, - "NameEnd": 107 + "NamePos": 103, + "NameEnd": 111 }, "Scope": null, "OnCluster": null @@ -67,8 +67,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 109, - "NameEnd": 117 + "NamePos": 113, + "NameEnd": 121 }, "Scope": null, "OnCluster": null @@ -78,8 +78,8 @@ "Settings": null }, { - "CreatePos": 119, - "StatementEnd": 170, + "CreatePos": 124, + "StatementEnd": 175, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -87,17 +87,17 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 139 + "NamePos": 136, + "NameEnd": 144 }, "Scope": null, "OnCluster": { - "OnPos": 140, + "OnPos": 145, "Expr": { "Name": "cluster_1", "QuoteType": 1, - "NamePos": 151, - "NameEnd": 160 + "NamePos": 156, + "NameEnd": 165 } } }, @@ -105,8 +105,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 162, - "NameEnd": 170 + "NamePos": 167, + "NameEnd": 175 }, "Scope": null, "OnCluster": null @@ -116,8 +116,8 @@ "Settings": null }, { - "CreatePos": 172, - "StatementEnd": 244, + "CreatePos": 178, + "StatementEnd": 250, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -125,17 +125,17 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 192 + "NamePos": 190, + "NameEnd": 198 }, "Scope": null, "OnCluster": { - "OnPos": 193, + "OnPos": 199, "Expr": { "Name": "cluster_1", "QuoteType": 1, - "NamePos": 204, - "NameEnd": 213 + "NamePos": 210, + "NameEnd": 219 } } }, @@ -143,17 +143,17 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 215, - "NameEnd": 223 + "NamePos": 221, + "NameEnd": 229 }, "Scope": null, "OnCluster": { - "OnPos": 224, + "OnPos": 230, "Expr": { "Name": "cluster_2", "QuoteType": 1, - "NamePos": 235, - "NameEnd": 244 + "NamePos": 241, + "NameEnd": 250 } } } @@ -162,8 +162,8 @@ "Settings": null }, { - "CreatePos": 246, - "StatementEnd": 280, + "CreatePos": 253, + "StatementEnd": 287, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -171,8 +171,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 258, - "NameEnd": 266 + "NamePos": 265, + "NameEnd": 273 }, "Scope": null, "OnCluster": null @@ -185,15 +185,15 @@ "Modifier": { "Name": "NONE", "QuoteType": 1, - "NamePos": 276, - "NameEnd": 280 + "NamePos": 283, + "NameEnd": 287 } } ] }, { - "CreatePos": 282, - "StatementEnd": 328, + "CreatePos": 290, + "StatementEnd": 336, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -201,8 +201,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 294, - "NameEnd": 302 + "NamePos": 302, + "NameEnd": 310 }, "Scope": null, "OnCluster": null @@ -216,13 +216,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 312, - "NameEnd": 319 + "NamePos": 320, + "NameEnd": 327 }, "Operation": "", "Value": { - "LiteralPos": 321, - "LiteralEnd": 328, + "LiteralPos": 329, + "LiteralEnd": 336, "Literal": "default" } } @@ -232,8 +232,8 @@ ] }, { - "CreatePos": 331, - "StatementEnd": 385, + "CreatePos": 340, + "StatementEnd": 394, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -241,8 +241,8 @@ "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 343, - "NameEnd": 351 + "NamePos": 352, + "NameEnd": 360 }, "Scope": null, "OnCluster": null @@ -256,13 +256,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 361, - "NameEnd": 377 + "NamePos": 370, + "NameEnd": 386 }, "Operation": "=", "Value": { - "NumPos": 378, - "NumEnd": 385, + "NumPos": 387, + "NumEnd": 394, "Literal": "5000000", "Base": 10 } @@ -273,8 +273,8 @@ ] }, { - "CreatePos": 387, - "StatementEnd": 445, + "CreatePos": 397, + "StatementEnd": 455, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -282,8 +282,8 @@ "Name": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 399, - "NameEnd": 407 + "NamePos": 409, + "NameEnd": 417 }, "Scope": null, "OnCluster": null @@ -297,8 +297,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 417, - "NameEnd": 433 + "NamePos": 427, + "NameEnd": 443 }, "Operation": "", "Value": null @@ -307,13 +307,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 434, - "NameEnd": 437 + "NamePos": 444, + "NameEnd": 447 }, "Operation": "=", "Value": { - "NumPos": 438, - "NumEnd": 445, + "NumPos": 448, + "NumEnd": 455, "Literal": "5000000", "Base": 10 } @@ -324,8 +324,8 @@ ] }, { - "CreatePos": 447, - "StatementEnd": 505, + "CreatePos": 458, + "StatementEnd": 516, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -333,8 +333,8 @@ "Name": { "Name": "r5_01293", "QuoteType": 1, - "NamePos": 459, - "NameEnd": 467 + "NamePos": 470, + "NameEnd": 478 }, "Scope": null, "OnCluster": null @@ -348,8 +348,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 477, - "NameEnd": 493 + "NamePos": 488, + "NameEnd": 504 }, "Operation": "", "Value": null @@ -358,13 +358,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 494, - "NameEnd": 497 + "NamePos": 505, + "NameEnd": 508 }, "Operation": "=", "Value": { - "NumPos": 498, - "NumEnd": 505, + "NumPos": 509, + "NumEnd": 516, "Literal": "5000000", "Base": 10 } @@ -375,8 +375,8 @@ ] }, { - "CreatePos": 507, - "StatementEnd": 559, + "CreatePos": 519, + "StatementEnd": 571, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -384,8 +384,8 @@ "Name": { "Name": "r6_01293", "QuoteType": 1, - "NamePos": 519, - "NameEnd": 527 + "NamePos": 531, + "NameEnd": 539 }, "Scope": null, "OnCluster": null @@ -399,8 +399,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 537, - "NameEnd": 553 + "NamePos": 549, + "NameEnd": 565 }, "Operation": "", "Value": null @@ -409,15 +409,15 @@ "Modifier": { "Name": "CONST", "QuoteType": 1, - "NamePos": 554, - "NameEnd": 559 + "NamePos": 566, + "NameEnd": 571 } } ] }, { - "CreatePos": 561, - "StatementEnd": 616, + "CreatePos": 574, + "StatementEnd": 629, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -425,8 +425,8 @@ "Name": { "Name": "r7_01293", "QuoteType": 1, - "NamePos": 573, - "NameEnd": 581 + "NamePos": 586, + "NameEnd": 594 }, "Scope": null, "OnCluster": null @@ -440,8 +440,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 591, - "NameEnd": 607 + "NamePos": 604, + "NameEnd": 620 }, "Operation": "", "Value": null @@ -450,15 +450,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 608, - "NameEnd": 616 + "NamePos": 621, + "NameEnd": 629 } } ] }, { - "CreatePos": 618, - "StatementEnd": 702, + "CreatePos": 632, + "StatementEnd": 716, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -466,8 +466,8 @@ "Name": { "Name": "r8_01293", "QuoteType": 1, - "NamePos": 630, - "NameEnd": 638 + "NamePos": 644, + "NameEnd": 652 }, "Scope": null, "OnCluster": null @@ -481,13 +481,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 648, - "NameEnd": 664 + "NamePos": 662, + "NameEnd": 678 }, "Operation": "=", "Value": { - "NumPos": 665, - "NumEnd": 672, + "NumPos": 679, + "NumEnd": 686, "Literal": "5000000", "Base": 10 } @@ -496,13 +496,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 673, - "NameEnd": 676 + "NamePos": 687, + "NameEnd": 690 }, "Operation": "", "Value": { - "NumPos": 677, - "NumEnd": 684, + "NumPos": 691, + "NumEnd": 698, "Literal": "4000000", "Base": 10 } @@ -511,13 +511,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 685, - "NameEnd": 688 + "NamePos": 699, + "NameEnd": 702 }, "Operation": "", "Value": { - "NumPos": 689, - "NumEnd": 696, + "NumPos": 703, + "NumEnd": 710, "Literal": "6000000", "Base": 10 } @@ -526,15 +526,15 @@ "Modifier": { "Name": "CONST", "QuoteType": 1, - "NamePos": 697, - "NameEnd": 702 + "NamePos": 711, + "NameEnd": 716 } } ] }, { - "CreatePos": 704, - "StatementEnd": 786, + "CreatePos": 719, + "StatementEnd": 801, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -542,8 +542,8 @@ "Name": { "Name": "r9_01293", "QuoteType": 1, - "NamePos": 716, - "NameEnd": 724 + "NamePos": 731, + "NameEnd": 739 }, "Scope": null, "OnCluster": null @@ -557,13 +557,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 734, - "NameEnd": 741 + "NamePos": 749, + "NameEnd": 756 }, "Operation": "", "Value": { - "LiteralPos": 743, - "LiteralEnd": 750, + "LiteralPos": 758, + "LiteralEnd": 765, "Literal": "default" } } @@ -576,13 +576,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 753, - "NameEnd": 769 + "NamePos": 768, + "NameEnd": 784 }, "Operation": "=", "Value": { - "NumPos": 770, - "NumEnd": 777, + "NumPos": 785, + "NumEnd": 792, "Literal": "5000000", "Base": 10 } @@ -591,15 +591,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 778, - "NameEnd": 786 + "NamePos": 793, + "NameEnd": 801 } } ] }, { - "CreatePos": 788, - "StatementEnd": 818, + "CreatePos": 804, + "StatementEnd": 834, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -607,8 +607,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 800, - "NameEnd": 808 + "NamePos": 816, + "NameEnd": 824 }, "Scope": null, "OnCluster": null @@ -617,8 +617,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 810, - "NameEnd": 818 + "NamePos": 826, + "NameEnd": 834 }, "Scope": null, "OnCluster": null @@ -628,8 +628,8 @@ "Settings": null }, { - "CreatePos": 820, - "StatementEnd": 860, + "CreatePos": 837, + "StatementEnd": 877, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -637,8 +637,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 832, - "NameEnd": 840 + "NamePos": 849, + "NameEnd": 857 }, "Scope": null, "OnCluster": null @@ -652,13 +652,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 850, - "NameEnd": 858 + "NamePos": 867, + "NameEnd": 875 }, "Operation": "=", "Value": { - "NumPos": 859, - "NumEnd": 860, + "NumPos": 876, + "NumEnd": 877, "Literal": "1", "Base": 10 } @@ -669,8 +669,8 @@ ] }, { - "CreatePos": 862, - "StatementEnd": 908, + "CreatePos": 880, + "StatementEnd": 926, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -678,8 +678,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 874, - "NameEnd": 882 + "NamePos": 892, + "NameEnd": 900 }, "Scope": null, "OnCluster": null @@ -693,13 +693,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 892, - "NameEnd": 899 + "NamePos": 910, + "NameEnd": 917 }, "Operation": "", "Value": { - "LiteralPos": 901, - "LiteralEnd": 908, + "LiteralPos": 919, + "LiteralEnd": 926, "Literal": "default" } } @@ -709,8 +709,8 @@ ] }, { - "CreatePos": 911, - "StatementEnd": 998, + "CreatePos": 930, + "StatementEnd": 1017, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -718,8 +718,8 @@ "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 923, - "NameEnd": 931 + "NamePos": 942, + "NameEnd": 950 }, "Scope": null, "OnCluster": null @@ -733,13 +733,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 941, - "NameEnd": 957 + "NamePos": 960, + "NameEnd": 976 }, "Operation": "=", "Value": { - "NumPos": 958, - "NumEnd": 965, + "NumPos": 977, + "NumEnd": 984, "Literal": "5000000", "Base": 10 } @@ -748,13 +748,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 966, - "NameEnd": 969 + "NamePos": 985, + "NameEnd": 988 }, "Operation": "", "Value": { - "NumPos": 970, - "NumEnd": 977, + "NumPos": 989, + "NumEnd": 996, "Literal": "4000000", "Base": 10 } @@ -763,13 +763,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 978, - "NameEnd": 981 + "NamePos": 997, + "NameEnd": 1000 }, "Operation": "", "Value": { - "NumPos": 982, - "NumEnd": 989, + "NumPos": 1001, + "NumEnd": 1008, "Literal": "6000000", "Base": 10 } @@ -778,15 +778,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 990, - "NameEnd": 998 + "NamePos": 1009, + "NameEnd": 1017 } } ] }, { - "CreatePos": 1000, - "StatementEnd": 1085, + "CreatePos": 1020, + "StatementEnd": 1105, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -794,8 +794,8 @@ "Name": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 1012, - "NameEnd": 1020 + "NamePos": 1032, + "NameEnd": 1040 }, "Scope": null, "OnCluster": null @@ -809,13 +809,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 1030, - "NameEnd": 1037 + "NamePos": 1050, + "NameEnd": 1057 }, "Operation": "", "Value": { - "LiteralPos": 1039, - "LiteralEnd": 1046, + "LiteralPos": 1059, + "LiteralEnd": 1066, "Literal": "default" } } @@ -828,13 +828,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 1049, - "NameEnd": 1065 + "NamePos": 1069, + "NameEnd": 1085 }, "Operation": "=", "Value": { - "NumPos": 1066, - "NumEnd": 1073, + "NumPos": 1086, + "NumEnd": 1093, "Literal": "5000000", "Base": 10 } @@ -848,13 +848,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 1075, - "NameEnd": 1083 + "NamePos": 1095, + "NameEnd": 1103 }, "Operation": "=", "Value": { - "NumPos": 1084, - "NumEnd": 1085, + "NumPos": 1104, + "NumEnd": 1105, "Literal": "1", "Base": 10 } @@ -865,8 +865,8 @@ ] }, { - "CreatePos": 1087, - "StatementEnd": 1121, + "CreatePos": 1108, + "StatementEnd": 1142, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -874,8 +874,8 @@ "Name": { "Name": "r5_01293", "QuoteType": 1, - "NamePos": 1099, - "NameEnd": 1107 + "NamePos": 1120, + "NameEnd": 1128 }, "Scope": null, "OnCluster": null @@ -888,15 +888,15 @@ "Modifier": { "Name": "NONE", "QuoteType": 1, - "NamePos": 1117, - "NameEnd": 1121 + "NamePos": 1138, + "NameEnd": 1142 } } ] }, { - "CreatePos": 1123, - "StatementEnd": 1146, + "CreatePos": 1145, + "StatementEnd": 1168, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -904,12 +904,12 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 1135, - "NameEnd": 1143 + "NamePos": 1157, + "NameEnd": 1165 }, "Scope": { - "LiteralPos": 1145, - "LiteralEnd": 1146, + "LiteralPos": 1167, + "LiteralEnd": 1168, "Literal": "%" }, "OnCluster": null @@ -919,8 +919,8 @@ "Settings": null }, { - "CreatePos": 1149, - "StatementEnd": 1183, + "CreatePos": 1172, + "StatementEnd": 1206, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -928,12 +928,12 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 1161, - "NameEnd": 1169 + "NamePos": 1184, + "NameEnd": 1192 }, "Scope": { - "LiteralPos": 1171, - "LiteralEnd": 1183, + "LiteralPos": 1194, + "LiteralEnd": 1206, "Literal": "%.myhost.com" }, "OnCluster": null diff --git a/parser/testdata/ddl/output/create_table_basic.sql.golden.json b/parser/testdata/ddl/output/create_table_basic.sql.golden.json index fc79f87..0b601d8 100644 --- a/parser/testdata/ddl/output/create_table_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_basic.sql.golden.json @@ -1,38 +1,38 @@ [ { - "CreatePos": 122, - "StatementEnd": 774, + "CreatePos": 127, + "StatementEnd": 803, "OrReplace": false, "Name": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 149, - "NameEnd": 153 + "NamePos": 154, + "NameEnd": 158 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 154, - "NameEnd": 166 + "NamePos": 159, + "NameEnd": 171 } }, "IfNotExists": true, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 167, - "SchemaEnd": 656, + "SchemaPos": 172, + "SchemaEnd": 681, "Columns": [ { - "NamePos": 173, - "ColumnEnd": 182, + "NamePos": 179, + "ColumnEnd": 188, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 173, - "NameEnd": 175 + "NamePos": 179, + "NameEnd": 181 }, "DotIdent": null }, @@ -40,8 +40,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 176, - "NameEnd": 182 + "NamePos": 182, + "NameEnd": 188 } }, "NotNull": null, @@ -55,14 +55,14 @@ "CompressionCodec": null }, { - "NamePos": 188, - "ColumnEnd": 212, + "NamePos": 195, + "ColumnEnd": 219, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 188, - "NameEnd": 190 + "NamePos": 195, + "NameEnd": 197 }, "DotIdent": null }, @@ -70,8 +70,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 191, - "NameEnd": 197 + "NamePos": 198, + "NameEnd": 204 } }, "NotNull": null, @@ -80,19 +80,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 198, - "RightParenPos": 212, + "CodecPos": 205, + "RightParenPos": 219, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 204, - "NameEnd": 208 + "NamePos": 211, + "NameEnd": 215 }, "Level": { - "NumPos": 208, - "NumEnd": 210, + "NumPos": 215, + "NumEnd": 217, "Literal": "1", "Base": 10 } @@ -102,30 +102,30 @@ "CompressionCodec": null }, { - "NamePos": 218, - "ColumnEnd": 232, + "NamePos": 226, + "ColumnEnd": 240, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 218, - "NameEnd": 220 + "NamePos": 226, + "NameEnd": 228 }, "DotIdent": null }, "Type": { - "LeftParenPos": 229, - "RightParenPos": 232, + "LeftParenPos": 237, + "RightParenPos": 240, "Name": { "Name": "VARCHAR", "QuoteType": 1, - "NamePos": 221, - "NameEnd": 228 + "NamePos": 229, + "NameEnd": 236 }, "Params": [ { - "NumPos": 229, - "NumEnd": 232, + "NumPos": 237, + "NumEnd": 240, "Literal": "255", "Base": 10 } @@ -142,14 +142,14 @@ "CompressionCodec": null }, { - "NamePos": 239, - "ColumnEnd": 250, + "NamePos": 248, + "ColumnEnd": 259, "Name": { "Ident": { "Name": "f3", "QuoteType": 1, - "NamePos": 239, - "NameEnd": 241 + "NamePos": 248, + "NameEnd": 250 }, "DotIdent": null }, @@ -157,8 +157,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 242, - "NameEnd": 250 + "NamePos": 251, + "NameEnd": 259 } }, "NotNull": null, @@ -172,14 +172,14 @@ "CompressionCodec": null }, { - "NamePos": 256, - "ColumnEnd": 267, + "NamePos": 266, + "ColumnEnd": 277, "Name": { "Ident": { "Name": "f4", "QuoteType": 1, - "NamePos": 256, - "NameEnd": 258 + "NamePos": 266, + "NameEnd": 268 }, "DotIdent": null }, @@ -187,8 +187,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 259, - "NameEnd": 267 + "NamePos": 269, + "NameEnd": 277 } }, "NotNull": null, @@ -202,41 +202,41 @@ "CompressionCodec": null }, { - "NamePos": 273, - "ColumnEnd": 293, + "NamePos": 284, + "ColumnEnd": 304, "Name": { "Ident": { "Name": "f5", "QuoteType": 1, - "NamePos": 273, - "NameEnd": 275 + "NamePos": 284, + "NameEnd": 286 }, "DotIdent": null }, "Type": { - "LeftParenPos": 280, - "RightParenPos": 293, + "LeftParenPos": 291, + "RightParenPos": 304, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 276, - "NameEnd": 279 + "NamePos": 287, + "NameEnd": 290 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 280, - "NameEnd": 286 + "NamePos": 291, + "NameEnd": 297 } }, { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 287, - "NameEnd": 293 + "NamePos": 298, + "NameEnd": 304 } } ] @@ -252,14 +252,14 @@ "CompressionCodec": null }, { - "NamePos": 300, - "ColumnEnd": 309, + "NamePos": 312, + "ColumnEnd": 321, "Name": { "Ident": { "Name": "f6", "QuoteType": 1, - "NamePos": 300, - "NameEnd": 302 + "NamePos": 312, + "NameEnd": 314 }, "DotIdent": null }, @@ -267,8 +267,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 303, - "NameEnd": 309 + "NamePos": 315, + "NameEnd": 321 } }, "NotNull": null, @@ -282,36 +282,36 @@ "CompressionCodec": null }, { - "NamePos": 315, - "ColumnEnd": 450, + "NamePos": 328, + "ColumnEnd": 470, "Name": { "Ident": { "Name": "f7", "QuoteType": 1, - "NamePos": 315, - "NameEnd": 317 + "NamePos": 328, + "NameEnd": 330 }, "DotIdent": null }, "Type": { - "LeftParenPos": 335, - "RightParenPos": 450, + "LeftParenPos": 349, + "RightParenPos": 470, "Name": { "Name": "Nested", "QuoteType": 1, - "NamePos": 318, - "NameEnd": 324 + "NamePos": 331, + "NameEnd": 337 }, "Columns": [ { - "NamePos": 335, - "ColumnEnd": 345, + "NamePos": 349, + "ColumnEnd": 359, "Name": { "Ident": { "Name": "f70", "QuoteType": 1, - "NamePos": 335, - "NameEnd": 338 + "NamePos": 349, + "NameEnd": 352 }, "DotIdent": null }, @@ -319,8 +319,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 339, - "NameEnd": 345 + "NamePos": 353, + "NameEnd": 359 } }, "NotNull": null, @@ -334,14 +334,14 @@ "CompressionCodec": null }, { - "NamePos": 355, - "ColumnEnd": 365, + "NamePos": 370, + "ColumnEnd": 380, "Name": { "Ident": { "Name": "f71", "QuoteType": 1, - "NamePos": 355, - "NameEnd": 358 + "NamePos": 370, + "NameEnd": 373 }, "DotIdent": null }, @@ -349,8 +349,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 359, - "NameEnd": 365 + "NamePos": 374, + "NameEnd": 380 } }, "NotNull": null, @@ -364,14 +364,14 @@ "CompressionCodec": null }, { - "NamePos": 375, - "ColumnEnd": 387, + "NamePos": 391, + "ColumnEnd": 403, "Name": { "Ident": { "Name": "f72", "QuoteType": 1, - "NamePos": 375, - "NameEnd": 378 + "NamePos": 391, + "NameEnd": 394 }, "DotIdent": null }, @@ -379,8 +379,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 379, - "NameEnd": 387 + "NamePos": 395, + "NameEnd": 403 } }, "NotNull": null, @@ -394,14 +394,14 @@ "CompressionCodec": null }, { - "NamePos": 397, - "ColumnEnd": 406, + "NamePos": 414, + "ColumnEnd": 423, "Name": { "Ident": { "Name": "f73", "QuoteType": 1, - "NamePos": 397, - "NameEnd": 400 + "NamePos": 414, + "NameEnd": 417 }, "DotIdent": null }, @@ -409,8 +409,8 @@ "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 401, - "NameEnd": 406 + "NamePos": 418, + "NameEnd": 423 } }, "NotNull": null, @@ -424,14 +424,14 @@ "CompressionCodec": null }, { - "NamePos": 416, - "ColumnEnd": 425, + "NamePos": 434, + "ColumnEnd": 443, "Name": { "Ident": { "Name": "f74", "QuoteType": 1, - "NamePos": 416, - "NameEnd": 419 + "NamePos": 434, + "NameEnd": 437 }, "DotIdent": null }, @@ -439,8 +439,8 @@ "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 420, - "NameEnd": 425 + "NamePos": 438, + "NameEnd": 443 } }, "NotNull": null, @@ -454,14 +454,14 @@ "CompressionCodec": null }, { - "NamePos": 435, - "ColumnEnd": 445, + "NamePos": 454, + "ColumnEnd": 464, "Name": { "Ident": { "Name": "f75", "QuoteType": 1, - "NamePos": 435, - "NameEnd": 438 + "NamePos": 454, + "NameEnd": 457 }, "DotIdent": null }, @@ -469,8 +469,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 439, - "NameEnd": 445 + "NamePos": 458, + "NameEnd": 464 } }, "NotNull": null, @@ -496,14 +496,14 @@ "CompressionCodec": null }, { - "NamePos": 457, - "ColumnEnd": 481, + "NamePos": 478, + "ColumnEnd": 502, "Name": { "Ident": { "Name": "f8", "QuoteType": 1, - "NamePos": 457, - "NameEnd": 459 + "NamePos": 478, + "NameEnd": 480 }, "DotIdent": null }, @@ -511,8 +511,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 460, - "NameEnd": 468 + "NamePos": 481, + "NameEnd": 489 } }, "NotNull": null, @@ -521,15 +521,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 477, - "NameEnd": 480 + "NamePos": 498, + "NameEnd": 501 }, "Params": { - "LeftParenPos": 480, - "RightParenPos": 481, + "LeftParenPos": 501, + "RightParenPos": 502, "Items": { - "ListPos": 481, - "ListEnd": 481, + "ListPos": 502, + "ListEnd": 502, "HasDistinct": false, "Items": [] }, @@ -544,14 +544,14 @@ "CompressionCodec": null }, { - "NamePos": 488, - "ColumnEnd": 529, + "NamePos": 510, + "ColumnEnd": 551, "Name": { "Ident": { "Name": "f9", "QuoteType": 1, - "NamePos": 488, - "NameEnd": 490 + "NamePos": 510, + "NameEnd": 512 }, "DotIdent": null }, @@ -559,8 +559,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 491, - "NameEnd": 497 + "NamePos": 513, + "NameEnd": 519 } }, "NotNull": null, @@ -570,15 +570,15 @@ "Name": { "Name": "toString", "QuoteType": 1, - "NamePos": 511, - "NameEnd": 519 + "NamePos": 533, + "NameEnd": 541 }, "Params": { - "LeftParenPos": 519, - "RightParenPos": 529, + "LeftParenPos": 541, + "RightParenPos": 551, "Items": { - "ListPos": 520, - "ListEnd": 528, + "ListPos": 542, + "ListEnd": 550, "HasDistinct": false, "Items": [ { @@ -586,21 +586,21 @@ "Object": { "Name": "f7", "QuoteType": 1, - "NamePos": 520, - "NameEnd": 522 + "NamePos": 542, + "NameEnd": 544 }, "Params": { - "LeftBracketPos": 522, - "RightBracketPos": 528, + "LeftBracketPos": 544, + "RightBracketPos": 550, "Items": { - "ListPos": 524, - "ListEnd": 527, + "ListPos": 546, + "ListEnd": 549, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 524, - "LiteralEnd": 527, + "LiteralPos": 546, + "LiteralEnd": 549, "Literal": "f70" }, "Alias": null @@ -623,14 +623,14 @@ "CompressionCodec": null }, { - "NamePos": 536, - "ColumnEnd": 556, + "NamePos": 559, + "ColumnEnd": 579, "Name": { "Ident": { "Name": "f10", "QuoteType": 1, - "NamePos": 536, - "NameEnd": 539 + "NamePos": 559, + "NameEnd": 562 }, "DotIdent": null }, @@ -638,8 +638,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 540, - "NameEnd": 546 + "NamePos": 563, + "NameEnd": 569 } }, "NotNull": null, @@ -649,8 +649,8 @@ "AliasExpr": { "Name": "f11", "QuoteType": 1, - "NamePos": 553, - "NameEnd": 556 + "NamePos": 576, + "NameEnd": 579 }, "Codec": null, "TTL": null, @@ -658,14 +658,14 @@ "CompressionCodec": null }, { - "NamePos": 562, - "ColumnEnd": 653, + "NamePos": 586, + "ColumnEnd": 677, "Name": { "Ident": { "Name": "f12", "QuoteType": 1, - "NamePos": 562, - "NameEnd": 565 + "NamePos": 586, + "NameEnd": 589 }, "DotIdent": null }, @@ -673,20 +673,20 @@ "Name": { "Name": "JSON", "QuoteType": 1, - "NamePos": 566, - "NameEnd": 570 + "NamePos": 590, + "NameEnd": 594 }, "Options": { - "LParen": 571, - "RParen": 653, + "LParen": 595, + "RParen": 677, "Items": [ { "SkipPath": null, "SkipRegex": null, "MaxDynamicPaths": null, "MaxDynamicTypes": { - "NumPos": 589, - "NumEnd": 591, + "NumPos": 613, + "NumEnd": 615, "Literal": "10", "Base": 10 }, @@ -696,8 +696,8 @@ "SkipPath": null, "SkipRegex": null, "MaxDynamicPaths": { - "NumPos": 611, - "NumEnd": 612, + "NumPos": 635, + "NumEnd": 636, "Literal": "3", "Base": 10 }, @@ -710,8 +710,8 @@ { "Name": "a", "QuoteType": 1, - "NamePos": 619, - "NameEnd": 620 + "NamePos": 643, + "NameEnd": 644 } ] }, @@ -726,20 +726,20 @@ { "Name": "a", "QuoteType": 1, - "NamePos": 627, - "NameEnd": 628 + "NamePos": 651, + "NameEnd": 652 }, { "Name": "b", "QuoteType": 1, - "NamePos": 629, - "NameEnd": 630 + "NamePos": 653, + "NameEnd": 654 }, { "Name": "c", "QuoteType": 1, - "NamePos": 631, - "NameEnd": 632 + "NamePos": 655, + "NameEnd": 656 } ] }, @@ -751,8 +751,8 @@ { "SkipPath": null, "SkipRegex": { - "LiteralPos": 647, - "LiteralEnd": 652, + "LiteralPos": 671, + "LiteralEnd": 676, "Literal": "hello" }, "MaxDynamicPaths": null, @@ -777,26 +777,26 @@ "TableFunction": null }, "Engine": { - "EnginePos": 658, - "EngineEnd": 774, + "EnginePos": 683, + "EngineEnd": 803, "Name": "MergeTree", "Params": null, "PrimaryKey": { - "PrimaryPos": 677, + "PrimaryPos": 703, "Expr": { - "LeftParenPos": 689, - "RightParenPos": 700, + "LeftParenPos": 715, + "RightParenPos": 726, "Items": { - "ListPos": 690, - "ListEnd": 700, + "ListPos": 716, + "ListEnd": 726, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 690, - "NameEnd": 692 + "NamePos": 716, + "NameEnd": 718 }, "Alias": null }, @@ -804,8 +804,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 694, - "NameEnd": 696 + "NamePos": 720, + "NameEnd": 722 }, "Alias": null }, @@ -813,8 +813,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 698, - "NameEnd": 700 + "NamePos": 724, + "NameEnd": 726 }, "Alias": null } @@ -824,10 +824,10 @@ } }, "PartitionBy": { - "PartitionPos": 702, + "PartitionPos": 729, "Expr": { - "ListPos": 715, - "ListEnd": 728, + "ListPos": 742, + "ListEnd": 755, "HasDistinct": false, "Items": [ { @@ -835,23 +835,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 715, - "NameEnd": 725 + "NamePos": 742, + "NameEnd": 752 }, "Params": { - "LeftParenPos": 725, - "RightParenPos": 728, + "LeftParenPos": 752, + "RightParenPos": 755, "Items": { - "ListPos": 726, - "ListEnd": 728, + "ListPos": 753, + "ListEnd": 755, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 726, - "NameEnd": 728 + "NamePos": 753, + "NameEnd": 755 }, "Alias": null } @@ -867,32 +867,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 730, - "ListEnd": 755, + "TTLPos": 758, + "ListEnd": 783, "Items": [ { - "TTLPos": 730, + "TTLPos": 758, "Expr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 734, - "NameEnd": 736 + "NamePos": 762, + "NameEnd": 764 }, "Operation": "+", "RightExpr": { - "IntervalPos": 739, + "IntervalPos": 767, "Expr": { - "NumPos": 748, - "NumEnd": 749, + "NumPos": 776, + "NumEnd": 777, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 750, - "NameEnd": 755 + "NamePos": 778, + "NameEnd": 783 } }, "HasGlobal": false, @@ -904,25 +904,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 756, - "ListEnd": 774, + "OrderPos": 785, + "ListEnd": 803, "Items": [ { - "OrderPos": 756, + "OrderPos": 785, "Expr": { - "LeftParenPos": 765, - "RightParenPos": 774, + "LeftParenPos": 794, + "RightParenPos": 803, "Items": { - "ListPos": 766, - "ListEnd": 774, + "ListPos": 795, + "ListEnd": 803, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 766, - "NameEnd": 768 + "NamePos": 795, + "NameEnd": 797 }, "Alias": null }, @@ -930,8 +930,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 769, - "NameEnd": 771 + "NamePos": 798, + "NameEnd": 800 }, "Alias": null }, @@ -939,8 +939,8 @@ "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 772, - "NameEnd": 774 + "NamePos": 801, + "NameEnd": 803 }, "Alias": null } @@ -957,8 +957,8 @@ "SubQuery": null, "HasTemporary": false, "Comment": { - "LiteralPos": 785, - "LiteralEnd": 802, + "LiteralPos": 815, + "LiteralEnd": 832, "Literal": "Comment for table" } } diff --git a/parser/testdata/ddl/output/create_table_json_typehints.sql.golden.json b/parser/testdata/ddl/output/create_table_json_typehints.sql.golden.json index 9d2644c..ba5d72b 100644 --- a/parser/testdata/ddl/output/create_table_json_typehints.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_json_typehints.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 139, + "StatementEnd": 142, "OrReplace": false, "Name": { "Database": null, @@ -17,17 +17,17 @@ "OnCluster": null, "TableSchema": { "SchemaPos": 15, - "SchemaEnd": 103, + "SchemaEnd": 105, "Columns": [ { - "NamePos": 21, - "ColumnEnd": 101, + "NamePos": 22, + "ColumnEnd": 102, "Name": { "Ident": { "Name": "j", "QuoteType": 1, - "NamePos": 21, - "NameEnd": 22 + "NamePos": 22, + "NameEnd": 23 }, "DotIdent": null }, @@ -35,12 +35,12 @@ "Name": { "Name": "JSON", "QuoteType": 1, - "NamePos": 23, - "NameEnd": 27 + "NamePos": 24, + "NameEnd": 28 }, "Options": { - "LParen": 28, - "RParen": 101, + "LParen": 29, + "RParen": 102, "Items": [ { "SkipPath": null, @@ -53,8 +53,8 @@ { "Name": "message", "QuoteType": 1, - "NamePos": 28, - "NameEnd": 35 + "NamePos": 29, + "NameEnd": 36 } ] }, @@ -62,8 +62,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 42 + "NamePos": 37, + "NameEnd": 43 } } } @@ -79,14 +79,14 @@ { "Name": "a", "QuoteType": 1, - "NamePos": 44, - "NameEnd": 45 + "NamePos": 45, + "NameEnd": 46 }, { "Name": "b", "QuoteType": 1, - "NamePos": 46, - "NameEnd": 47 + "NamePos": 47, + "NameEnd": 48 } ] }, @@ -94,8 +94,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 48, - "NameEnd": 54 + "NamePos": 49, + "NameEnd": 55 } } } @@ -104,8 +104,8 @@ "SkipPath": null, "SkipRegex": null, "MaxDynamicPaths": { - "NumPos": 74, - "NumEnd": 75, + "NumPos": 75, + "NumEnd": 76, "Literal": "0", "Base": 10 }, @@ -118,8 +118,8 @@ { "Name": "x", "QuoteType": 1, - "NamePos": 82, - "NameEnd": 83 + "NamePos": 83, + "NameEnd": 84 } ] }, @@ -131,8 +131,8 @@ { "SkipPath": null, "SkipRegex": { - "LiteralPos": 98, - "LiteralEnd": 100, + "LiteralPos": 99, + "LiteralEnd": 101, "Literal": "re" }, "MaxDynamicPaths": null, @@ -157,8 +157,8 @@ "TableFunction": null }, "Engine": { - "EnginePos": 105, - "EngineEnd": 139, + "EnginePos": 107, + "EngineEnd": 142, "Name": "MergeTree", "Params": null, "PrimaryKey": null, @@ -167,24 +167,24 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 124, - "ListEnd": 139, + "OrderPos": 127, + "ListEnd": 142, "Items": [ { - "OrderPos": 124, + "OrderPos": 127, "Expr": { "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 138 + "NamePos": 136, + "NameEnd": 141 }, "Params": { - "LeftParenPos": 138, - "RightParenPos": 139, + "LeftParenPos": 141, + "RightParenPos": 142, "Items": { - "ListPos": 139, - "ListEnd": 139, + "ListPos": 142, + "ListEnd": 142, "HasDistinct": false, "Items": [] }, diff --git a/parser/testdata/ddl/output/create_table_with_codec_delta.sql.golden.json b/parser/testdata/ddl/output/create_table_with_codec_delta.sql.golden.json index 4f61143..e0e8cc1 100644 --- a/parser/testdata/ddl/output/create_table_with_codec_delta.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_codec_delta.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 812, + "StatementEnd": 827, "OrReplace": false, "Name": { "Database": null, @@ -16,18 +16,18 @@ "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 38, - "SchemaEnd": 375, + "SchemaPos": 39, + "SchemaEnd": 385, "Columns": [ { - "NamePos": 42, - "ColumnEnd": 74, + "NamePos": 44, + "ColumnEnd": 76, "Name": { "Ident": { "Name": "id", "QuoteType": 3, - "NamePos": 42, - "NameEnd": 44 + "NamePos": 44, + "NameEnd": 46 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 46, - "NameEnd": 52 + "NamePos": 48, + "NameEnd": 54 } }, "NotNull": null, @@ -45,24 +45,24 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 53, - "RightParenPos": 74, + "CodecPos": 55, + "RightParenPos": 76, "Type": { "Name": "Delta", "QuoteType": 1, - "NamePos": 59, - "NameEnd": 64 + "NamePos": 61, + "NameEnd": 66 }, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 66, - "NameEnd": 70 + "NamePos": 68, + "NameEnd": 72 }, "Level": { - "NumPos": 70, - "NumEnd": 72, + "NumPos": 72, + "NumEnd": 74, "Literal": "1", "Base": 10 } @@ -72,14 +72,14 @@ "CompressionCodec": null }, { - "NamePos": 78, - "ColumnEnd": 107, + "NamePos": 81, + "ColumnEnd": 110, "Name": { "Ident": { "Name": "api_id", "QuoteType": 3, - "NamePos": 78, - "NameEnd": 84 + "NamePos": 81, + "NameEnd": 87 }, "DotIdent": null }, @@ -87,8 +87,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 86, - "NameEnd": 92 + "NamePos": 89, + "NameEnd": 95 } }, "NotNull": null, @@ -97,19 +97,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 93, - "RightParenPos": 107, + "CodecPos": 96, + "RightParenPos": 110, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 99, - "NameEnd": 103 + "NamePos": 102, + "NameEnd": 106 }, "Level": { - "NumPos": 103, - "NumEnd": 105, + "NumPos": 106, + "NumEnd": 108, "Literal": "1", "Base": 10 } @@ -119,14 +119,14 @@ "CompressionCodec": null }, { - "NamePos": 111, - "ColumnEnd": 150, + "NamePos": 115, + "ColumnEnd": 154, "Name": { "Ident": { "Name": "app_id", "QuoteType": 3, - "NamePos": 111, - "NameEnd": 117 + "NamePos": 115, + "NameEnd": 121 }, "DotIdent": null }, @@ -134,8 +134,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 119, - "NameEnd": 125 + "NamePos": 123, + "NameEnd": 129 } }, "NotNull": null, @@ -144,29 +144,29 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 126, - "RightParenPos": 150, + "CodecPos": 130, + "RightParenPos": 154, "Type": { "Name": "Delta", "QuoteType": 1, - "NamePos": 132, - "NameEnd": 137 + "NamePos": 136, + "NameEnd": 141 }, "TypeLevel": { - "NumPos": 137, - "NumEnd": 139, + "NumPos": 141, + "NumEnd": 143, "Literal": "9", "Base": 10 }, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 142, - "NameEnd": 146 + "NamePos": 146, + "NameEnd": 150 }, "Level": { - "NumPos": 146, - "NumEnd": 148, + "NumPos": 150, + "NumEnd": 152, "Literal": "1", "Base": 10 } @@ -176,14 +176,14 @@ "CompressionCodec": null }, { - "NamePos": 154, - "ColumnEnd": 199, + "NamePos": 159, + "ColumnEnd": 204, "Name": { "Ident": { "Name": "device_id", "QuoteType": 3, - "NamePos": 154, - "NameEnd": 163 + "NamePos": 159, + "NameEnd": 168 }, "DotIdent": null }, @@ -191,8 +191,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 171 + "NamePos": 170, + "NameEnd": 176 } }, "NotNull": null, @@ -201,24 +201,24 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 172, - "RightParenPos": 199, + "CodecPos": 177, + "RightParenPos": 204, "Type": { "Name": "DoubleDelta", "QuoteType": 1, - "NamePos": 178, - "NameEnd": 189 + "NamePos": 183, + "NameEnd": 194 }, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 191, - "NameEnd": 195 + "NamePos": 196, + "NameEnd": 200 }, "Level": { - "NumPos": 195, - "NumEnd": 197, + "NumPos": 200, + "NumEnd": 202, "Literal": "1", "Base": 10 } @@ -228,14 +228,14 @@ "CompressionCodec": null }, { - "NamePos": 203, - "ColumnEnd": 237, + "NamePos": 209, + "ColumnEnd": 243, "Name": { "Ident": { "Name": "guage", "QuoteType": 3, - "NamePos": 203, - "NameEnd": 208 + "NamePos": 209, + "NameEnd": 214 }, "DotIdent": null }, @@ -243,8 +243,8 @@ "Name": { "Name": "Float64", "QuoteType": 1, - "NamePos": 210, - "NameEnd": 217 + "NamePos": 216, + "NameEnd": 223 } }, "NotNull": null, @@ -253,20 +253,20 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 218, - "RightParenPos": 237, + "CodecPos": 224, + "RightParenPos": 243, "Type": { "Name": "Gorilla", "QuoteType": 1, - "NamePos": 224, - "NameEnd": 231 + "NamePos": 230, + "NameEnd": 237 }, "TypeLevel": null, "Name": { "Name": "LZ4", "QuoteType": 1, - "NamePos": 233, - "NameEnd": 236 + "NamePos": 239, + "NameEnd": 242 }, "Level": null }, @@ -275,14 +275,14 @@ "CompressionCodec": null }, { - "NamePos": 241, - "ColumnEnd": 270, + "NamePos": 248, + "ColumnEnd": 277, "Name": { "Ident": { "Name": "value", "QuoteType": 3, - "NamePos": 241, - "NameEnd": 246 + "NamePos": 248, + "NameEnd": 253 }, "DotIdent": null }, @@ -290,8 +290,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 248, - "NameEnd": 254 + "NamePos": 255, + "NameEnd": 261 } }, "NotNull": null, @@ -300,20 +300,20 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 255, - "RightParenPos": 270, + "CodecPos": 262, + "RightParenPos": 277, "Type": { "Name": "T64", "QuoteType": 1, - "NamePos": 261, - "NameEnd": 264 + "NamePos": 268, + "NameEnd": 271 }, "TypeLevel": null, "Name": { "Name": "LZ4", "QuoteType": 1, - "NamePos": 266, - "NameEnd": 269 + "NamePos": 273, + "NameEnd": 276 }, "Level": null }, @@ -322,30 +322,30 @@ "CompressionCodec": null }, { - "NamePos": 274, - "ColumnEnd": 313, + "NamePos": 282, + "ColumnEnd": 321, "Name": { "Ident": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 274, - "NameEnd": 283 + "NamePos": 282, + "NameEnd": 291 }, "DotIdent": null }, "Type": { - "LeftParenPos": 296, - "RightParenPos": 297, + "LeftParenPos": 304, + "RightParenPos": 305, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 285, - "NameEnd": 295 + "NamePos": 293, + "NameEnd": 303 }, "Params": [ { - "NumPos": 296, - "NumEnd": 297, + "NumPos": 304, + "NumEnd": 305, "Literal": "9", "Base": 10 } @@ -357,19 +357,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 299, - "RightParenPos": 313, + "CodecPos": 307, + "RightParenPos": 321, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 305, - "NameEnd": 309 + "NamePos": 313, + "NameEnd": 317 }, "Level": { - "NumPos": 309, - "NumEnd": 311, + "NumPos": 317, + "NumEnd": 319, "Literal": "1", "Base": 10 } @@ -379,31 +379,31 @@ "CompressionCodec": null }, { - "IndexPos": 316, + "IndexPos": 325, "Name": { "Ident": { "Name": "timestamp_index", "QuoteType": 1, - "NamePos": 322, - "NameEnd": 337 + "NamePos": 331, + "NameEnd": 346 }, "DotIdent": null }, "ColumnExpr": { "Expr": { - "LeftParenPos": 337, - "RightParenPos": 347, + "LeftParenPos": 346, + "RightParenPos": 356, "Items": { - "ListPos": 338, - "ListEnd": 347, + "ListPos": 347, + "ListEnd": 356, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 338, - "NameEnd": 347 + "NamePos": 347, + "NameEnd": 356 }, "Alias": null } @@ -417,13 +417,13 @@ "Name": { "Name": "minmax", "QuoteType": 1, - "NamePos": 354, - "NameEnd": 360 + "NamePos": 363, + "NameEnd": 369 } }, "Granularity": { - "NumPos": 373, - "NumEnd": 374, + "NumPos": 382, + "NumEnd": 383, "Literal": "4", "Base": 10 } @@ -433,29 +433,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 377, - "EngineEnd": 812, + "EnginePos": 388, + "EngineEnd": 827, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 405, - "RightParenPos": 437, + "LeftParenPos": 416, + "RightParenPos": 448, "Items": { - "ListPos": 407, - "ListEnd": 436, + "ListPos": 418, + "ListEnd": 447, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 407, - "LiteralEnd": 423, + "LiteralPos": 418, + "LiteralEnd": 434, "Literal": "/root/test_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 427, - "LiteralEnd": 436, + "LiteralPos": 438, + "LiteralEnd": 447, "Literal": "{replica}" }, "Alias": null @@ -466,10 +466,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 439, + "PartitionPos": 451, "Expr": { - "ListPos": 452, - "ListEnd": 477, + "ListPos": 464, + "ListEnd": 489, "HasDistinct": false, "Items": [ { @@ -477,23 +477,23 @@ "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 452, - "NameEnd": 465 + "NamePos": 464, + "NameEnd": 477 }, "Params": { - "LeftParenPos": 465, - "RightParenPos": 477, + "LeftParenPos": 477, + "RightParenPos": 489, "Items": { - "ListPos": 467, - "ListEnd": 476, + "ListPos": 479, + "ListEnd": 488, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 467, - "NameEnd": 476 + "NamePos": 479, + "NameEnd": 488 }, "Alias": null } @@ -509,33 +509,33 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 535, - "ListEnd": 626, + "TTLPos": 549, + "ListEnd": 640, "Items": [ { - "TTLPos": 535, + "TTLPos": 549, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 539, - "NameEnd": 552 + "NamePos": 553, + "NameEnd": 566 }, "Params": { - "LeftParenPos": 552, - "RightParenPos": 564, + "LeftParenPos": 566, + "RightParenPos": 578, "Items": { - "ListPos": 554, - "ListEnd": 563, + "ListPos": 568, + "ListEnd": 577, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 554, - "NameEnd": 563 + "NamePos": 568, + "NameEnd": 577 }, "Alias": null } @@ -546,18 +546,18 @@ }, "Operation": "+", "RightExpr": { - "IntervalPos": 568, + "IntervalPos": 582, "Expr": { - "NumPos": 577, - "NumEnd": 578, + "NumPos": 591, + "NumEnd": 592, "Literal": "7", "Base": 10 }, "Unit": { "Name": "DAY", "QuoteType": 1, - "NamePos": 579, - "NameEnd": 582 + "NamePos": 593, + "NameEnd": 596 } }, "HasGlobal": false, @@ -566,29 +566,29 @@ "Policy": null }, { - "TTLPos": 535, + "TTLPos": 549, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 583, - "NameEnd": 596 + "NamePos": 597, + "NameEnd": 610 }, "Params": { - "LeftParenPos": 596, - "RightParenPos": 608, + "LeftParenPos": 610, + "RightParenPos": 622, "Items": { - "ListPos": 598, - "ListEnd": 607, + "ListPos": 612, + "ListEnd": 621, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 598, - "NameEnd": 607 + "NamePos": 612, + "NameEnd": 621 }, "Alias": null } @@ -599,18 +599,18 @@ }, "Operation": "+", "RightExpr": { - "IntervalPos": 612, + "IntervalPos": 626, "Expr": { - "NumPos": 621, - "NumEnd": 622, + "NumPos": 635, + "NumEnd": 636, "Literal": "2", "Base": 10 }, "Unit": { "Name": "DAY", "QuoteType": 1, - "NamePos": 623, - "NameEnd": 626 + "NamePos": 637, + "NameEnd": 640 } }, "HasGlobal": false, @@ -621,79 +621,79 @@ ] }, "Settings": { - "SettingsPos": 627, - "ListEnd": 812, + "SettingsPos": 642, + "ListEnd": 827, "Items": [ { - "SettingsPos": 636, + "SettingsPos": 651, "Name": { "Name": "execute_merges_on_single_replica_time_threshold", "QuoteType": 1, - "NamePos": 636, - "NameEnd": 683 + "NamePos": 651, + "NameEnd": 698 }, "Expr": { - "NumPos": 684, - "NumEnd": 688, + "NumPos": 699, + "NumEnd": 703, "Literal": "1200", "Base": 10 } }, { - "SettingsPos": 690, + "SettingsPos": 705, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 690, - "NameEnd": 707 + "NamePos": 705, + "NameEnd": 722 }, "Expr": { - "NumPos": 708, - "NumEnd": 713, + "NumPos": 723, + "NumEnd": 728, "Literal": "16384", "Base": 10 } }, { - "SettingsPos": 715, + "SettingsPos": 730, "Name": { "Name": "max_bytes_to_merge_at_max_space_in_pool", "QuoteType": 1, - "NamePos": 715, - "NameEnd": 754 + "NamePos": 730, + "NameEnd": 769 }, "Expr": { - "NumPos": 755, - "NumEnd": 766, + "NumPos": 770, + "NumEnd": 781, "Literal": "64424509440", "Base": 10 } }, { - "SettingsPos": 768, + "SettingsPos": 783, "Name": { "Name": "storage_policy", "QuoteType": 1, - "NamePos": 768, - "NameEnd": 782 + "NamePos": 783, + "NameEnd": 797 }, "Expr": { - "LiteralPos": 784, - "LiteralEnd": 788, + "LiteralPos": 799, + "LiteralEnd": 803, "Literal": "main" } }, { - "SettingsPos": 791, + "SettingsPos": 806, "Name": { "Name": "ttl_only_drop_parts", "QuoteType": 1, - "NamePos": 791, - "NameEnd": 810 + "NamePos": 806, + "NameEnd": 825 }, "Expr": { - "NumPos": 811, - "NumEnd": 812, + "NumPos": 826, + "NumEnd": 827, "Literal": "1", "Base": 10 } @@ -701,17 +701,17 @@ ] }, "OrderBy": { - "OrderPos": 479, - "ListEnd": 533, + "OrderPos": 492, + "ListEnd": 546, "Items": [ { - "OrderPos": 479, + "OrderPos": 492, "Expr": { - "LeftParenPos": 488, - "RightParenPos": 533, + "LeftParenPos": 501, + "RightParenPos": 546, "Items": { - "ListPos": 489, - "ListEnd": 532, + "ListPos": 502, + "ListEnd": 545, "HasDistinct": false, "Items": [ { @@ -719,23 +719,23 @@ "Name": { "Name": "toUnixTimestamp64Nano", "QuoteType": 1, - "NamePos": 489, - "NameEnd": 510 + "NamePos": 502, + "NameEnd": 523 }, "Params": { - "LeftParenPos": 510, - "RightParenPos": 522, + "LeftParenPos": 523, + "RightParenPos": 535, "Items": { - "ListPos": 512, - "ListEnd": 521, + "ListPos": 525, + "ListEnd": 534, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 512, - "NameEnd": 521 + "NamePos": 525, + "NameEnd": 534 }, "Alias": null } @@ -750,8 +750,8 @@ "Expr": { "Name": "api_id", "QuoteType": 3, - "NamePos": 526, - "NameEnd": 532 + "NamePos": 539, + "NameEnd": 545 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_enum_fields.sql.golden.json b/parser/testdata/ddl/output/create_table_with_enum_fields.sql.golden.json index 2e6213c..df98331 100644 --- a/parser/testdata/ddl/output/create_table_with_enum_fields.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_enum_fields.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 448, + "StatementEnd": 457, "OrReplace": false, "Name": { "Database": null, @@ -24,18 +24,18 @@ } }, "TableSchema": { - "SchemaPos": 43, - "SchemaEnd": 233, + "SchemaPos": 44, + "SchemaEnd": 237, "Columns": [ { - "NamePos": 50, - "ColumnEnd": 176, + "NamePos": 52, + "ColumnEnd": 178, "Name": { "Ident": { "Name": "method", "QuoteType": 3, - "NamePos": 50, - "NameEnd": 56 + "NamePos": 52, + "NameEnd": 58 }, "DotIdent": null }, @@ -43,125 +43,125 @@ "Name": { "Name": "Enum8", "QuoteType": 1, - "NamePos": 58, - "NameEnd": 63 + "NamePos": 60, + "NameEnd": 65 }, - "ListPos": 65, - "ListEnd": 160, + "ListPos": 67, + "ListEnd": 162, "Values": [ { "Name": { - "LiteralPos": 65, - "LiteralEnd": 68, + "LiteralPos": 67, + "LiteralEnd": 70, "Literal": "GET" }, "Value": { - "NumPos": 70, - "NumEnd": 71, + "NumPos": 72, + "NumEnd": 73, "Literal": "1", "Base": 10 } }, { "Name": { - "LiteralPos": 75, - "LiteralEnd": 79, + "LiteralPos": 77, + "LiteralEnd": 81, "Literal": "POST" }, "Value": { - "NumPos": 81, - "NumEnd": 82, + "NumPos": 83, + "NumEnd": 84, "Literal": "2", "Base": 10 } }, { "Name": { - "LiteralPos": 85, - "LiteralEnd": 89, + "LiteralPos": 87, + "LiteralEnd": 91, "Literal": "HEAD" }, "Value": { - "NumPos": 91, - "NumEnd": 92, + "NumPos": 93, + "NumEnd": 94, "Literal": "3", "Base": 10 } }, { "Name": { - "LiteralPos": 95, - "LiteralEnd": 98, + "LiteralPos": 97, + "LiteralEnd": 100, "Literal": "PUT" }, "Value": { - "NumPos": 100, - "NumEnd": 101, + "NumPos": 102, + "NumEnd": 103, "Literal": "4", "Base": 10 } }, { "Name": { - "LiteralPos": 103, - "LiteralEnd": 108, + "LiteralPos": 105, + "LiteralEnd": 110, "Literal": "PATCH" }, "Value": { - "NumPos": 110, - "NumEnd": 111, + "NumPos": 112, + "NumEnd": 113, "Literal": "5", "Base": 10 } }, { "Name": { - "LiteralPos": 114, - "LiteralEnd": 120, + "LiteralPos": 116, + "LiteralEnd": 122, "Literal": "DELETE" }, "Value": { - "NumPos": 122, - "NumEnd": 123, + "NumPos": 124, + "NumEnd": 125, "Literal": "6", "Base": 10 } }, { "Name": { - "LiteralPos": 126, - "LiteralEnd": 133, + "LiteralPos": 128, + "LiteralEnd": 135, "Literal": "CONNECT" }, "Value": { - "NumPos": 135, - "NumEnd": 136, + "NumPos": 137, + "NumEnd": 138, "Literal": "7", "Base": 10 } }, { "Name": { - "LiteralPos": 139, - "LiteralEnd": 146, + "LiteralPos": 141, + "LiteralEnd": 148, "Literal": "OPTIONS" }, "Value": { - "NumPos": 148, - "NumEnd": 149, + "NumPos": 150, + "NumEnd": 151, "Literal": "8", "Base": 10 } }, { "Name": { - "LiteralPos": 152, - "LiteralEnd": 157, + "LiteralPos": 154, + "LiteralEnd": 159, "Literal": "TRACE" }, "Value": { - "NumPos": 159, - "NumEnd": 160, + "NumPos": 161, + "NumEnd": 162, "Literal": "9", "Base": 10 } @@ -174,19 +174,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 162, - "RightParenPos": 176, + "CodecPos": 164, + "RightParenPos": 178, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 168, - "NameEnd": 172 + "NamePos": 170, + "NameEnd": 174 }, "Level": { - "NumPos": 172, - "NumEnd": 174, + "NumPos": 174, + "NumEnd": 176, "Literal": "1", "Base": 10 } @@ -196,30 +196,30 @@ "CompressionCodec": null }, { - "NamePos": 183, - "ColumnEnd": 232, + "NamePos": 186, + "ColumnEnd": 235, "Name": { "Ident": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 183, - "NameEnd": 192 + "NamePos": 186, + "NameEnd": 195 }, "DotIdent": null }, "Type": { - "LeftParenPos": 205, - "RightParenPos": 206, + "LeftParenPos": 208, + "RightParenPos": 209, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 194, - "NameEnd": 204 + "NamePos": 197, + "NameEnd": 207 }, "Params": [ { - "NumPos": 205, - "NumEnd": 206, + "NumPos": 208, + "NumEnd": 209, "Literal": "3", "Base": 10 } @@ -231,20 +231,20 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 208, - "RightParenPos": 232, + "CodecPos": 211, + "RightParenPos": 235, "Type": { "Name": "DoubleDelta", "QuoteType": 1, - "NamePos": 214, - "NameEnd": 225 + "NamePos": 217, + "NameEnd": 228 }, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 227, - "NameEnd": 231 + "NamePos": 230, + "NameEnd": 234 }, "Level": null }, @@ -257,29 +257,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 235, - "EngineEnd": 448, + "EnginePos": 240, + "EngineEnd": 457, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 263, - "RightParenPos": 313, + "LeftParenPos": 268, + "RightParenPos": 318, "Items": { - "ListPos": 265, - "ListEnd": 312, + "ListPos": 270, + "ListEnd": 317, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 265, - "LiteralEnd": 299, + "LiteralPos": 270, + "LiteralEnd": 304, "Literal": "/clickhouse/tables/{layer}-{shard}" }, "Alias": null }, { "Expr": { - "LiteralPos": 303, - "LiteralEnd": 312, + "LiteralPos": 308, + "LiteralEnd": 317, "Literal": "{replica}" }, "Alias": null @@ -290,10 +290,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 315, + "PartitionPos": 321, "Expr": { - "ListPos": 328, - "ListEnd": 344, + "ListPos": 334, + "ListEnd": 350, "HasDistinct": false, "Items": [ { @@ -301,23 +301,23 @@ "Name": { "Name": "toDate", "QuoteType": 1, - "NamePos": 328, - "NameEnd": 334 + "NamePos": 334, + "NameEnd": 340 }, "Params": { - "LeftParenPos": 334, - "RightParenPos": 344, + "LeftParenPos": 340, + "RightParenPos": 350, "Items": { - "ListPos": 335, - "ListEnd": 344, + "ListPos": 341, + "ListEnd": 350, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 335, - "NameEnd": 344 + "NamePos": 341, + "NameEnd": 350 }, "Alias": null } @@ -333,33 +333,33 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 374, - "ListEnd": 413, + "TTLPos": 382, + "ListEnd": 421, "Items": [ { - "TTLPos": 374, + "TTLPos": 382, "Expr": { "LeftExpr": { "Name": { "Name": "toDate", "QuoteType": 1, - "NamePos": 378, - "NameEnd": 384 + "NamePos": 386, + "NameEnd": 392 }, "Params": { - "LeftParenPos": 384, - "RightParenPos": 394, + "LeftParenPos": 392, + "RightParenPos": 402, "Items": { - "ListPos": 385, - "ListEnd": 394, + "ListPos": 393, + "ListEnd": 402, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 385, - "NameEnd": 394 + "NamePos": 393, + "NameEnd": 402 }, "Alias": null } @@ -373,21 +373,21 @@ "Name": { "Name": "toIntervalDay", "QuoteType": 1, - "NamePos": 398, - "NameEnd": 411 + "NamePos": 406, + "NameEnd": 419 }, "Params": { - "LeftParenPos": 411, - "RightParenPos": 413, + "LeftParenPos": 419, + "RightParenPos": 421, "Items": { - "ListPos": 412, - "ListEnd": 413, + "ListPos": 420, + "ListEnd": 421, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 412, - "NumEnd": 413, + "NumPos": 420, + "NumEnd": 421, "Literal": "3", "Base": 10 }, @@ -406,20 +406,20 @@ ] }, "Settings": { - "SettingsPos": 415, - "ListEnd": 448, + "SettingsPos": 424, + "ListEnd": 457, "Items": [ { - "SettingsPos": 424, + "SettingsPos": 433, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 424, - "NameEnd": 441 + "NamePos": 433, + "NameEnd": 450 }, "Expr": { - "NumPos": 444, - "NumEnd": 448, + "NumPos": 453, + "NumEnd": 457, "Literal": "8192", "Base": 10 } @@ -427,25 +427,25 @@ ] }, "OrderBy": { - "OrderPos": 346, - "ListEnd": 372, + "OrderPos": 353, + "ListEnd": 379, "Items": [ { - "OrderPos": 346, + "OrderPos": 353, "Expr": { - "LeftParenPos": 355, - "RightParenPos": 372, + "LeftParenPos": 362, + "RightParenPos": 379, "Items": { - "ListPos": 356, - "ListEnd": 372, + "ListPos": 363, + "ListEnd": 379, "HasDistinct": false, "Items": [ { "Expr": { "Name": "method", "QuoteType": 1, - "NamePos": 356, - "NameEnd": 362 + "NamePos": 363, + "NameEnd": 369 }, "Alias": null }, @@ -453,8 +453,8 @@ "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 363, - "NameEnd": 372 + "NamePos": 370, + "NameEnd": 379 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_index.sql.golden.json b/parser/testdata/ddl/output/create_table_with_index.sql.golden.json index 123b1ac..3fcad97 100644 --- a/parser/testdata/ddl/output/create_table_with_index.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_index.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 1037, + "StatementEnd": 1056, "OrReplace": false, "Name": { "Database": null, @@ -16,18 +16,18 @@ "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 38, - "SchemaEnd": 600, + "SchemaPos": 39, + "SchemaEnd": 614, "Columns": [ { - "NamePos": 42, - "ColumnEnd": 74, + "NamePos": 44, + "ColumnEnd": 76, "Name": { "Ident": { "Name": "common.id", "QuoteType": 3, - "NamePos": 42, - "NameEnd": 51 + "NamePos": 44, + "NameEnd": 53 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 53, - "NameEnd": 59 + "NamePos": 55, + "NameEnd": 61 } }, "NotNull": null, @@ -45,19 +45,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 60, - "RightParenPos": 74, + "CodecPos": 62, + "RightParenPos": 76, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 66, - "NameEnd": 70 + "NamePos": 68, + "NameEnd": 72 }, "Level": { - "NumPos": 70, - "NumEnd": 72, + "NumPos": 72, + "NumEnd": 74, "Literal": "1", "Base": 10 } @@ -67,14 +67,14 @@ "CompressionCodec": null }, { - "NamePos": 78, - "ColumnEnd": 110, + "NamePos": 81, + "ColumnEnd": 113, "Name": { "Ident": { "Name": "id", "QuoteType": 3, - "NamePos": 78, - "NameEnd": 80 + "NamePos": 81, + "NameEnd": 83 }, "DotIdent": null }, @@ -82,8 +82,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 82, - "NameEnd": 88 + "NamePos": 85, + "NameEnd": 91 } }, "NotNull": null, @@ -92,24 +92,24 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 89, - "RightParenPos": 110, + "CodecPos": 92, + "RightParenPos": 113, "Type": { "Name": "Delta", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 100 + "NamePos": 98, + "NameEnd": 103 }, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 102, - "NameEnd": 106 + "NamePos": 105, + "NameEnd": 109 }, "Level": { - "NumPos": 106, - "NumEnd": 108, + "NumPos": 109, + "NumEnd": 111, "Literal": "1", "Base": 10 } @@ -119,14 +119,14 @@ "CompressionCodec": null }, { - "NamePos": 114, - "ColumnEnd": 143, + "NamePos": 118, + "ColumnEnd": 147, "Name": { "Ident": { "Name": "api_id", "QuoteType": 3, - "NamePos": 114, - "NameEnd": 120 + "NamePos": 118, + "NameEnd": 124 }, "DotIdent": null }, @@ -134,8 +134,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 122, - "NameEnd": 128 + "NamePos": 126, + "NameEnd": 132 } }, "NotNull": null, @@ -144,19 +144,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 129, - "RightParenPos": 143, + "CodecPos": 133, + "RightParenPos": 147, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 135, - "NameEnd": 139 + "NamePos": 139, + "NameEnd": 143 }, "Level": { - "NumPos": 139, - "NumEnd": 141, + "NumPos": 143, + "NumEnd": 145, "Literal": "1", "Base": 10 } @@ -166,33 +166,33 @@ "CompressionCodec": null }, { - "NamePos": 147, - "ColumnEnd": 163, + "NamePos": 152, + "ColumnEnd": 168, "Name": { "Ident": { "Name": "arr", "QuoteType": 3, - "NamePos": 147, - "NameEnd": 150 + "NamePos": 152, + "NameEnd": 155 }, "DotIdent": null }, "Type": { - "LeftParenPos": 158, - "RightParenPos": 163, + "LeftParenPos": 163, + "RightParenPos": 168, "Name": { "Name": "Array", "QuoteType": 1, - "NamePos": 152, - "NameEnd": 157 + "NamePos": 157, + "NameEnd": 162 }, "Params": [ { "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 158, - "NameEnd": 163 + "NamePos": 163, + "NameEnd": 168 } } ] @@ -208,14 +208,14 @@ "CompressionCodec": null }, { - "NamePos": 168, - "ColumnEnd": 198, + "NamePos": 174, + "ColumnEnd": 204, "Name": { "Ident": { "Name": "content", "QuoteType": 3, - "NamePos": 168, - "NameEnd": 175 + "NamePos": 174, + "NameEnd": 181 }, "DotIdent": null }, @@ -223,8 +223,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 177, - "NameEnd": 183 + "NamePos": 183, + "NameEnd": 189 } }, "NotNull": null, @@ -233,19 +233,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 184, - "RightParenPos": 198, + "CodecPos": 190, + "RightParenPos": 204, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 190, - "NameEnd": 194 + "NamePos": 196, + "NameEnd": 200 }, "Level": { - "NumPos": 194, - "NumEnd": 196, + "NumPos": 200, + "NumEnd": 202, "Literal": "1", "Base": 10 } @@ -255,14 +255,14 @@ "CompressionCodec": null }, { - "NamePos": 202, - "ColumnEnd": 216, + "NamePos": 209, + "ColumnEnd": 223, "Name": { "Ident": { "Name": "output", "QuoteType": 3, - "NamePos": 202, - "NameEnd": 208 + "NamePos": 209, + "NameEnd": 215 }, "DotIdent": null }, @@ -270,8 +270,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 210, - "NameEnd": 216 + "NamePos": 217, + "NameEnd": 223 } }, "NotNull": null, @@ -285,13 +285,13 @@ "CompressionCodec": null }, { - "IndexPos": 219, + "IndexPos": 227, "Name": { "Ident": { "Name": "id_common_id_bloom_filter", "QuoteType": 1, - "NamePos": 225, - "NameEnd": 250 + "NamePos": 233, + "NameEnd": 258 }, "DotIdent": null }, @@ -301,52 +301,52 @@ { "Name": "common", "QuoteType": 1, - "NamePos": 251, - "NameEnd": 257 + "NamePos": 259, + "NameEnd": 265 }, { "Name": "id", "QuoteType": 1, - "NamePos": 258, - "NameEnd": 260 + "NamePos": 266, + "NameEnd": 268 } ] }, "Alias": null }, "ColumnType": { - "LeftParenPos": 279, - "RightParenPos": 284, + "LeftParenPos": 287, + "RightParenPos": 292, "Name": { "Name": "bloom_filter", "QuoteType": 1, - "NamePos": 266, - "NameEnd": 278 + "NamePos": 274, + "NameEnd": 286 }, "Params": [ { - "NumPos": 279, - "NumEnd": 284, + "NumPos": 287, + "NumEnd": 292, "Literal": "0.001", "Base": 10 } ] }, "Granularity": { - "NumPos": 298, - "NumEnd": 299, + "NumPos": 306, + "NumEnd": 307, "Literal": "1", "Base": 10 } }, { - "IndexPos": 302, + "IndexPos": 311, "Name": { "Ident": { "Name": "id_idx", "QuoteType": 1, - "NamePos": 308, - "NameEnd": 314 + "NamePos": 317, + "NameEnd": 323 }, "DotIdent": null }, @@ -354,8 +354,8 @@ "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 315, - "NameEnd": 317 + "NamePos": 324, + "NameEnd": 326 }, "Alias": null }, @@ -363,25 +363,25 @@ "Name": { "Name": "minmax", "QuoteType": 1, - "NamePos": 323, - "NameEnd": 329 + "NamePos": 332, + "NameEnd": 338 } }, "Granularity": { - "NumPos": 342, - "NumEnd": 344, + "NumPos": 351, + "NumEnd": 353, "Literal": "10", "Base": 10 } }, { - "IndexPos": 347, + "IndexPos": 357, "Name": { "Ident": { "Name": "api_id_idx", "QuoteType": 1, - "NamePos": 353, - "NameEnd": 363 + "NamePos": 363, + "NameEnd": 373 }, "DotIdent": null }, @@ -389,44 +389,44 @@ "Expr": { "Name": "api_id", "QuoteType": 1, - "NamePos": 364, - "NameEnd": 370 + "NamePos": 374, + "NameEnd": 380 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 380, - "RightParenPos": 383, + "LeftParenPos": 390, + "RightParenPos": 393, "Name": { "Name": "set", "QuoteType": 1, - "NamePos": 376, - "NameEnd": 379 + "NamePos": 386, + "NameEnd": 389 }, "Params": [ { - "NumPos": 380, - "NumEnd": 383, + "NumPos": 390, + "NumEnd": 393, "Literal": "100", "Base": 10 } ] }, "Granularity": { - "NumPos": 397, - "NumEnd": 398, + "NumPos": 407, + "NumEnd": 408, "Literal": "2", "Base": 10 } }, { - "IndexPos": 401, + "IndexPos": 412, "Name": { "Ident": { "Name": "arr_idx", "QuoteType": 1, - "NamePos": 407, - "NameEnd": 414 + "NamePos": 418, + "NameEnd": 425 }, "DotIdent": null }, @@ -434,44 +434,44 @@ "Expr": { "Name": "arr", "QuoteType": 1, - "NamePos": 415, - "NameEnd": 418 + "NamePos": 426, + "NameEnd": 429 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 437, - "RightParenPos": 441, + "LeftParenPos": 448, + "RightParenPos": 452, "Name": { "Name": "bloom_filter", "QuoteType": 1, - "NamePos": 424, - "NameEnd": 436 + "NamePos": 435, + "NameEnd": 447 }, "Params": [ { - "NumPos": 437, - "NumEnd": 441, + "NumPos": 448, + "NumEnd": 452, "Literal": "0.01", "Base": 10 } ] }, "Granularity": { - "NumPos": 455, - "NumEnd": 456, + "NumPos": 466, + "NumEnd": 467, "Literal": "3", "Base": 10 } }, { - "IndexPos": 459, + "IndexPos": 471, "Name": { "Ident": { "Name": "content_idx", "QuoteType": 1, - "NamePos": 465, - "NameEnd": 476 + "NamePos": 477, + "NameEnd": 488 }, "DotIdent": null }, @@ -479,56 +479,56 @@ "Expr": { "Name": "content", "QuoteType": 1, - "NamePos": 477, - "NameEnd": 484 + "NamePos": 489, + "NameEnd": 496 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 501, - "RightParenPos": 512, + "LeftParenPos": 513, + "RightParenPos": 524, "Name": { "Name": "tokenbf_v1", "QuoteType": 1, - "NamePos": 490, - "NameEnd": 500 + "NamePos": 502, + "NameEnd": 512 }, "Params": [ { - "NumPos": 501, - "NumEnd": 506, + "NumPos": 513, + "NumEnd": 518, "Literal": "30720", "Base": 10 }, { - "NumPos": 508, - "NumEnd": 509, + "NumPos": 520, + "NumEnd": 521, "Literal": "2", "Base": 10 }, { - "NumPos": 511, - "NumEnd": 512, + "NumPos": 523, + "NumEnd": 524, "Literal": "0", "Base": 10 } ] }, "Granularity": { - "NumPos": 526, - "NumEnd": 527, + "NumPos": 538, + "NumEnd": 539, "Literal": "1", "Base": 10 } }, { - "IndexPos": 530, + "IndexPos": 543, "Name": { "Ident": { "Name": "output_idx", "QuoteType": 1, - "NamePos": 536, - "NameEnd": 546 + "NamePos": 549, + "NameEnd": 559 }, "DotIdent": null }, @@ -536,50 +536,50 @@ "Expr": { "Name": "output", "QuoteType": 1, - "NamePos": 547, - "NameEnd": 553 + "NamePos": 560, + "NameEnd": 566 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 570, - "RightParenPos": 584, + "LeftParenPos": 583, + "RightParenPos": 597, "Name": { "Name": "ngrambf_v1", "QuoteType": 1, - "NamePos": 559, - "NameEnd": 569 + "NamePos": 572, + "NameEnd": 582 }, "Params": [ { - "NumPos": 570, - "NumEnd": 571, + "NumPos": 583, + "NumEnd": 584, "Literal": "3", "Base": 10 }, { - "NumPos": 573, - "NumEnd": 578, + "NumPos": 586, + "NumEnd": 591, "Literal": "10000", "Base": 10 }, { - "NumPos": 580, - "NumEnd": 581, + "NumPos": 593, + "NumEnd": 594, "Literal": "2", "Base": 10 }, { - "NumPos": 583, - "NumEnd": 584, + "NumPos": 596, + "NumEnd": 597, "Literal": "1", "Base": 10 } ] }, "Granularity": { - "NumPos": 598, - "NumEnd": 599, + "NumPos": 611, + "NumEnd": 612, "Literal": "2", "Base": 10 } @@ -589,29 +589,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 602, - "EngineEnd": 1037, + "EnginePos": 617, + "EngineEnd": 1056, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 630, - "RightParenPos": 662, + "LeftParenPos": 645, + "RightParenPos": 677, "Items": { - "ListPos": 632, - "ListEnd": 661, + "ListPos": 647, + "ListEnd": 676, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 632, - "LiteralEnd": 648, + "LiteralPos": 647, + "LiteralEnd": 663, "Literal": "/root/test_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 652, - "LiteralEnd": 661, + "LiteralPos": 667, + "LiteralEnd": 676, "Literal": "{replica}" }, "Alias": null @@ -622,10 +622,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 664, + "PartitionPos": 680, "Expr": { - "ListPos": 677, - "ListEnd": 702, + "ListPos": 693, + "ListEnd": 718, "HasDistinct": false, "Items": [ { @@ -633,23 +633,23 @@ "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 677, - "NameEnd": 690 + "NamePos": 693, + "NameEnd": 706 }, "Params": { - "LeftParenPos": 690, - "RightParenPos": 702, + "LeftParenPos": 706, + "RightParenPos": 718, "Items": { - "ListPos": 692, - "ListEnd": 701, + "ListPos": 708, + "ListEnd": 717, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 692, - "NameEnd": 701 + "NamePos": 708, + "NameEnd": 717 }, "Alias": null } @@ -665,33 +665,33 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 760, - "ListEnd": 851, + "TTLPos": 778, + "ListEnd": 869, "Items": [ { - "TTLPos": 760, + "TTLPos": 778, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 764, - "NameEnd": 777 + "NamePos": 782, + "NameEnd": 795 }, "Params": { - "LeftParenPos": 777, - "RightParenPos": 789, + "LeftParenPos": 795, + "RightParenPos": 807, "Items": { - "ListPos": 779, - "ListEnd": 788, + "ListPos": 797, + "ListEnd": 806, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 779, - "NameEnd": 788 + "NamePos": 797, + "NameEnd": 806 }, "Alias": null } @@ -702,18 +702,18 @@ }, "Operation": "+", "RightExpr": { - "IntervalPos": 793, + "IntervalPos": 811, "Expr": { - "NumPos": 802, - "NumEnd": 803, + "NumPos": 820, + "NumEnd": 821, "Literal": "7", "Base": 10 }, "Unit": { "Name": "DAY", "QuoteType": 1, - "NamePos": 804, - "NameEnd": 807 + "NamePos": 822, + "NameEnd": 825 } }, "HasGlobal": false, @@ -722,29 +722,29 @@ "Policy": null }, { - "TTLPos": 760, + "TTLPos": 778, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 808, - "NameEnd": 821 + "NamePos": 826, + "NameEnd": 839 }, "Params": { - "LeftParenPos": 821, - "RightParenPos": 833, + "LeftParenPos": 839, + "RightParenPos": 851, "Items": { - "ListPos": 823, - "ListEnd": 832, + "ListPos": 841, + "ListEnd": 850, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 823, - "NameEnd": 832 + "NamePos": 841, + "NameEnd": 850 }, "Alias": null } @@ -755,18 +755,18 @@ }, "Operation": "+", "RightExpr": { - "IntervalPos": 837, + "IntervalPos": 855, "Expr": { - "NumPos": 846, - "NumEnd": 847, + "NumPos": 864, + "NumEnd": 865, "Literal": "2", "Base": 10 }, "Unit": { "Name": "DAY", "QuoteType": 1, - "NamePos": 848, - "NameEnd": 851 + "NamePos": 866, + "NameEnd": 869 } }, "HasGlobal": false, @@ -777,79 +777,79 @@ ] }, "Settings": { - "SettingsPos": 852, - "ListEnd": 1037, + "SettingsPos": 871, + "ListEnd": 1056, "Items": [ { - "SettingsPos": 861, + "SettingsPos": 880, "Name": { "Name": "execute_merges_on_single_replica_time_threshold", "QuoteType": 1, - "NamePos": 861, - "NameEnd": 908 + "NamePos": 880, + "NameEnd": 927 }, "Expr": { - "NumPos": 909, - "NumEnd": 913, + "NumPos": 928, + "NumEnd": 932, "Literal": "1200", "Base": 10 } }, { - "SettingsPos": 915, + "SettingsPos": 934, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 915, - "NameEnd": 932 + "NamePos": 934, + "NameEnd": 951 }, "Expr": { - "NumPos": 933, - "NumEnd": 938, + "NumPos": 952, + "NumEnd": 957, "Literal": "16384", "Base": 10 } }, { - "SettingsPos": 940, + "SettingsPos": 959, "Name": { "Name": "max_bytes_to_merge_at_max_space_in_pool", "QuoteType": 1, - "NamePos": 940, - "NameEnd": 979 + "NamePos": 959, + "NameEnd": 998 }, "Expr": { - "NumPos": 980, - "NumEnd": 991, + "NumPos": 999, + "NumEnd": 1010, "Literal": "64424509440", "Base": 10 } }, { - "SettingsPos": 993, + "SettingsPos": 1012, "Name": { "Name": "storage_policy", "QuoteType": 1, - "NamePos": 993, - "NameEnd": 1007 + "NamePos": 1012, + "NameEnd": 1026 }, "Expr": { - "LiteralPos": 1009, - "LiteralEnd": 1013, + "LiteralPos": 1028, + "LiteralEnd": 1032, "Literal": "main" } }, { - "SettingsPos": 1016, + "SettingsPos": 1035, "Name": { "Name": "ttl_only_drop_parts", "QuoteType": 1, - "NamePos": 1016, - "NameEnd": 1035 + "NamePos": 1035, + "NameEnd": 1054 }, "Expr": { - "NumPos": 1036, - "NumEnd": 1037, + "NumPos": 1055, + "NumEnd": 1056, "Literal": "1", "Base": 10 } @@ -857,17 +857,17 @@ ] }, "OrderBy": { - "OrderPos": 704, - "ListEnd": 758, + "OrderPos": 721, + "ListEnd": 775, "Items": [ { - "OrderPos": 704, + "OrderPos": 721, "Expr": { - "LeftParenPos": 713, - "RightParenPos": 758, + "LeftParenPos": 730, + "RightParenPos": 775, "Items": { - "ListPos": 714, - "ListEnd": 757, + "ListPos": 731, + "ListEnd": 774, "HasDistinct": false, "Items": [ { @@ -875,23 +875,23 @@ "Name": { "Name": "toUnixTimestamp64Nano", "QuoteType": 1, - "NamePos": 714, - "NameEnd": 735 + "NamePos": 731, + "NameEnd": 752 }, "Params": { - "LeftParenPos": 735, - "RightParenPos": 747, + "LeftParenPos": 752, + "RightParenPos": 764, "Items": { - "ListPos": 737, - "ListEnd": 746, + "ListPos": 754, + "ListEnd": 763, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 737, - "NameEnd": 746 + "NamePos": 754, + "NameEnd": 763 }, "Alias": null } @@ -906,8 +906,8 @@ "Expr": { "Name": "api_id", "QuoteType": 3, - "NamePos": 751, - "NameEnd": 757 + "NamePos": 768, + "NameEnd": 774 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_keyword_partition_by.sql.golden.json b/parser/testdata/ddl/output/create_table_with_keyword_partition_by.sql.golden.json index b668cd7..b0c99f2 100644 --- a/parser/testdata/ddl/output/create_table_with_keyword_partition_by.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_keyword_partition_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 259, + "StatementEnd": 267, "OrReplace": false, "Name": { "Database": { @@ -28,17 +28,17 @@ "OnCluster": null, "TableSchema": { "SchemaPos": 75, - "SchemaEnd": 148, + "SchemaEnd": 153, "Columns": [ { - "NamePos": 82, - "ColumnEnd": 92, + "NamePos": 83, + "ColumnEnd": 93, "Name": { "Ident": { "Name": "date", "QuoteType": 3, - "NamePos": 82, - "NameEnd": 86 + "NamePos": 83, + "NameEnd": 87 }, "DotIdent": null }, @@ -46,8 +46,8 @@ "Name": { "Name": "Date", "QuoteType": 1, - "NamePos": 88, - "NameEnd": 92 + "NamePos": 89, + "NameEnd": 93 } }, "NotNull": null, @@ -61,14 +61,14 @@ "CompressionCodec": null }, { - "NamePos": 99, - "ColumnEnd": 109, + "NamePos": 101, + "ColumnEnd": 111, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 99, - "NameEnd": 101 + "NamePos": 101, + "NameEnd": 103 }, "DotIdent": null }, @@ -76,8 +76,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 103, - "NameEnd": 109 + "NamePos": 105, + "NameEnd": 111 } }, "NotNull": null, @@ -91,14 +91,14 @@ "CompressionCodec": null }, { - "NamePos": 116, - "ColumnEnd": 126, + "NamePos": 119, + "ColumnEnd": 129, "Name": { "Ident": { "Name": "f2", "QuoteType": 3, - "NamePos": 116, - "NameEnd": 118 + "NamePos": 119, + "NameEnd": 121 }, "DotIdent": null }, @@ -106,8 +106,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 120, - "NameEnd": 126 + "NamePos": 123, + "NameEnd": 129 } }, "NotNull": null, @@ -121,14 +121,14 @@ "CompressionCodec": null }, { - "NamePos": 133, - "ColumnEnd": 143, + "NamePos": 137, + "ColumnEnd": 147, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 133, - "NameEnd": 135 + "NamePos": 137, + "NameEnd": 139 }, "DotIdent": null }, @@ -136,8 +136,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 137, - "NameEnd": 143 + "NamePos": 141, + "NameEnd": 147 } }, "NotNull": null, @@ -155,24 +155,24 @@ "TableFunction": null }, "Engine": { - "EnginePos": 150, - "EngineEnd": 259, + "EnginePos": 155, + "EngineEnd": 267, "Name": "ReplacingMergeTree", "Params": null, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 182, + "PartitionPos": 188, "Expr": { - "ListPos": 195, - "ListEnd": 199, + "ListPos": 201, + "ListEnd": 205, "HasDistinct": false, "Items": [ { "Expr": { "Name": "date", "QuoteType": 1, - "NamePos": 195, - "NameEnd": 199 + "NamePos": 201, + "NameEnd": 205 }, "Alias": null } @@ -182,20 +182,20 @@ "SampleBy": null, "TTL": null, "Settings": { - "SettingsPos": 226, - "ListEnd": 259, + "SettingsPos": 234, + "ListEnd": 267, "Items": [ { - "SettingsPos": 235, + "SettingsPos": 243, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 235, - "NameEnd": 252 + "NamePos": 243, + "NameEnd": 260 }, "Expr": { - "NumPos": 255, - "NumEnd": 259, + "NumPos": 263, + "NumEnd": 267, "Literal": "8192", "Base": 10 } @@ -203,25 +203,25 @@ ] }, "OrderBy": { - "OrderPos": 204, - "ListEnd": 220, + "OrderPos": 211, + "ListEnd": 227, "Items": [ { - "OrderPos": 204, + "OrderPos": 211, "Expr": { - "LeftParenPos": 213, - "RightParenPos": 220, + "LeftParenPos": 220, + "RightParenPos": 227, "Items": { - "ListPos": 214, - "ListEnd": 220, + "ListPos": 221, + "ListEnd": 227, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 214, - "NameEnd": 216 + "NamePos": 221, + "NameEnd": 223 }, "Alias": null }, @@ -229,8 +229,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 218, - "NameEnd": 220 + "NamePos": 225, + "NameEnd": 227 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_null_engine.sql.golden.json b/parser/testdata/ddl/output/create_table_with_null_engine.sql.golden.json index e609b2d..54de2e9 100644 --- a/parser/testdata/ddl/output/create_table_with_null_engine.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_null_engine.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 172, + "StatementEnd": 176, "OrReplace": false, "Name": { "Database": { @@ -29,18 +29,18 @@ } }, "TableSchema": { - "SchemaPos": 40, - "SchemaEnd": 157, + "SchemaPos": 41, + "SchemaEnd": 161, "Columns": [ { - "NamePos": 47, - "ColumnEnd": 78, + "NamePos": 49, + "ColumnEnd": 80, "Name": { "Ident": { "Name": "trace_id", "QuoteType": 3, - "NamePos": 47, - "NameEnd": 55 + "NamePos": 49, + "NameEnd": 57 }, "DotIdent": null }, @@ -48,8 +48,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 57, - "NameEnd": 63 + "NamePos": 59, + "NameEnd": 65 } }, "NotNull": null, @@ -58,19 +58,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 64, - "RightParenPos": 78, + "CodecPos": 66, + "RightParenPos": 80, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 70, - "NameEnd": 74 + "NamePos": 72, + "NameEnd": 76 }, "Level": { - "NumPos": 74, - "NumEnd": 76, + "NumPos": 76, + "NumEnd": 78, "Literal": "1", "Base": 10 } @@ -80,13 +80,13 @@ "CompressionCodec": null }, { - "IndexPos": 84, + "IndexPos": 87, "Name": { "Ident": { "Name": "trace_id_bloom_idx", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 108 + "NamePos": 93, + "NameEnd": 111 }, "DotIdent": null }, @@ -94,32 +94,32 @@ "Expr": { "Name": "trace_id", "QuoteType": 1, - "NamePos": 109, - "NameEnd": 117 + "NamePos": 112, + "NameEnd": 120 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 136, - "RightParenPos": 140, + "LeftParenPos": 139, + "RightParenPos": 143, "Name": { "Name": "bloom_filter", "QuoteType": 1, - "NamePos": 123, - "NameEnd": 135 + "NamePos": 126, + "NameEnd": 138 }, "Params": [ { - "NumPos": 136, - "NumEnd": 140, + "NumPos": 139, + "NumEnd": 143, "Literal": "0.01", "Base": 10 } ] }, "Granularity": { - "NumPos": 154, - "NumEnd": 156, + "NumPos": 157, + "NumEnd": 159, "Literal": "64", "Base": 10 } @@ -129,15 +129,15 @@ "TableFunction": null }, "Engine": { - "EnginePos": 159, - "EngineEnd": 172, + "EnginePos": 163, + "EngineEnd": 176, "Name": "Null", "Params": { - "LeftParenPos": 172, - "RightParenPos": 173, + "LeftParenPos": 176, + "RightParenPos": 177, "Items": { - "ListPos": 173, - "ListEnd": 173, + "ListPos": 177, + "ListEnd": 177, "HasDistinct": false, "Items": [] }, diff --git a/parser/testdata/ddl/output/create_table_with_nullable.sql.golden.json b/parser/testdata/ddl/output/create_table_with_nullable.sql.golden.json index 3e88e89..d0f1319 100644 --- a/parser/testdata/ddl/output/create_table_with_nullable.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_nullable.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 420, + "StatementEnd": 432, "OrReplace": false, "Name": { "Database": { @@ -20,25 +20,25 @@ "IfNotExists": false, "UUID": { "Value": { - "LiteralPos": 74, - "LiteralEnd": 110, + "LiteralPos": 75, + "LiteralEnd": 111, "Literal": "27673372-7973-44f5-a767-33727973c4f5" } }, "OnCluster": null, "TableSchema": { - "SchemaPos": 112, - "SchemaEnd": 313, + "SchemaPos": 113, + "SchemaEnd": 322, "Columns": [ { - "NamePos": 119, - "ColumnEnd": 129, + "NamePos": 121, + "ColumnEnd": 131, "Name": { "Ident": { "Name": "f0", "QuoteType": 3, - "NamePos": 119, - "NameEnd": 121 + "NamePos": 121, + "NameEnd": 123 }, "DotIdent": null }, @@ -46,8 +46,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 123, - "NameEnd": 129 + "NamePos": 125, + "NameEnd": 131 } }, "NotNull": null, @@ -61,14 +61,14 @@ "CompressionCodec": null }, { - "NamePos": 136, - "ColumnEnd": 146, + "NamePos": 139, + "ColumnEnd": 149, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 136, - "NameEnd": 138 + "NamePos": 139, + "NameEnd": 141 }, "DotIdent": null }, @@ -76,8 +76,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 140, - "NameEnd": 146 + "NamePos": 143, + "NameEnd": 149 } }, "NotNull": null, @@ -91,33 +91,33 @@ "CompressionCodec": null }, { - "NamePos": 153, - "ColumnEnd": 178, + "NamePos": 157, + "ColumnEnd": 182, "Name": { "Ident": { "Name": "f2", "QuoteType": 3, - "NamePos": 153, - "NameEnd": 155 + "NamePos": 157, + "NameEnd": 159 }, "DotIdent": null }, "Type": { - "LeftParenPos": 172, - "RightParenPos": 178, + "LeftParenPos": 176, + "RightParenPos": 182, "Name": { "Name": "LowCardinality", "QuoteType": 1, - "NamePos": 157, - "NameEnd": 171 + "NamePos": 161, + "NameEnd": 175 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 172, - "NameEnd": 178 + "NamePos": 176, + "NameEnd": 182 } } ] @@ -133,33 +133,33 @@ "CompressionCodec": null }, { - "NamePos": 186, - "ColumnEnd": 211, + "NamePos": 191, + "ColumnEnd": 216, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 186, - "NameEnd": 188 + "NamePos": 191, + "NameEnd": 193 }, "DotIdent": null }, "Type": { - "LeftParenPos": 205, - "RightParenPos": 211, + "LeftParenPos": 210, + "RightParenPos": 216, "Name": { "Name": "LowCardinality", "QuoteType": 1, - "NamePos": 190, - "NameEnd": 204 + "NamePos": 195, + "NameEnd": 209 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 205, - "NameEnd": 211 + "NamePos": 210, + "NameEnd": 216 } } ] @@ -175,30 +175,30 @@ "CompressionCodec": null }, { - "NamePos": 219, - "ColumnEnd": 235, + "NamePos": 225, + "ColumnEnd": 241, "Name": { "Ident": { "Name": "f4", "QuoteType": 3, - "NamePos": 219, - "NameEnd": 221 + "NamePos": 225, + "NameEnd": 227 }, "DotIdent": null }, "Type": { - "LeftParenPos": 234, - "RightParenPos": 235, + "LeftParenPos": 240, + "RightParenPos": 241, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 223, - "NameEnd": 233 + "NamePos": 229, + "NameEnd": 239 }, "Params": [ { - "NumPos": 234, - "NumEnd": 235, + "NumPos": 240, + "NumEnd": 241, "Literal": "3", "Base": 10 } @@ -215,40 +215,40 @@ "CompressionCodec": null }, { - "NamePos": 243, - "ColumnEnd": 269, + "NamePos": 250, + "ColumnEnd": 276, "Name": { "Ident": { "Name": "f5", "QuoteType": 3, - "NamePos": 243, - "NameEnd": 245 + "NamePos": 250, + "NameEnd": 252 }, "DotIdent": null }, "Type": { - "LeftParenPos": 256, - "RightParenPos": 269, + "LeftParenPos": 263, + "RightParenPos": 276, "Name": { "Name": "Nullable", "QuoteType": 1, - "NamePos": 247, - "NameEnd": 255 + "NamePos": 254, + "NameEnd": 262 }, "Params": [ { - "LeftParenPos": 267, - "RightParenPos": 268, + "LeftParenPos": 274, + "RightParenPos": 275, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 256, - "NameEnd": 266 + "NamePos": 263, + "NameEnd": 273 }, "Params": [ { - "NumPos": 267, - "NumEnd": 268, + "NumPos": 274, + "NumEnd": 275, "Literal": "3", "Base": 10 } @@ -267,40 +267,40 @@ "CompressionCodec": null }, { - "NamePos": 277, - "ColumnEnd": 311, + "NamePos": 285, + "ColumnEnd": 319, "Name": { "Ident": { "Name": "succeed_at", "QuoteType": 3, - "NamePos": 277, - "NameEnd": 287 + "NamePos": 285, + "NameEnd": 295 }, "DotIdent": null }, "Type": { - "LeftParenPos": 298, - "RightParenPos": 311, + "LeftParenPos": 306, + "RightParenPos": 319, "Name": { "Name": "Nullable", "QuoteType": 1, - "NamePos": 289, - "NameEnd": 297 + "NamePos": 297, + "NameEnd": 305 }, "Params": [ { - "LeftParenPos": 309, - "RightParenPos": 310, + "LeftParenPos": 317, + "RightParenPos": 318, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 298, - "NameEnd": 308 + "NamePos": 306, + "NameEnd": 316 }, "Params": [ { - "NumPos": 309, - "NumEnd": 310, + "NumPos": 317, + "NumEnd": 318, "Literal": "3", "Base": 10 } @@ -323,16 +323,16 @@ "TableFunction": null }, "Engine": { - "EnginePos": 315, - "EngineEnd": 420, + "EnginePos": 324, + "EngineEnd": 432, "Name": "MergeTree", "Params": null, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 334, + "PartitionPos": 344, "Expr": { - "ListPos": 347, - "ListEnd": 368, + "ListPos": 357, + "ListEnd": 378, "HasDistinct": false, "Items": [ { @@ -341,23 +341,23 @@ "Name": { "Name": "xxHash32", "QuoteType": 1, - "NamePos": 347, - "NameEnd": 355 + "NamePos": 357, + "NameEnd": 365 }, "Params": { - "LeftParenPos": 355, - "RightParenPos": 362, + "LeftParenPos": 365, + "RightParenPos": 372, "Items": { - "ListPos": 356, - "ListEnd": 362, + "ListPos": 366, + "ListEnd": 372, "HasDistinct": false, "Items": [ { "Expr": { "Name": "tag_id", "QuoteType": 1, - "NamePos": 356, - "NameEnd": 362 + "NamePos": 366, + "NameEnd": 372 }, "Alias": null } @@ -368,8 +368,8 @@ }, "Operation": "%", "RightExpr": { - "NumPos": 366, - "NumEnd": 368, + "NumPos": 376, + "NumEnd": 378, "Literal": "20", "Base": 10 }, @@ -384,20 +384,20 @@ "SampleBy": null, "TTL": null, "Settings": { - "SettingsPos": 387, - "ListEnd": 420, + "SettingsPos": 399, + "ListEnd": 432, "Items": [ { - "SettingsPos": 396, + "SettingsPos": 408, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 396, - "NameEnd": 413 + "NamePos": 408, + "NameEnd": 425 }, "Expr": { - "NumPos": 416, - "NumEnd": 420, + "NumPos": 428, + "NumEnd": 432, "Literal": "8192", "Base": 10 } @@ -405,16 +405,16 @@ ] }, "OrderBy": { - "OrderPos": 369, - "ListEnd": 386, + "OrderPos": 380, + "ListEnd": 397, "Items": [ { - "OrderPos": 369, + "OrderPos": 380, "Expr": { "Name": "label_id", "QuoteType": 1, - "NamePos": 378, - "NameEnd": 386 + "NamePos": 389, + "NameEnd": 397 }, "Alias": null, "Direction": "" diff --git a/parser/testdata/ddl/output/create_table_with_on_clsuter.sql.golden.json b/parser/testdata/ddl/output/create_table_with_on_clsuter.sql.golden.json index 6c5024f..be8d6c6 100644 --- a/parser/testdata/ddl/output/create_table_with_on_clsuter.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_on_clsuter.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 399, + "StatementEnd": 411, "OrReplace": false, "Name": { "Database": { @@ -29,17 +29,17 @@ }, "TableSchema": { "SchemaPos": 74, - "SchemaEnd": 227, + "SchemaEnd": 236, "Columns": [ { - "NamePos": 80, - "ColumnEnd": 89, + "NamePos": 81, + "ColumnEnd": 90, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 80, - "NameEnd": 82 + "NamePos": 81, + "NameEnd": 83 }, "DotIdent": null }, @@ -47,8 +47,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 89 + "NamePos": 84, + "NameEnd": 90 } }, "NotNull": null, @@ -62,14 +62,14 @@ "CompressionCodec": null }, { - "NamePos": 95, - "ColumnEnd": 104, + "NamePos": 97, + "ColumnEnd": 106, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 97 + "NamePos": 97, + "NameEnd": 99 }, "DotIdent": null }, @@ -77,8 +77,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 98, - "NameEnd": 104 + "NamePos": 100, + "NameEnd": 106 } }, "NotNull": null, @@ -92,14 +92,14 @@ "CompressionCodec": null }, { - "NamePos": 110, - "ColumnEnd": 119, + "NamePos": 113, + "ColumnEnd": 122, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 110, - "NameEnd": 112 + "NamePos": 113, + "NameEnd": 115 }, "DotIdent": null }, @@ -107,8 +107,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 113, - "NameEnd": 119 + "NamePos": 116, + "NameEnd": 122 } }, "NotNull": null, @@ -122,14 +122,14 @@ "CompressionCodec": null }, { - "NamePos": 125, - "ColumnEnd": 136, + "NamePos": 129, + "ColumnEnd": 140, "Name": { "Ident": { "Name": "f3", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 127 + "NamePos": 129, + "NameEnd": 131 }, "DotIdent": null }, @@ -137,8 +137,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 128, - "NameEnd": 136 + "NamePos": 132, + "NameEnd": 140 } }, "NotNull": null, @@ -152,14 +152,14 @@ "CompressionCodec": null }, { - "NamePos": 142, - "ColumnEnd": 153, + "NamePos": 147, + "ColumnEnd": 158, "Name": { "Ident": { "Name": "f4", "QuoteType": 1, - "NamePos": 142, - "NameEnd": 144 + "NamePos": 147, + "NameEnd": 149 }, "DotIdent": null }, @@ -167,8 +167,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 145, - "NameEnd": 153 + "NamePos": 150, + "NameEnd": 158 } }, "NotNull": null, @@ -182,41 +182,41 @@ "CompressionCodec": null }, { - "NamePos": 159, - "ColumnEnd": 179, + "NamePos": 165, + "ColumnEnd": 185, "Name": { "Ident": { "Name": "f5", "QuoteType": 1, - "NamePos": 159, - "NameEnd": 161 + "NamePos": 165, + "NameEnd": 167 }, "DotIdent": null }, "Type": { - "LeftParenPos": 166, - "RightParenPos": 179, + "LeftParenPos": 172, + "RightParenPos": 185, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 162, - "NameEnd": 165 + "NamePos": 168, + "NameEnd": 171 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 166, - "NameEnd": 172 + "NamePos": 172, + "NameEnd": 178 } }, { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 173, - "NameEnd": 179 + "NamePos": 179, + "NameEnd": 185 } } ] @@ -232,14 +232,14 @@ "CompressionCodec": null }, { - "NamePos": 186, - "ColumnEnd": 195, + "NamePos": 193, + "ColumnEnd": 202, "Name": { "Ident": { "Name": "f6", "QuoteType": 1, - "NamePos": 186, - "NameEnd": 188 + "NamePos": 193, + "NameEnd": 195 }, "DotIdent": null }, @@ -247,8 +247,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 189, - "NameEnd": 195 + "NamePos": 196, + "NameEnd": 202 } }, "NotNull": null, @@ -262,14 +262,14 @@ "CompressionCodec": null }, { - "NamePos": 201, - "ColumnEnd": 225, + "NamePos": 209, + "ColumnEnd": 233, "Name": { "Ident": { "Name": "f7", "QuoteType": 1, - "NamePos": 201, - "NameEnd": 203 + "NamePos": 209, + "NameEnd": 211 }, "DotIdent": null }, @@ -277,8 +277,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 204, - "NameEnd": 212 + "NamePos": 212, + "NameEnd": 220 } }, "NotNull": null, @@ -287,15 +287,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 221, - "NameEnd": 224 + "NamePos": 229, + "NameEnd": 232 }, "Params": { - "LeftParenPos": 224, - "RightParenPos": 225, + "LeftParenPos": 232, + "RightParenPos": 233, "Items": { - "ListPos": 225, - "ListEnd": 225, + "ListPos": 233, + "ListEnd": 233, "HasDistinct": false, "Items": [] }, @@ -314,29 +314,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 229, - "EngineEnd": 399, + "EnginePos": 238, + "EngineEnd": 411, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 257, - "RightParenPos": 325, + "LeftParenPos": 266, + "RightParenPos": 334, "Items": { - "ListPos": 259, - "ListEnd": 324, + "ListPos": 268, + "ListEnd": 333, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 259, - "LiteralEnd": 311, + "LiteralPos": 268, + "LiteralEnd": 320, "Literal": "/clickhouse/tables/{layer}-{shard}/test/events_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 315, - "LiteralEnd": 324, + "LiteralPos": 324, + "LiteralEnd": 333, "Literal": "{replica}" }, "Alias": null @@ -347,10 +347,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 353, + "PartitionPos": 364, "Expr": { - "ListPos": 366, - "ListEnd": 379, + "ListPos": 377, + "ListEnd": 390, "HasDistinct": false, "Items": [ { @@ -358,23 +358,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 366, - "NameEnd": 376 + "NamePos": 377, + "NameEnd": 387 }, "Params": { - "LeftParenPos": 376, - "RightParenPos": 379, + "LeftParenPos": 387, + "RightParenPos": 390, "Items": { - "ListPos": 377, - "ListEnd": 379, + "ListPos": 388, + "ListEnd": 390, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 377, - "NameEnd": 379 + "NamePos": 388, + "NameEnd": 390 }, "Alias": null } @@ -390,32 +390,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 327, - "ListEnd": 352, + "TTLPos": 337, + "ListEnd": 362, "Items": [ { - "TTLPos": 327, + "TTLPos": 337, "Expr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 331, - "NameEnd": 333 + "NamePos": 341, + "NameEnd": 343 }, "Operation": "+", "RightExpr": { - "IntervalPos": 336, + "IntervalPos": 346, "Expr": { - "NumPos": 345, - "NumEnd": 346, + "NumPos": 355, + "NumEnd": 356, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 347, - "NameEnd": 352 + "NamePos": 357, + "NameEnd": 362 } }, "HasGlobal": false, @@ -427,25 +427,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 381, - "ListEnd": 399, + "OrderPos": 393, + "ListEnd": 411, "Items": [ { - "OrderPos": 381, + "OrderPos": 393, "Expr": { - "LeftParenPos": 390, - "RightParenPos": 399, + "LeftParenPos": 402, + "RightParenPos": 411, "Items": { - "ListPos": 391, - "ListEnd": 399, + "ListPos": 403, + "ListEnd": 411, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 391, - "NameEnd": 393 + "NamePos": 403, + "NameEnd": 405 }, "Alias": null }, @@ -453,8 +453,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 394, - "NameEnd": 396 + "NamePos": 406, + "NameEnd": 408 }, "Alias": null }, @@ -462,8 +462,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 397, - "NameEnd": 399 + "NamePos": 409, + "NameEnd": 411 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_projection.sql.golden.json b/parser/testdata/ddl/output/create_table_with_projection.sql.golden.json index e008540..d2312f7 100644 --- a/parser/testdata/ddl/output/create_table_with_projection.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_projection.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 270, + "StatementEnd": 284, "OrReplace": false, "Name": { "Database": null, @@ -16,18 +16,18 @@ "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 20, - "SchemaEnd": 229, + "SchemaPos": 21, + "SchemaEnd": 241, "Columns": [ { - "NamePos": 27, - "ColumnEnd": 47, + "NamePos": 29, + "ColumnEnd": 49, "Name": { "Ident": { "Name": "event_time", "QuoteType": 3, - "NamePos": 27, - "NameEnd": 37 + "NamePos": 29, + "NameEnd": 39 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 39, - "NameEnd": 47 + "NamePos": 41, + "NameEnd": 49 } }, "NotNull": null, @@ -50,14 +50,14 @@ "CompressionCodec": null }, { - "NamePos": 54, - "ColumnEnd": 70, + "NamePos": 57, + "ColumnEnd": 73, "Name": { "Ident": { "Name": "event_id", "QuoteType": 3, - "NamePos": 54, - "NameEnd": 62 + "NamePos": 57, + "NameEnd": 65 }, "DotIdent": null }, @@ -65,8 +65,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 64, - "NameEnd": 70 + "NamePos": 67, + "NameEnd": 73 } }, "NotNull": null, @@ -80,14 +80,14 @@ "CompressionCodec": null }, { - "NamePos": 77, - "ColumnEnd": 92, + "NamePos": 81, + "ColumnEnd": 96, "Name": { "Ident": { "Name": "user_id", "QuoteType": 3, - "NamePos": 77, - "NameEnd": 84 + "NamePos": 81, + "NameEnd": 88 }, "DotIdent": null }, @@ -95,8 +95,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 86, - "NameEnd": 92 + "NamePos": 90, + "NameEnd": 96 } }, "NotNull": null, @@ -110,14 +110,14 @@ "CompressionCodec": null }, { - "NamePos": 99, - "ColumnEnd": 118, + "NamePos": 104, + "ColumnEnd": 123, "Name": { "Ident": { "Name": "huge_string", "QuoteType": 3, - "NamePos": 99, - "NameEnd": 110 + "NamePos": 104, + "NameEnd": 115 }, "DotIdent": null }, @@ -125,8 +125,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 112, - "NameEnd": 118 + "NamePos": 117, + "NameEnd": 123 } }, "NotNull": null, @@ -141,31 +141,31 @@ }, { "IncludeProjectionKeyword": true, - "ProjectionPos": 124, + "ProjectionPos": 130, "Identifier": { "Ident": { "Name": "order_by_user_id", "QuoteType": 1, - "NamePos": 135, - "NameEnd": 151 + "NamePos": 141, + "NameEnd": 157 }, "DotIdent": null }, "Select": { - "LeftParenPos": 156, - "RightParenPos": 227, + "LeftParenPos": 163, + "RightParenPos": 238, "With": null, "SelectColumns": { - "ListPos": 185, - "ListEnd": 197, + "ListPos": 194, + "ListEnd": 206, "HasDistinct": false, "Items": [ { "Expr": { "Name": "_part_offset", "QuoteType": 1, - "NamePos": 185, - "NameEnd": 197 + "NamePos": 194, + "NameEnd": 206 }, "Alias": null } @@ -173,18 +173,18 @@ }, "GroupBy": null, "OrderBy": { - "OrderByPos": 206, + "OrderByPos": 216, "Columns": { - "ListPos": 215, - "ListEnd": 222, + "ListPos": 225, + "ListEnd": 232, "HasDistinct": false, "Items": [ { "Expr": { "Name": "user_id", "QuoteType": 1, - "NamePos": 215, - "NameEnd": 222 + "NamePos": 225, + "NameEnd": 232 }, "Alias": null } @@ -198,15 +198,15 @@ "TableFunction": null }, "Engine": { - "EnginePos": 231, - "EngineEnd": 270, + "EnginePos": 244, + "EngineEnd": 284, "Name": "MergeTree", "Params": { - "LeftParenPos": 249, - "RightParenPos": 250, + "LeftParenPos": 262, + "RightParenPos": 263, "Items": { - "ListPos": 250, - "ListEnd": 250, + "ListPos": 263, + "ListEnd": 263, "HasDistinct": false, "Items": [] }, @@ -218,25 +218,25 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 252, - "ListEnd": 270, + "OrderPos": 266, + "ListEnd": 284, "Items": [ { - "OrderPos": 252, + "OrderPos": 266, "Expr": { - "LeftParenPos": 261, - "RightParenPos": 270, + "LeftParenPos": 275, + "RightParenPos": 284, "Items": { - "ListPos": 262, - "ListEnd": 270, + "ListPos": 276, + "ListEnd": 284, "HasDistinct": false, "Items": [ { "Expr": { "Name": "event_id", "QuoteType": 1, - "NamePos": 262, - "NameEnd": 270 + "NamePos": 276, + "NameEnd": 284 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_sample_by.sql.golden.json b/parser/testdata/ddl/output/create_table_with_sample_by.sql.golden.json index 0cf7845..c72c8b1 100644 --- a/parser/testdata/ddl/output/create_table_with_sample_by.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_sample_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 351, + "StatementEnd": 361, "OrReplace": false, "Name": { "Database": { @@ -27,18 +27,18 @@ }, "OnCluster": null, "TableSchema": { - "SchemaPos": 70, - "SchemaEnd": 124, + "SchemaPos": 71, + "SchemaEnd": 129, "Columns": [ { - "NamePos": 77, - "ColumnEnd": 89, + "NamePos": 79, + "ColumnEnd": 91, "Name": { "Ident": { "Name": "f0", "QuoteType": 3, - "NamePos": 77, - "NameEnd": 79 + "NamePos": 79, + "NameEnd": 81 }, "DotIdent": null }, @@ -46,8 +46,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 81, - "NameEnd": 89 + "NamePos": 83, + "NameEnd": 91 } }, "NotNull": null, @@ -61,14 +61,14 @@ "CompressionCodec": null }, { - "NamePos": 96, - "ColumnEnd": 106, + "NamePos": 99, + "ColumnEnd": 109, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 96, - "NameEnd": 98 + "NamePos": 99, + "NameEnd": 101 }, "DotIdent": null }, @@ -76,8 +76,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 100, - "NameEnd": 106 + "NamePos": 103, + "NameEnd": 109 } }, "NotNull": null, @@ -91,14 +91,14 @@ "CompressionCodec": null }, { - "NamePos": 113, - "ColumnEnd": 123, + "NamePos": 117, + "ColumnEnd": 127, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 113, - "NameEnd": 115 + "NamePos": 117, + "NameEnd": 119 }, "DotIdent": null }, @@ -106,8 +106,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 117, - "NameEnd": 123 + "NamePos": 121, + "NameEnd": 127 } }, "NotNull": null, @@ -125,29 +125,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 126, - "EngineEnd": 351, + "EnginePos": 132, + "EngineEnd": 361, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 154, - "RightParenPos": 217, + "LeftParenPos": 160, + "RightParenPos": 223, "Items": { - "ListPos": 156, - "ListEnd": 216, + "ListPos": 162, + "ListEnd": 222, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 156, - "LiteralEnd": 203, + "LiteralPos": 162, + "LiteralEnd": 209, "Literal": "/clickhouse/tables/{layer}/{shard}/default/test" }, "Alias": null }, { "Expr": { - "LiteralPos": 207, - "LiteralEnd": 216, + "LiteralPos": 213, + "LiteralEnd": 222, "Literal": "{replica}" }, "Alias": null @@ -158,10 +158,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 219, + "PartitionPos": 226, "Expr": { - "ListPos": 232, - "ListEnd": 250, + "ListPos": 239, + "ListEnd": 257, "HasDistinct": false, "Items": [ { @@ -169,23 +169,23 @@ "Name": { "Name": "toYYYYMM", "QuoteType": 1, - "NamePos": 232, - "NameEnd": 240 + "NamePos": 239, + "NameEnd": 247 }, "Params": { - "LeftParenPos": 240, - "RightParenPos": 250, + "LeftParenPos": 247, + "RightParenPos": 257, "Items": { - "ListPos": 241, - "ListEnd": 250, + "ListPos": 248, + "ListEnd": 257, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 241, - "NameEnd": 250 + "NamePos": 248, + "NameEnd": 257 }, "Alias": null } @@ -200,30 +200,30 @@ } }, "SampleBy": { - "SamplePos": 301, + "SamplePos": 310, "Expr": { "Name": "userid", "QuoteType": 1, - "NamePos": 311, - "NameEnd": 317 + "NamePos": 320, + "NameEnd": 326 } }, "TTL": null, "Settings": { - "SettingsPos": 318, - "ListEnd": 351, + "SettingsPos": 328, + "ListEnd": 361, "Items": [ { - "SettingsPos": 327, + "SettingsPos": 337, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 327, - "NameEnd": 344 + "NamePos": 337, + "NameEnd": 354 }, "Expr": { - "NumPos": 347, - "NumEnd": 351, + "NumPos": 357, + "NumEnd": 361, "Literal": "8192", "Base": 10 } @@ -231,25 +231,25 @@ ] }, "OrderBy": { - "OrderPos": 252, - "ListEnd": 299, + "OrderPos": 260, + "ListEnd": 307, "Items": [ { - "OrderPos": 252, + "OrderPos": 260, "Expr": { - "LeftParenPos": 261, - "RightParenPos": 299, + "LeftParenPos": 269, + "RightParenPos": 307, "Items": { - "ListPos": 262, - "ListEnd": 299, + "ListPos": 270, + "ListEnd": 307, "HasDistinct": false, "Items": [ { "Expr": { "Name": "contractid", "QuoteType": 1, - "NamePos": 262, - "NameEnd": 272 + "NamePos": 270, + "NameEnd": 280 }, "Alias": null }, @@ -258,23 +258,23 @@ "Name": { "Name": "toDate", "QuoteType": 1, - "NamePos": 274, - "NameEnd": 280 + "NamePos": 282, + "NameEnd": 288 }, "Params": { - "LeftParenPos": 280, - "RightParenPos": 290, + "LeftParenPos": 288, + "RightParenPos": 298, "Items": { - "ListPos": 281, - "ListEnd": 290, + "ListPos": 289, + "ListEnd": 298, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 281, - "NameEnd": 290 + "NamePos": 289, + "NameEnd": 298 }, "Alias": null } @@ -289,8 +289,8 @@ "Expr": { "Name": "userid", "QuoteType": 1, - "NamePos": 293, - "NameEnd": 299 + "NamePos": 301, + "NameEnd": 307 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_ttl_policy.sql.golden.json b/parser/testdata/ddl/output/create_table_with_ttl_policy.sql.golden.json index 0670392..e9346fb 100644 --- a/parser/testdata/ddl/output/create_table_with_ttl_policy.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_ttl_policy.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 203, + "StatementEnd": 213, "OrReplace": false, "Name": { "Database": null, @@ -16,18 +16,18 @@ "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 17, - "SchemaEnd": 45, + "SchemaPos": 18, + "SchemaEnd": 49, "Columns": [ { - "NamePos": 23, - "ColumnEnd": 33, + "NamePos": 25, + "ColumnEnd": 35, "Name": { "Ident": { "Name": "d", "QuoteType": 1, - "NamePos": 23, - "NameEnd": 24 + "NamePos": 25, + "NameEnd": 26 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 25, - "NameEnd": 33 + "NamePos": 27, + "NameEnd": 35 } }, "NotNull": null, @@ -50,14 +50,14 @@ "CompressionCodec": null }, { - "NamePos": 39, - "ColumnEnd": 44, + "NamePos": 42, + "ColumnEnd": 47, "Name": { "Ident": { "Name": "a", "QuoteType": 1, - "NamePos": 39, - "NameEnd": 40 + "NamePos": 42, + "NameEnd": 43 }, "DotIdent": null }, @@ -65,8 +65,8 @@ "Name": { "Name": "Int", "QuoteType": 1, - "NamePos": 41, - "NameEnd": 44 + "NamePos": 44, + "NameEnd": 47 } }, "NotNull": null, @@ -84,16 +84,16 @@ "TableFunction": null }, "Engine": { - "EnginePos": 51, - "EngineEnd": 203, + "EnginePos": 56, + "EngineEnd": 213, "Name": "MergeTree", "Params": null, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 70, + "PartitionPos": 76, "Expr": { - "ListPos": 83, - "ListEnd": 93, + "ListPos": 89, + "ListEnd": 99, "HasDistinct": false, "Items": [ { @@ -101,23 +101,23 @@ "Name": { "Name": "toYYYYMM", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 91 + "NamePos": 89, + "NameEnd": 97 }, "Params": { - "LeftParenPos": 91, - "RightParenPos": 93, + "LeftParenPos": 97, + "RightParenPos": 99, "Items": { - "ListPos": 92, - "ListEnd": 93, + "ListPos": 98, + "ListEnd": 99, "HasDistinct": false, "Items": [ { "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 93 + "NamePos": 98, + "NameEnd": 99 }, "Alias": null } @@ -133,32 +133,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 106, - "ListEnd": 203, + "TTLPos": 114, + "ListEnd": 213, "Items": [ { - "TTLPos": 106, + "TTLPos": 114, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 110, - "NameEnd": 111 + "NamePos": 118, + "NameEnd": 119 }, "Operation": "+", "RightExpr": { - "IntervalPos": 114, + "IntervalPos": 122, "Expr": { - "NumPos": 123, - "NumEnd": 124, + "NumPos": 131, + "NumEnd": 132, "Literal": "1", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 130 + "NamePos": 133, + "NameEnd": 138 } }, "HasGlobal": false, @@ -166,12 +166,12 @@ }, "Policy": { "Item": { - "RulePos": 131, + "RulePos": 139, "ToVolume": null, "ToDisk": null, "Action": { - "ActionPos": 131, - "ActionEnd": 137, + "ActionPos": 139, + "ActionEnd": 145, "Action": "DELETE", "Codec": null } @@ -181,28 +181,28 @@ } }, { - "TTLPos": 106, + "TTLPos": 114, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 143, - "NameEnd": 144 + "NamePos": 152, + "NameEnd": 153 }, "Operation": "+", "RightExpr": { - "IntervalPos": 147, + "IntervalPos": 156, "Expr": { - "NumPos": 156, - "NumEnd": 157, + "NumPos": 165, + "NumEnd": 166, "Literal": "1", "Base": 10 }, "Unit": { "Name": "WEEK", "QuoteType": 1, - "NamePos": 158, - "NameEnd": 162 + "NamePos": 167, + "NameEnd": 171 } }, "HasGlobal": false, @@ -210,10 +210,10 @@ }, "Policy": { "Item": { - "RulePos": 163, + "RulePos": 172, "ToVolume": { - "LiteralPos": 174, - "LiteralEnd": 177, + "LiteralPos": 183, + "LiteralEnd": 186, "Literal": "aaa" }, "ToDisk": null, @@ -224,28 +224,28 @@ } }, { - "TTLPos": 106, + "TTLPos": 114, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 185 + "NamePos": 194, + "NameEnd": 195 }, "Operation": "+", "RightExpr": { - "IntervalPos": 188, + "IntervalPos": 198, "Expr": { - "NumPos": 197, - "NumEnd": 198, + "NumPos": 207, + "NumEnd": 208, "Literal": "2", "Base": 10 }, "Unit": { "Name": "WEEK", "QuoteType": 1, - "NamePos": 199, - "NameEnd": 203 + "NamePos": 209, + "NameEnd": 213 } }, "HasGlobal": false, @@ -253,11 +253,11 @@ }, "Policy": { "Item": { - "RulePos": 204, + "RulePos": 214, "ToVolume": null, "ToDisk": { - "LiteralPos": 213, - "LiteralEnd": 216, + "LiteralPos": 223, + "LiteralEnd": 226, "Literal": "bbb" }, "Action": null @@ -270,16 +270,16 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 95, - "ListEnd": 105, + "OrderPos": 102, + "ListEnd": 112, "Items": [ { - "OrderPos": 95, + "OrderPos": 102, "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 104, - "NameEnd": 105 + "NamePos": 111, + "NameEnd": 112 }, "Alias": null, "Direction": "" @@ -292,34 +292,34 @@ "Comment": null }, { - "CreatePos": 221, - "StatementEnd": 364, + "CreatePos": 234, + "StatementEnd": 385, "OrReplace": false, "Name": { "Database": null, "Table": { "Name": "table_with_where", "QuoteType": 1, - "NamePos": 234, - "NameEnd": 250 + "NamePos": 247, + "NameEnd": 263 } }, "IfNotExists": false, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 251, - "SchemaEnd": 279, + "SchemaPos": 265, + "SchemaEnd": 296, "Columns": [ { - "NamePos": 257, - "ColumnEnd": 267, + "NamePos": 272, + "ColumnEnd": 282, "Name": { "Ident": { "Name": "d", "QuoteType": 1, - "NamePos": 257, - "NameEnd": 258 + "NamePos": 272, + "NameEnd": 273 }, "DotIdent": null }, @@ -327,8 +327,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 259, - "NameEnd": 267 + "NamePos": 274, + "NameEnd": 282 } }, "NotNull": null, @@ -342,14 +342,14 @@ "CompressionCodec": null }, { - "NamePos": 273, - "ColumnEnd": 278, + "NamePos": 289, + "ColumnEnd": 294, "Name": { "Ident": { "Name": "a", "QuoteType": 1, - "NamePos": 273, - "NameEnd": 274 + "NamePos": 289, + "NameEnd": 290 }, "DotIdent": null }, @@ -357,8 +357,8 @@ "Name": { "Name": "Int", "QuoteType": 1, - "NamePos": 275, - "NameEnd": 278 + "NamePos": 291, + "NameEnd": 294 } }, "NotNull": null, @@ -376,16 +376,16 @@ "TableFunction": null }, "Engine": { - "EnginePos": 285, - "EngineEnd": 364, + "EnginePos": 303, + "EngineEnd": 385, "Name": "MergeTree", "Params": null, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 304, + "PartitionPos": 323, "Expr": { - "ListPos": 317, - "ListEnd": 327, + "ListPos": 336, + "ListEnd": 346, "HasDistinct": false, "Items": [ { @@ -393,23 +393,23 @@ "Name": { "Name": "toYYYYMM", "QuoteType": 1, - "NamePos": 317, - "NameEnd": 325 + "NamePos": 336, + "NameEnd": 344 }, "Params": { - "LeftParenPos": 325, - "RightParenPos": 327, + "LeftParenPos": 344, + "RightParenPos": 346, "Items": { - "ListPos": 326, - "ListEnd": 327, + "ListPos": 345, + "ListEnd": 346, "HasDistinct": false, "Items": [ { "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 326, - "NameEnd": 327 + "NamePos": 345, + "NameEnd": 346 }, "Alias": null } @@ -425,32 +425,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 340, - "ListEnd": 364, + "TTLPos": 361, + "ListEnd": 385, "Items": [ { - "TTLPos": 340, + "TTLPos": 361, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 344, - "NameEnd": 345 + "NamePos": 365, + "NameEnd": 366 }, "Operation": "+", "RightExpr": { - "IntervalPos": 348, + "IntervalPos": 369, "Expr": { - "NumPos": 357, - "NumEnd": 358, + "NumPos": 378, + "NumEnd": 379, "Literal": "1", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 359, - "NameEnd": 364 + "NamePos": 380, + "NameEnd": 385 } }, "HasGlobal": false, @@ -458,40 +458,40 @@ }, "Policy": { "Item": { - "RulePos": 365, + "RulePos": 386, "ToVolume": null, "ToDisk": null, "Action": { - "ActionPos": 365, - "ActionEnd": 371, + "ActionPos": 386, + "ActionEnd": 392, "Action": "DELETE", "Codec": null } }, "Where": { - "WherePos": 372, + "WherePos": 393, "Expr": { "LeftExpr": { "Name": { "Name": "toDayOfWeek", "QuoteType": 1, - "NamePos": 378, - "NameEnd": 389 + "NamePos": 399, + "NameEnd": 410 }, "Params": { - "LeftParenPos": 389, - "RightParenPos": 391, + "LeftParenPos": 410, + "RightParenPos": 412, "Items": { - "ListPos": 390, - "ListEnd": 391, + "ListPos": 411, + "ListEnd": 412, "HasDistinct": false, "Items": [ { "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 390, - "NameEnd": 391 + "NamePos": 411, + "NameEnd": 412 }, "Alias": null } @@ -502,8 +502,8 @@ }, "Operation": "=", "RightExpr": { - "NumPos": 395, - "NumEnd": 396, + "NumPos": 416, + "NumEnd": 417, "Literal": "1", "Base": 10 }, @@ -518,16 +518,16 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 329, - "ListEnd": 339, + "OrderPos": 349, + "ListEnd": 359, "Items": [ { - "OrderPos": 329, + "OrderPos": 349, "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 338, - "NameEnd": 339 + "NamePos": 358, + "NameEnd": 359 }, "Alias": null, "Direction": "" @@ -540,34 +540,34 @@ "Comment": null }, { - "CreatePos": 399, - "StatementEnd": 707, + "CreatePos": 422, + "StatementEnd": 739, "OrReplace": false, "Name": { "Database": null, "Table": { "Name": "table_for_recompression", "QuoteType": 1, - "NamePos": 412, - "NameEnd": 435 + "NamePos": 435, + "NameEnd": 458 } }, "IfNotExists": false, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 436, - "SchemaEnd": 487, + "SchemaPos": 460, + "SchemaEnd": 515, "Columns": [ { - "NamePos": 442, - "ColumnEnd": 452, + "NamePos": 467, + "ColumnEnd": 477, "Name": { "Ident": { "Name": "d", "QuoteType": 1, - "NamePos": 442, - "NameEnd": 443 + "NamePos": 467, + "NameEnd": 468 }, "DotIdent": null }, @@ -575,8 +575,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 444, - "NameEnd": 452 + "NamePos": 469, + "NameEnd": 477 } }, "NotNull": null, @@ -590,14 +590,14 @@ "CompressionCodec": null }, { - "NamePos": 458, - "ColumnEnd": 468, + "NamePos": 484, + "ColumnEnd": 494, "Name": { "Ident": { "Name": "key", "QuoteType": 1, - "NamePos": 458, - "NameEnd": 461 + "NamePos": 484, + "NameEnd": 487 }, "DotIdent": null }, @@ -605,8 +605,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 462, - "NameEnd": 468 + "NamePos": 488, + "NameEnd": 494 } }, "NotNull": null, @@ -620,14 +620,14 @@ "CompressionCodec": null }, { - "NamePos": 474, - "ColumnEnd": 486, + "NamePos": 501, + "ColumnEnd": 513, "Name": { "Ident": { "Name": "value", "QuoteType": 1, - "NamePos": 474, - "NameEnd": 479 + "NamePos": 501, + "NameEnd": 506 }, "DotIdent": null }, @@ -635,8 +635,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 480, - "NameEnd": 486 + "NamePos": 507, + "NameEnd": 513 } }, "NotNull": null, @@ -654,15 +654,15 @@ "TableFunction": null }, "Engine": { - "EnginePos": 489, - "EngineEnd": 707, + "EnginePos": 517, + "EngineEnd": 739, "Name": "MergeTree", "Params": { - "LeftParenPos": 505, - "RightParenPos": 506, + "LeftParenPos": 533, + "RightParenPos": 534, "Items": { - "ListPos": 506, - "ListEnd": 506, + "ListPos": 534, + "ListEnd": 534, "HasDistinct": false, "Items": [] }, @@ -670,18 +670,18 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 525, + "PartitionPos": 555, "Expr": { - "ListPos": 538, - "ListEnd": 541, + "ListPos": 568, + "ListEnd": 571, "HasDistinct": false, "Items": [ { "Expr": { "Name": "key", "QuoteType": 1, - "NamePos": 538, - "NameEnd": 541 + "NamePos": 568, + "NameEnd": 571 }, "Alias": null } @@ -690,32 +690,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 542, - "ListEnd": 614, + "TTLPos": 573, + "ListEnd": 645, "Items": [ { - "TTLPos": 542, + "TTLPos": 573, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 546, - "NameEnd": 547 + "NamePos": 577, + "NameEnd": 578 }, "Operation": "+", "RightExpr": { - "IntervalPos": 550, + "IntervalPos": 581, "Expr": { - "NumPos": 559, - "NumEnd": 560, + "NumPos": 590, + "NumEnd": 591, "Literal": "1", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 561, - "NameEnd": 566 + "NamePos": 592, + "NameEnd": 597 } }, "HasGlobal": false, @@ -723,27 +723,27 @@ }, "Policy": { "Item": { - "RulePos": 567, + "RulePos": 598, "ToVolume": null, "ToDisk": null, "Action": { - "ActionPos": 567, - "ActionEnd": 577, + "ActionPos": 598, + "ActionEnd": 608, "Action": "RECOMPRESS", "Codec": { - "CodecPos": 578, - "RightParenPos": 593, + "CodecPos": 609, + "RightParenPos": 624, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 584, - "NameEnd": 588 + "NamePos": 615, + "NameEnd": 619 }, "Level": { - "NumPos": 588, - "NumEnd": 591, + "NumPos": 619, + "NumEnd": 622, "Literal": "17", "Base": 10 } @@ -755,28 +755,28 @@ } }, { - "TTLPos": 542, + "TTLPos": 573, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 595, - "NameEnd": 596 + "NamePos": 626, + "NameEnd": 627 }, "Operation": "+", "RightExpr": { - "IntervalPos": 599, + "IntervalPos": 630, "Expr": { - "NumPos": 608, - "NumEnd": 609, + "NumPos": 639, + "NumEnd": 640, "Literal": "1", "Base": 10 }, "Unit": { "Name": "YEAR", "QuoteType": 1, - "NamePos": 610, - "NameEnd": 614 + "NamePos": 641, + "NameEnd": 645 } }, "HasGlobal": false, @@ -784,27 +784,27 @@ }, "Policy": { "Item": { - "RulePos": 615, + "RulePos": 646, "ToVolume": null, "ToDisk": null, "Action": { - "ActionPos": 615, - "ActionEnd": 625, + "ActionPos": 646, + "ActionEnd": 656, "Action": "RECOMPRESS", "Codec": { - "CodecPos": 626, - "RightParenPos": 642, + "CodecPos": 657, + "RightParenPos": 673, "Type": null, "TypeLevel": null, "Name": { "Name": "LZ4HC", "QuoteType": 1, - "NamePos": 632, - "NameEnd": 637 + "NamePos": 663, + "NameEnd": 668 }, "Level": { - "NumPos": 637, - "NumEnd": 640, + "NumPos": 668, + "NumEnd": 671, "Literal": "10", "Base": 10 } @@ -818,35 +818,35 @@ ] }, "Settings": { - "SettingsPos": 643, - "ListEnd": 707, + "SettingsPos": 675, + "ListEnd": 739, "Items": [ { - "SettingsPos": 652, + "SettingsPos": 684, "Name": { "Name": "min_rows_for_wide_part", "QuoteType": 1, - "NamePos": 652, - "NameEnd": 674 + "NamePos": 684, + "NameEnd": 706 }, "Expr": { - "NumPos": 677, - "NumEnd": 678, + "NumPos": 709, + "NumEnd": 710, "Literal": "0", "Base": 10 } }, { - "SettingsPos": 680, + "SettingsPos": 712, "Name": { "Name": "min_bytes_for_wide_part", "QuoteType": 1, - "NamePos": 680, - "NameEnd": 703 + "NamePos": 712, + "NameEnd": 735 }, "Expr": { - "NumPos": 706, - "NumEnd": 707, + "NumPos": 738, + "NumEnd": 739, "Literal": "0", "Base": 10 } @@ -854,24 +854,24 @@ ] }, "OrderBy": { - "OrderPos": 508, - "ListEnd": 523, + "OrderPos": 537, + "ListEnd": 552, "Items": [ { - "OrderPos": 508, + "OrderPos": 537, "Expr": { "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 517, - "NameEnd": 522 + "NamePos": 546, + "NameEnd": 551 }, "Params": { - "LeftParenPos": 522, - "RightParenPos": 523, + "LeftParenPos": 551, + "RightParenPos": 552, "Items": { - "ListPos": 523, - "ListEnd": 523, + "ListPos": 552, + "ListEnd": 552, "HasDistinct": false, "Items": [] }, diff --git a/parser/testdata/ddl/output/create_table_with_uuid.sql.golden.json b/parser/testdata/ddl/output/create_table_with_uuid.sql.golden.json index 2fbe878..7e0b24c 100644 --- a/parser/testdata/ddl/output/create_table_with_uuid.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_uuid.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 411, + "StatementEnd": 423, "OrReplace": false, "Name": { "Database": { @@ -35,17 +35,17 @@ }, "TableSchema": { "SchemaPos": 86, - "SchemaEnd": 239, + "SchemaEnd": 248, "Columns": [ { - "NamePos": 92, - "ColumnEnd": 101, + "NamePos": 93, + "ColumnEnd": 102, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 94 + "NamePos": 93, + "NameEnd": 95 }, "DotIdent": null }, @@ -53,8 +53,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 101 + "NamePos": 96, + "NameEnd": 102 } }, "NotNull": null, @@ -68,14 +68,14 @@ "CompressionCodec": null }, { - "NamePos": 107, - "ColumnEnd": 116, + "NamePos": 109, + "ColumnEnd": 118, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 107, - "NameEnd": 109 + "NamePos": 109, + "NameEnd": 111 }, "DotIdent": null }, @@ -83,8 +83,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 110, - "NameEnd": 116 + "NamePos": 112, + "NameEnd": 118 } }, "NotNull": null, @@ -98,14 +98,14 @@ "CompressionCodec": null }, { - "NamePos": 122, - "ColumnEnd": 131, + "NamePos": 125, + "ColumnEnd": 134, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 122, - "NameEnd": 124 + "NamePos": 125, + "NameEnd": 127 }, "DotIdent": null }, @@ -113,8 +113,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 131 + "NamePos": 128, + "NameEnd": 134 } }, "NotNull": null, @@ -128,14 +128,14 @@ "CompressionCodec": null }, { - "NamePos": 137, - "ColumnEnd": 148, + "NamePos": 141, + "ColumnEnd": 152, "Name": { "Ident": { "Name": "f3", "QuoteType": 1, - "NamePos": 137, - "NameEnd": 139 + "NamePos": 141, + "NameEnd": 143 }, "DotIdent": null }, @@ -143,8 +143,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 140, - "NameEnd": 148 + "NamePos": 144, + "NameEnd": 152 } }, "NotNull": null, @@ -158,14 +158,14 @@ "CompressionCodec": null }, { - "NamePos": 154, - "ColumnEnd": 165, + "NamePos": 159, + "ColumnEnd": 170, "Name": { "Ident": { "Name": "f4", "QuoteType": 1, - "NamePos": 154, - "NameEnd": 156 + "NamePos": 159, + "NameEnd": 161 }, "DotIdent": null }, @@ -173,8 +173,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 157, - "NameEnd": 165 + "NamePos": 162, + "NameEnd": 170 } }, "NotNull": null, @@ -188,41 +188,41 @@ "CompressionCodec": null }, { - "NamePos": 171, - "ColumnEnd": 191, + "NamePos": 177, + "ColumnEnd": 197, "Name": { "Ident": { "Name": "f5", "QuoteType": 1, - "NamePos": 171, - "NameEnd": 173 + "NamePos": 177, + "NameEnd": 179 }, "DotIdent": null }, "Type": { - "LeftParenPos": 178, - "RightParenPos": 191, + "LeftParenPos": 184, + "RightParenPos": 197, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 174, - "NameEnd": 177 + "NamePos": 180, + "NameEnd": 183 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 178, - "NameEnd": 184 + "NamePos": 184, + "NameEnd": 190 } }, { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 185, - "NameEnd": 191 + "NamePos": 191, + "NameEnd": 197 } } ] @@ -238,14 +238,14 @@ "CompressionCodec": null }, { - "NamePos": 198, - "ColumnEnd": 207, + "NamePos": 205, + "ColumnEnd": 214, "Name": { "Ident": { "Name": "f6", "QuoteType": 1, - "NamePos": 198, - "NameEnd": 200 + "NamePos": 205, + "NameEnd": 207 }, "DotIdent": null }, @@ -253,8 +253,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 201, - "NameEnd": 207 + "NamePos": 208, + "NameEnd": 214 } }, "NotNull": null, @@ -268,14 +268,14 @@ "CompressionCodec": null }, { - "NamePos": 213, - "ColumnEnd": 237, + "NamePos": 221, + "ColumnEnd": 245, "Name": { "Ident": { "Name": "f7", "QuoteType": 1, - "NamePos": 213, - "NameEnd": 215 + "NamePos": 221, + "NameEnd": 223 }, "DotIdent": null }, @@ -283,8 +283,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 216, - "NameEnd": 224 + "NamePos": 224, + "NameEnd": 232 } }, "NotNull": null, @@ -293,15 +293,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 233, - "NameEnd": 236 + "NamePos": 241, + "NameEnd": 244 }, "Params": { - "LeftParenPos": 236, - "RightParenPos": 237, + "LeftParenPos": 244, + "RightParenPos": 245, "Items": { - "ListPos": 237, - "ListEnd": 237, + "ListPos": 245, + "ListEnd": 245, "HasDistinct": false, "Items": [] }, @@ -320,29 +320,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 241, - "EngineEnd": 411, + "EnginePos": 250, + "EngineEnd": 423, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 269, - "RightParenPos": 337, + "LeftParenPos": 278, + "RightParenPos": 346, "Items": { - "ListPos": 271, - "ListEnd": 336, + "ListPos": 280, + "ListEnd": 345, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 271, - "LiteralEnd": 323, + "LiteralPos": 280, + "LiteralEnd": 332, "Literal": "/clickhouse/tables/{layer}-{shard}/test/events_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 327, - "LiteralEnd": 336, + "LiteralPos": 336, + "LiteralEnd": 345, "Literal": "{replica}" }, "Alias": null @@ -353,10 +353,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 365, + "PartitionPos": 376, "Expr": { - "ListPos": 378, - "ListEnd": 391, + "ListPos": 389, + "ListEnd": 402, "HasDistinct": false, "Items": [ { @@ -364,23 +364,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 378, - "NameEnd": 388 + "NamePos": 389, + "NameEnd": 399 }, "Params": { - "LeftParenPos": 388, - "RightParenPos": 391, + "LeftParenPos": 399, + "RightParenPos": 402, "Items": { - "ListPos": 389, - "ListEnd": 391, + "ListPos": 400, + "ListEnd": 402, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 389, - "NameEnd": 391 + "NamePos": 400, + "NameEnd": 402 }, "Alias": null } @@ -396,32 +396,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 339, - "ListEnd": 364, + "TTLPos": 349, + "ListEnd": 374, "Items": [ { - "TTLPos": 339, + "TTLPos": 349, "Expr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 343, - "NameEnd": 345 + "NamePos": 353, + "NameEnd": 355 }, "Operation": "+", "RightExpr": { - "IntervalPos": 348, + "IntervalPos": 358, "Expr": { - "NumPos": 357, - "NumEnd": 358, + "NumPos": 367, + "NumEnd": 368, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 359, - "NameEnd": 364 + "NamePos": 369, + "NameEnd": 374 } }, "HasGlobal": false, @@ -433,25 +433,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 393, - "ListEnd": 411, + "OrderPos": 405, + "ListEnd": 423, "Items": [ { - "OrderPos": 393, + "OrderPos": 405, "Expr": { - "LeftParenPos": 402, - "RightParenPos": 411, + "LeftParenPos": 414, + "RightParenPos": 423, "Items": { - "ListPos": 403, - "ListEnd": 411, + "ListPos": 415, + "ListEnd": 423, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 403, - "NameEnd": 405 + "NamePos": 415, + "NameEnd": 417 }, "Alias": null }, @@ -459,8 +459,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 406, - "NameEnd": 408 + "NamePos": 418, + "NameEnd": 420 }, "Alias": null }, @@ -468,8 +468,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 409, - "NameEnd": 411 + "NamePos": 421, + "NameEnd": 423 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_user.sql.golden.json b/parser/testdata/ddl/output/create_user.sql.golden.json index 25cdc84..03eef33 100644 --- a/parser/testdata/ddl/output/create_user.sql.golden.json +++ b/parser/testdata/ddl/output/create_user.sql.golden.json @@ -1,7 +1,7 @@ [ { - "CreatePos": 28, - "StatementEnd": 45, + "CreatePos": 30, + "StatementEnd": 47, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -9,8 +9,8 @@ "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 40, - "NameEnd": 45 + "NamePos": 42, + "NameEnd": 47 }, "Scope": null, "OnCluster": null @@ -25,8 +25,8 @@ "Settings": null }, { - "CreatePos": 47, - "StatementEnd": 78, + "CreatePos": 50, + "StatementEnd": 81, "IfNotExists": true, "OrReplace": false, "UserNames": [ @@ -34,8 +34,8 @@ "Name": { "Name": "user2", "QuoteType": 1, - "NamePos": 73, - "NameEnd": 78 + "NamePos": 76, + "NameEnd": 81 }, "Scope": null, "OnCluster": null @@ -50,8 +50,8 @@ "Settings": null }, { - "CreatePos": 80, - "StatementEnd": 108, + "CreatePos": 84, + "StatementEnd": 112, "IfNotExists": false, "OrReplace": true, "UserNames": [ @@ -59,8 +59,8 @@ "Name": { "Name": "user3", "QuoteType": 1, - "NamePos": 103, - "NameEnd": 108 + "NamePos": 107, + "NameEnd": 112 }, "Scope": null, "OnCluster": null @@ -75,8 +75,8 @@ "Settings": null }, { - "CreatePos": 110, - "StatementEnd": 134, + "CreatePos": 115, + "StatementEnd": 139, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -84,8 +84,8 @@ "Name": { "Name": "user4", "QuoteType": 1, - "NamePos": 122, - "NameEnd": 127 + "NamePos": 127, + "NameEnd": 132 }, "Scope": null, "OnCluster": null @@ -94,8 +94,8 @@ "Name": { "Name": "user5", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 134 + "NamePos": 134, + "NameEnd": 139 }, "Scope": null, "OnCluster": null @@ -110,8 +110,8 @@ "Settings": null }, { - "CreatePos": 172, - "StatementEnd": 205, + "CreatePos": 180, + "StatementEnd": 213, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -119,16 +119,16 @@ "Name": { "Name": "user6", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 189 + "NamePos": 192, + "NameEnd": 197 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 190, - "AuthEnd": 205, + "AuthPos": 198, + "AuthEnd": 213, "NotIdentified": true, "AuthType": "", "AuthValue": null, @@ -144,8 +144,8 @@ "Settings": null }, { - "CreatePos": 206, - "StatementEnd": 274, + "CreatePos": 215, + "StatementEnd": 283, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -153,21 +153,21 @@ "Name": { "Name": "user7", "QuoteType": 1, - "NamePos": 218, - "NameEnd": 223 + "NamePos": 227, + "NameEnd": 232 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 224, - "AuthEnd": 274, + "AuthPos": 233, + "AuthEnd": 283, "NotIdentified": false, "AuthType": "plaintext_password", "AuthValue": { - "LiteralPos": 263, - "LiteralEnd": 274, + "LiteralPos": 272, + "LiteralEnd": 283, "Literal": "password123" }, "LdapServer": null, @@ -182,8 +182,8 @@ "Settings": null }, { - "CreatePos": 277, - "StatementEnd": 338, + "CreatePos": 287, + "StatementEnd": 348, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -191,21 +191,21 @@ "Name": { "Name": "user8", "QuoteType": 1, - "NamePos": 289, - "NameEnd": 294 + "NamePos": 299, + "NameEnd": 304 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 295, - "AuthEnd": 338, + "AuthPos": 305, + "AuthEnd": 348, "NotIdentified": false, "AuthType": "sha256_password", "AuthValue": { - "LiteralPos": 331, - "LiteralEnd": 338, + "LiteralPos": 341, + "LiteralEnd": 348, "Literal": "hash123" }, "LdapServer": null, @@ -220,8 +220,8 @@ "Settings": null }, { - "CreatePos": 341, - "StatementEnd": 399, + "CreatePos": 352, + "StatementEnd": 410, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -229,22 +229,22 @@ "Name": { "Name": "user9", "QuoteType": 1, - "NamePos": 353, - "NameEnd": 358 + "NamePos": 364, + "NameEnd": 369 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 359, - "AuthEnd": 399, + "AuthPos": 370, + "AuthEnd": 410, "NotIdentified": false, "AuthType": "", "AuthValue": null, "LdapServer": { - "LiteralPos": 388, - "LiteralEnd": 399, + "LiteralPos": 399, + "LiteralEnd": 410, "Literal": "ldap_server" }, "KerberosRealm": null, @@ -258,8 +258,8 @@ "Settings": null }, { - "CreatePos": 402, - "StatementEnd": 446, + "CreatePos": 414, + "StatementEnd": 458, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -267,16 +267,16 @@ "Name": { "Name": "user10", "QuoteType": 1, - "NamePos": 414, - "NameEnd": 420 + "NamePos": 426, + "NameEnd": 432 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 421, - "AuthEnd": 446, + "AuthPos": 433, + "AuthEnd": 458, "NotIdentified": false, "AuthType": "", "AuthValue": null, @@ -292,8 +292,8 @@ "Settings": null }, { - "CreatePos": 447, - "StatementEnd": 509, + "CreatePos": 460, + "StatementEnd": 522, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -301,23 +301,23 @@ "Name": { "Name": "user11", "QuoteType": 1, - "NamePos": 459, - "NameEnd": 465 + "NamePos": 472, + "NameEnd": 478 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 466, - "AuthEnd": 509, + "AuthPos": 479, + "AuthEnd": 522, "NotIdentified": false, "AuthType": "", "AuthValue": null, "LdapServer": null, "KerberosRealm": { - "LiteralPos": 498, - "LiteralEnd": 509, + "LiteralPos": 511, + "LiteralEnd": 522, "Literal": "EXAMPLE.COM" }, "IsKerberos": true @@ -330,8 +330,8 @@ "Settings": null }, { - "CreatePos": 551, - "StatementEnd": 581, + "CreatePos": 567, + "StatementEnd": 597, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -339,8 +339,8 @@ "Name": { "Name": "user12", "QuoteType": 1, - "NamePos": 563, - "NameEnd": 569 + "NamePos": 579, + "NameEnd": 585 }, "Scope": null, "OnCluster": null @@ -349,8 +349,8 @@ "Authentication": null, "Hosts": [ { - "HostPos": 570, - "HostEnd": 581, + "HostPos": 586, + "HostEnd": 597, "HostType": "LOCAL", "HostValue": null } @@ -362,8 +362,8 @@ "Settings": null }, { - "CreatePos": 582, - "StatementEnd": 610, + "CreatePos": 599, + "StatementEnd": 627, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -371,8 +371,8 @@ "Name": { "Name": "user13", "QuoteType": 1, - "NamePos": 594, - "NameEnd": 600 + "NamePos": 611, + "NameEnd": 617 }, "Scope": null, "OnCluster": null @@ -381,8 +381,8 @@ "Authentication": null, "Hosts": [ { - "HostPos": 601, - "HostEnd": 610, + "HostPos": 618, + "HostEnd": 627, "HostType": "ANY", "HostValue": null } @@ -394,8 +394,8 @@ "Settings": null }, { - "CreatePos": 611, - "StatementEnd": 640, + "CreatePos": 629, + "StatementEnd": 658, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -403,8 +403,8 @@ "Name": { "Name": "user14", "QuoteType": 1, - "NamePos": 623, - "NameEnd": 629 + "NamePos": 641, + "NameEnd": 647 }, "Scope": null, "OnCluster": null @@ -413,8 +413,8 @@ "Authentication": null, "Hosts": [ { - "HostPos": 630, - "HostEnd": 640, + "HostPos": 648, + "HostEnd": 658, "HostType": "NONE", "HostValue": null } @@ -426,8 +426,8 @@ "Settings": null }, { - "CreatePos": 641, - "StatementEnd": 680, + "CreatePos": 660, + "StatementEnd": 699, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -435,8 +435,8 @@ "Name": { "Name": "user15", "QuoteType": 1, - "NamePos": 653, - "NameEnd": 659 + "NamePos": 672, + "NameEnd": 678 }, "Scope": null, "OnCluster": null @@ -445,12 +445,12 @@ "Authentication": null, "Hosts": [ { - "HostPos": 660, - "HostEnd": 680, + "HostPos": 679, + "HostEnd": 699, "HostType": "NAME", "HostValue": { - "LiteralPos": 671, - "LiteralEnd": 680, + "LiteralPos": 690, + "LiteralEnd": 699, "Literal": "localhost" } } @@ -462,8 +462,8 @@ "Settings": null }, { - "CreatePos": 683, - "StatementEnd": 731, + "CreatePos": 703, + "StatementEnd": 751, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -471,8 +471,8 @@ "Name": { "Name": "user16", "QuoteType": 1, - "NamePos": 695, - "NameEnd": 701 + "NamePos": 715, + "NameEnd": 721 }, "Scope": null, "OnCluster": null @@ -481,12 +481,12 @@ "Authentication": null, "Hosts": [ { - "HostPos": 702, - "HostEnd": 731, + "HostPos": 722, + "HostEnd": 751, "HostType": "REGEXP", "HostValue": { - "LiteralPos": 715, - "LiteralEnd": 731, + "LiteralPos": 735, + "LiteralEnd": 751, "Literal": ".*\\.example\\.com" } } @@ -498,8 +498,8 @@ "Settings": null }, { - "CreatePos": 734, - "StatementEnd": 773, + "CreatePos": 755, + "StatementEnd": 794, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -507,8 +507,8 @@ "Name": { "Name": "user17", "QuoteType": 1, - "NamePos": 746, - "NameEnd": 752 + "NamePos": 767, + "NameEnd": 773 }, "Scope": null, "OnCluster": null @@ -517,12 +517,12 @@ "Authentication": null, "Hosts": [ { - "HostPos": 753, - "HostEnd": 773, + "HostPos": 774, + "HostEnd": 794, "HostType": "IP", "HostValue": { - "LiteralPos": 762, - "LiteralEnd": 773, + "LiteralPos": 783, + "LiteralEnd": 794, "Literal": "192.168.1.1" } } @@ -534,8 +534,8 @@ "Settings": null }, { - "CreatePos": 776, - "StatementEnd": 811, + "CreatePos": 798, + "StatementEnd": 833, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -543,8 +543,8 @@ "Name": { "Name": "user18", "QuoteType": 1, - "NamePos": 788, - "NameEnd": 794 + "NamePos": 810, + "NameEnd": 816 }, "Scope": null, "OnCluster": null @@ -553,12 +553,12 @@ "Authentication": null, "Hosts": [ { - "HostPos": 795, - "HostEnd": 811, + "HostPos": 817, + "HostEnd": 833, "HostType": "LIKE", "HostValue": { - "LiteralPos": 806, - "LiteralEnd": 811, + "LiteralPos": 828, + "LiteralEnd": 833, "Literal": "test%" } } @@ -570,8 +570,8 @@ "Settings": null }, { - "CreatePos": 849, - "StatementEnd": 886, + "CreatePos": 874, + "StatementEnd": 911, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -579,8 +579,8 @@ "Name": { "Name": "user19", "QuoteType": 1, - "NamePos": 861, - "NameEnd": 867 + "NamePos": 886, + "NameEnd": 892 }, "Scope": null, "OnCluster": null @@ -589,15 +589,15 @@ "Authentication": null, "Hosts": null, "DefaultRole": { - "DefaultPos": 868, - "DefaultEnd": 886, + "DefaultPos": 893, + "DefaultEnd": 911, "Roles": [ { "Name": { "Name": "role1", "QuoteType": 1, - "NamePos": 881, - "NameEnd": 886 + "NamePos": 906, + "NameEnd": 911 }, "Scope": null, "OnCluster": null @@ -611,8 +611,8 @@ "Settings": null }, { - "CreatePos": 888, - "StatementEnd": 932, + "CreatePos": 914, + "StatementEnd": 958, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -620,8 +620,8 @@ "Name": { "Name": "user20", "QuoteType": 1, - "NamePos": 900, - "NameEnd": 906 + "NamePos": 926, + "NameEnd": 932 }, "Scope": null, "OnCluster": null @@ -630,15 +630,15 @@ "Authentication": null, "Hosts": null, "DefaultRole": { - "DefaultPos": 907, - "DefaultEnd": 932, + "DefaultPos": 933, + "DefaultEnd": 958, "Roles": [ { "Name": { "Name": "role1", "QuoteType": 1, - "NamePos": 920, - "NameEnd": 925 + "NamePos": 946, + "NameEnd": 951 }, "Scope": null, "OnCluster": null @@ -647,8 +647,8 @@ "Name": { "Name": "role2", "QuoteType": 1, - "NamePos": 927, - "NameEnd": 932 + "NamePos": 953, + "NameEnd": 958 }, "Scope": null, "OnCluster": null @@ -662,8 +662,8 @@ "Settings": null }, { - "CreatePos": 934, - "StatementEnd": 971, + "CreatePos": 961, + "StatementEnd": 998, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -671,8 +671,8 @@ "Name": { "Name": "user21", "QuoteType": 1, - "NamePos": 946, - "NameEnd": 952 + "NamePos": 973, + "NameEnd": 979 }, "Scope": null, "OnCluster": null @@ -681,8 +681,8 @@ "Authentication": null, "Hosts": null, "DefaultRole": { - "DefaultPos": 953, - "DefaultEnd": 971, + "DefaultPos": 980, + "DefaultEnd": 998, "Roles": null, "None": true }, @@ -692,8 +692,8 @@ "Settings": null }, { - "CreatePos": 1010, - "StatementEnd": 1053, + "CreatePos": 1040, + "StatementEnd": 1083, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -701,8 +701,8 @@ "Name": { "Name": "user22", "QuoteType": 1, - "NamePos": 1022, - "NameEnd": 1028 + "NamePos": 1052, + "NameEnd": 1058 }, "Scope": null, "OnCluster": null @@ -714,16 +714,16 @@ "DefaultDatabase": { "Name": "test_db", "QuoteType": 1, - "NamePos": 1046, - "NameEnd": 1053 + "NamePos": 1076, + "NameEnd": 1083 }, "DefaultDbNone": false, "Grantees": null, "Settings": null }, { - "CreatePos": 1055, - "StatementEnd": 1096, + "CreatePos": 1086, + "StatementEnd": 1127, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -731,8 +731,8 @@ "Name": { "Name": "user23", "QuoteType": 1, - "NamePos": 1067, - "NameEnd": 1073 + "NamePos": 1098, + "NameEnd": 1104 }, "Scope": null, "OnCluster": null @@ -747,8 +747,8 @@ "Settings": null }, { - "CreatePos": 1127, - "StatementEnd": 1160, + "CreatePos": 1161, + "StatementEnd": 1194, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -756,8 +756,8 @@ "Name": { "Name": "user24", "QuoteType": 1, - "NamePos": 1139, - "NameEnd": 1145 + "NamePos": 1173, + "NameEnd": 1179 }, "Scope": null, "OnCluster": null @@ -769,15 +769,15 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1146, - "GranteesEnd": 1160, + "GranteesPos": 1180, + "GranteesEnd": 1194, "Grantees": [ { "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 1155, - "NameEnd": 1160 + "NamePos": 1189, + "NameEnd": 1194 }, "Scope": null, "OnCluster": null @@ -790,8 +790,8 @@ "Settings": null }, { - "CreatePos": 1162, - "StatementEnd": 1202, + "CreatePos": 1197, + "StatementEnd": 1237, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -799,8 +799,8 @@ "Name": { "Name": "user25", "QuoteType": 1, - "NamePos": 1174, - "NameEnd": 1180 + "NamePos": 1209, + "NameEnd": 1215 }, "Scope": null, "OnCluster": null @@ -812,15 +812,15 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1181, - "GranteesEnd": 1202, + "GranteesPos": 1216, + "GranteesEnd": 1237, "Grantees": [ { "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 1190, - "NameEnd": 1195 + "NamePos": 1225, + "NameEnd": 1230 }, "Scope": null, "OnCluster": null @@ -829,8 +829,8 @@ "Name": { "Name": "user2", "QuoteType": 1, - "NamePos": 1197, - "NameEnd": 1202 + "NamePos": 1232, + "NameEnd": 1237 }, "Scope": null, "OnCluster": null @@ -843,8 +843,8 @@ "Settings": null }, { - "CreatePos": 1204, - "StatementEnd": 1236, + "CreatePos": 1240, + "StatementEnd": 1272, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -852,8 +852,8 @@ "Name": { "Name": "user26", "QuoteType": 1, - "NamePos": 1216, - "NameEnd": 1222 + "NamePos": 1252, + "NameEnd": 1258 }, "Scope": null, "OnCluster": null @@ -865,8 +865,8 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1223, - "GranteesEnd": 1236, + "GranteesPos": 1259, + "GranteesEnd": 1272, "Grantees": null, "ExceptUsers": null, "Any": true, @@ -875,8 +875,8 @@ "Settings": null }, { - "CreatePos": 1237, - "StatementEnd": 1270, + "CreatePos": 1274, + "StatementEnd": 1307, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -884,8 +884,8 @@ "Name": { "Name": "user27", "QuoteType": 1, - "NamePos": 1249, - "NameEnd": 1255 + "NamePos": 1286, + "NameEnd": 1292 }, "Scope": null, "OnCluster": null @@ -897,8 +897,8 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1256, - "GranteesEnd": 1270, + "GranteesPos": 1293, + "GranteesEnd": 1307, "Grantees": null, "ExceptUsers": null, "Any": false, @@ -907,8 +907,8 @@ "Settings": null }, { - "CreatePos": 1271, - "StatementEnd": 1324, + "CreatePos": 1309, + "StatementEnd": 1362, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -916,8 +916,8 @@ "Name": { "Name": "user28", "QuoteType": 1, - "NamePos": 1283, - "NameEnd": 1289 + "NamePos": 1321, + "NameEnd": 1327 }, "Scope": null, "OnCluster": null @@ -929,15 +929,15 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1290, - "GranteesEnd": 1324, + "GranteesPos": 1328, + "GranteesEnd": 1362, "Grantees": [ { "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 1299, - "NameEnd": 1304 + "NamePos": 1337, + "NameEnd": 1342 }, "Scope": null, "OnCluster": null @@ -946,8 +946,8 @@ "Name": { "Name": "user2", "QuoteType": 1, - "NamePos": 1306, - "NameEnd": 1311 + "NamePos": 1344, + "NameEnd": 1349 }, "Scope": null, "OnCluster": null @@ -958,8 +958,8 @@ "Name": { "Name": "user3", "QuoteType": 1, - "NamePos": 1319, - "NameEnd": 1324 + "NamePos": 1357, + "NameEnd": 1362 }, "Scope": null, "OnCluster": null @@ -971,8 +971,8 @@ "Settings": null }, { - "CreatePos": 1356, - "StatementEnd": 1408, + "CreatePos": 1397, + "StatementEnd": 1449, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -980,8 +980,8 @@ "Name": { "Name": "user29", "QuoteType": 1, - "NamePos": 1368, - "NameEnd": 1374 + "NamePos": 1409, + "NameEnd": 1415 }, "Scope": null, "OnCluster": null @@ -1000,13 +1000,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 1384, - "NameEnd": 1400 + "NamePos": 1425, + "NameEnd": 1441 }, "Operation": "=", "Value": { - "NumPos": 1401, - "NumEnd": 1408, + "NumPos": 1442, + "NumEnd": 1449, "Literal": "5000000", "Base": 10 } @@ -1017,8 +1017,8 @@ ] }, { - "CreatePos": 1410, - "StatementEnd": 1454, + "CreatePos": 1452, + "StatementEnd": 1496, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -1026,8 +1026,8 @@ "Name": { "Name": "user30", "QuoteType": 1, - "NamePos": 1422, - "NameEnd": 1428 + "NamePos": 1464, + "NameEnd": 1470 }, "Scope": null, "OnCluster": null @@ -1046,13 +1046,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 1438, - "NameEnd": 1445 + "NamePos": 1480, + "NameEnd": 1487 }, "Operation": "", "Value": { - "LiteralPos": 1447, - "LiteralEnd": 1454, + "LiteralPos": 1489, + "LiteralEnd": 1496, "Literal": "default" } } @@ -1062,8 +1062,8 @@ ] }, { - "CreatePos": 1457, - "StatementEnd": 1521, + "CreatePos": 1500, + "StatementEnd": 1564, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -1071,8 +1071,8 @@ "Name": { "Name": "user31", "QuoteType": 1, - "NamePos": 1469, - "NameEnd": 1475 + "NamePos": 1512, + "NameEnd": 1518 }, "Scope": null, "OnCluster": null @@ -1091,13 +1091,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 1485, - "NameEnd": 1493 + "NamePos": 1528, + "NameEnd": 1536 }, "Operation": "=", "Value": { - "NumPos": 1494, - "NumEnd": 1495, + "NumPos": 1537, + "NumEnd": 1538, "Literal": "1", "Base": 10 } @@ -1111,13 +1111,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 1497, - "NameEnd": 1513 + "NamePos": 1540, + "NameEnd": 1556 }, "Operation": "=", "Value": { - "NumPos": 1514, - "NumEnd": 1521, + "NumPos": 1557, + "NumEnd": 1564, "Literal": "5000000", "Base": 10 } @@ -1128,8 +1128,8 @@ ] }, { - "CreatePos": 1569, - "StatementEnd": 1815, + "CreatePos": 1615, + "StatementEnd": 1867, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -1137,21 +1137,21 @@ "Name": { "Name": "user32", "QuoteType": 1, - "NamePos": 1581, - "NameEnd": 1587 + "NamePos": 1627, + "NameEnd": 1633 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 1593, - "AuthEnd": 1640, + "AuthPos": 1640, + "AuthEnd": 1687, "NotIdentified": false, "AuthType": "plaintext_password", "AuthValue": { - "LiteralPos": 1632, - "LiteralEnd": 1640, + "LiteralPos": 1679, + "LiteralEnd": 1687, "Literal": "password" }, "LdapServer": null, @@ -1160,26 +1160,26 @@ }, "Hosts": [ { - "HostPos": 1646, - "HostEnd": 1666, + "HostPos": 1694, + "HostEnd": 1714, "HostType": "NAME", "HostValue": { - "LiteralPos": 1657, - "LiteralEnd": 1666, + "LiteralPos": 1705, + "LiteralEnd": 1714, "Literal": "localhost" } } ], "DefaultRole": { - "DefaultPos": 1672, - "DefaultEnd": 1697, + "DefaultPos": 1721, + "DefaultEnd": 1746, "Roles": [ { "Name": { "Name": "role1", "QuoteType": 1, - "NamePos": 1685, - "NameEnd": 1690 + "NamePos": 1734, + "NameEnd": 1739 }, "Scope": null, "OnCluster": null @@ -1188,8 +1188,8 @@ "Name": { "Name": "role2", "QuoteType": 1, - "NamePos": 1692, - "NameEnd": 1697 + "NamePos": 1741, + "NameEnd": 1746 }, "Scope": null, "OnCluster": null @@ -1200,20 +1200,20 @@ "DefaultDatabase": { "Name": "test_db", "QuoteType": 1, - "NamePos": 1719, - "NameEnd": 1726 + "NamePos": 1769, + "NameEnd": 1776 }, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1731, - "GranteesEnd": 1765, + "GranteesPos": 1782, + "GranteesEnd": 1816, "Grantees": [ { "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 1740, - "NameEnd": 1745 + "NamePos": 1791, + "NameEnd": 1796 }, "Scope": null, "OnCluster": null @@ -1222,8 +1222,8 @@ "Name": { "Name": "user2", "QuoteType": 1, - "NamePos": 1747, - "NameEnd": 1752 + "NamePos": 1798, + "NameEnd": 1803 }, "Scope": null, "OnCluster": null @@ -1234,8 +1234,8 @@ "Name": { "Name": "user3", "QuoteType": 1, - "NamePos": 1760, - "NameEnd": 1765 + "NamePos": 1811, + "NameEnd": 1816 }, "Scope": null, "OnCluster": null @@ -1251,13 +1251,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 1779, - "NameEnd": 1795 + "NamePos": 1831, + "NameEnd": 1847 }, "Operation": "=", "Value": { - "NumPos": 1796, - "NumEnd": 1803, + "NumPos": 1848, + "NumEnd": 1855, "Literal": "5000000", "Base": 10 } @@ -1271,13 +1271,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 1805, - "NameEnd": 1813 + "NamePos": 1857, + "NameEnd": 1865 }, "Operation": "=", "Value": { - "NumPos": 1814, - "NumEnd": 1815, + "NumPos": 1866, + "NumEnd": 1867, "Literal": "1", "Base": 10 } diff --git a/parser/testdata/ddl/output/create_view_basic.sql.golden.json b/parser/testdata/ddl/output/create_view_basic.sql.golden.json index c05c781..9e99d2e 100644 --- a/parser/testdata/ddl/output/create_view_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_view_basic.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 104, + "StatementEnd": 110, "OrReplace": false, "Name": { "Database": null, @@ -86,8 +86,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 63, - "StatementEnd": 104, + "SelectPos": 65, + "StatementEnd": 110, "With": null, "Top": null, "HasDistinct": false, @@ -97,8 +97,8 @@ "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 74, - "NameEnd": 76 + "NamePos": 77, + "NameEnd": 79 }, "Modifiers": [], "Alias": null @@ -107,32 +107,32 @@ "Expr": { "Name": "name", "QuoteType": 1, - "NamePos": 82, - "NameEnd": 86 + "NamePos": 86, + "NameEnd": 90 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 87, + "FromPos": 92, "Expr": { "Table": { - "TablePos": 96, - "TableEnd": 104, + "TablePos": 102, + "TableEnd": 110, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "my_table", "QuoteType": 1, - "NamePos": 96, - "NameEnd": 104 + "NamePos": 102, + "NameEnd": 110 } }, "HasFinal": false }, - "StatementEnd": 104, + "StatementEnd": 110, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/ddl/output/create_view_on_cluster_with_uuid.sql.golden.json b/parser/testdata/ddl/output/create_view_on_cluster_with_uuid.sql.golden.json index f5ec828..44b5449 100644 --- a/parser/testdata/ddl/output/create_view_on_cluster_with_uuid.sql.golden.json +++ b/parser/testdata/ddl/output/create_view_on_cluster_with_uuid.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 199, + "StatementEnd": 207, "OrReplace": false, "Name": { "Database": { @@ -20,16 +20,16 @@ "IfNotExists": true, "UUID": { "Value": { - "LiteralPos": 61, - "LiteralEnd": 97, + "LiteralPos": 62, + "LiteralEnd": 98, "Literal": "3493e374-e2bb-481b-b493-e374e2bb981b" } }, "OnCluster": { - "OnPos": 107, + "OnPos": 109, "Expr": { - "LiteralPos": 119, - "LiteralEnd": 129, + "LiteralPos": 121, + "LiteralEnd": 131, "Literal": "my_cluster" } }, @@ -37,8 +37,8 @@ "SubQuery": { "HasParen": true, "Select": { - "SelectPos": 140, - "StatementEnd": 199, + "SelectPos": 144, + "StatementEnd": 207, "With": null, "Top": null, "HasDistinct": false, @@ -48,8 +48,8 @@ "Expr": { "Name": "column1", "QuoteType": 1, - "NamePos": 151, - "NameEnd": 158 + "NamePos": 156, + "NameEnd": 163 }, "Modifiers": [], "Alias": null @@ -58,32 +58,32 @@ "Expr": { "Name": "column2", "QuoteType": 1, - "NamePos": 164, - "NameEnd": 171 + "NamePos": 170, + "NameEnd": 177 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 176, + "FromPos": 183, "Expr": { "Table": { - "TablePos": 185, - "TableEnd": 199, + "TablePos": 193, + "TableEnd": 207, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "my_other_table", "QuoteType": 1, - "NamePos": 185, - "NameEnd": 199 + "NamePos": 193, + "NameEnd": 207 } }, "HasFinal": false }, - "StatementEnd": 199, + "StatementEnd": 207, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/ddl/output/drop_role.sql.golden.json b/parser/testdata/ddl/output/drop_role.sql.golden.json index fb43780..0e49caf 100644 --- a/parser/testdata/ddl/output/drop_role.sql.golden.json +++ b/parser/testdata/ddl/output/drop_role.sql.golden.json @@ -100,16 +100,16 @@ "From": null }, { - "DropPos": 110, + "DropPos": 111, "Target": "ROLE", - "StatementEnd": 146, + "StatementEnd": 147, "Names": [ { "Name": { "Name": "r2_01293_renamed", "QuoteType": 1, - "NamePos": 130, - "NameEnd": 146 + "NamePos": 131, + "NameEnd": 147 }, "Scope": null, "OnCluster": null @@ -120,28 +120,28 @@ "From": null }, { - "DropPos": 148, + "DropPos": 150, "Target": "ROLE", - "StatementEnd": 204, + "StatementEnd": 206, "Names": [ { "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 168, - "NameEnd": 176 + "NamePos": 170, + "NameEnd": 178 }, "Scope": { - "LiteralPos": 178, - "LiteralEnd": 179, + "LiteralPos": 180, + "LiteralEnd": 181, "Literal": "%" }, "OnCluster": null }, { "Name": { - "LiteralPos": 183, - "LiteralEnd": 204, + "LiteralPos": 185, + "LiteralEnd": 206, "Literal": "r2_01293@%.myhost.com" }, "Scope": null, diff --git a/parser/testdata/ddl/output/grant_privilege.sql.golden.json b/parser/testdata/ddl/output/grant_privilege.sql.golden.json index 0a6a7d2..4a438c8 100644 --- a/parser/testdata/ddl/output/grant_privilege.sql.golden.json +++ b/parser/testdata/ddl/output/grant_privilege.sql.golden.json @@ -67,30 +67,30 @@ "WithOptions": [] }, { - "GrantPos": 39, - "StatementEnd": 113, + "GrantPos": 40, + "StatementEnd": 114, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 45, + "PrivilegePos": 46, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 51, - "RightParenPos": 55, + "LeftParenPos": 52, + "RightParenPos": 56, "Items": { - "ListPos": 52, - "ListEnd": 55, + "ListPos": 53, + "ListEnd": 56, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 52, - "NameEnd": 53 + "NamePos": 53, + "NameEnd": 54 }, "Alias": null }, @@ -98,8 +98,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 54, - "NameEnd": 55 + "NamePos": 55, + "NameEnd": 56 }, "Alias": null } @@ -113,22 +113,22 @@ "Database": { "Name": "db", "QuoteType": 1, - "NamePos": 60, - "NameEnd": 62 + "NamePos": 61, + "NameEnd": 63 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 63, - "NameEnd": 68 + "NamePos": 64, + "NameEnd": 69 } }, "To": [ { "Name": "john", "QuoteType": 1, - "NamePos": 72, - "NameEnd": 76 + "NamePos": 73, + "NameEnd": 77 } ], "WithOptions": [ @@ -137,30 +137,30 @@ ] }, { - "GrantPos": 114, - "StatementEnd": 147, + "GrantPos": 116, + "StatementEnd": 149, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 120, + "PrivilegePos": 122, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 126, - "RightParenPos": 130, + "LeftParenPos": 128, + "RightParenPos": 132, "Items": { - "ListPos": 127, - "ListEnd": 130, + "ListPos": 129, + "ListEnd": 132, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 127, - "NameEnd": 128 + "NamePos": 129, + "NameEnd": 130 }, "Alias": null }, @@ -168,8 +168,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 130 + "NamePos": 131, + "NameEnd": 132 }, "Alias": null } @@ -183,51 +183,51 @@ "Database": { "Name": "db", "QuoteType": 1, - "NamePos": 135, - "NameEnd": 137 + "NamePos": 137, + "NameEnd": 139 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 138, - "NameEnd": 139 + "NamePos": 140, + "NameEnd": 141 } }, "To": [ { "Name": "john", "QuoteType": 1, - "NamePos": 143, - "NameEnd": 147 + "NamePos": 145, + "NameEnd": 149 } ], "WithOptions": [] }, { - "GrantPos": 149, - "StatementEnd": 185, + "GrantPos": 152, + "StatementEnd": 188, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 155, + "PrivilegePos": 158, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 161, - "RightParenPos": 165, + "LeftParenPos": 164, + "RightParenPos": 168, "Items": { - "ListPos": 162, - "ListEnd": 165, + "ListPos": 165, + "ListEnd": 168, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 162, - "NameEnd": 163 + "NamePos": 165, + "NameEnd": 166 }, "Alias": null }, @@ -235,8 +235,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 164, - "NameEnd": 165 + "NamePos": 167, + "NameEnd": 168 }, "Alias": null } @@ -250,51 +250,51 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 170, - "NameEnd": 171 + "NamePos": 173, + "NameEnd": 174 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 172, - "NameEnd": 177 + "NamePos": 175, + "NameEnd": 180 } }, "To": [ { "Name": "john", "QuoteType": 1, - "NamePos": 181, - "NameEnd": 185 + "NamePos": 184, + "NameEnd": 188 } ], "WithOptions": [] }, { - "GrantPos": 187, - "StatementEnd": 219, + "GrantPos": 191, + "StatementEnd": 223, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 193, + "PrivilegePos": 197, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 199, - "RightParenPos": 203, + "LeftParenPos": 203, + "RightParenPos": 207, "Items": { - "ListPos": 200, - "ListEnd": 203, + "ListPos": 204, + "ListEnd": 207, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 200, - "NameEnd": 201 + "NamePos": 204, + "NameEnd": 205 }, "Alias": null }, @@ -302,8 +302,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 202, - "NameEnd": 203 + "NamePos": 206, + "NameEnd": 207 }, "Alias": null } @@ -317,51 +317,51 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 208, - "NameEnd": 209 + "NamePos": 212, + "NameEnd": 213 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 210, - "NameEnd": 211 + "NamePos": 214, + "NameEnd": 215 } }, "To": [ { "Name": "john", "QuoteType": 1, - "NamePos": 215, - "NameEnd": 219 + "NamePos": 219, + "NameEnd": 223 } ], "WithOptions": [] }, { - "GrantPos": 221, - "StatementEnd": 265, + "GrantPos": 226, + "StatementEnd": 270, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 227, + "PrivilegePos": 232, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 233, - "RightParenPos": 237, + "LeftParenPos": 238, + "RightParenPos": 242, "Items": { - "ListPos": 234, - "ListEnd": 237, + "ListPos": 239, + "ListEnd": 242, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 234, - "NameEnd": 235 + "NamePos": 239, + "NameEnd": 240 }, "Alias": null }, @@ -369,8 +369,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 236, - "NameEnd": 237 + "NamePos": 241, + "NameEnd": 242 }, "Alias": null } @@ -384,51 +384,51 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 242, - "NameEnd": 243 + "NamePos": 247, + "NameEnd": 248 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 244, - "NameEnd": 249 + "NamePos": 249, + "NameEnd": 254 } }, "To": [ { "Name": "CURRENT_USER", "QuoteType": 1, - "NamePos": 253, - "NameEnd": 265 + "NamePos": 258, + "NameEnd": 270 } ], "WithOptions": [] }, { - "GrantPos": 267, - "StatementEnd": 321, + "GrantPos": 273, + "StatementEnd": 327, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 273, + "PrivilegePos": 279, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 279, - "RightParenPos": 283, + "LeftParenPos": 285, + "RightParenPos": 289, "Items": { - "ListPos": 280, - "ListEnd": 283, + "ListPos": 286, + "ListEnd": 289, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 280, - "NameEnd": 281 + "NamePos": 286, + "NameEnd": 287 }, "Alias": null }, @@ -436,8 +436,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 282, - "NameEnd": 283 + "NamePos": 288, + "NameEnd": 289 }, "Alias": null } @@ -451,45 +451,45 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 288, - "NameEnd": 289 + "NamePos": 294, + "NameEnd": 295 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 290, - "NameEnd": 295 + "NamePos": 296, + "NameEnd": 301 } }, "To": [ { "Name": "CURRENT_USER", "QuoteType": 1, - "NamePos": 299, - "NameEnd": 311 + "NamePos": 305, + "NameEnd": 317 }, { "Name": "john", "QuoteType": 1, - "NamePos": 312, - "NameEnd": 316 + "NamePos": 318, + "NameEnd": 322 }, { "Name": "mary", "QuoteType": 1, - "NamePos": 317, - "NameEnd": 321 + "NamePos": 323, + "NameEnd": 327 } ], "WithOptions": [] }, { - "GrantPos": 323, - "StatementEnd": 372, + "GrantPos": 330, + "StatementEnd": 379, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 329, + "PrivilegePos": 336, "PrivilegeEnd": 0, "Keywords": [ "ALL" @@ -501,22 +501,22 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 336, - "NameEnd": 337 + "NamePos": 343, + "NameEnd": 344 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 338, - "NameEnd": 339 + "NamePos": 345, + "NameEnd": 346 } }, "To": [ { "Name": "admin_role", "QuoteType": 1, - "NamePos": 343, - "NameEnd": 353 + "NamePos": 350, + "NameEnd": 360 } ], "WithOptions": [ @@ -524,12 +524,12 @@ ] }, { - "GrantPos": 373, - "StatementEnd": 435, + "GrantPos": 381, + "StatementEnd": 443, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 379, + "PrivilegePos": 387, "PrivilegeEnd": 0, "Keywords": [ "SELECT" @@ -537,7 +537,7 @@ "Params": null }, { - "PrivilegePos": 386, + "PrivilegePos": 394, "PrivilegeEnd": 0, "Keywords": [ "INSERT" @@ -549,51 +549,51 @@ "Database": { "Name": "database", "QuoteType": 1, - "NamePos": 396, - "NameEnd": 404 + "NamePos": 404, + "NameEnd": 412 }, "Table": { "Name": "table_1", "QuoteType": 1, - "NamePos": 405, - "NameEnd": 412 + "NamePos": 413, + "NameEnd": 420 } }, "To": [ { "Name": "table_1_select_role", "QuoteType": 1, - "NamePos": 416, - "NameEnd": 435 + "NamePos": 424, + "NameEnd": 443 } ], "WithOptions": [] }, { - "GrantPos": 437, - "StatementEnd": 508, + "GrantPos": 446, + "StatementEnd": 517, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 443, + "PrivilegePos": 452, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 449, - "RightParenPos": 457, + "LeftParenPos": 458, + "RightParenPos": 466, "Items": { - "ListPos": 450, - "ListEnd": 457, + "ListPos": 459, + "ListEnd": 466, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 450, - "NameEnd": 451 + "NamePos": 459, + "NameEnd": 460 }, "Alias": null }, @@ -601,8 +601,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 453, - "NameEnd": 454 + "NamePos": 462, + "NameEnd": 463 }, "Alias": null }, @@ -610,8 +610,8 @@ "Expr": { "Name": "z", "QuoteType": 1, - "NamePos": 456, - "NameEnd": 457 + "NamePos": 465, + "NameEnd": 466 }, "Alias": null } @@ -621,7 +621,7 @@ } }, { - "PrivilegePos": 459, + "PrivilegePos": 468, "PrivilegeEnd": 0, "Keywords": [ "INSERT" @@ -633,33 +633,33 @@ "Database": { "Name": "database", "QuoteType": 1, - "NamePos": 469, - "NameEnd": 477 + "NamePos": 478, + "NameEnd": 486 }, "Table": { "Name": "table_1", "QuoteType": 1, - "NamePos": 478, - "NameEnd": 485 + "NamePos": 487, + "NameEnd": 494 } }, "To": [ { "Name": "table_1_select_role", "QuoteType": 1, - "NamePos": 489, - "NameEnd": 508 + "NamePos": 498, + "NameEnd": 517 } ], "WithOptions": [] }, { - "GrantPos": 510, - "StatementEnd": 558, + "GrantPos": 520, + "StatementEnd": 568, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 516, + "PrivilegePos": 526, "PrivilegeEnd": 0, "Keywords": [ "SELECT" @@ -667,7 +667,7 @@ "Params": null }, { - "PrivilegePos": 524, + "PrivilegePos": 534, "PrivilegeEnd": 0, "Keywords": [ "dictGet" @@ -679,33 +679,33 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 535, - "NameEnd": 536 + "NamePos": 545, + "NameEnd": 546 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 537, - "NameEnd": 538 + "NamePos": 547, + "NameEnd": 548 } }, "To": [ { "Name": "select_all_role", "QuoteType": 1, - "NamePos": 543, - "NameEnd": 558 + "NamePos": 553, + "NameEnd": 568 } ], "WithOptions": [] }, { - "GrantPos": 560, - "StatementEnd": 605, + "GrantPos": 571, + "StatementEnd": 616, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 566, + "PrivilegePos": 577, "PrivilegeEnd": 0, "Keywords": [ "ADMIN", @@ -718,22 +718,22 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 582, - "NameEnd": 583 + "NamePos": 593, + "NameEnd": 594 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 584, - "NameEnd": 585 + "NamePos": 595, + "NameEnd": 596 } }, "To": [ { "Name": "select_all_role", "QuoteType": 1, - "NamePos": 590, - "NameEnd": 605 + "NamePos": 601, + "NameEnd": 616 } ], "WithOptions": [] diff --git a/parser/testdata/ddl/output/optimize.sql.golden.json b/parser/testdata/ddl/output/optimize.sql.golden.json index 31a555b..e3d1aae 100644 --- a/parser/testdata/ddl/output/optimize.sql.golden.json +++ b/parser/testdata/ddl/output/optimize.sql.golden.json @@ -21,33 +21,33 @@ } }, { - "OptimizePos": 49, - "StatementEnd": 85, + "OptimizePos": 50, + "StatementEnd": 86, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 64, - "NameEnd": 69 + "NamePos": 65, + "NameEnd": 70 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 70, + "DeduplicatePos": 71, "By": { - "ListPos": 85, - "ListEnd": 85, + "ListPos": 86, + "ListEnd": 86, "HasDistinct": false, "Items": [ { "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 85, - "NameEnd": 85 + "NamePos": 86, + "NameEnd": 86 }, "Alias": null } @@ -57,33 +57,33 @@ } }, { - "OptimizePos": 131, - "StatementEnd": 181, + "OptimizePos": 133, + "StatementEnd": 183, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 146, - "NameEnd": 151 + "NamePos": 148, + "NameEnd": 153 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 152, + "DeduplicatePos": 154, "By": { - "ListPos": 167, - "ListEnd": 181, + "ListPos": 169, + "ListEnd": 183, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 167, - "NameEnd": 171 + "NamePos": 169, + "NameEnd": 173 }, "Alias": null }, @@ -91,8 +91,8 @@ "Expr": { "Name": "colY", "QuoteType": 1, - "NamePos": 172, - "NameEnd": 176 + "NamePos": 174, + "NameEnd": 178 }, "Alias": null }, @@ -100,8 +100,8 @@ "Expr": { "Name": "colZ", "QuoteType": 1, - "NamePos": 177, - "NameEnd": 181 + "NamePos": 179, + "NameEnd": 183 }, "Alias": null } @@ -111,49 +111,49 @@ } }, { - "OptimizePos": 183, - "StatementEnd": 219, + "OptimizePos": 186, + "StatementEnd": 222, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 198, - "NameEnd": 203 + "NamePos": 201, + "NameEnd": 206 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 204, + "DeduplicatePos": 207, "By": { - "ListPos": 219, - "ListEnd": 219, + "ListPos": 222, + "ListEnd": 222, "HasDistinct": false, "Items": [ { "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 219, - "NameEnd": 219 + "NamePos": 222, + "NameEnd": 222 }, "Alias": null } ] }, "Except": { - "ListPos": 228, - "ListEnd": 232, + "ListPos": 231, + "ListEnd": 235, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 228, - "NameEnd": 232 + "NamePos": 231, + "NameEnd": 235 }, "Alias": null } @@ -162,58 +162,58 @@ } }, { - "OptimizePos": 234, - "StatementEnd": 270, + "OptimizePos": 238, + "StatementEnd": 274, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 249, - "NameEnd": 254 + "NamePos": 253, + "NameEnd": 258 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 255, + "DeduplicatePos": 259, "By": { - "ListPos": 270, - "ListEnd": 270, + "ListPos": 274, + "ListEnd": 274, "HasDistinct": false, "Items": [ { "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 270, - "NameEnd": 270 + "NamePos": 274, + "NameEnd": 274 }, "Alias": null } ] }, "Except": { - "ListPos": 279, - "ListEnd": 290, + "ListPos": 283, + "ListEnd": 294, "HasDistinct": false, "Items": [ { "Expr": { - "LeftParenPos": 279, - "RightParenPos": 290, + "LeftParenPos": 283, + "RightParenPos": 294, "Items": { - "ListPos": 280, - "ListEnd": 290, + "ListPos": 284, + "ListEnd": 294, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 280, - "NameEnd": 284 + "NamePos": 284, + "NameEnd": 288 }, "Alias": null }, @@ -221,8 +221,8 @@ "Expr": { "Name": "colY", "QuoteType": 1, - "NamePos": 286, - "NameEnd": 290 + "NamePos": 290, + "NameEnd": 294 }, "Alias": null } @@ -237,25 +237,25 @@ } }, { - "OptimizePos": 293, - "StatementEnd": 362, + "OptimizePos": 298, + "StatementEnd": 367, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 308, - "NameEnd": 313 + "NamePos": 313, + "NameEnd": 318 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 314, + "DeduplicatePos": 319, "By": { - "ListPos": 329, - "ListEnd": 362, + "ListPos": 334, + "ListEnd": 367, "HasDistinct": false, "Items": [ { @@ -263,21 +263,21 @@ "Name": { "Name": "COLUMNS", "QuoteType": 1, - "NamePos": 329, - "NameEnd": 336 + "NamePos": 334, + "NameEnd": 341 }, "Params": { - "LeftParenPos": 336, - "RightParenPos": 362, + "LeftParenPos": 341, + "RightParenPos": 367, "Items": { - "ListPos": 338, - "ListEnd": 361, + "ListPos": 343, + "ListEnd": 366, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 338, - "LiteralEnd": 361, + "LiteralPos": 343, + "LiteralEnd": 366, "Literal": "column-matched-by-regex" }, "Alias": null @@ -295,25 +295,25 @@ } }, { - "OptimizePos": 365, - "StatementEnd": 434, + "OptimizePos": 371, + "StatementEnd": 440, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 380, - "NameEnd": 385 + "NamePos": 386, + "NameEnd": 391 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 386, + "DeduplicatePos": 392, "By": { - "ListPos": 401, - "ListEnd": 434, + "ListPos": 407, + "ListEnd": 440, "HasDistinct": false, "Items": [ { @@ -321,21 +321,21 @@ "Name": { "Name": "COLUMNS", "QuoteType": 1, - "NamePos": 401, - "NameEnd": 408 + "NamePos": 407, + "NameEnd": 414 }, "Params": { - "LeftParenPos": 408, - "RightParenPos": 434, + "LeftParenPos": 414, + "RightParenPos": 440, "Items": { - "ListPos": 410, - "ListEnd": 433, + "ListPos": 416, + "ListEnd": 439, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 410, - "LiteralEnd": 433, + "LiteralPos": 416, + "LiteralEnd": 439, "Literal": "column-matched-by-regex" }, "Alias": null @@ -350,16 +350,16 @@ ] }, "Except": { - "ListPos": 443, - "ListEnd": 447, + "ListPos": 449, + "ListEnd": 453, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 443, - "NameEnd": 447 + "NamePos": 449, + "NameEnd": 453 }, "Alias": null } @@ -368,25 +368,25 @@ } }, { - "OptimizePos": 449, - "StatementEnd": 518, + "OptimizePos": 456, + "StatementEnd": 525, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 464, - "NameEnd": 469 + "NamePos": 471, + "NameEnd": 476 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 470, + "DeduplicatePos": 477, "By": { - "ListPos": 485, - "ListEnd": 518, + "ListPos": 492, + "ListEnd": 525, "HasDistinct": false, "Items": [ { @@ -394,21 +394,21 @@ "Name": { "Name": "COLUMNS", "QuoteType": 1, - "NamePos": 485, - "NameEnd": 492 + "NamePos": 492, + "NameEnd": 499 }, "Params": { - "LeftParenPos": 492, - "RightParenPos": 518, + "LeftParenPos": 499, + "RightParenPos": 525, "Items": { - "ListPos": 494, - "ListEnd": 517, + "ListPos": 501, + "ListEnd": 524, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 494, - "LiteralEnd": 517, + "LiteralPos": 501, + "LiteralEnd": 524, "Literal": "column-matched-by-regex" }, "Alias": null @@ -423,25 +423,25 @@ ] }, "Except": { - "ListPos": 527, - "ListEnd": 538, + "ListPos": 534, + "ListEnd": 545, "HasDistinct": false, "Items": [ { "Expr": { - "LeftParenPos": 527, - "RightParenPos": 538, + "LeftParenPos": 534, + "RightParenPos": 545, "Items": { - "ListPos": 528, - "ListEnd": 538, + "ListPos": 535, + "ListEnd": 545, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 528, - "NameEnd": 532 + "NamePos": 535, + "NameEnd": 539 }, "Alias": null }, @@ -449,8 +449,8 @@ "Expr": { "Name": "colY", "QuoteType": 1, - "NamePos": 534, - "NameEnd": 538 + "NamePos": 541, + "NameEnd": 545 }, "Alias": null } diff --git a/parser/testdata/ddl/output/rename.sql.golden.json b/parser/testdata/ddl/output/rename.sql.golden.json index dfef0e7..00e2899 100644 --- a/parser/testdata/ddl/output/rename.sql.golden.json +++ b/parser/testdata/ddl/output/rename.sql.golden.json @@ -1,7 +1,7 @@ [ { - "RenamePos": 16, - "StatementEnd": 38, + "RenamePos": 17, + "StatementEnd": 39, "RenameTarget": "TABLE", "TargetPairList": [ { @@ -10,8 +10,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 29, - "NameEnd": 31 + "NamePos": 30, + "NameEnd": 32 } }, "New": { @@ -19,8 +19,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 35, - "NameEnd": 38 + "NamePos": 36, + "NameEnd": 39 } } } @@ -28,8 +28,8 @@ "OnCluster": null }, { - "RenamePos": 40, - "StatementEnd": 90, + "RenamePos": 42, + "StatementEnd": 92, "RenameTarget": "TABLE", "TargetPairList": [ { @@ -38,8 +38,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 53, - "NameEnd": 55 + "NamePos": 55, + "NameEnd": 57 } }, "New": { @@ -47,24 +47,24 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 59, - "NameEnd": 62 + "NamePos": 61, + "NameEnd": 64 } } } ], "OnCluster": { - "OnPos": 63, + "OnPos": 65, "Expr": { - "LiteralPos": 75, - "LiteralEnd": 90, + "LiteralPos": 77, + "LiteralEnd": 92, "Literal": "default_cluster" } } }, { - "RenamePos": 93, - "StatementEnd": 126, + "RenamePos": 96, + "StatementEnd": 129, "RenameTarget": "TABLE", "TargetPairList": [ { @@ -73,8 +73,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 106, - "NameEnd": 108 + "NamePos": 109, + "NameEnd": 111 } }, "New": { @@ -82,8 +82,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 112, - "NameEnd": 115 + "NamePos": 115, + "NameEnd": 118 } } }, @@ -93,8 +93,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 117, - "NameEnd": 119 + "NamePos": 120, + "NameEnd": 122 } }, "New": { @@ -102,8 +102,8 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 123, - "NameEnd": 126 + "NamePos": 126, + "NameEnd": 129 } } } @@ -111,8 +111,8 @@ "OnCluster": null }, { - "RenamePos": 128, - "StatementEnd": 189, + "RenamePos": 132, + "StatementEnd": 193, "RenameTarget": "TABLE", "TargetPairList": [ { @@ -121,8 +121,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 141, - "NameEnd": 143 + "NamePos": 145, + "NameEnd": 147 } }, "New": { @@ -130,8 +130,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 147, - "NameEnd": 150 + "NamePos": 151, + "NameEnd": 154 } } }, @@ -141,8 +141,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 152, - "NameEnd": 154 + "NamePos": 156, + "NameEnd": 158 } }, "New": { @@ -150,24 +150,24 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 158, - "NameEnd": 161 + "NamePos": 162, + "NameEnd": 165 } } } ], "OnCluster": { - "OnPos": 162, + "OnPos": 166, "Expr": { - "LiteralPos": 174, - "LiteralEnd": 189, + "LiteralPos": 178, + "LiteralEnd": 193, "Literal": "default_cluster" } } }, { - "RenamePos": 216, - "StatementEnd": 243, + "RenamePos": 222, + "StatementEnd": 249, "RenameTarget": "DICTIONARY", "TargetPairList": [ { @@ -176,8 +176,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 234, - "NameEnd": 236 + "NamePos": 240, + "NameEnd": 242 } }, "New": { @@ -185,8 +185,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 240, - "NameEnd": 243 + "NamePos": 246, + "NameEnd": 249 } } } @@ -194,8 +194,8 @@ "OnCluster": null }, { - "RenamePos": 245, - "StatementEnd": 300, + "RenamePos": 252, + "StatementEnd": 307, "RenameTarget": "DICTIONARY", "TargetPairList": [ { @@ -204,8 +204,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 263, - "NameEnd": 265 + "NamePos": 270, + "NameEnd": 272 } }, "New": { @@ -213,24 +213,24 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 269, - "NameEnd": 272 + "NamePos": 276, + "NameEnd": 279 } } } ], "OnCluster": { - "OnPos": 273, + "OnPos": 280, "Expr": { - "LiteralPos": 285, - "LiteralEnd": 300, + "LiteralPos": 292, + "LiteralEnd": 307, "Literal": "default_cluster" } } }, { - "RenamePos": 303, - "StatementEnd": 341, + "RenamePos": 311, + "StatementEnd": 349, "RenameTarget": "DICTIONARY", "TargetPairList": [ { @@ -239,8 +239,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 321, - "NameEnd": 323 + "NamePos": 329, + "NameEnd": 331 } }, "New": { @@ -248,8 +248,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 327, - "NameEnd": 330 + "NamePos": 335, + "NameEnd": 338 } } }, @@ -259,8 +259,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 332, - "NameEnd": 334 + "NamePos": 340, + "NameEnd": 342 } }, "New": { @@ -268,8 +268,8 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 338, - "NameEnd": 341 + "NamePos": 346, + "NameEnd": 349 } } } @@ -277,8 +277,8 @@ "OnCluster": null }, { - "RenamePos": 343, - "StatementEnd": 409, + "RenamePos": 352, + "StatementEnd": 418, "RenameTarget": "DICTIONARY", "TargetPairList": [ { @@ -287,8 +287,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 361, - "NameEnd": 363 + "NamePos": 370, + "NameEnd": 372 } }, "New": { @@ -296,8 +296,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 367, - "NameEnd": 370 + "NamePos": 376, + "NameEnd": 379 } } }, @@ -307,8 +307,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 372, - "NameEnd": 374 + "NamePos": 381, + "NameEnd": 383 } }, "New": { @@ -316,24 +316,24 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 378, - "NameEnd": 381 + "NamePos": 387, + "NameEnd": 390 } } } ], "OnCluster": { - "OnPos": 382, + "OnPos": 391, "Expr": { - "LiteralPos": 394, - "LiteralEnd": 409, + "LiteralPos": 403, + "LiteralEnd": 418, "Literal": "default_cluster" } } }, { - "RenamePos": 431, - "StatementEnd": 456, + "RenamePos": 442, + "StatementEnd": 467, "RenameTarget": "DATABASE", "TargetPairList": [ { @@ -342,8 +342,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 447, - "NameEnd": 449 + "NamePos": 458, + "NameEnd": 460 } }, "New": { @@ -351,8 +351,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 453, - "NameEnd": 456 + "NamePos": 464, + "NameEnd": 467 } } } @@ -360,8 +360,8 @@ "OnCluster": null }, { - "RenamePos": 458, - "StatementEnd": 511, + "RenamePos": 470, + "StatementEnd": 523, "RenameTarget": "DATABASE", "TargetPairList": [ { @@ -370,8 +370,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 474, - "NameEnd": 476 + "NamePos": 486, + "NameEnd": 488 } }, "New": { @@ -379,24 +379,24 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 480, - "NameEnd": 483 + "NamePos": 492, + "NameEnd": 495 } } } ], "OnCluster": { - "OnPos": 484, + "OnPos": 496, "Expr": { - "LiteralPos": 496, - "LiteralEnd": 511, + "LiteralPos": 508, + "LiteralEnd": 523, "Literal": "default_cluster" } } }, { - "RenamePos": 514, - "StatementEnd": 550, + "RenamePos": 527, + "StatementEnd": 563, "RenameTarget": "DATABASE", "TargetPairList": [ { @@ -405,8 +405,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 530, - "NameEnd": 532 + "NamePos": 543, + "NameEnd": 545 } }, "New": { @@ -414,8 +414,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 536, - "NameEnd": 539 + "NamePos": 549, + "NameEnd": 552 } } }, @@ -425,8 +425,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 541, - "NameEnd": 543 + "NamePos": 554, + "NameEnd": 556 } }, "New": { @@ -434,8 +434,8 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 547, - "NameEnd": 550 + "NamePos": 560, + "NameEnd": 563 } } } @@ -443,8 +443,8 @@ "OnCluster": null }, { - "RenamePos": 552, - "StatementEnd": 616, + "RenamePos": 566, + "StatementEnd": 630, "RenameTarget": "DATABASE", "TargetPairList": [ { @@ -453,8 +453,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 568, - "NameEnd": 570 + "NamePos": 582, + "NameEnd": 584 } }, "New": { @@ -462,8 +462,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 574, - "NameEnd": 577 + "NamePos": 588, + "NameEnd": 591 } } }, @@ -473,8 +473,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 579, - "NameEnd": 581 + "NamePos": 593, + "NameEnd": 595 } }, "New": { @@ -482,17 +482,17 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 585, - "NameEnd": 588 + "NamePos": 599, + "NameEnd": 602 } } } ], "OnCluster": { - "OnPos": 589, + "OnPos": 603, "Expr": { - "LiteralPos": 601, - "LiteralEnd": 616, + "LiteralPos": 615, + "LiteralEnd": 630, "Literal": "default_cluster" } } diff --git a/parser/testdata/ddl/output/systems.sql.golden.json b/parser/testdata/ddl/output/systems.sql.golden.json index 6b87597..5c1e6e4 100644 --- a/parser/testdata/ddl/output/systems.sql.golden.json +++ b/parser/testdata/ddl/output/systems.sql.golden.json @@ -9,18 +9,18 @@ } }, { - "SystemPos": 19, + "SystemPos": 20, "Expr": { - "DropPos": 26, - "StatementEnd": 49, + "DropPos": 27, + "StatementEnd": 50, "Type": "UNCOMPRESSED CACHE" } }, { - "SystemPos": 51, + "SystemPos": 53, "Expr": { - "DropPos": 58, - "StatementEnd": 79, + "DropPos": 60, + "StatementEnd": 81, "Type": "FILESYSTEM CACHE" } } diff --git a/parser/testdata/dml/output/alter_table_with_comment.sql.golden.json b/parser/testdata/dml/output/alter_table_with_comment.sql.golden.json index b92a2e3..8270fc5 100644 --- a/parser/testdata/dml/output/alter_table_with_comment.sql.golden.json +++ b/parser/testdata/dml/output/alter_table_with_comment.sql.golden.json @@ -77,43 +77,43 @@ ] }, { - "AlterPos": 110, - "StatementEnd": 202, + "AlterPos": 111, + "StatementEnd": 203, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 122, - "NameEnd": 126 + "NamePos": 123, + "NameEnd": 127 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 127, - "NameEnd": 139 + "NamePos": 128, + "NameEnd": 140 } }, "OnCluster": { - "OnPos": 140, + "OnPos": 141, "Expr": { - "LiteralPos": 152, - "LiteralEnd": 167, + "LiteralPos": 153, + "LiteralEnd": 168, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 169, - "StatementEnd": 202, + "AddPos": 170, + "StatementEnd": 203, "Column": { - "NamePos": 180, - "ColumnEnd": 202, + "NamePos": 181, + "ColumnEnd": 203, "Name": { "Ident": { "Name": "hello", "QuoteType": 1, - "NamePos": 180, - "NameEnd": 185 + "NamePos": 181, + "NameEnd": 186 }, "DotIdent": null }, @@ -121,15 +121,15 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 186, - "NameEnd": 192 + "NamePos": 187, + "NameEnd": 193 } }, "NotNull": null, "Nullable": null, "DefaultExpr": { - "LiteralPos": 202, - "LiteralEnd": 202, + "LiteralPos": 203, + "LiteralEnd": 203, "Literal": "" }, "MaterializedExpr": null, diff --git a/parser/testdata/dml/output/create_column_with_ttl.sql.golden.json b/parser/testdata/dml/output/create_column_with_ttl.sql.golden.json index bbd67d5..9af9e48 100644 --- a/parser/testdata/dml/output/create_column_with_ttl.sql.golden.json +++ b/parser/testdata/dml/output/create_column_with_ttl.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 176, + "StatementEnd": 182, "OrReplace": false, "Name": { "Database": null, @@ -17,17 +17,17 @@ "OnCluster": null, "TableSchema": { "SchemaPos": 22, - "SchemaEnd": 140, + "SchemaEnd": 144, "Columns": [ { - "NamePos": 28, - "ColumnEnd": 46, + "NamePos": 29, + "ColumnEnd": 47, "Name": { "Ident": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 28, - "NameEnd": 37 + "NamePos": 29, + "NameEnd": 38 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 38, - "NameEnd": 46 + "NamePos": 39, + "NameEnd": 47 } }, "NotNull": null, @@ -50,14 +50,14 @@ "CompressionCodec": null }, { - "NamePos": 52, - "ColumnEnd": 93, + "NamePos": 54, + "ColumnEnd": 95, "Name": { "Ident": { "Name": "x", "QuoteType": 1, - "NamePos": 52, - "NameEnd": 53 + "NamePos": 54, + "NameEnd": 55 }, "DotIdent": null }, @@ -65,8 +65,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 54, - "NameEnd": 60 + "NamePos": 56, + "NameEnd": 62 } }, "NotNull": null, @@ -76,32 +76,32 @@ "AliasExpr": null, "Codec": null, "TTL": { - "TTLPos": 61, - "ListEnd": 93, + "TTLPos": 63, + "ListEnd": 95, "Items": [ { - "TTLPos": 61, + "TTLPos": 63, "Expr": { "LeftExpr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 65, - "NameEnd": 74 + "NamePos": 67, + "NameEnd": 76 }, "Operation": "+", "RightExpr": { - "IntervalPos": 77, + "IntervalPos": 79, "Expr": { - "NumPos": 86, - "NumEnd": 87, + "NumPos": 88, + "NumEnd": 89, "Literal": "1", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 88, - "NameEnd": 93 + "NamePos": 90, + "NameEnd": 95 } }, "HasGlobal": false, @@ -115,14 +115,14 @@ "CompressionCodec": null }, { - "NamePos": 99, - "ColumnEnd": 139, + "NamePos": 102, + "ColumnEnd": 142, "Name": { "Ident": { "Name": "y", "QuoteType": 1, - "NamePos": 99, - "NameEnd": 100 + "NamePos": 102, + "NameEnd": 103 }, "DotIdent": null }, @@ -130,8 +130,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 101, - "NameEnd": 107 + "NamePos": 104, + "NameEnd": 110 } }, "NotNull": null, @@ -141,32 +141,32 @@ "AliasExpr": null, "Codec": null, "TTL": { - "TTLPos": 108, - "ListEnd": 139, + "TTLPos": 111, + "ListEnd": 142, "Items": [ { - "TTLPos": 108, + "TTLPos": 111, "Expr": { "LeftExpr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 112, - "NameEnd": 121 + "NamePos": 115, + "NameEnd": 124 }, "Operation": "+", "RightExpr": { - "IntervalPos": 124, + "IntervalPos": 127, "Expr": { - "NumPos": 133, - "NumEnd": 134, + "NumPos": 136, + "NumEnd": 137, "Literal": "1", "Base": 10 }, "Unit": { "Name": "WEEK", "QuoteType": 1, - "NamePos": 135, - "NameEnd": 139 + "NamePos": 138, + "NameEnd": 142 } }, "HasGlobal": false, @@ -184,8 +184,8 @@ "TableFunction": null }, "Engine": { - "EnginePos": 142, - "EngineEnd": 176, + "EnginePos": 147, + "EngineEnd": 182, "Name": "MergeTree", "Params": null, "PrimaryKey": null, @@ -194,24 +194,24 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 161, - "ListEnd": 176, + "OrderPos": 167, + "ListEnd": 182, "Items": [ { - "OrderPos": 161, + "OrderPos": 167, "Expr": { "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 170, - "NameEnd": 175 + "NamePos": 176, + "NameEnd": 181 }, "Params": { - "LeftParenPos": 175, - "RightParenPos": 176, + "LeftParenPos": 181, + "RightParenPos": 182, "Items": { - "ListPos": 176, - "ListEnd": 176, + "ListPos": 182, + "ListEnd": 182, "HasDistinct": false, "Items": [] }, diff --git a/parser/testdata/dml/output/insert_values.sql.golden.json b/parser/testdata/dml/output/insert_values.sql.golden.json index 3222fc3..42d3acd 100644 --- a/parser/testdata/dml/output/insert_values.sql.golden.json +++ b/parser/testdata/dml/output/insert_values.sql.golden.json @@ -61,33 +61,33 @@ }, "Values": [ { - "LeftParenPos": 87, - "RightParenPos": 168, + "LeftParenPos": 88, + "RightParenPos": 169, "Values": [ { - "NumPos": 88, - "NumEnd": 91, + "NumPos": 89, + "NumEnd": 92, "Literal": "101", "Base": 10 }, { - "LiteralPos": 94, - "LiteralEnd": 112, + "LiteralPos": 95, + "LiteralEnd": 113, "Literal": "Hello, ClickHouse!" }, { "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 147, - "NameEnd": 150 + "NamePos": 148, + "NameEnd": 151 }, "Params": { - "LeftParenPos": 150, - "RightParenPos": 151, + "LeftParenPos": 151, + "RightParenPos": 152, "Items": { - "ListPos": 151, - "ListEnd": 151, + "ListPos": 152, + "ListEnd": 152, "HasDistinct": false, "Items": [] }, @@ -95,41 +95,41 @@ } }, { - "NumPos": 160, - "NumEnd": 164, + "NumPos": 161, + "NumEnd": 165, "Literal": "-1.0", "Base": 10 } ] }, { - "LeftParenPos": 175, - "RightParenPos": 256, + "LeftParenPos": 177, + "RightParenPos": 258, "Values": [ { - "NumPos": 176, - "NumEnd": 179, + "NumPos": 178, + "NumEnd": 181, "Literal": "102", "Base": 10 }, { - "LiteralPos": 182, - "LiteralEnd": 212, + "LiteralPos": 184, + "LiteralEnd": 214, "Literal": "Insert a lot of rows per batch" }, { "Name": { "Name": "yesterday", "QuoteType": 1, - "NamePos": 235, - "NameEnd": 244 + "NamePos": 237, + "NameEnd": 246 }, "Params": { - "LeftParenPos": 244, - "RightParenPos": 245, + "LeftParenPos": 246, + "RightParenPos": 247, "Items": { - "ListPos": 245, - "ListEnd": 245, + "ListPos": 247, + "ListEnd": 247, "HasDistinct": false, "Items": [] }, @@ -137,41 +137,41 @@ } }, { - "NumPos": 248, - "NumEnd": 255, + "NumPos": 250, + "NumEnd": 257, "Literal": "1.41421", "Base": 10 } ] }, { - "LeftParenPos": 263, - "RightParenPos": 344, + "LeftParenPos": 266, + "RightParenPos": 347, "Values": [ { - "NumPos": 264, - "NumEnd": 267, + "NumPos": 267, + "NumEnd": 270, "Literal": "102", "Base": 10 }, { - "LiteralPos": 270, - "LiteralEnd": 320, + "LiteralPos": 273, + "LiteralEnd": 323, "Literal": "Sort your data based on your commonly-used queries" }, { "Name": { "Name": "today", "QuoteType": 1, - "NamePos": 323, - "NameEnd": 328 + "NamePos": 326, + "NameEnd": 331 }, "Params": { - "LeftParenPos": 328, - "RightParenPos": 329, + "LeftParenPos": 331, + "RightParenPos": 332, "Items": { - "ListPos": 329, - "ListEnd": 329, + "ListPos": 332, + "ListEnd": 332, "HasDistinct": false, "Items": [] }, @@ -179,26 +179,26 @@ } }, { - "NumPos": 336, - "NumEnd": 341, + "NumPos": 339, + "NumEnd": 344, "Literal": "2.718", "Base": 10 } ] }, { - "LeftParenPos": 351, - "RightParenPos": 432, + "LeftParenPos": 355, + "RightParenPos": 436, "Values": [ { - "NumPos": 352, - "NumEnd": 355, + "NumPos": 356, + "NumEnd": 359, "Literal": "101", "Base": 10 }, { - "LiteralPos": 358, - "LiteralEnd": 403, + "LiteralPos": 362, + "LiteralEnd": 407, "Literal": "Granules are the smallest chunks of data read" }, { @@ -206,15 +206,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 411, - "NameEnd": 414 + "NamePos": 415, + "NameEnd": 418 }, "Params": { - "LeftParenPos": 414, - "RightParenPos": 415, + "LeftParenPos": 418, + "RightParenPos": 419, "Items": { - "ListPos": 415, - "ListEnd": 415, + "ListPos": 419, + "ListEnd": 419, "HasDistinct": false, "Items": [] }, @@ -223,8 +223,8 @@ }, "Operation": "+", "RightExpr": { - "NumPos": 419, - "NumEnd": 420, + "NumPos": 423, + "NumEnd": 424, "Literal": "5", "Base": 10 }, @@ -232,8 +232,8 @@ "HasNot": false }, { - "NumPos": 424, - "NumEnd": 431, + "NumPos": 428, + "NumEnd": 435, "Literal": "3.14159", "Base": 10 } diff --git a/parser/testdata/dml/output/insert_with_format.sql.golden.json b/parser/testdata/dml/output/insert_with_format.sql.golden.json index be2ed5d..b9ef10f 100644 --- a/parser/testdata/dml/output/insert_with_format.sql.golden.json +++ b/parser/testdata/dml/output/insert_with_format.sql.golden.json @@ -22,33 +22,33 @@ "SelectExpr": null }, { - "InsertPos": 59, + "InsertPos": 60, "Format": null, "HasTableKeyword": false, "Table": { "Database": { "Name": "db", "QuoteType": 2, - "NamePos": 72, - "NameEnd": 74 + "NamePos": 73, + "NameEnd": 75 }, "Table": { "Name": "table_name", "QuoteType": 2, - "NamePos": 77, - "NameEnd": 87 + "NamePos": 78, + "NameEnd": 88 } }, "ColumnNames": { - "LeftParenPos": 89, - "RightParenPos": 100, + "LeftParenPos": 90, + "RightParenPos": 101, "ColumnNames": [ { "Ident": { "Name": "col1", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 94 + "NamePos": 91, + "NameEnd": 95 }, "DotIdent": null }, @@ -56,8 +56,8 @@ "Ident": { "Name": "col2", "QuoteType": 1, - "NamePos": 96, - "NameEnd": 100 + "NamePos": 97, + "NameEnd": 101 }, "DotIdent": null } @@ -65,18 +65,18 @@ }, "Values": [ { - "LeftParenPos": 109, - "RightParenPos": 114, + "LeftParenPos": 110, + "RightParenPos": 115, "Values": [ { - "NumPos": 110, - "NumEnd": 111, + "NumPos": 111, + "NumEnd": 112, "Literal": "1", "Base": 10 }, { - "NumPos": 113, - "NumEnd": 114, + "NumPos": 114, + "NumEnd": 115, "Literal": "2", "Base": 10 } @@ -86,33 +86,33 @@ "SelectExpr": null }, { - "InsertPos": 117, + "InsertPos": 119, "Format": null, "HasTableKeyword": false, "Table": { "Database": { "Name": "_test_1345# $.ДБ", "QuoteType": 3, - "NamePos": 130, - "NameEnd": 148 + "NamePos": 132, + "NameEnd": 150 }, "Table": { "Name": "2. Таблица №2", "QuoteType": 3, - "NamePos": 151, - "NameEnd": 173 + "NamePos": 153, + "NameEnd": 175 } }, "ColumnNames": { - "LeftParenPos": 175, - "RightParenPos": 186, + "LeftParenPos": 177, + "RightParenPos": 188, "ColumnNames": [ { "Ident": { "Name": "col1", "QuoteType": 1, - "NamePos": 176, - "NameEnd": 180 + "NamePos": 178, + "NameEnd": 182 }, "DotIdent": null }, @@ -120,8 +120,8 @@ "Ident": { "Name": "col2", "QuoteType": 1, - "NamePos": 182, - "NameEnd": 186 + "NamePos": 184, + "NameEnd": 188 }, "DotIdent": null } @@ -131,7 +131,7 @@ "SelectExpr": null }, { - "InsertPos": 189, + "InsertPos": 192, "Format": null, "HasTableKeyword": false, "Table": { @@ -139,20 +139,20 @@ "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 201, - "NameEnd": 211 + "NamePos": 204, + "NameEnd": 214 } }, "ColumnNames": { - "LeftParenPos": 212, - "RightParenPos": 223, + "LeftParenPos": 215, + "RightParenPos": 226, "ColumnNames": [ { "Ident": { "Name": "col1", "QuoteType": 1, - "NamePos": 213, - "NameEnd": 217 + "NamePos": 216, + "NameEnd": 220 }, "DotIdent": null }, @@ -160,8 +160,8 @@ "Ident": { "Name": "col2", "QuoteType": 1, - "NamePos": 219, - "NameEnd": 223 + "NamePos": 222, + "NameEnd": 226 }, "DotIdent": null } @@ -169,18 +169,18 @@ }, "Values": [ { - "LeftParenPos": 232, - "RightParenPos": 237, + "LeftParenPos": 235, + "RightParenPos": 240, "Values": [ { - "NumPos": 233, - "NumEnd": 234, + "NumPos": 236, + "NumEnd": 237, "Literal": "1", "Base": 10 }, { - "NumPos": 236, - "NumEnd": 237, + "NumPos": 239, + "NumEnd": 240, "Literal": "2", "Base": 10 } diff --git a/parser/testdata/dml/output/insert_with_placeholder.sql.golden.json b/parser/testdata/dml/output/insert_with_placeholder.sql.golden.json index 7c39114..d3f6efa 100644 --- a/parser/testdata/dml/output/insert_with_placeholder.sql.golden.json +++ b/parser/testdata/dml/output/insert_with_placeholder.sql.golden.json @@ -56,66 +56,61 @@ }, "Values": [ { - "LeftParenPos": 63, - "RightParenPos": 74, + "LeftParenPos": 64, + "RightParenPos": 75, "Values": [ { - "PlaceholderPos": 64, - "PlaceHolderEnd": 64, + "PlaceholderPos": 65, + "PlaceHolderEnd": 65, "Type": "?" }, { - "PlaceholderPos": 67, - "PlaceHolderEnd": 67, + "PlaceholderPos": 68, + "PlaceHolderEnd": 68, "Type": "?" }, { - "PlaceholderPos": 70, - "PlaceHolderEnd": 70, + "PlaceholderPos": 71, + "PlaceHolderEnd": 71, "Type": "?" }, { - "PlaceholderPos": 73, - "PlaceHolderEnd": 73, + "PlaceholderPos": 74, + "PlaceHolderEnd": 74, "Type": "?" } ] }, { - "LeftParenPos": 81, - "RightParenPos": 92, + "LeftParenPos": 83, + "RightParenPos": 94, "Values": [ { - "PlaceholderPos": 82, - "PlaceHolderEnd": 82, + "PlaceholderPos": 84, + "PlaceHolderEnd": 84, "Type": "?" }, { - "PlaceholderPos": 85, - "PlaceHolderEnd": 85, + "PlaceholderPos": 87, + "PlaceHolderEnd": 87, "Type": "?" }, { - "PlaceholderPos": 88, - "PlaceHolderEnd": 88, + "PlaceholderPos": 90, + "PlaceHolderEnd": 90, "Type": "?" }, { - "PlaceholderPos": 91, - "PlaceHolderEnd": 91, + "PlaceholderPos": 93, + "PlaceHolderEnd": 93, "Type": "?" } ] }, { - "LeftParenPos": 99, - "RightParenPos": 110, + "LeftParenPos": 102, + "RightParenPos": 113, "Values": [ - { - "PlaceholderPos": 100, - "PlaceHolderEnd": 100, - "Type": "?" - }, { "PlaceholderPos": 103, "PlaceHolderEnd": 103, @@ -130,31 +125,36 @@ "PlaceholderPos": 109, "PlaceHolderEnd": 109, "Type": "?" + }, + { + "PlaceholderPos": 112, + "PlaceHolderEnd": 112, + "Type": "?" } ] }, { - "LeftParenPos": 117, - "RightParenPos": 128, + "LeftParenPos": 121, + "RightParenPos": 132, "Values": [ { - "PlaceholderPos": 118, - "PlaceHolderEnd": 118, + "PlaceholderPos": 122, + "PlaceHolderEnd": 122, "Type": "?" }, { - "PlaceholderPos": 121, - "PlaceHolderEnd": 121, + "PlaceholderPos": 125, + "PlaceHolderEnd": 125, "Type": "?" }, { - "PlaceholderPos": 124, - "PlaceHolderEnd": 124, + "PlaceholderPos": 128, + "PlaceHolderEnd": 128, "Type": "?" }, { - "PlaceholderPos": 127, - "PlaceHolderEnd": 127, + "PlaceholderPos": 131, + "PlaceHolderEnd": 131, "Type": "?" } ] @@ -163,7 +163,7 @@ "SelectExpr": null }, { - "InsertPos": 133, + "InsertPos": 140, "Format": null, "HasTableKeyword": false, "Table": { @@ -171,20 +171,20 @@ "Table": { "Name": "test_with_typed_columns", "QuoteType": 1, - "NamePos": 145, - "NameEnd": 168 + "NamePos": 152, + "NameEnd": 175 } }, "ColumnNames": { - "LeftParenPos": 169, - "RightParenPos": 184, + "LeftParenPos": 176, + "RightParenPos": 191, "ColumnNames": [ { "Ident": { "Name": "id", "QuoteType": 1, - "NamePos": 170, - "NameEnd": 172 + "NamePos": 177, + "NameEnd": 179 }, "DotIdent": null }, @@ -192,8 +192,8 @@ "Ident": { "Name": "created_at", "QuoteType": 1, - "NamePos": 174, - "NameEnd": 184 + "NamePos": 181, + "NameEnd": 191 }, "DotIdent": null } @@ -201,49 +201,49 @@ }, "Values": [ { - "LeftParenPos": 193, - "RightParenPos": 234, + "LeftParenPos": 201, + "RightParenPos": 242, "Values": [ { - "LeftBracePos": 194, - "RightBracePos": 205, + "LeftBracePos": 202, + "RightBracePos": 213, "Name": { "Name": "id", "QuoteType": 1, - "NamePos": 195, - "NameEnd": 197 + "NamePos": 203, + "NameEnd": 205 }, "Type": { "Name": { "Name": "Int32", "QuoteType": 1, - "NamePos": 199, - "NameEnd": 204 + "NamePos": 207, + "NameEnd": 212 } } }, { - "LeftBracePos": 207, - "RightBracePos": 234, + "LeftBracePos": 215, + "RightBracePos": 242, "Name": { "Name": "created_at", "QuoteType": 1, - "NamePos": 208, - "NameEnd": 218 + "NamePos": 216, + "NameEnd": 226 }, "Type": { - "LeftParenPos": 231, - "RightParenPos": 232, + "LeftParenPos": 239, + "RightParenPos": 240, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 220, - "NameEnd": 230 + "NamePos": 228, + "NameEnd": 238 }, "Params": [ { - "NumPos": 231, - "NumEnd": 232, + "NumPos": 239, + "NumEnd": 240, "Literal": "6", "Base": 10 } diff --git a/parser/testdata/dml/output/insert_with_select.sql.golden.json b/parser/testdata/dml/output/insert_with_select.sql.golden.json index 7739082..3428de2 100644 --- a/parser/testdata/dml/output/insert_with_select.sql.golden.json +++ b/parser/testdata/dml/output/insert_with_select.sql.golden.json @@ -20,8 +20,8 @@ "ColumnNames": null, "Values": null, "SelectExpr": { - "SelectPos": 29, - "StatementEnd": 103, + "SelectPos": 30, + "StatementEnd": 109, "With": null, "Top": null, "HasDistinct": false, @@ -31,8 +31,8 @@ "Expr": { "Name": "CounterID", "QuoteType": 1, - "NamePos": 40, - "NameEnd": 49 + "NamePos": 42, + "NameEnd": 51 }, "Modifiers": [], "Alias": null @@ -41,8 +41,8 @@ "Expr": { "Name": "StartDate", "QuoteType": 1, - "NamePos": 55, - "NameEnd": 64 + "NamePos": 58, + "NameEnd": 67 }, "Modifiers": [], "Alias": null @@ -51,8 +51,8 @@ "Expr": { "Name": "Sign", "QuoteType": 1, - "NamePos": 70, - "NameEnd": 74 + "NamePos": 74, + "NameEnd": 78 }, "Modifiers": [], "Alias": null @@ -61,37 +61,37 @@ "Expr": { "Name": "UserID", "QuoteType": 1, - "NamePos": 80, - "NameEnd": 86 + "NamePos": 85, + "NameEnd": 91 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 87, + "FromPos": 93, "Expr": { "Table": { - "TablePos": 92, - "TableEnd": 103, + "TablePos": 98, + "TableEnd": 109, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 96 + "NamePos": 98, + "NameEnd": 102 }, "Table": { "Name": "visits", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 103 + "NamePos": 103, + "NameEnd": 109 } }, "HasFinal": false }, - "StatementEnd": 103, + "StatementEnd": 109, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/access_tuple_with_dot.sql.golden.json b/parser/testdata/query/output/access_tuple_with_dot.sql.golden.json index 2291559..f8da868 100644 --- a/parser/testdata/query/output/access_tuple_with_dot.sql.golden.json +++ b/parser/testdata/query/output/access_tuple_with_dot.sql.golden.json @@ -93,8 +93,8 @@ "Except": null }, { - "SelectPos": 37, - "StatementEnd": 336, + "SelectPos": 39, + "StatementEnd": 341, "With": null, "Top": null, "HasDistinct": false, @@ -105,15 +105,15 @@ "Name": { "Name": "toTypeName", "QuoteType": 1, - "NamePos": 44, - "NameEnd": 54 + "NamePos": 46, + "NameEnd": 56 }, "Params": { - "LeftParenPos": 54, - "RightParenPos": 151, + "LeftParenPos": 56, + "RightParenPos": 153, "Items": { - "ListPos": 56, - "ListEnd": 150, + "ListPos": 58, + "ListEnd": 152, "HasDistinct": false, "Items": [ { @@ -122,54 +122,54 @@ "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 56, - "NameEnd": 61 + "NamePos": 58, + "NameEnd": 63 }, "Params": { - "LeftParenPos": 61, - "RightParenPos": 102, + "LeftParenPos": 63, + "RightParenPos": 104, "Items": { - "ListPos": 63, - "ListEnd": 102, + "ListPos": 65, + "ListEnd": 104, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 63, - "LiteralEnd": 64, + "LiteralPos": 65, + "LiteralEnd": 66, "Literal": "a" }, "Alias": { "Name": "first", "QuoteType": 1, - "NamePos": 69, - "NameEnd": 74 + "NamePos": 71, + "NameEnd": 76 } }, { "Expr": { - "LiteralPos": 76, - "LiteralEnd": 77, + "LiteralPos": 78, + "LiteralEnd": 79, "Literal": "b" }, "Alias": { "Name": "second", "QuoteType": 1, - "NamePos": 82, - "NameEnd": 88 + "NamePos": 84, + "NameEnd": 90 } }, { "Expr": { - "LiteralPos": 91, - "LiteralEnd": 92, + "LiteralPos": 93, + "LiteralEnd": 94, "Literal": "c" }, "Alias": { "Name": "third", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 102 + "NamePos": 99, + "NameEnd": 104 } } ] @@ -179,24 +179,24 @@ }, "Operation": "::", "RightExpr": { - "LeftParenPos": 111, - "RightParenPos": 150, + "LeftParenPos": 113, + "RightParenPos": 152, "Name": { "Name": "Tuple", "QuoteType": 1, - "NamePos": 105, - "NameEnd": 110 + "NamePos": 107, + "NameEnd": 112 }, "Columns": [ { - "NamePos": 111, - "ColumnEnd": 123, + "NamePos": 113, + "ColumnEnd": 125, "Name": { "Ident": { "Name": "first", "QuoteType": 1, - "NamePos": 111, - "NameEnd": 116 + "NamePos": 113, + "NameEnd": 118 }, "DotIdent": null }, @@ -204,8 +204,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 117, - "NameEnd": 123 + "NamePos": 119, + "NameEnd": 125 } }, "NotNull": null, @@ -219,14 +219,14 @@ "CompressionCodec": null }, { - "NamePos": 124, - "ColumnEnd": 137, + "NamePos": 126, + "ColumnEnd": 139, "Name": { "Ident": { "Name": "second", "QuoteType": 1, - "NamePos": 124, - "NameEnd": 130 + "NamePos": 126, + "NameEnd": 132 }, "DotIdent": null }, @@ -234,8 +234,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 137 + "NamePos": 133, + "NameEnd": 139 } }, "NotNull": null, @@ -249,14 +249,14 @@ "CompressionCodec": null }, { - "NamePos": 138, - "ColumnEnd": 150, + "NamePos": 140, + "ColumnEnd": 152, "Name": { "Ident": { "Name": "third", "QuoteType": 1, - "NamePos": 138, - "NameEnd": 143 + "NamePos": 140, + "NameEnd": 145 }, "DotIdent": null }, @@ -264,8 +264,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 144, - "NameEnd": 150 + "NamePos": 146, + "NameEnd": 152 } }, "NotNull": null, @@ -296,11 +296,11 @@ { "Expr": { "Object": { - "LeftParenPos": 161, - "RightParenPos": 257, + "LeftParenPos": 164, + "RightParenPos": 260, "Items": { - "ListPos": 162, - "ListEnd": 256, + "ListPos": 165, + "ListEnd": 259, "HasDistinct": false, "Items": [ { @@ -309,54 +309,54 @@ "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 162, - "NameEnd": 167 + "NamePos": 165, + "NameEnd": 170 }, "Params": { - "LeftParenPos": 167, - "RightParenPos": 208, + "LeftParenPos": 170, + "RightParenPos": 211, "Items": { - "ListPos": 169, - "ListEnd": 208, + "ListPos": 172, + "ListEnd": 211, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 169, - "LiteralEnd": 170, + "LiteralPos": 172, + "LiteralEnd": 173, "Literal": "a" }, "Alias": { "Name": "first", "QuoteType": 1, - "NamePos": 175, - "NameEnd": 180 + "NamePos": 178, + "NameEnd": 183 } }, { "Expr": { - "LiteralPos": 182, - "LiteralEnd": 183, + "LiteralPos": 185, + "LiteralEnd": 186, "Literal": "b" }, "Alias": { "Name": "second", "QuoteType": 1, - "NamePos": 188, - "NameEnd": 194 + "NamePos": 191, + "NameEnd": 197 } }, { "Expr": { - "LiteralPos": 197, - "LiteralEnd": 198, + "LiteralPos": 200, + "LiteralEnd": 201, "Literal": "c" }, "Alias": { "Name": "third", "QuoteType": 1, - "NamePos": 203, - "NameEnd": 208 + "NamePos": 206, + "NameEnd": 211 } } ] @@ -366,24 +366,24 @@ }, "Operation": "::", "RightExpr": { - "LeftParenPos": 217, - "RightParenPos": 256, + "LeftParenPos": 220, + "RightParenPos": 259, "Name": { "Name": "Tuple", "QuoteType": 1, - "NamePos": 211, - "NameEnd": 216 + "NamePos": 214, + "NameEnd": 219 }, "Columns": [ { - "NamePos": 217, - "ColumnEnd": 229, + "NamePos": 220, + "ColumnEnd": 232, "Name": { "Ident": { "Name": "first", "QuoteType": 1, - "NamePos": 217, - "NameEnd": 222 + "NamePos": 220, + "NameEnd": 225 }, "DotIdent": null }, @@ -391,8 +391,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 223, - "NameEnd": 229 + "NamePos": 226, + "NameEnd": 232 } }, "NotNull": null, @@ -406,14 +406,14 @@ "CompressionCodec": null }, { - "NamePos": 230, - "ColumnEnd": 243, + "NamePos": 233, + "ColumnEnd": 246, "Name": { "Ident": { "Name": "second", "QuoteType": 1, - "NamePos": 230, - "NameEnd": 236 + "NamePos": 233, + "NameEnd": 239 }, "DotIdent": null }, @@ -421,8 +421,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 237, - "NameEnd": 243 + "NamePos": 240, + "NameEnd": 246 } }, "NotNull": null, @@ -436,14 +436,14 @@ "CompressionCodec": null }, { - "NamePos": 244, - "ColumnEnd": 256, + "NamePos": 247, + "ColumnEnd": 259, "Name": { "Ident": { "Name": "third", "QuoteType": 1, - "NamePos": 244, - "NameEnd": 249 + "NamePos": 247, + "NameEnd": 252 }, "DotIdent": null }, @@ -451,8 +451,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 250, - "NameEnd": 256 + "NamePos": 253, + "NameEnd": 259 } }, "NotNull": null, @@ -480,8 +480,8 @@ "Index": { "Name": "second", "QuoteType": 1, - "NamePos": 259, - "NameEnd": 265 + "NamePos": 262, + "NameEnd": 268 } }, "Modifiers": [], @@ -493,37 +493,37 @@ "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 274, - "NameEnd": 279 + "NamePos": 278, + "NameEnd": 283 }, "Params": { - "LeftParenPos": 279, - "RightParenPos": 291, + "LeftParenPos": 283, + "RightParenPos": 295, "Items": { - "ListPos": 281, - "ListEnd": 290, + "ListPos": 285, + "ListEnd": 294, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 281, - "LiteralEnd": 282, + "LiteralPos": 285, + "LiteralEnd": 286, "Literal": "a" }, "Alias": null }, { "Expr": { - "LiteralPos": 285, - "LiteralEnd": 286, + "LiteralPos": 289, + "LiteralEnd": 290, "Literal": "b" }, "Alias": null }, { "Expr": { - "LiteralPos": 289, - "LiteralEnd": 290, + "LiteralPos": 293, + "LiteralEnd": 294, "Literal": "c" }, "Alias": null @@ -535,8 +535,8 @@ }, "Operation": ".", "Index": { - "NumPos": 293, - "NumEnd": 294, + "NumPos": 297, + "NumEnd": 298, "Literal": "3", "Base": 10 } @@ -549,15 +549,15 @@ "Name": { "Name": "tupleElement", "QuoteType": 1, - "NamePos": 303, - "NameEnd": 315 + "NamePos": 308, + "NameEnd": 320 }, "Params": { - "LeftParenPos": 315, - "RightParenPos": 336, + "LeftParenPos": 320, + "RightParenPos": 341, "Items": { - "ListPos": 316, - "ListEnd": 336, + "ListPos": 321, + "ListEnd": 341, "HasDistinct": false, "Items": [ { @@ -565,37 +565,37 @@ "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 316, - "NameEnd": 321 + "NamePos": 321, + "NameEnd": 326 }, "Params": { - "LeftParenPos": 321, - "RightParenPos": 333, + "LeftParenPos": 326, + "RightParenPos": 338, "Items": { - "ListPos": 323, - "ListEnd": 332, + "ListPos": 328, + "ListEnd": 337, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 323, - "LiteralEnd": 324, + "LiteralPos": 328, + "LiteralEnd": 329, "Literal": "a" }, "Alias": null }, { "Expr": { - "LiteralPos": 327, - "LiteralEnd": 328, + "LiteralPos": 332, + "LiteralEnd": 333, "Literal": "b" }, "Alias": null }, { "Expr": { - "LiteralPos": 331, - "LiteralEnd": 332, + "LiteralPos": 336, + "LiteralEnd": 337, "Literal": "c" }, "Alias": null @@ -609,8 +609,8 @@ }, { "Expr": { - "NumPos": 335, - "NumEnd": 336, + "NumPos": 340, + "NumEnd": 341, "Literal": "1", "Base": 10 }, diff --git a/parser/testdata/query/output/query_with_expr_compare.sql.golden.json b/parser/testdata/query/output/query_with_expr_compare.sql.golden.json index 349f1c3..39dd652 100644 --- a/parser/testdata/query/output/query_with_expr_compare.sql.golden.json +++ b/parser/testdata/query/output/query_with_expr_compare.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 225, + "StatementEnd": 230, "With": null, "Top": null, "HasDistinct": false, @@ -97,17 +97,17 @@ } ], "From": { - "FromPos": 55, + "FromPos": 56, "Expr": { "Table": { - "TablePos": 59, - "TableEnd": 121, + "TablePos": 60, + "TableEnd": 123, "Alias": null, "Expr": { "HasParen": true, "Select": { - "SelectPos": 65, - "StatementEnd": 121, + "SelectPos": 67, + "StatementEnd": 123, "With": null, "Top": null, "HasDistinct": false, @@ -115,30 +115,30 @@ "SelectItems": [ { "Expr": { - "LiteralPos": 73, - "LiteralEnd": 90, + "LiteralPos": 75, + "LiteralEnd": 92, "Literal": "pathA/pathB/pathC" }, "Modifiers": [], "Alias": { "Name": "path", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 99 + "NamePos": 97, + "NameEnd": 101 } }, { "Expr": { - "LiteralPos": 102, - "LiteralEnd": 112, + "LiteralPos": 104, + "LiteralEnd": 114, "Literal": "2024-09-10" }, "Modifiers": [], "Alias": { "Name": "date", "QuoteType": 1, - "NamePos": 117, - "NameEnd": 121 + "NamePos": 119, + "NameEnd": 123 } } ], @@ -162,7 +162,7 @@ }, "HasFinal": false }, - "StatementEnd": 121, + "StatementEnd": 123, "SampleRatio": null, "HasFinal": false } @@ -171,30 +171,30 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 128, + "WherePos": 132, "Expr": { "LeftExpr": { "Expr": { "Name": { "Name": "toDate", "QuoteType": 1, - "NamePos": 134, - "NameEnd": 140 + "NamePos": 138, + "NameEnd": 144 }, "Params": { - "LeftParenPos": 140, - "RightParenPos": 145, + "LeftParenPos": 144, + "RightParenPos": 149, "Items": { - "ListPos": 141, - "ListEnd": 145, + "ListPos": 145, + "ListEnd": 149, "HasDistinct": false, "Items": [ { "Expr": { "Name": "date", "QuoteType": 1, - "NamePos": 141, - "NameEnd": 145 + "NamePos": 145, + "NameEnd": 149 }, "Alias": null } @@ -204,14 +204,14 @@ } }, "Between": { - "LiteralPos": 156, - "LiteralEnd": 166, + "LiteralPos": 160, + "LiteralEnd": 170, "Literal": "2024-09-01" }, - "AndPos": 168, + "AndPos": 172, "And": { - "LiteralPos": 173, - "LiteralEnd": 183, + "LiteralPos": 177, + "LiteralEnd": 187, "Literal": "2024-09-30" } }, @@ -222,21 +222,21 @@ "Name": { "Name": "splitByChar", "QuoteType": 1, - "NamePos": 191, - "NameEnd": 202 + "NamePos": 196, + "NameEnd": 207 }, "Params": { - "LeftParenPos": 202, - "RightParenPos": 212, + "LeftParenPos": 207, + "RightParenPos": 217, "Items": { - "ListPos": 204, - "ListEnd": 212, + "ListPos": 209, + "ListEnd": 217, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 204, - "LiteralEnd": 205, + "LiteralPos": 209, + "LiteralEnd": 210, "Literal": "/" }, "Alias": null @@ -245,8 +245,8 @@ "Expr": { "Name": "path", "QuoteType": 1, - "NamePos": 208, - "NameEnd": 212 + "NamePos": 213, + "NameEnd": 217 }, "Alias": null } @@ -256,17 +256,17 @@ } }, "Params": { - "LeftBracketPos": 213, - "RightBracketPos": 215, + "LeftBracketPos": 218, + "RightBracketPos": 220, "Items": { - "ListPos": 214, - "ListEnd": 215, + "ListPos": 219, + "ListEnd": 220, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 214, - "NumEnd": 215, + "NumPos": 219, + "NumEnd": 220, "Literal": "1", "Base": 10 }, @@ -278,8 +278,8 @@ }, "Operation": "=", "RightExpr": { - "LiteralPos": 220, - "LiteralEnd": 225, + "LiteralPos": 225, + "LiteralEnd": 230, "Literal": "pathA" }, "HasGlobal": false, diff --git a/parser/testdata/query/output/select_case_when_exists.sql.golden.json b/parser/testdata/query/output/select_case_when_exists.sql.golden.json index 5a8fa71..59a936e 100644 --- a/parser/testdata/query/output/select_case_when_exists.sql.golden.json +++ b/parser/testdata/query/output/select_case_when_exists.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 205, + "StatementEnd": 215, "With": null, "Top": null, "HasDistinct": false, @@ -11,40 +11,40 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 11, - "NameEnd": 11 + "NamePos": 12, + "NameEnd": 12 }, "Modifiers": [], "Alias": null }, { "Expr": { - "CasePos": 18, + "CasePos": 20, "EndPos": 0, "Expr": null, "Whens": [ { - "WhenPos": 31, - "ThenPos": 110, + "WhenPos": 34, + "ThenPos": 116, "When": { "Name": { "Name": "EXISTS", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 42 + "NamePos": 39, + "NameEnd": 45 }, "Params": { - "LeftParenPos": 42, - "RightParenPos": 100, + "LeftParenPos": 45, + "RightParenPos": 105, "Items": { - "ListPos": 43, - "ListEnd": 99, + "ListPos": 46, + "ListEnd": 104, "HasDistinct": false, "Items": [ { "Expr": { - "SelectPos": 43, - "StatementEnd": 99, + "SelectPos": 46, + "StatementEnd": 104, "With": null, "Top": null, "HasDistinct": false, @@ -52,8 +52,8 @@ "SelectItems": [ { "Expr": { - "NumPos": 50, - "NumEnd": 51, + "NumPos": 53, + "NumEnd": 54, "Literal": "1", "Base": 10 }, @@ -62,24 +62,24 @@ } ], "From": { - "FromPos": 56, + "FromPos": 60, "Expr": { "Table": { - "TablePos": 61, - "TableEnd": 71, + "TablePos": 65, + "TableEnd": 75, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 61, - "NameEnd": 71 + "NamePos": 65, + "NameEnd": 75 } }, "HasFinal": false }, - "StatementEnd": 71, + "StatementEnd": 75, "SampleRatio": null, "HasFinal": false } @@ -88,18 +88,18 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 76, + "WherePos": 81, "Expr": { "LeftExpr": { "Name": "col1", "QuoteType": 1, - "NamePos": 82, - "NameEnd": 86 + "NamePos": 87, + "NameEnd": 91 }, "Operation": "=", "RightExpr": { - "LiteralPos": 90, - "LiteralEnd": 99, + "LiteralPos": 95, + "LiteralEnd": 104, "Literal": "999999999" }, "HasGlobal": false, @@ -126,18 +126,18 @@ } }, "Then": { - "LiteralPos": 116, - "LiteralEnd": 120, + "LiteralPos": 122, + "LiteralEnd": 126, "Literal": "then" }, "ElsePos": 0, "Else": null } ], - "ElsePos": 130, + "ElsePos": 137, "Else": { - "LiteralPos": 136, - "LiteralEnd": 140, + "LiteralPos": 143, + "LiteralEnd": 147, "Literal": "else" } }, @@ -145,30 +145,30 @@ "Alias": { "Name": "check_result", "QuoteType": 1, - "NamePos": 153, - "NameEnd": 165 + "NamePos": 161, + "NameEnd": 173 } } ], "From": { - "FromPos": 166, + "FromPos": 175, "Expr": { "Table": { - "TablePos": 171, - "TableEnd": 181, + "TablePos": 180, + "TableEnd": 190, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 171, - "NameEnd": 181 + "NamePos": 180, + "NameEnd": 190 } }, "HasFinal": false }, - "StatementEnd": 181, + "StatementEnd": 190, "SampleRatio": null, "HasFinal": false } @@ -177,18 +177,18 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 182, + "WherePos": 192, "Expr": { "LeftExpr": { "Name": "col1", "QuoteType": 1, - "NamePos": 188, - "NameEnd": 192 + "NamePos": 198, + "NameEnd": 202 }, "Operation": "=", "RightExpr": { - "LiteralPos": 196, - "LiteralEnd": 205, + "LiteralPos": 206, + "LiteralEnd": 215, "Literal": "123456789" }, "HasGlobal": false, diff --git a/parser/testdata/query/output/select_cast.sql.golden.json b/parser/testdata/query/output/select_cast.sql.golden.json index 136b88a..7a4632b 100644 --- a/parser/testdata/query/output/select_cast.sql.golden.json +++ b/parser/testdata/query/output/select_cast.sql.golden.json @@ -54,8 +54,8 @@ "Except": null }, { - "SelectPos": 36, - "StatementEnd": 70, + "SelectPos": 37, + "StatementEnd": 71, "With": null, "Top": null, "HasDistinct": false, @@ -63,18 +63,18 @@ "SelectItems": [ { "Expr": { - "CastPos": 43, + "CastPos": 44, "Expr": { - "NumPos": 48, - "NumEnd": 49, + "NumPos": 49, + "NumEnd": 50, "Literal": "1", "Base": 10 }, "Separator": ",", - "AsPos": 49, + "AsPos": 50, "AsType": { - "LiteralPos": 52, - "LiteralEnd": 59, + "LiteralPos": 53, + "LiteralEnd": 60, "Literal": "Float64" } }, @@ -82,8 +82,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 65, - "NameEnd": 70 + "NamePos": 66, + "NameEnd": 71 } } ], @@ -105,8 +105,8 @@ "Except": null }, { - "SelectPos": 72, - "StatementEnd": 102, + "SelectPos": 74, + "StatementEnd": 104, "With": null, "Top": null, "HasDistinct": false, @@ -114,25 +114,25 @@ "SelectItems": [ { "Expr": { - "LeftParenPos": 79, - "RightParenPos": 92, + "LeftParenPos": 81, + "RightParenPos": 94, "Items": { - "ListPos": 80, - "ListEnd": 92, + "ListPos": 82, + "ListEnd": 94, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 80, - "NumEnd": 81, + "NumPos": 82, + "NumEnd": 83, "Literal": "1", "Base": 10 }, "Alias": { "Name": "Float64", "QuoteType": 1, - "NamePos": 85, - "NameEnd": 92 + "NamePos": 87, + "NameEnd": 94 } } ] @@ -143,8 +143,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 102 + "NamePos": 99, + "NameEnd": 104 } } ], @@ -166,8 +166,8 @@ "Except": null }, { - "SelectPos": 104, - "StatementEnd": 130, + "SelectPos": 107, + "StatementEnd": 133, "With": null, "Top": null, "HasDistinct": false, @@ -176,8 +176,8 @@ { "Expr": { "LeftExpr": { - "NumPos": 111, - "NumEnd": 112, + "NumPos": 114, + "NumEnd": 115, "Literal": "1", "Base": 10 }, @@ -185,8 +185,8 @@ "RightExpr": { "Name": "Float64", "QuoteType": 1, - "NamePos": 114, - "NameEnd": 121 + "NamePos": 117, + "NameEnd": 124 }, "HasGlobal": false, "HasNot": false @@ -195,8 +195,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 130 + "NamePos": 128, + "NameEnd": 133 } } ], diff --git a/parser/testdata/query/output/select_column_alias_string.sql.golden.json b/parser/testdata/query/output/select_column_alias_string.sql.golden.json index 891eaf7..e69e783 100644 --- a/parser/testdata/query/output/select_column_alias_string.sql.golden.json +++ b/parser/testdata/query/output/select_column_alias_string.sql.golden.json @@ -40,8 +40,8 @@ "Except": null }, { - "SelectPos": 27, - "StatementEnd": 52, + "SelectPos": 29, + "StatementEnd": 54, "With": null, "Top": null, "HasDistinct": false, @@ -51,8 +51,8 @@ "Expr": { "Name": "$abc", "QuoteType": 1, - "NamePos": 34, - "NameEnd": 38 + "NamePos": 36, + "NameEnd": 40 }, "Modifiers": [], "Alias": null @@ -61,8 +61,8 @@ "Expr": { "Name": "a$$bc", "QuoteType": 1, - "NamePos": 40, - "NameEnd": 45 + "NamePos": 42, + "NameEnd": 47 }, "Modifiers": [], "Alias": null @@ -71,8 +71,8 @@ "Expr": { "Name": "abc$$", "QuoteType": 1, - "NamePos": 47, - "NameEnd": 52 + "NamePos": 49, + "NameEnd": 54 }, "Modifiers": [], "Alias": null diff --git a/parser/testdata/query/output/select_item_with_modifiers.sql.golden.json b/parser/testdata/query/output/select_item_with_modifiers.sql.golden.json index 0c9402d..796e3a3 100644 --- a/parser/testdata/query/output/select_item_with_modifiers.sql.golden.json +++ b/parser/testdata/query/output/select_item_with_modifiers.sql.golden.json @@ -93,8 +93,8 @@ "Except": null }, { - "SelectPos": 37, - "StatementEnd": 73, + "SelectPos": 38, + "StatementEnd": 74, "With": null, "Top": null, "HasDistinct": false, @@ -104,23 +104,23 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 44, - "NameEnd": 44 + "NamePos": 45, + "NameEnd": 45 }, "Modifiers": [ { "Name": { "Name": "REPLACE", "QuoteType": 1, - "NamePos": 46, - "NameEnd": 53 + "NamePos": 47, + "NameEnd": 54 }, "Params": { - "LeftParenPos": 53, - "RightParenPos": 64, + "LeftParenPos": 54, + "RightParenPos": 65, "Items": { - "ListPos": 54, - "ListEnd": 64, + "ListPos": 55, + "ListEnd": 65, "HasDistinct": false, "Items": [ { @@ -128,13 +128,13 @@ "LeftExpr": { "Name": "i", "QuoteType": 1, - "NamePos": 54, - "NameEnd": 55 + "NamePos": 55, + "NameEnd": 56 }, "Operation": "+", "RightExpr": { - "NumPos": 58, - "NumEnd": 59, + "NumPos": 59, + "NumEnd": 60, "Literal": "1", "Base": 10 }, @@ -144,8 +144,8 @@ "Alias": { "Name": "i", "QuoteType": 1, - "NamePos": 63, - "NameEnd": 64 + "NamePos": 64, + "NameEnd": 65 } } ] @@ -158,24 +158,24 @@ } ], "From": { - "FromPos": 66, + "FromPos": 67, "Expr": { "Table": { - "TablePos": 71, - "TableEnd": 73, + "TablePos": 72, + "TableEnd": 74, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 71, - "NameEnd": 73 + "NamePos": 72, + "NameEnd": 74 } }, "HasFinal": false }, - "StatementEnd": 73, + "StatementEnd": 74, "SampleRatio": null, "HasFinal": false } @@ -197,8 +197,8 @@ "Except": null }, { - "SelectPos": 75, - "StatementEnd": 133, + "SelectPos": 77, + "StatementEnd": 135, "With": null, "Top": null, "HasDistinct": false, @@ -208,23 +208,23 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 82, - "NameEnd": 82 + "NamePos": 84, + "NameEnd": 84 }, "Modifiers": [ { "Name": { "Name": "REPLACE", "QuoteType": 1, - "NamePos": 84, - "NameEnd": 91 + "NamePos": 86, + "NameEnd": 93 }, "Params": { - "LeftParenPos": 91, - "RightParenPos": 102, + "LeftParenPos": 93, + "RightParenPos": 104, "Items": { - "ListPos": 92, - "ListEnd": 102, + "ListPos": 94, + "ListEnd": 104, "HasDistinct": false, "Items": [ { @@ -232,13 +232,13 @@ "LeftExpr": { "Name": "i", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 93 + "NamePos": 94, + "NameEnd": 95 }, "Operation": "+", "RightExpr": { - "NumPos": 96, - "NumEnd": 97, + "NumPos": 98, + "NumEnd": 99, "Literal": "1", "Base": 10 }, @@ -248,8 +248,8 @@ "Alias": { "Name": "i", "QuoteType": 1, - "NamePos": 101, - "NameEnd": 102 + "NamePos": 103, + "NameEnd": 104 } } ] @@ -261,23 +261,23 @@ "Name": { "Name": "EXCEPT", "QuoteType": 1, - "NamePos": 104, - "NameEnd": 110 + "NamePos": 106, + "NameEnd": 112 }, "Params": { - "LeftParenPos": 111, - "RightParenPos": 113, + "LeftParenPos": 113, + "RightParenPos": 115, "Items": { - "ListPos": 112, - "ListEnd": 113, + "ListPos": 114, + "ListEnd": 115, "HasDistinct": false, "Items": [ { "Expr": { "Name": "j", "QuoteType": 1, - "NamePos": 112, - "NameEnd": 113 + "NamePos": 114, + "NameEnd": 115 }, "Alias": null } @@ -290,23 +290,23 @@ "Name": { "Name": "APPLY", "QuoteType": 1, - "NamePos": 115, - "NameEnd": 120 + "NamePos": 117, + "NameEnd": 122 }, "Params": { - "LeftParenPos": 120, - "RightParenPos": 124, + "LeftParenPos": 122, + "RightParenPos": 126, "Items": { - "ListPos": 121, - "ListEnd": 124, + "ListPos": 123, + "ListEnd": 126, "HasDistinct": false, "Items": [ { "Expr": { "Name": "sum", "QuoteType": 1, - "NamePos": 121, - "NameEnd": 124 + "NamePos": 123, + "NameEnd": 126 }, "Alias": null } @@ -320,24 +320,24 @@ } ], "From": { - "FromPos": 126, + "FromPos": 128, "Expr": { "Table": { - "TablePos": 131, - "TableEnd": 133, + "TablePos": 133, + "TableEnd": 135, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 133 + "NamePos": 133, + "NameEnd": 135 } }, "HasFinal": false }, - "StatementEnd": 133, + "StatementEnd": 135, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/select_json_type.sql.golden.json b/parser/testdata/query/output/select_json_type.sql.golden.json index 7f99c09..628f5ac 100644 --- a/parser/testdata/query/output/select_json_type.sql.golden.json +++ b/parser/testdata/query/output/select_json_type.sql.golden.json @@ -94,8 +94,8 @@ "Except": null }, { - "SelectPos": 26, - "StatementEnd": 75, + "SelectPos": 27, + "StatementEnd": 76, "With": null, "Top": null, "HasDistinct": false, @@ -106,29 +106,29 @@ "Name": { "Name": "JSON_TYPE", "QuoteType": 1, - "NamePos": 33, - "NameEnd": 42 + "NamePos": 34, + "NameEnd": 43 }, "Params": { - "LeftParenPos": 42, - "RightParenPos": 75, + "LeftParenPos": 43, + "RightParenPos": 76, "Items": { - "ListPos": 44, - "ListEnd": 74, + "ListPos": 45, + "ListEnd": 75, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 44, - "LiteralEnd": 67, + "LiteralPos": 45, + "LiteralEnd": 68, "Literal": "{\"a\": 1, \"b\": {\"c\": 2}}" }, "Alias": null }, { "Expr": { - "LiteralPos": 71, - "LiteralEnd": 74, + "LiteralPos": 72, + "LiteralEnd": 75, "Literal": "$.b" }, "Alias": null @@ -160,8 +160,8 @@ "Except": null }, { - "SelectPos": 78, - "StatementEnd": 114, + "SelectPos": 80, + "StatementEnd": 116, "With": null, "Top": null, "HasDistinct": false, @@ -169,18 +169,18 @@ "SelectItems": [ { "Expr": { - "CastPos": 85, + "CastPos": 87, "Expr": { "Name": "some", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 94 + "NamePos": 92, + "NameEnd": 96 }, "Separator": ",", - "AsPos": 94, + "AsPos": 96, "AsType": { - "LiteralPos": 97, - "LiteralEnd": 103, + "LiteralPos": 99, + "LiteralEnd": 105, "Literal": "String" } }, @@ -188,8 +188,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 109, - "NameEnd": 114 + "NamePos": 111, + "NameEnd": 116 } } ], @@ -211,8 +211,8 @@ "Except": null }, { - "SelectPos": 116, - "StatementEnd": 157, + "SelectPos": 119, + "StatementEnd": 160, "With": null, "Top": null, "HasDistinct": false, @@ -220,28 +220,28 @@ "SelectItems": [ { "Expr": { - "CastPos": 123, + "CastPos": 126, "Expr": { "Fields": [ { "Name": "some", "QuoteType": 1, - "NamePos": 128, - "NameEnd": 132 + "NamePos": 131, + "NameEnd": 135 }, { "Name": "long", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 137 + "NamePos": 136, + "NameEnd": 140 } ] }, "Separator": ",", - "AsPos": 137, + "AsPos": 140, "AsType": { - "LiteralPos": 140, - "LiteralEnd": 146, + "LiteralPos": 143, + "LiteralEnd": 149, "Literal": "String" } }, @@ -249,8 +249,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 152, - "NameEnd": 157 + "NamePos": 155, + "NameEnd": 160 } } ], @@ -272,8 +272,8 @@ "Except": null }, { - "SelectPos": 159, - "StatementEnd": 205, + "SelectPos": 163, + "StatementEnd": 209, "With": null, "Top": null, "HasDistinct": false, @@ -281,34 +281,34 @@ "SelectItems": [ { "Expr": { - "CastPos": 166, + "CastPos": 170, "Expr": { "Fields": [ { "Name": "some", "QuoteType": 1, - "NamePos": 171, - "NameEnd": 175 + "NamePos": 175, + "NameEnd": 179 }, { "Name": "long", "QuoteType": 1, - "NamePos": 176, - "NameEnd": 180 + "NamePos": 180, + "NameEnd": 184 }, { "Name": "json", "QuoteType": 1, - "NamePos": 181, - "NameEnd": 185 + "NamePos": 185, + "NameEnd": 189 } ] }, "Separator": ",", - "AsPos": 185, + "AsPos": 189, "AsType": { - "LiteralPos": 188, - "LiteralEnd": 194, + "LiteralPos": 192, + "LiteralEnd": 198, "Literal": "String" } }, @@ -316,8 +316,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 200, - "NameEnd": 205 + "NamePos": 204, + "NameEnd": 209 } } ], @@ -339,8 +339,8 @@ "Except": null }, { - "SelectPos": 207, - "StatementEnd": 258, + "SelectPos": 212, + "StatementEnd": 263, "With": null, "Top": null, "HasDistinct": false, @@ -348,40 +348,40 @@ "SelectItems": [ { "Expr": { - "CastPos": 214, + "CastPos": 219, "Expr": { "Fields": [ { "Name": "some", "QuoteType": 1, - "NamePos": 219, - "NameEnd": 223 - }, - { - "Name": "long", - "QuoteType": 1, "NamePos": 224, "NameEnd": 228 }, { - "Name": "json", + "Name": "long", "QuoteType": 1, "NamePos": 229, "NameEnd": 233 }, { - "Name": "path", + "Name": "json", "QuoteType": 1, "NamePos": 234, "NameEnd": 238 + }, + { + "Name": "path", + "QuoteType": 1, + "NamePos": 239, + "NameEnd": 243 } ] }, "Separator": ",", - "AsPos": 238, + "AsPos": 243, "AsType": { - "LiteralPos": 241, - "LiteralEnd": 247, + "LiteralPos": 246, + "LiteralEnd": 252, "Literal": "String" } }, @@ -389,8 +389,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 253, - "NameEnd": 258 + "NamePos": 258, + "NameEnd": 263 } } ], diff --git a/parser/testdata/query/output/select_simple.sql.golden.json b/parser/testdata/query/output/select_simple.sql.golden.json index 0b4a323..2c884d2 100644 --- a/parser/testdata/query/output/select_simple.sql.golden.json +++ b/parser/testdata/query/output/select_simple.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 277, + "StatementEnd": 287, "With": null, "Top": null, "HasDistinct": false, @@ -11,8 +11,8 @@ "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 11, - "NameEnd": 13 + "NamePos": 12, + "NameEnd": 14 }, "Modifiers": [], "Alias": null @@ -22,23 +22,23 @@ "Name": { "Name": "coalesce", "QuoteType": 1, - "NamePos": 15, - "NameEnd": 23 + "NamePos": 16, + "NameEnd": 24 }, "Params": { - "LeftParenPos": 23, - "RightParenPos": 30, + "LeftParenPos": 24, + "RightParenPos": 31, "Items": { - "ListPos": 24, - "ListEnd": 30, + "ListPos": 25, + "ListEnd": 31, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 24, - "NameEnd": 26 + "NamePos": 25, + "NameEnd": 27 }, "Alias": null }, @@ -46,8 +46,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 28, - "NameEnd": 30 + "NamePos": 29, + "NameEnd": 31 }, "Alias": null } @@ -60,8 +60,8 @@ "Alias": { "Name": "f3", "QuoteType": 1, - "NamePos": 35, - "NameEnd": 37 + "NamePos": 36, + "NameEnd": 38 } }, { @@ -70,38 +70,38 @@ "Name": { "Name": "row_number", "QuoteType": 1, - "NamePos": 39, - "NameEnd": 49 + "NamePos": 40, + "NameEnd": 50 }, "Params": { - "LeftParenPos": 49, - "RightParenPos": 50, + "LeftParenPos": 50, + "RightParenPos": 51, "Items": { - "ListPos": 50, - "ListEnd": 50, + "ListPos": 51, + "ListEnd": 51, "HasDistinct": false, "Items": [] }, "ColumnArgList": null } }, - "OverPos": 52, + "OverPos": 54, "OverExpr": { - "LeftParenPos": 57, - "RightParenPos": 89, + "LeftParenPos": 59, + "RightParenPos": 91, "PartitionBy": { - "PartitionPos": 57, + "PartitionPos": 59, "Expr": { - "ListPos": 71, - "ListEnd": 73, + "ListPos": 73, + "ListEnd": 75, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 71, - "NameEnd": 73 + "NamePos": 73, + "NameEnd": 75 }, "Alias": null } @@ -109,16 +109,16 @@ } }, "OrderBy": { - "OrderPos": 74, - "ListEnd": 85, + "OrderPos": 76, + "ListEnd": 87, "Items": [ { - "OrderPos": 74, + "OrderPos": 76, "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 85 + "NamePos": 85, + "NameEnd": 87 }, "Alias": null, "Direction": "ASC" @@ -132,35 +132,35 @@ "Alias": { "Name": "rn", "QuoteType": 1, - "NamePos": 94, - "NameEnd": 96 + "NamePos": 96, + "NameEnd": 98 } } ], "From": { - "FromPos": 97, + "FromPos": 100, "Expr": { "Table": { - "TablePos": 102, - "TableEnd": 119, + "TablePos": 105, + "TableEnd": 122, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 102, - "NameEnd": 106 + "NamePos": 105, + "NameEnd": 109 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 107, - "NameEnd": 119 + "NamePos": 110, + "NameEnd": 122 } }, "HasFinal": false }, - "StatementEnd": 119, + "StatementEnd": 122, "SampleRatio": null, "HasFinal": false } @@ -169,16 +169,16 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 120, + "WherePos": 124, "Expr": { "LeftExpr": { "LeftExpr": { "LeftExpr": { - "LeftParenPos": 126, - "RightParenPos": 155, + "LeftParenPos": 130, + "RightParenPos": 159, "Items": { - "ListPos": 127, - "ListEnd": 154, + "ListPos": 131, + "ListEnd": 158, "HasDistinct": false, "Items": [ { @@ -186,38 +186,38 @@ "LeftExpr": { "Name": "f0", "QuoteType": 1, - "NamePos": 127, - "NameEnd": 129 + "NamePos": 131, + "NameEnd": 133 }, "Operation": "IN", "RightExpr": { - "LeftParenPos": 133, - "RightParenPos": 154, + "LeftParenPos": 137, + "RightParenPos": 158, "Items": { - "ListPos": 135, - "ListEnd": 153, + "ListPos": 139, + "ListEnd": 157, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 135, - "LiteralEnd": 138, + "LiteralPos": 139, + "LiteralEnd": 142, "Literal": "foo" }, "Alias": null }, { "Expr": { - "LiteralPos": 142, - "LiteralEnd": 145, + "LiteralPos": 146, + "LiteralEnd": 149, "Literal": "bar" }, "Alias": null }, { "Expr": { - "LiteralPos": 149, - "LiteralEnd": 153, + "LiteralPos": 153, + "LiteralEnd": 157, "Literal": "test" }, "Alias": null @@ -237,11 +237,11 @@ }, "Operation": "AND", "RightExpr": { - "LeftParenPos": 161, - "RightParenPos": 176, + "LeftParenPos": 165, + "RightParenPos": 180, "Items": { - "ListPos": 162, - "ListEnd": 175, + "ListPos": 166, + "ListEnd": 179, "HasDistinct": false, "Items": [ { @@ -249,13 +249,13 @@ "LeftExpr": { "Name": "f1", "QuoteType": 1, - "NamePos": 162, - "NameEnd": 164 + "NamePos": 166, + "NameEnd": 168 }, "Operation": "=", "RightExpr": { - "LiteralPos": 168, - "LiteralEnd": 175, + "LiteralPos": 172, + "LiteralEnd": 179, "Literal": "testing" }, "HasGlobal": false, @@ -272,11 +272,11 @@ }, "Operation": "AND", "RightExpr": { - "LeftParenPos": 182, - "RightParenPos": 205, + "LeftParenPos": 186, + "RightParenPos": 209, "Items": { - "ListPos": 183, - "ListEnd": 204, + "ListPos": 187, + "ListEnd": 208, "HasDistinct": false, "Items": [ { @@ -284,13 +284,13 @@ "LeftExpr": { "Name": "f2", "QuoteType": 1, - "NamePos": 183, - "NameEnd": 185 + "NamePos": 187, + "NameEnd": 189 }, "Operation": "NOT LIKE", "RightExpr": { - "LiteralPos": 196, - "LiteralEnd": 204, + "LiteralPos": 200, + "LiteralEnd": 208, "Literal": "testing2" }, "HasGlobal": false, @@ -310,38 +310,38 @@ "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 211, - "NameEnd": 213 + "NamePos": 216, + "NameEnd": 218 }, "Operation": "NOT IN", "RightExpr": { - "LeftParenPos": 221, - "RightParenPos": 235, + "LeftParenPos": 226, + "RightParenPos": 240, "Items": { - "ListPos": 223, - "ListEnd": 234, + "ListPos": 228, + "ListEnd": 239, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 223, - "LiteralEnd": 224, + "LiteralPos": 228, + "LiteralEnd": 229, "Literal": "a" }, "Alias": null }, { "Expr": { - "LiteralPos": 228, - "LiteralEnd": 229, + "LiteralPos": 233, + "LiteralEnd": 234, "Literal": "b" }, "Alias": null }, { "Expr": { - "LiteralPos": 233, - "LiteralEnd": 234, + "LiteralPos": 238, + "LiteralEnd": 239, "Literal": "c" }, "Alias": null @@ -358,20 +358,20 @@ } }, "GroupBy": { - "GroupByPos": 239, - "GroupByEnd": 258, + "GroupByPos": 247, + "GroupByEnd": 268, "AggregateType": "", "Expr": { - "ListPos": 248, - "ListEnd": 256, + "ListPos": 256, + "ListEnd": 264, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 248, - "NameEnd": 250 + "NamePos": 256, + "NameEnd": 258 }, "Alias": null }, @@ -379,8 +379,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 254, - "NameEnd": 256 + "NamePos": 262, + "NameEnd": 264 }, "Alias": null } @@ -395,31 +395,31 @@ "OrderBy": null, "LimitBy": { "Limit": { - "LimitPos": 258, + "LimitPos": 268, "Limit": { - "NumPos": 269, - "NumEnd": 271, + "NumPos": 279, + "NumEnd": 281, "Literal": "10", "Base": 10 }, "Offset": { - "NumPos": 264, - "NumEnd": 267, + "NumPos": 274, + "NumEnd": 277, "Literal": "100", "Base": 10 } }, "ByExpr": { - "ListPos": 275, - "ListEnd": 277, + "ListPos": 285, + "ListEnd": 287, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 275, - "NameEnd": 277 + "NamePos": 285, + "NameEnd": 287 }, "Alias": null } diff --git a/parser/testdata/query/output/select_simple_with_cte_with_column_aliases.sql.golden.json b/parser/testdata/query/output/select_simple_with_cte_with_column_aliases.sql.golden.json index 03b1d62..8be3728 100644 --- a/parser/testdata/query/output/select_simple_with_cte_with_column_aliases.sql.golden.json +++ b/parser/testdata/query/output/select_simple_with_cte_with_column_aliases.sql.golden.json @@ -1,34 +1,34 @@ [ { "SelectPos": 0, - "StatementEnd": 133, + "StatementEnd": 140, "With": { "WithPos": 0, - "EndPos": 24, + "EndPos": 25, "CTEs": [ { - "CTEPos": 9, + "CTEPos": 10, "Expr": { "Name": { "Name": "test", "QuoteType": 1, - "NamePos": 9, - "NameEnd": 13 + "NamePos": 10, + "NameEnd": 14 }, "Params": { - "LeftParenPos": 13, - "RightParenPos": 24, + "LeftParenPos": 14, + "RightParenPos": 25, "Items": { - "ListPos": 14, - "ListEnd": 24, + "ListPos": 15, + "ListEnd": 25, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 14, - "NameEnd": 16 + "NamePos": 15, + "NameEnd": 17 }, "Alias": null }, @@ -36,8 +36,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 18, - "NameEnd": 20 + "NamePos": 19, + "NameEnd": 21 }, "Alias": null }, @@ -45,8 +45,8 @@ "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 22, - "NameEnd": 24 + "NamePos": 23, + "NameEnd": 25 }, "Alias": null } @@ -56,8 +56,8 @@ } }, "Alias": { - "SelectPos": 30, - "StatementEnd": 58, + "SelectPos": 31, + "StatementEnd": 59, "With": null, "Top": null, "HasDistinct": false, @@ -67,8 +67,8 @@ "Expr": { "Name": "f4", "QuoteType": 1, - "NamePos": 37, - "NameEnd": 39 + "NamePos": 38, + "NameEnd": 40 }, "Modifiers": [], "Alias": null @@ -77,8 +77,8 @@ "Expr": { "Name": "f5", "QuoteType": 1, - "NamePos": 41, - "NameEnd": 43 + "NamePos": 42, + "NameEnd": 44 }, "Modifiers": [], "Alias": null @@ -87,32 +87,32 @@ "Expr": { "Name": "f6", "QuoteType": 1, - "NamePos": 45, - "NameEnd": 47 + "NamePos": 46, + "NameEnd": 48 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 48, + "FromPos": 49, "Expr": { "Table": { - "TablePos": 53, - "TableEnd": 58, + "TablePos": 54, + "TableEnd": 59, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "sales", "QuoteType": 1, - "NamePos": 53, - "NameEnd": 58 + "NamePos": 54, + "NameEnd": 59 } }, "HasFinal": false }, - "StatementEnd": 58, + "StatementEnd": 59, "SampleRatio": null, "HasFinal": false } @@ -144,67 +144,67 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 71, - "NameEnd": 73 + "NamePos": 74, + "NameEnd": 76 }, "Modifiers": [], "Alias": { "Name": "new_f1", "QuoteType": 1, - "NamePos": 77, - "NameEnd": 83 + "NamePos": 80, + "NameEnd": 86 } }, { "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 89, - "NameEnd": 91 + "NamePos": 93, + "NameEnd": 95 }, "Modifiers": [], "Alias": { "Name": "new_f2", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 101 + "NamePos": 99, + "NameEnd": 105 } }, { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 107, - "NameEnd": 109 + "NamePos": 112, + "NameEnd": 114 }, "Modifiers": [], "Alias": { "Name": "new_f3", "QuoteType": 1, - "NamePos": 113, - "NameEnd": 119 + "NamePos": 118, + "NameEnd": 124 } } ], "From": { - "FromPos": 120, + "FromPos": 126, "Expr": { "Table": { - "TablePos": 129, - "TableEnd": 133, + "TablePos": 136, + "TableEnd": 140, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "test", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 133 + "NamePos": 136, + "NameEnd": 140 } }, "HasFinal": false }, - "StatementEnd": 133, + "StatementEnd": 140, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/select_simple_with_is_not_null.sql.golden.json b/parser/testdata/query/output/select_simple_with_is_not_null.sql.golden.json index 34b76ec..634779a 100644 --- a/parser/testdata/query/output/select_simple_with_is_not_null.sql.golden.json +++ b/parser/testdata/query/output/select_simple_with_is_not_null.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 133, + "StatementEnd": 138, "With": null, "Top": null, "HasDistinct": false, @@ -54,29 +54,29 @@ } ], "From": { - "FromPos": 25, + "FromPos": 26, "Expr": { "Table": { - "TablePos": 30, - "TableEnd": 47, + "TablePos": 31, + "TableEnd": 48, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 30, - "NameEnd": 34 + "NamePos": 31, + "NameEnd": 35 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 35, - "NameEnd": 47 + "NamePos": 36, + "NameEnd": 48 } }, "HasFinal": false }, - "StatementEnd": 47, + "StatementEnd": 48, "SampleRatio": null, "HasFinal": false } @@ -85,16 +85,16 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 48, + "WherePos": 50, "Expr": { "LeftExpr": { "LeftExpr": { "LeftExpr": { - "LeftParenPos": 54, - "RightParenPos": 83, + "LeftParenPos": 56, + "RightParenPos": 85, "Items": { - "ListPos": 55, - "ListEnd": 82, + "ListPos": 57, + "ListEnd": 84, "HasDistinct": false, "Items": [ { @@ -102,38 +102,38 @@ "LeftExpr": { "Name": "f0", "QuoteType": 1, - "NamePos": 55, - "NameEnd": 57 + "NamePos": 57, + "NameEnd": 59 }, "Operation": "IN", "RightExpr": { - "LeftParenPos": 61, - "RightParenPos": 82, + "LeftParenPos": 63, + "RightParenPos": 84, "Items": { - "ListPos": 63, - "ListEnd": 81, + "ListPos": 65, + "ListEnd": 83, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 63, - "LiteralEnd": 66, + "LiteralPos": 65, + "LiteralEnd": 68, "Literal": "foo" }, "Alias": null }, { "Expr": { - "LiteralPos": 70, - "LiteralEnd": 73, + "LiteralPos": 72, + "LiteralEnd": 75, "Literal": "bar" }, "Alias": null }, { "Expr": { - "LiteralPos": 77, - "LiteralEnd": 81, + "LiteralPos": 79, + "LiteralEnd": 83, "Literal": "test" }, "Alias": null @@ -153,11 +153,11 @@ }, "Operation": "AND", "RightExpr": { - "LeftParenPos": 91, - "RightParenPos": 106, + "LeftParenPos": 94, + "RightParenPos": 109, "Items": { - "ListPos": 92, - "ListEnd": 105, + "ListPos": 95, + "ListEnd": 108, "HasDistinct": false, "Items": [ { @@ -165,13 +165,13 @@ "LeftExpr": { "Name": "f1", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 94 + "NamePos": 95, + "NameEnd": 97 }, "Operation": "=", "RightExpr": { - "LiteralPos": 98, - "LiteralEnd": 105, + "LiteralPos": 101, + "LiteralEnd": 108, "Literal": "testing" }, "HasGlobal": false, @@ -188,12 +188,12 @@ }, "Operation": "AND", "RightExpr": { - "IsPos": 127, + "IsPos": 132, "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 114, - "NameEnd": 116 + "NamePos": 118, + "NameEnd": 120 } }, "HasGlobal": false, @@ -201,12 +201,12 @@ }, "Operation": "AND", "RightExpr": { - "IsPos": 145, + "IsPos": 150, "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 133 + "NamePos": 136, + "NameEnd": 138 } }, "HasGlobal": false, diff --git a/parser/testdata/query/output/select_simple_with_is_null.sql.golden.json b/parser/testdata/query/output/select_simple_with_is_null.sql.golden.json index 30d10a6..95c16fc 100644 --- a/parser/testdata/query/output/select_simple_with_is_null.sql.golden.json +++ b/parser/testdata/query/output/select_simple_with_is_null.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 112, + "StatementEnd": 114, "With": null, "Top": null, "HasDistinct": false, @@ -54,29 +54,29 @@ } ], "From": { - "FromPos": 25, + "FromPos": 26, "Expr": { "Table": { - "TablePos": 30, - "TableEnd": 47, + "TablePos": 31, + "TableEnd": 48, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 30, - "NameEnd": 34 + "NamePos": 31, + "NameEnd": 35 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 35, - "NameEnd": 47 + "NamePos": 36, + "NameEnd": 48 } }, "HasFinal": false }, - "StatementEnd": 47, + "StatementEnd": 48, "SampleRatio": null, "HasFinal": false } @@ -85,15 +85,15 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 48, + "WherePos": 50, "Expr": { "LeftExpr": { "LeftExpr": { - "LeftParenPos": 54, - "RightParenPos": 83, + "LeftParenPos": 56, + "RightParenPos": 85, "Items": { - "ListPos": 55, - "ListEnd": 82, + "ListPos": 57, + "ListEnd": 84, "HasDistinct": false, "Items": [ { @@ -101,38 +101,38 @@ "LeftExpr": { "Name": "f0", "QuoteType": 1, - "NamePos": 55, - "NameEnd": 57 + "NamePos": 57, + "NameEnd": 59 }, "Operation": "IN", "RightExpr": { - "LeftParenPos": 61, - "RightParenPos": 82, + "LeftParenPos": 63, + "RightParenPos": 84, "Items": { - "ListPos": 63, - "ListEnd": 81, + "ListPos": 65, + "ListEnd": 83, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 63, - "LiteralEnd": 66, + "LiteralPos": 65, + "LiteralEnd": 68, "Literal": "foo" }, "Alias": null }, { "Expr": { - "LiteralPos": 70, - "LiteralEnd": 73, + "LiteralPos": 72, + "LiteralEnd": 75, "Literal": "bar" }, "Alias": null }, { "Expr": { - "LiteralPos": 77, - "LiteralEnd": 81, + "LiteralPos": 79, + "LiteralEnd": 83, "Literal": "test" }, "Alias": null @@ -152,11 +152,11 @@ }, "Operation": "AND", "RightExpr": { - "LeftParenPos": 89, - "RightParenPos": 104, + "LeftParenPos": 91, + "RightParenPos": 106, "Items": { - "ListPos": 90, - "ListEnd": 103, + "ListPos": 92, + "ListEnd": 105, "HasDistinct": false, "Items": [ { @@ -164,13 +164,13 @@ "LeftExpr": { "Name": "f1", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 92 + "NamePos": 92, + "NameEnd": 94 }, "Operation": "=", "RightExpr": { - "LiteralPos": 96, - "LiteralEnd": 103, + "LiteralPos": 98, + "LiteralEnd": 105, "Literal": "testing" }, "HasGlobal": false, @@ -187,12 +187,12 @@ }, "Operation": "AND", "RightExpr": { - "IsPos": 120, + "IsPos": 122, "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 110, - "NameEnd": 112 + "NamePos": 112, + "NameEnd": 114 } }, "HasGlobal": false, diff --git a/parser/testdata/query/output/select_simple_with_with_clause.sql.golden.json b/parser/testdata/query/output/select_simple_with_with_clause.sql.golden.json index 0836041..50d4043 100644 --- a/parser/testdata/query/output/select_simple_with_with_clause.sql.golden.json +++ b/parser/testdata/query/output/select_simple_with_with_clause.sql.golden.json @@ -1,22 +1,22 @@ [ { "SelectPos": 0, - "StatementEnd": 124, + "StatementEnd": 132, "With": { "WithPos": 0, - "EndPos": 46, + "EndPos": 48, "CTEs": [ { - "CTEPos": 9, + "CTEPos": 10, "Expr": { "Name": "cte1", "QuoteType": 1, - "NamePos": 9, - "NameEnd": 13 + "NamePos": 10, + "NameEnd": 14 }, "Alias": { - "SelectPos": 18, - "StatementEnd": 35, + "SelectPos": 19, + "StatementEnd": 36, "With": null, "Top": null, "HasDistinct": false, @@ -26,32 +26,32 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 25, - "NameEnd": 27 + "NamePos": 26, + "NameEnd": 28 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 28, + "FromPos": 29, "Expr": { "Table": { - "TablePos": 33, - "TableEnd": 35, + "TablePos": 34, + "TableEnd": 36, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 33, - "NameEnd": 35 + "NamePos": 34, + "NameEnd": 36 } }, "HasFinal": false }, - "StatementEnd": 35, + "StatementEnd": 36, "SampleRatio": null, "HasFinal": false } @@ -74,16 +74,16 @@ } }, { - "CTEPos": 42, + "CTEPos": 44, "Expr": { "Name": "cte2", "QuoteType": 1, - "NamePos": 42, - "NameEnd": 46 + "NamePos": 44, + "NameEnd": 48 }, "Alias": { - "SelectPos": 51, - "StatementEnd": 68, + "SelectPos": 53, + "StatementEnd": 70, "With": null, "Top": null, "HasDistinct": false, @@ -93,32 +93,32 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 58, - "NameEnd": 60 + "NamePos": 60, + "NameEnd": 62 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 61, + "FromPos": 63, "Expr": { "Table": { - "TablePos": 66, - "TableEnd": 68, + "TablePos": 68, + "TableEnd": 70, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 66, - "NameEnd": 68 + "NamePos": 68, + "NameEnd": 70 } }, "HasFinal": false }, - "StatementEnd": 68, + "StatementEnd": 70, "SampleRatio": null, "HasFinal": false } @@ -152,14 +152,14 @@ { "Name": "cte1", "QuoteType": 1, - "NamePos": 81, - "NameEnd": 85 + "NamePos": 85, + "NameEnd": 89 }, { "Name": "f1", "QuoteType": 1, - "NamePos": 86, - "NameEnd": 88 + "NamePos": 90, + "NameEnd": 92 } ] }, @@ -172,14 +172,14 @@ { "Name": "cte2", "QuoteType": 1, - "NamePos": 94, - "NameEnd": 98 + "NamePos": 99, + "NameEnd": 103 }, { "Name": "f2", "QuoteType": 1, - "NamePos": 99, - "NameEnd": 101 + "NamePos": 104, + "NameEnd": 106 } ] }, @@ -192,14 +192,14 @@ { "Name": "t3", "QuoteType": 1, - "NamePos": 107, - "NameEnd": 109 + "NamePos": 113, + "NameEnd": 115 }, { "Name": "f3", "QuoteType": 1, - "NamePos": 110, - "NameEnd": 112 + "NamePos": 116, + "NameEnd": 118 } ] }, @@ -208,68 +208,68 @@ } ], "From": { - "FromPos": 113, + "FromPos": 120, "Expr": { - "JoinPos": 122, + "JoinPos": 130, "Left": { "Table": { - "TablePos": 122, - "TableEnd": 124, + "TablePos": 130, + "TableEnd": 132, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t3", "QuoteType": 1, - "NamePos": 122, - "NameEnd": 124 + "NamePos": 130, + "NameEnd": 132 } }, "HasFinal": false }, - "StatementEnd": 124, + "StatementEnd": 132, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 125, + "JoinPos": 133, "Left": { "Table": { - "TablePos": 125, - "TableEnd": 129, + "TablePos": 133, + "TableEnd": 137, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "cte1", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 129 + "NamePos": 133, + "NameEnd": 137 } }, "HasFinal": false }, - "StatementEnd": 129, + "StatementEnd": 137, "SampleRatio": null, "HasFinal": false }, "Right": { "Table": { - "TablePos": 130, - "TableEnd": 134, + "TablePos": 138, + "TableEnd": 142, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "cte2", "QuoteType": 1, - "NamePos": 130, - "NameEnd": 134 + "NamePos": 138, + "NameEnd": 142 } }, "HasFinal": false }, - "StatementEnd": 134, + "StatementEnd": 142, "SampleRatio": null, "HasFinal": false }, diff --git a/parser/testdata/query/output/select_table_function_with_query.sql.golden.json b/parser/testdata/query/output/select_table_function_with_query.sql.golden.json index d929838..a46ed59 100644 --- a/parser/testdata/query/output/select_table_function_with_query.sql.golden.json +++ b/parser/testdata/query/output/select_table_function_with_query.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 125, + "StatementEnd": 132, "With": null, "Top": null, "HasDistinct": false, @@ -77,50 +77,50 @@ } ], "From": { - "FromPos": 41, + "FromPos": 42, "Expr": { "Table": { - "TablePos": 46, - "TableEnd": 125, + "TablePos": 48, + "TableEnd": 132, "Alias": null, "Expr": { "Name": { "Name": "numbers", "QuoteType": 1, - "NamePos": 46, - "NameEnd": 53 + "NamePos": 48, + "NameEnd": 55 }, "Args": { - "LeftParenPos": 53, - "RightParenPos": 125, + "LeftParenPos": 55, + "RightParenPos": 132, "Args": [ { "Name": { "Name": "plus", "QuoteType": 1, - "NamePos": 59, - "NameEnd": 63 + "NamePos": 62, + "NameEnd": 66 }, "Args": { - "LeftParenPos": 59, - "RightParenPos": 123, + "LeftParenPos": 62, + "RightParenPos": 129, "Args": [ { "Name": { "Name": "ifNull", "QuoteType": 1, - "NamePos": 73, - "NameEnd": 79 + "NamePos": 77, + "NameEnd": 83 }, "Args": { - "LeftParenPos": 73, - "RightParenPos": 117, + "LeftParenPos": 77, + "RightParenPos": 122, "Args": [ { "HasParen": true, "Select": { - "SelectPos": 81, - "StatementEnd": 105, + "SelectPos": 85, + "StatementEnd": 109, "With": null, "Top": null, "HasDistinct": false, @@ -128,8 +128,8 @@ "SelectItems": [ { "Expr": { - "NumPos": 88, - "NumEnd": 89, + "NumPos": 92, + "NumEnd": 93, "Literal": "1", "Base": 10 }, @@ -137,14 +137,14 @@ "Alias": { "Name": "bin_count", "QuoteType": 1, - "NamePos": 93, - "NameEnd": 102 + "NamePos": 97, + "NameEnd": 106 } }, { "Expr": { - "NumPos": 104, - "NumEnd": 105, + "NumPos": 108, + "NumEnd": 109, "Literal": "1", "Base": 10 }, @@ -171,8 +171,8 @@ } }, { - "NumPos": 116, - "NumEnd": 117, + "NumPos": 121, + "NumEnd": 122, "Literal": "1", "Base": 10 } @@ -187,7 +187,7 @@ }, "HasFinal": false }, - "StatementEnd": 125, + "StatementEnd": 132, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/select_with_group_by.sql.golden.json b/parser/testdata/query/output/select_with_group_by.sql.golden.json index 136ff44..5c3fc65 100644 --- a/parser/testdata/query/output/select_with_group_by.sql.golden.json +++ b/parser/testdata/query/output/select_with_group_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 171, + "StatementEnd": 183, "With": null, "Top": null, "HasDistinct": false, @@ -11,8 +11,8 @@ "Expr": { "Name": "datacenter", "QuoteType": 1, - "NamePos": 11, - "NameEnd": 21 + "NamePos": 12, + "NameEnd": 22 }, "Modifiers": [], "Alias": null @@ -21,8 +21,8 @@ "Expr": { "Name": "distro", "QuoteType": 1, - "NamePos": 27, - "NameEnd": 33 + "NamePos": 29, + "NameEnd": 35 }, "Modifiers": [], "Alias": null @@ -32,23 +32,23 @@ "Name": { "Name": "SUM", "QuoteType": 1, - "NamePos": 39, - "NameEnd": 42 + "NamePos": 42, + "NameEnd": 45 }, "Params": { - "LeftParenPos": 43, - "RightParenPos": 52, + "LeftParenPos": 46, + "RightParenPos": 55, "Items": { - "ListPos": 44, - "ListEnd": 52, + "ListPos": 47, + "ListEnd": 55, "HasDistinct": false, "Items": [ { "Expr": { "Name": "quantity", "QuoteType": 1, - "NamePos": 44, - "NameEnd": 52 + "NamePos": 47, + "NameEnd": 55 }, "Alias": null } @@ -61,30 +61,30 @@ "Alias": { "Name": "qty", "QuoteType": 1, - "NamePos": 57, - "NameEnd": 60 + "NamePos": 60, + "NameEnd": 63 } } ], "From": { - "FromPos": 61, + "FromPos": 65, "Expr": { "Table": { - "TablePos": 70, - "TableEnd": 77, + "TablePos": 75, + "TableEnd": 82, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "servers", "QuoteType": 1, - "NamePos": 70, - "NameEnd": 77 + "NamePos": 75, + "NameEnd": 82 } }, "HasFinal": false }, - "StatementEnd": 77, + "StatementEnd": 82, "SampleRatio": null, "HasFinal": false } @@ -94,32 +94,32 @@ "Prewhere": null, "Where": null, "GroupBy": { - "GroupByPos": 78, - "GroupByEnd": 171, + "GroupByPos": 84, + "GroupByEnd": 183, "AggregateType": "GROUPING SETS", "Expr": { - "LeftParenPos": 104, - "RightParenPos": 170, + "LeftParenPos": 111, + "RightParenPos": 182, "Items": { - "ListPos": 110, - "ListEnd": 168, + "ListPos": 118, + "ListEnd": 179, "HasDistinct": false, "Items": [ { "Expr": { - "LeftParenPos": 110, - "RightParenPos": 128, + "LeftParenPos": 118, + "RightParenPos": 136, "Items": { - "ListPos": 111, - "ListEnd": 128, + "ListPos": 119, + "ListEnd": 136, "HasDistinct": false, "Items": [ { "Expr": { "Name": "datacenter", "QuoteType": 1, - "NamePos": 111, - "NameEnd": 121 + "NamePos": 119, + "NameEnd": 129 }, "Alias": null }, @@ -127,8 +127,8 @@ "Expr": { "Name": "distro", "QuoteType": 1, - "NamePos": 122, - "NameEnd": 128 + "NamePos": 130, + "NameEnd": 136 }, "Alias": null } @@ -140,19 +140,19 @@ }, { "Expr": { - "LeftParenPos": 135, - "RightParenPos": 146, + "LeftParenPos": 144, + "RightParenPos": 155, "Items": { - "ListPos": 136, - "ListEnd": 146, + "ListPos": 145, + "ListEnd": 155, "HasDistinct": false, "Items": [ { "Expr": { "Name": "datacenter", "QuoteType": 1, - "NamePos": 136, - "NameEnd": 146 + "NamePos": 145, + "NameEnd": 155 }, "Alias": null } @@ -164,19 +164,19 @@ }, { "Expr": { - "LeftParenPos": 153, - "RightParenPos": 160, + "LeftParenPos": 163, + "RightParenPos": 170, "Items": { - "ListPos": 154, - "ListEnd": 160, + "ListPos": 164, + "ListEnd": 170, "HasDistinct": false, "Items": [ { "Expr": { "Name": "distro", "QuoteType": 1, - "NamePos": 154, - "NameEnd": 160 + "NamePos": 164, + "NameEnd": 170 }, "Alias": null } @@ -188,11 +188,11 @@ }, { "Expr": { - "LeftParenPos": 167, - "RightParenPos": 168, + "LeftParenPos": 178, + "RightParenPos": 179, "Items": { - "ListPos": 168, - "ListEnd": 168, + "ListPos": 179, + "ListEnd": 179, "HasDistinct": false, "Items": [] }, @@ -220,8 +220,8 @@ "Except": null }, { - "SelectPos": 174, - "StatementEnd": 264, + "SelectPos": 188, + "StatementEnd": 284, "With": null, "Top": null, "HasDistinct": false, @@ -231,8 +231,8 @@ "Expr": { "Name": "datacenter", "QuoteType": 1, - "NamePos": 185, - "NameEnd": 195 + "NamePos": 200, + "NameEnd": 210 }, "Modifiers": [], "Alias": null @@ -241,8 +241,8 @@ "Expr": { "Name": "distro", "QuoteType": 1, - "NamePos": 201, - "NameEnd": 207 + "NamePos": 217, + "NameEnd": 223 }, "Modifiers": [], "Alias": null @@ -252,23 +252,23 @@ "Name": { "Name": "SUM", "QuoteType": 1, - "NamePos": 213, - "NameEnd": 216 + "NamePos": 230, + "NameEnd": 233 }, "Params": { - "LeftParenPos": 217, - "RightParenPos": 226, + "LeftParenPos": 234, + "RightParenPos": 243, "Items": { - "ListPos": 218, - "ListEnd": 226, + "ListPos": 235, + "ListEnd": 243, "HasDistinct": false, "Items": [ { "Expr": { "Name": "quantity", "QuoteType": 1, - "NamePos": 218, - "NameEnd": 226 + "NamePos": 235, + "NameEnd": 243 }, "Alias": null } @@ -281,30 +281,30 @@ "Alias": { "Name": "qty", "QuoteType": 1, - "NamePos": 231, - "NameEnd": 234 + "NamePos": 248, + "NameEnd": 251 } } ], "From": { - "FromPos": 235, + "FromPos": 253, "Expr": { "Table": { - "TablePos": 244, - "TableEnd": 251, + "TablePos": 263, + "TableEnd": 270, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "servers", "QuoteType": 1, - "NamePos": 244, - "NameEnd": 251 + "NamePos": 263, + "NameEnd": 270 } }, "HasFinal": false }, - "StatementEnd": 251, + "StatementEnd": 270, "SampleRatio": null, "HasFinal": false } @@ -314,8 +314,8 @@ "Prewhere": null, "Where": null, "GroupBy": { - "GroupByPos": 252, - "GroupByEnd": 264, + "GroupByPos": 272, + "GroupByEnd": 284, "AggregateType": "ALL", "Expr": null, "WithCube": false, diff --git a/parser/testdata/query/output/select_with_keyword_in_group_by.sql.golden.json b/parser/testdata/query/output/select_with_keyword_in_group_by.sql.golden.json index 9957f9a..20192a2 100644 --- a/parser/testdata/query/output/select_with_keyword_in_group_by.sql.golden.json +++ b/parser/testdata/query/output/select_with_keyword_in_group_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 181, + "StatementEnd": 187, "With": null, "Top": null, "HasDistinct": false, @@ -12,23 +12,23 @@ "Name": { "Name": "toStartOfInterval", "QuoteType": 1, - "NamePos": 11, - "NameEnd": 28 + "NamePos": 12, + "NameEnd": 29 }, "Params": { - "LeftParenPos": 28, - "RightParenPos": 59, + "LeftParenPos": 29, + "RightParenPos": 60, "Items": { - "ListPos": 29, - "ListEnd": 58, + "ListPos": 30, + "ListEnd": 59, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 29, - "NameEnd": 38 + "NamePos": 30, + "NameEnd": 39 }, "Alias": null }, @@ -37,21 +37,21 @@ "Name": { "Name": "toIntervalMinute", "QuoteType": 1, - "NamePos": 40, - "NameEnd": 56 + "NamePos": 41, + "NameEnd": 57 }, "Params": { - "LeftParenPos": 56, - "RightParenPos": 58, + "LeftParenPos": 57, + "RightParenPos": 59, "Items": { - "ListPos": 57, - "ListEnd": 58, + "ListPos": 58, + "ListEnd": 59, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 57, - "NumEnd": 58, + "NumPos": 58, + "NumEnd": 59, "Literal": "1", "Base": 10 }, @@ -73,40 +73,40 @@ "Alias": { "Name": "interval", "QuoteType": 1, - "NamePos": 64, - "NameEnd": 72 + "NamePos": 65, + "NameEnd": 73 } }, { "Expr": { "Name": "column_name", "QuoteType": 1, - "NamePos": 78, - "NameEnd": 89 + "NamePos": 80, + "NameEnd": 91 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 90, + "FromPos": 93, "Expr": { "Table": { - "TablePos": 95, - "TableEnd": 100, + "TablePos": 98, + "TableEnd": 103, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 100 + "NamePos": 98, + "NameEnd": 103 } }, "HasFinal": false }, - "StatementEnd": 100, + "StatementEnd": 103, "SampleRatio": null, "HasFinal": false } @@ -115,38 +115,38 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 101, + "WherePos": 105, "Expr": { "Name": "true", "QuoteType": 1, - "NamePos": 107, - "NameEnd": 111 + "NamePos": 111, + "NameEnd": 115 } }, "GroupBy": { - "GroupByPos": 112, - "GroupByEnd": 145, + "GroupByPos": 117, + "GroupByEnd": 151, "AggregateType": "", "Expr": { - "ListPos": 121, - "ListEnd": 143, + "ListPos": 126, + "ListEnd": 148, "HasDistinct": false, "Items": [ { "Expr": { - "LeftParenPos": 121, - "RightParenPos": 143, + "LeftParenPos": 126, + "RightParenPos": 148, "Items": { - "ListPos": 122, - "ListEnd": 143, + "ListPos": 127, + "ListEnd": 148, "HasDistinct": false, "Items": [ { "Expr": { "Name": "interval", "QuoteType": 1, - "NamePos": 122, - "NameEnd": 130 + "NamePos": 127, + "NameEnd": 135 }, "Alias": null }, @@ -154,8 +154,8 @@ "Expr": { "Name": "column_name", "QuoteType": 1, - "NamePos": 132, - "NameEnd": 143 + "NamePos": 137, + "NameEnd": 148 }, "Alias": null } @@ -174,39 +174,39 @@ "WithTotal": false, "Having": null, "OrderBy": { - "OrderPos": 145, - "ListEnd": 181, + "OrderPos": 151, + "ListEnd": 187, "Items": [ { - "OrderPos": 145, + "OrderPos": 151, "Expr": { - "LeftParenPos": 154, - "RightParenPos": 181, + "LeftParenPos": 160, + "RightParenPos": 187, "Items": { - "ListPos": 155, - "ListEnd": 181, + "ListPos": 161, + "ListEnd": 187, "HasDistinct": false, "Items": [ { "Expr": { "Name": "interval", "QuoteType": 1, - "NamePos": 155, - "NameEnd": 163 + "NamePos": 161, + "NameEnd": 169 }, "Alias": { "Name": "i", "QuoteType": 1, - "NamePos": 167, - "NameEnd": 168 + "NamePos": 173, + "NameEnd": 174 } }, { "Expr": { "Name": "column_name", "QuoteType": 1, - "NamePos": 170, - "NameEnd": 181 + "NamePos": 176, + "NameEnd": 187 }, "Alias": null } diff --git a/parser/testdata/query/output/select_with_left_join.sql.golden.json b/parser/testdata/query/output/select_with_left_join.sql.golden.json index d7bc53a..d97638b 100644 --- a/parser/testdata/query/output/select_with_left_join.sql.golden.json +++ b/parser/testdata/query/output/select_with_left_join.sql.golden.json @@ -1,22 +1,22 @@ [ { "SelectPos": 0, - "StatementEnd": 121, + "StatementEnd": 131, "With": { "WithPos": 0, - "EndPos": 68, + "EndPos": 73, "CTEs": [ { - "CTEPos": 9, + "CTEPos": 10, "Expr": { "Name": "t1", "QuoteType": 1, - "NamePos": 9, - "NameEnd": 11 + "NamePos": 10, + "NameEnd": 12 }, "Alias": { - "SelectPos": 37, - "StatementEnd": 54, + "SelectPos": 40, + "StatementEnd": 57, "With": null, "Top": null, "HasDistinct": false, @@ -24,8 +24,8 @@ "SelectItems": [ { "Expr": { - "NumPos": 44, - "NumEnd": 45, + "NumPos": 47, + "NumEnd": 48, "Literal": "1", "Base": 10 }, @@ -33,8 +33,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 49, - "NameEnd": 54 + "NamePos": 52, + "NameEnd": 57 } } ], @@ -57,16 +57,16 @@ } }, { - "CTEPos": 66, + "CTEPos": 71, "Expr": { "Name": "t2", "QuoteType": 1, - "NamePos": 66, - "NameEnd": 68 + "NamePos": 71, + "NameEnd": 73 }, "Alias": { - "SelectPos": 81, - "StatementEnd": 98, + "SelectPos": 88, + "StatementEnd": 105, "With": null, "Top": null, "HasDistinct": false, @@ -74,8 +74,8 @@ "SelectItems": [ { "Expr": { - "NumPos": 88, - "NumEnd": 89, + "NumPos": 95, + "NumEnd": 96, "Literal": "2", "Base": 10 }, @@ -83,8 +83,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 93, - "NameEnd": 98 + "NamePos": 100, + "NameEnd": 105 } } ], @@ -116,56 +116,56 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 112, - "NameEnd": 112 + "NamePos": 121, + "NameEnd": 121 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 114, + "FromPos": 124, "Expr": { - "JoinPos": 119, + "JoinPos": 129, "Left": { "Table": { - "TablePos": 119, - "TableEnd": 121, + "TablePos": 129, + "TableEnd": 131, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 119, - "NameEnd": 121 + "NamePos": 129, + "NameEnd": 131 } }, "HasFinal": false }, - "StatementEnd": 121, + "StatementEnd": 131, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 131, + "JoinPos": 142, "Left": { "Table": { - "TablePos": 141, - "TableEnd": 143, + "TablePos": 152, + "TableEnd": 154, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 141, - "NameEnd": 143 + "NamePos": 152, + "NameEnd": 154 } }, "HasFinal": false }, - "StatementEnd": 143, + "StatementEnd": 154, "SampleRatio": null, "HasFinal": false }, @@ -175,18 +175,18 @@ "JOIN" ], "Constraints": { - "OnPos": 144, + "OnPos": 155, "On": { - "ListPos": 147, - "ListEnd": 151, + "ListPos": 158, + "ListEnd": 162, "HasDistinct": false, "Items": [ { "Expr": { "Name": "true", "QuoteType": 1, - "NamePos": 147, - "NameEnd": 151 + "NamePos": 158, + "NameEnd": 162 }, "Alias": null } diff --git a/parser/testdata/query/output/select_with_multi_join.sql.golden.json b/parser/testdata/query/output/select_with_multi_join.sql.golden.json index 3725e4f..69674c9 100644 --- a/parser/testdata/query/output/select_with_multi_join.sql.golden.json +++ b/parser/testdata/query/output/select_with_multi_join.sql.golden.json @@ -1,10 +1,10 @@ [ { "SelectPos": 0, - "StatementEnd": 217, + "StatementEnd": 229, "With": { "WithPos": 0, - "EndPos": 91, + "EndPos": 95, "CTEs": [ { "CTEPos": 5, @@ -15,8 +15,8 @@ "NameEnd": 7 }, "Alias": { - "SelectPos": 17, - "StatementEnd": 41, + "SelectPos": 18, + "StatementEnd": 42, "With": null, "Top": null, "HasDistinct": false, @@ -24,16 +24,16 @@ "SelectItems": [ { "Expr": { - "LiteralPos": 25, - "LiteralEnd": 31, + "LiteralPos": 26, + "LiteralEnd": 32, "Literal": "value1" }, "Modifiers": [], "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 41 + "NamePos": 37, + "NameEnd": 42 } } ], @@ -56,16 +56,16 @@ } }, { - "CTEPos": 49, + "CTEPos": 51, "Expr": { "Name": "t2", "QuoteType": 1, - "NamePos": 49, - "NameEnd": 51 + "NamePos": 51, + "NameEnd": 53 }, "Alias": { - "SelectPos": 57, - "StatementEnd": 81, + "SelectPos": 60, + "StatementEnd": 84, "With": null, "Top": null, "HasDistinct": false, @@ -73,16 +73,16 @@ "SelectItems": [ { "Expr": { - "LiteralPos": 65, - "LiteralEnd": 71, + "LiteralPos": 68, + "LiteralEnd": 74, "Literal": "value2" }, "Modifiers": [], "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 76, - "NameEnd": 81 + "NamePos": 79, + "NameEnd": 84 } } ], @@ -105,16 +105,16 @@ } }, { - "CTEPos": 89, + "CTEPos": 93, "Expr": { "Name": "t3", "QuoteType": 1, - "NamePos": 89, - "NameEnd": 91 + "NamePos": 93, + "NameEnd": 95 }, "Alias": { - "SelectPos": 97, - "StatementEnd": 121, + "SelectPos": 102, + "StatementEnd": 126, "With": null, "Top": null, "HasDistinct": false, @@ -122,16 +122,16 @@ "SelectItems": [ { "Expr": { - "LiteralPos": 105, - "LiteralEnd": 111, + "LiteralPos": 110, + "LiteralEnd": 116, "Literal": "value3" }, "Modifiers": [], "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 116, - "NameEnd": 121 + "NamePos": 121, + "NameEnd": 126 } } ], @@ -165,14 +165,14 @@ { "Name": "t1", "QuoteType": 1, - "NamePos": 139, - "NameEnd": 141 + "NamePos": 147, + "NameEnd": 149 }, { "Name": "value", "QuoteType": 1, - "NamePos": 142, - "NameEnd": 147 + "NamePos": 150, + "NameEnd": 155 } ] }, @@ -180,8 +180,8 @@ "Alias": { "Name": "value1", "QuoteType": 1, - "NamePos": 151, - "NameEnd": 157 + "NamePos": 159, + "NameEnd": 165 } }, { @@ -190,14 +190,14 @@ { "Name": "t2", "QuoteType": 1, - "NamePos": 163, - "NameEnd": 165 + "NamePos": 172, + "NameEnd": 174 }, { "Name": "value", "QuoteType": 1, - "NamePos": 166, - "NameEnd": 171 + "NamePos": 175, + "NameEnd": 180 } ] }, @@ -205,8 +205,8 @@ "Alias": { "Name": "value2", "QuoteType": 1, - "NamePos": 175, - "NameEnd": 181 + "NamePos": 184, + "NameEnd": 190 } }, { @@ -215,14 +215,14 @@ { "Name": "t3", "QuoteType": 1, - "NamePos": 187, - "NameEnd": 189 + "NamePos": 197, + "NameEnd": 199 }, { "Name": "value", "QuoteType": 1, - "NamePos": 190, - "NameEnd": 195 + "NamePos": 200, + "NameEnd": 205 } ] }, @@ -230,120 +230,120 @@ "Alias": { "Name": "value3", "QuoteType": 1, - "NamePos": 199, - "NameEnd": 205 + "NamePos": 209, + "NameEnd": 215 } } ], "From": { - "FromPos": 206, + "FromPos": 217, "Expr": { - "JoinPos": 215, + "JoinPos": 227, "Left": { "Table": { - "TablePos": 215, - "TableEnd": 217, + "TablePos": 227, + "TableEnd": 229, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 215, - "NameEnd": 217 + "NamePos": 227, + "NameEnd": 229 } }, "HasFinal": false }, - "StatementEnd": 217, + "StatementEnd": 229, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 226, + "JoinPos": 239, "Left": { "Table": { - "TablePos": 231, - "TableEnd": 233, + "TablePos": 244, + "TableEnd": 246, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 231, - "NameEnd": 233 + "NamePos": 244, + "NameEnd": 246 } }, "HasFinal": false }, - "StatementEnd": 233, + "StatementEnd": 246, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 250, + "JoinPos": 264, "Left": { "Table": { - "TablePos": 255, - "TableEnd": 257, + "TablePos": 269, + "TableEnd": 271, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t3", "QuoteType": 1, - "NamePos": 255, - "NameEnd": 257 + "NamePos": 269, + "NameEnd": 271 } }, "HasFinal": false }, - "StatementEnd": 257, + "StatementEnd": 271, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 266, + "JoinPos": 281, "Left": { "Table": { - "TablePos": 271, - "TableEnd": 273, + "TablePos": 286, + "TableEnd": 288, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t4", "QuoteType": 1, - "NamePos": 271, - "NameEnd": 273 + "NamePos": 286, + "NameEnd": 288 } }, "HasFinal": false }, - "StatementEnd": 273, + "StatementEnd": 288, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 290, + "JoinPos": 306, "Left": { "Table": { - "TablePos": 295, - "TableEnd": 297, + "TablePos": 311, + "TableEnd": 313, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t5", "QuoteType": 1, - "NamePos": 295, - "NameEnd": 297 + "NamePos": 311, + "NameEnd": 313 } }, "HasFinal": false }, - "StatementEnd": 297, + "StatementEnd": 313, "SampleRatio": null, "HasFinal": false }, @@ -357,18 +357,18 @@ "JOIN" ], "Constraints": { - "OnPos": 274, + "OnPos": 289, "On": { - "ListPos": 277, - "ListEnd": 281, + "ListPos": 292, + "ListEnd": 296, "HasDistinct": false, "Items": [ { "Expr": { "Name": "true", "QuoteType": 1, - "NamePos": 277, - "NameEnd": 281 + "NamePos": 292, + "NameEnd": 296 }, "Alias": null } @@ -385,18 +385,18 @@ "JOIN" ], "Constraints": { - "OnPos": 234, + "OnPos": 247, "On": { - "ListPos": 237, - "ListEnd": 241, + "ListPos": 250, + "ListEnd": 254, "HasDistinct": false, "Items": [ { "Expr": { "Name": "true", "QuoteType": 1, - "NamePos": 237, - "NameEnd": 241 + "NamePos": 250, + "NameEnd": 254 }, "Alias": null } diff --git a/parser/testdata/query/output/select_with_multi_line_comment.sql.golden.json b/parser/testdata/query/output/select_with_multi_line_comment.sql.golden.json index 4e5a80d..fe0b344 100644 --- a/parser/testdata/query/output/select_with_multi_line_comment.sql.golden.json +++ b/parser/testdata/query/output/select_with_multi_line_comment.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 61, + "StatementEnd": 66, "With": null, "Top": null, "HasDistinct": false, @@ -11,32 +11,32 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 48, - "NameEnd": 48 + "NamePos": 51, + "NameEnd": 51 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 50, + "FromPos": 54, "Expr": { "Table": { - "TablePos": 59, - "TableEnd": 61, + "TablePos": 64, + "TableEnd": 66, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t0", "QuoteType": 1, - "NamePos": 59, - "NameEnd": 61 + "NamePos": 64, + "NameEnd": 66 } }, "HasFinal": false }, - "StatementEnd": 61, + "StatementEnd": 66, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/select_with_query_parameter.sql.golden.json b/parser/testdata/query/output/select_with_query_parameter.sql.golden.json index 61bd673..6b5b273 100644 --- a/parser/testdata/query/output/select_with_query_parameter.sql.golden.json +++ b/parser/testdata/query/output/select_with_query_parameter.sql.golden.json @@ -24,22 +24,22 @@ } }, { - "SetPos": 18, + "SetPos": 19, "Settings": { - "SettingsPos": 22, - "ListEnd": 36, + "SettingsPos": 23, + "ListEnd": 37, "Items": [ { - "SettingsPos": 22, + "SettingsPos": 23, "Name": { "Name": "param_b", "QuoteType": 1, - "NamePos": 22, - "NameEnd": 29 + "NamePos": 23, + "NameEnd": 30 }, "Expr": { - "LiteralPos": 33, - "LiteralEnd": 36, + "LiteralPos": 34, + "LiteralEnd": 37, "Literal": "str" } } @@ -47,22 +47,22 @@ } }, { - "SetPos": 39, + "SetPos": 41, "Settings": { - "SettingsPos": 43, - "ListEnd": 73, + "SettingsPos": 45, + "ListEnd": 75, "Items": [ { - "SettingsPos": 43, + "SettingsPos": 45, "Name": { "Name": "param_c", "QuoteType": 1, - "NamePos": 43, - "NameEnd": 50 + "NamePos": 45, + "NameEnd": 52 }, "Expr": { - "LiteralPos": 54, - "LiteralEnd": 73, + "LiteralPos": 56, + "LiteralEnd": 75, "Literal": "2022-08-04 18:30:53" } } @@ -70,41 +70,41 @@ } }, { - "SetPos": 76, + "SetPos": 79, "Settings": { - "SettingsPos": 80, - "ListEnd": 121, + "SettingsPos": 83, + "ListEnd": 124, "Items": [ { - "SettingsPos": 80, + "SettingsPos": 83, "Name": { "Name": "param_d", "QuoteType": 1, - "NamePos": 80, - "NameEnd": 87 + "NamePos": 83, + "NameEnd": 90 }, "Expr": { - "LBracePos": 90, - "RBracePos": 121, + "LBracePos": 93, + "RBracePos": 124, "KeyValues": [ { "Key": { - "LiteralPos": 92, - "LiteralEnd": 94, + "LiteralPos": 95, + "LiteralEnd": 97, "Literal": "10" }, "Value": { - "LeftBracketPos": 97, - "RightBracketPos": 104, + "LeftBracketPos": 100, + "RightBracketPos": 107, "Items": { - "ListPos": 98, - "ListEnd": 104, + "ListPos": 101, + "ListEnd": 107, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 98, - "NumEnd": 100, + "NumPos": 101, + "NumEnd": 103, "Literal": "11", "Base": 10 }, @@ -112,8 +112,8 @@ }, { "Expr": { - "NumPos": 102, - "NumEnd": 104, + "NumPos": 105, + "NumEnd": 107, "Literal": "12", "Base": 10 }, @@ -125,22 +125,22 @@ }, { "Key": { - "LiteralPos": 108, - "LiteralEnd": 110, + "LiteralPos": 111, + "LiteralEnd": 113, "Literal": "13" }, "Value": { - "LeftBracketPos": 113, - "RightBracketPos": 120, + "LeftBracketPos": 116, + "RightBracketPos": 123, "Items": { - "ListPos": 114, - "ListEnd": 120, + "ListPos": 117, + "ListEnd": 123, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 114, - "NumEnd": 116, + "NumPos": 117, + "NumEnd": 119, "Literal": "14", "Base": 10 }, @@ -148,8 +148,8 @@ }, { "Expr": { - "NumPos": 118, - "NumEnd": 120, + "NumPos": 121, + "NumEnd": 123, "Literal": "15", "Base": 10 }, @@ -166,8 +166,8 @@ } }, { - "SelectPos": 125, - "StatementEnd": 218, + "SelectPos": 130, + "StatementEnd": 227, "With": null, "Top": null, "HasDistinct": false, @@ -175,20 +175,20 @@ "SelectItems": [ { "Expr": { - "LBracePos": 136, - "RBracePos": 146, + "LBracePos": 142, + "RBracePos": 152, "Name": { "Name": "a", "QuoteType": 1, - "NamePos": 137, - "NameEnd": 138 + "NamePos": 143, + "NameEnd": 144 }, "Type": { "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 140, - "NameEnd": 146 + "NamePos": 146, + "NameEnd": 152 } } }, @@ -197,20 +197,20 @@ }, { "Expr": { - "LBracePos": 153, - "RBracePos": 163, + "LBracePos": 160, + "RBracePos": 170, "Name": { "Name": "b", "QuoteType": 1, - "NamePos": 154, - "NameEnd": 155 + "NamePos": 161, + "NameEnd": 162 }, "Type": { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 157, - "NameEnd": 163 + "NamePos": 164, + "NameEnd": 170 } } }, @@ -219,20 +219,20 @@ }, { "Expr": { - "LBracePos": 170, - "RBracePos": 182, + "LBracePos": 178, + "RBracePos": 190, "Name": { "Name": "c", "QuoteType": 1, - "NamePos": 171, - "NameEnd": 172 + "NamePos": 179, + "NameEnd": 180 }, "Type": { "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 174, - "NameEnd": 182 + "NamePos": 182, + "NameEnd": 190 } } }, @@ -241,48 +241,48 @@ }, { "Expr": { - "LBracePos": 189, - "RBracePos": 218, + "LBracePos": 198, + "RBracePos": 227, "Name": { "Name": "d", "QuoteType": 1, - "NamePos": 190, - "NameEnd": 191 + "NamePos": 199, + "NameEnd": 200 }, "Type": { - "LeftParenPos": 197, - "RightParenPos": 217, + "LeftParenPos": 206, + "RightParenPos": 226, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 193, - "NameEnd": 196 + "NamePos": 202, + "NameEnd": 205 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 197, - "NameEnd": 203 + "NamePos": 206, + "NameEnd": 212 } }, { - "LeftParenPos": 211, - "RightParenPos": 216, + "LeftParenPos": 220, + "RightParenPos": 225, "Name": { "Name": "Array", "QuoteType": 1, - "NamePos": 205, - "NameEnd": 210 + "NamePos": 214, + "NameEnd": 219 }, "Params": [ { "Name": { "Name": "UInt8", "QuoteType": 1, - "NamePos": 211, - "NameEnd": 216 + "NamePos": 220, + "NameEnd": 225 } } ] @@ -312,8 +312,8 @@ "Except": null }, { - "SelectPos": 222, - "StatementEnd": 283, + "SelectPos": 233, + "StatementEnd": 294, "With": null, "Top": null, "HasDistinct": false, @@ -323,32 +323,32 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 229, - "NameEnd": 229 + "NamePos": 240, + "NameEnd": 240 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 231, + "FromPos": 242, "Expr": { "Table": { - "TablePos": 236, - "TableEnd": 246, + "TablePos": 247, + "TableEnd": 257, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "clickhouse", "QuoteType": 1, - "NamePos": 236, - "NameEnd": 246 + "NamePos": 247, + "NameEnd": 257 } }, "HasFinal": false }, - "StatementEnd": 246, + "StatementEnd": 257, "SampleRatio": null, "HasFinal": false } @@ -357,30 +357,30 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 247, + "WherePos": 258, "Expr": { "LeftExpr": { "Name": "tenant_id", "QuoteType": 1, - "NamePos": 253, - "NameEnd": 262 + "NamePos": 264, + "NameEnd": 273 }, "Operation": "=", "RightExpr": { - "LBracePos": 265, - "RBracePos": 283, + "LBracePos": 276, + "RBracePos": 294, "Name": { "Name": "tenant_id", "QuoteType": 1, - "NamePos": 266, - "NameEnd": 275 + "NamePos": 277, + "NameEnd": 286 }, "Type": { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 277, - "NameEnd": 283 + "NamePos": 288, + "NameEnd": 294 } } }, diff --git a/parser/testdata/query/output/select_with_window_function.sql.golden.json b/parser/testdata/query/output/select_with_window_function.sql.golden.json index 2f0f9a4..8bb49a1 100644 --- a/parser/testdata/query/output/select_with_window_function.sql.golden.json +++ b/parser/testdata/query/output/select_with_window_function.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 508, + "StatementEnd": 520, "With": null, "Top": null, "HasDistinct": false, @@ -26,90 +26,90 @@ "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 53, - "NameEnd": 62 + "NamePos": 54, + "NameEnd": 63 }, "Modifiers": [], "Alias": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 66, - "NameEnd": 75 + "NamePos": 67, + "NameEnd": 76 } }, { "Expr": { "Name": "step_0", "QuoteType": 1, - "NamePos": 81, - "NameEnd": 87 + "NamePos": 83, + "NameEnd": 89 }, "Modifiers": [], "Alias": { "Name": "step_0", "QuoteType": 1, - "NamePos": 91, - "NameEnd": 97 + "NamePos": 93, + "NameEnd": 99 } }, { "Expr": { "Name": "latest_0", "QuoteType": 1, - "NamePos": 103, - "NameEnd": 111 + "NamePos": 106, + "NameEnd": 114 }, "Modifiers": [], "Alias": { "Name": "latest_0", "QuoteType": 1, - "NamePos": 115, - "NameEnd": 123 + "NamePos": 118, + "NameEnd": 126 } }, { "Expr": { "Name": "step_1", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 135 + "NamePos": 133, + "NameEnd": 139 }, "Modifiers": [], "Alias": { "Name": "step_1", "QuoteType": 1, - "NamePos": 139, - "NameEnd": 145 + "NamePos": 143, + "NameEnd": 149 } }, { "Expr": { "Name": "latest_1", "QuoteType": 1, - "NamePos": 151, - "NameEnd": 159 + "NamePos": 156, + "NameEnd": 164 }, "Modifiers": [], "Alias": { "Name": "latest_1", "QuoteType": 1, - "NamePos": 163, - "NameEnd": 171 + "NamePos": 168, + "NameEnd": 176 } }, { "Expr": { "Name": "step_2", "QuoteType": 1, - "NamePos": 177, - "NameEnd": 183 + "NamePos": 183, + "NameEnd": 189 }, "Modifiers": [], "Alias": { "Name": "step_2", "QuoteType": 1, - "NamePos": 187, - "NameEnd": 193 + "NamePos": 193, + "NameEnd": 199 } }, { @@ -118,23 +118,23 @@ "Name": { "Name": "min", "QuoteType": 1, - "NamePos": 199, - "NameEnd": 202 + "NamePos": 206, + "NameEnd": 209 }, "Params": { - "LeftParenPos": 202, - "RightParenPos": 211, + "LeftParenPos": 209, + "RightParenPos": 218, "Items": { - "ListPos": 203, - "ListEnd": 211, + "ListPos": 210, + "ListEnd": 218, "HasDistinct": false, "Items": [ { "Expr": { "Name": "latest_2", "QuoteType": 1, - "NamePos": 203, - "NameEnd": 211 + "NamePos": 210, + "NameEnd": 218 }, "Alias": null } @@ -143,23 +143,23 @@ "ColumnArgList": null } }, - "OverPos": 213, + "OverPos": 220, "OverExpr": { - "LeftParenPos": 218, - "RightParenPos": 327, + "LeftParenPos": 225, + "RightParenPos": 335, "PartitionBy": { - "PartitionPos": 218, + "PartitionPos": 225, "Expr": { - "ListPos": 232, - "ListEnd": 250, + "ListPos": 239, + "ListEnd": 257, "HasDistinct": false, "Items": [ { "Expr": { "Name": "aggregation_target", "QuoteType": 1, - "NamePos": 232, - "NameEnd": 250 + "NamePos": 239, + "NameEnd": 257 }, "Alias": null } @@ -167,16 +167,16 @@ } }, "OrderBy": { - "OrderPos": 255, - "ListEnd": 273, + "OrderPos": 263, + "ListEnd": 281, "Items": [ { - "OrderPos": 255, + "OrderPos": 263, "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 264, - "NameEnd": 273 + "NamePos": 272, + "NameEnd": 281 }, "Alias": null, "Direction": "DESC" @@ -184,31 +184,31 @@ ] }, "Frame": { - "FramePos": 279, + "FramePos": 287, "Type": "ROWS", "Extend": { "Expr": null, "Between": { - "FramePos": 292, + "FramePos": 300, "Type": "", "Extend": { - "UnboundedPos": 292, + "UnboundedPos": 300, "UnboundedEnd": 0, "Direction": "PRECEDING" } }, - "AndPos": 312, + "AndPos": 320, "And": { - "FramePos": 316, + "FramePos": 324, "Type": "", "Extend": { "Number": { - "NumPos": 316, - "NumEnd": 317, + "NumPos": 324, + "NumEnd": 325, "Literal": "0", "Base": 10 }, - "UnboundedEnd": 327, + "UnboundedEnd": 335, "Direction": "PRECEDING" } } @@ -220,8 +220,8 @@ "Alias": { "Name": "latest_2", "QuoteType": 1, - "NamePos": 332, - "NameEnd": 340 + "NamePos": 340, + "NameEnd": 348 } }, { @@ -230,23 +230,23 @@ "Name": { "Name": "min", "QuoteType": 1, - "NamePos": 346, - "NameEnd": 349 + "NamePos": 355, + "NameEnd": 358 }, "Params": { - "LeftParenPos": 349, - "RightParenPos": 358, + "LeftParenPos": 358, + "RightParenPos": 367, "Items": { - "ListPos": 350, - "ListEnd": 358, + "ListPos": 359, + "ListEnd": 367, "HasDistinct": false, "Items": [ { "Expr": { "Name": "latest_1", "QuoteType": 1, - "NamePos": 350, - "NameEnd": 358 + "NamePos": 359, + "NameEnd": 367 }, "Alias": null } @@ -255,63 +255,63 @@ "ColumnArgList": null } }, - "OverPos": 360, + "OverPos": 369, "OverExpr": { "Name": "w", "QuoteType": 1, - "NamePos": 365, - "NameEnd": 366 + "NamePos": 374, + "NameEnd": 375 } }, "Modifiers": [], "Alias": { "Name": "latest_1", "QuoteType": 1, - "NamePos": 370, - "NameEnd": 378 + "NamePos": 379, + "NameEnd": 387 } } ], "From": { - "FromPos": 379, + "FromPos": 389, "Expr": { "Table": { - "TablePos": 384, - "TableEnd": 386, + "TablePos": 394, + "TableEnd": 396, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t0", "QuoteType": 1, - "NamePos": 384, - "NameEnd": 386 + "NamePos": 394, + "NameEnd": 396 } }, "HasFinal": false }, - "StatementEnd": 386, + "StatementEnd": 396, "SampleRatio": null, "HasFinal": false } }, "ArrayJoin": null, "Window": { - "LeftParenPos": 399, - "RightParenPos": 508, + "LeftParenPos": 410, + "RightParenPos": 520, "PartitionBy": { - "PartitionPos": 399, + "PartitionPos": 410, "Expr": { - "ListPos": 413, - "ListEnd": 431, + "ListPos": 424, + "ListEnd": 442, "HasDistinct": false, "Items": [ { "Expr": { "Name": "aggregation_target", "QuoteType": 1, - "NamePos": 413, - "NameEnd": 431 + "NamePos": 424, + "NameEnd": 442 }, "Alias": null } @@ -319,16 +319,16 @@ } }, "OrderBy": { - "OrderPos": 436, - "ListEnd": 454, + "OrderPos": 448, + "ListEnd": 466, "Items": [ { - "OrderPos": 436, + "OrderPos": 448, "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 445, - "NameEnd": 454 + "NamePos": 457, + "NameEnd": 466 }, "Alias": null, "Direction": "DESC" @@ -336,42 +336,42 @@ ] }, "Frame": { - "FramePos": 460, + "FramePos": 472, "Type": "ROWS", "Extend": { "Expr": null, "Between": { - "FramePos": 473, + "FramePos": 485, "Type": "", "Extend": { - "UnboundedPos": 473, + "UnboundedPos": 485, "UnboundedEnd": 0, "Direction": "PRECEDING" } }, - "AndPos": 493, + "AndPos": 505, "And": { - "FramePos": 497, + "FramePos": 509, "Type": "", "Extend": { "Number": { - "NumPos": 497, - "NumEnd": 498, + "NumPos": 509, + "NumEnd": 510, "Literal": "0", "Base": 10 }, - "UnboundedEnd": 508, + "UnboundedEnd": 520, "Direction": "PRECEDING" } } } }, - "WindowPos": 387, + "WindowPos": 398, "Name": { "Name": "w", "QuoteType": 1, - "NamePos": 394, - "NameEnd": 395 + "NamePos": 405, + "NameEnd": 406 }, "AsPos": 0 }, From 6797d5b186964b807437f33d72b087cebbeff46e Mon Sep 17 00:00:00 2001 From: git-hulk Date: Sat, 11 Oct 2025 13:31:09 +0800 Subject: [PATCH 3/3] Fix golden files --- .../ddl/output/alter_role.sql.golden.json | 418 +++++++-------- .../alter_table_add_index.sql.golden.json | 212 ++++---- ...alter_table_add_projection.sql.golden.json | 54 +- ...ter_table_attach_partition.sql.golden.json | 36 +- .../output/attach_table_basic.sql.golden.json | 212 ++++---- .../ddl/output/bug_001.sql.golden.json | 280 +++++----- .../testdata/ddl/output/check.sql.golden.json | 12 +- .../create_dictionary_basic.sql.golden.json | 200 +++---- ...e_dictionary_comprehensive.sql.golden.json | 222 ++++---- .../create_distributed_table.sql.golden.json | 70 +-- .../create_live_view_basic.sql.golden.json | 50 +- ...te_materialized_view_basic.sql.golden.json | 256 ++++----- ...rialized_view_with_definer.sql.golden.json | 164 +++--- ...ew_with_empty_table_schema.sql.golden.json | 250 ++++----- ...rialized_view_with_refresh.sql.golden.json | 96 ++-- .../create_mv_with_not_op.sql.golden.json | 274 +++++----- .../create_mv_with_order_by.sql.golden.json | 120 ++--- .../output/create_or_replace.sql.golden.json | 256 ++++----- .../ddl/output/create_role.sql.golden.json | 404 +++++++------- .../output/create_table_basic.sql.golden.json | 442 +++++++-------- ...reate_table_json_typehints.sql.golden.json | 74 +-- ...ate_table_with_codec_delta.sql.golden.json | 414 +++++++------- ...ate_table_with_enum_fields.sql.golden.json | 254 ++++----- .../create_table_with_index.sql.golden.json | 500 ++++++++--------- ..._with_keyword_partition_by.sql.golden.json | 102 ++-- ...ate_table_with_null_engine.sql.golden.json | 68 +-- ...create_table_with_nullable.sql.golden.json | 204 +++---- ...eate_table_with_on_clsuter.sql.golden.json | 212 ++++---- ...eate_table_with_projection.sql.golden.json | 112 ++-- ...reate_table_with_sample_by.sql.golden.json | 142 ++--- ...eate_table_with_ttl_policy.sql.golden.json | 440 +++++++-------- .../create_table_with_uuid.sql.golden.json | 212 ++++---- .../ddl/output/create_user.sql.golden.json | 504 +++++++++--------- .../output/create_view_basic.sql.golden.json | 26 +- ..._view_on_cluster_with_uuid.sql.golden.json | 36 +- .../ddl/output/drop_role.sql.golden.json | 24 +- .../output/grant_privilege.sql.golden.json | 328 ++++++------ .../ddl/output/optimize.sql.golden.json | 226 ++++---- .../ddl/output/rename.sql.golden.json | 228 ++++---- .../ddl/output/systems.sql.golden.json | 12 +- .../alter_table_with_comment.sql.golden.json | 38 +- .../create_column_with_ttl.sql.golden.json | 102 ++-- .../dml/output/insert_values.sql.golden.json | 116 ++-- .../output/insert_with_format.sql.golden.json | 86 +-- .../insert_with_placeholder.sql.golden.json | 128 ++--- .../output/insert_with_select.sql.golden.json | 36 +- .../access_tuple_with_dot.sql.golden.json | 256 ++++----- .../query_with_expr_compare.sql.golden.json | 94 ++-- .../select_case_when_exists.sql.golden.json | 90 ++-- .../query/output/select_cast.sql.golden.json | 60 +-- ...select_column_alias_string.sql.golden.json | 16 +- ...select_item_with_modifiers.sql.golden.json | 120 ++--- .../output/select_json_type.sql.golden.json | 128 ++--- .../output/select_simple.sql.golden.json | 212 ++++---- ...th_cte_with_column_aliases.sql.golden.json | 94 ++-- ...ct_simple_with_is_not_null.sql.golden.json | 80 +-- ...select_simple_with_is_null.sql.golden.json | 74 +-- ...ct_simple_with_with_clause.sql.golden.json | 116 ++-- ..._table_function_with_query.sql.golden.json | 54 +- .../select_with_group_by.sql.golden.json | 150 +++--- ...t_with_keyword_in_group_by.sql.golden.json | 110 ++-- .../select_with_left_join.sql.golden.json | 80 +-- .../select_with_multi_join.sql.golden.json | 170 +++--- ...ct_with_multi_line_comment.sql.golden.json | 18 +- ...elect_with_query_parameter.sql.golden.json | 198 +++---- ...elect_with_window_function.sql.golden.json | 196 +++---- 66 files changed, 5484 insertions(+), 5484 deletions(-) diff --git a/parser/testdata/ddl/output/alter_role.sql.golden.json b/parser/testdata/ddl/output/alter_role.sql.golden.json index fb87f8c..2c945ca 100644 --- a/parser/testdata/ddl/output/alter_role.sql.golden.json +++ b/parser/testdata/ddl/output/alter_role.sql.golden.json @@ -1,7 +1,7 @@ [ { - "AlterPos": 24, - "StatementEnd": 43, + "AlterPos": 22, + "StatementEnd": 41, "IfExists": false, "RoleRenamePairs": [ { @@ -9,21 +9,21 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 35, - "NameEnd": 43 + "NamePos": 33, + "NameEnd": 41 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 43 + "StatementEnd": 41 } ], "Settings": null }, { - "AlterPos": 46, - "StatementEnd": 105, + "AlterPos": 43, + "StatementEnd": 102, "IfExists": false, "RoleRenamePairs": [ { @@ -31,34 +31,34 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 57, - "NameEnd": 65 + "NamePos": 54, + "NameEnd": 62 }, "Scope": null, "OnCluster": { - "OnPos": 66, + "OnPos": 63, "Expr": { "Name": "cluster_1", "QuoteType": 1, - "NamePos": 77, - "NameEnd": 86 + "NamePos": 74, + "NameEnd": 83 } } }, "NewName": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 105 + "NamePos": 94, + "NameEnd": 102 }, - "StatementEnd": 105 + "StatementEnd": 102 } ], "Settings": null }, { - "AlterPos": 108, - "StatementEnd": 175, + "AlterPos": 104, + "StatementEnd": 171, "IfExists": false, "RoleRenamePairs": [ { @@ -66,8 +66,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 119, - "NameEnd": 127 + "NamePos": 115, + "NameEnd": 123 }, "Scope": null, "OnCluster": null @@ -75,18 +75,18 @@ "NewName": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 138, - "NameEnd": 146 + "NamePos": 134, + "NameEnd": 142 }, - "StatementEnd": 146 + "StatementEnd": 142 }, { "RoleName": { "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 148, - "NameEnd": 156 + "NamePos": 144, + "NameEnd": 152 }, "Scope": null, "OnCluster": null @@ -94,17 +94,17 @@ "NewName": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 167, - "NameEnd": 175 + "NamePos": 163, + "NameEnd": 171 }, - "StatementEnd": 175 + "StatementEnd": 171 } ], "Settings": null }, { - "AlterPos": 178, - "StatementEnd": 211, + "AlterPos": 173, + "StatementEnd": 206, "IfExists": false, "RoleRenamePairs": [ { @@ -112,14 +112,14 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 189, - "NameEnd": 197 + "NamePos": 184, + "NameEnd": 192 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 197 + "StatementEnd": 192 } ], "Settings": [ @@ -128,15 +128,15 @@ "Modifier": { "Name": "NONE", "QuoteType": 1, - "NamePos": 207, - "NameEnd": 211 + "NamePos": 202, + "NameEnd": 206 } } ] }, { - "AlterPos": 214, - "StatementEnd": 259, + "AlterPos": 208, + "StatementEnd": 253, "IfExists": false, "RoleRenamePairs": [ { @@ -144,14 +144,14 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 225, - "NameEnd": 233 + "NamePos": 219, + "NameEnd": 227 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 233 + "StatementEnd": 227 } ], "Settings": [ @@ -161,13 +161,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 243, - "NameEnd": 250 + "NamePos": 237, + "NameEnd": 244 }, "Operation": "", "Value": { - "LiteralPos": 252, - "LiteralEnd": 259, + "LiteralPos": 246, + "LiteralEnd": 253, "Literal": "default" } } @@ -177,8 +177,8 @@ ] }, { - "AlterPos": 263, - "StatementEnd": 316, + "AlterPos": 256, + "StatementEnd": 309, "IfExists": false, "RoleRenamePairs": [ { @@ -186,14 +186,14 @@ "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 274, - "NameEnd": 282 + "NamePos": 267, + "NameEnd": 275 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 282 + "StatementEnd": 275 } ], "Settings": [ @@ -203,13 +203,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 292, - "NameEnd": 308 + "NamePos": 285, + "NameEnd": 301 }, "Operation": "=", "Value": { - "NumPos": 309, - "NumEnd": 316, + "NumPos": 302, + "NumEnd": 309, "Literal": "5000000", "Base": 10 } @@ -220,8 +220,8 @@ ] }, { - "AlterPos": 319, - "StatementEnd": 376, + "AlterPos": 311, + "StatementEnd": 368, "IfExists": false, "RoleRenamePairs": [ { @@ -229,14 +229,14 @@ "Name": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 330, - "NameEnd": 338 + "NamePos": 322, + "NameEnd": 330 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 338 + "StatementEnd": 330 } ], "Settings": [ @@ -246,8 +246,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 348, - "NameEnd": 364 + "NamePos": 340, + "NameEnd": 356 }, "Operation": "", "Value": null @@ -256,13 +256,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 365, - "NameEnd": 368 + "NamePos": 357, + "NameEnd": 360 }, "Operation": "=", "Value": { - "NumPos": 369, - "NumEnd": 376, + "NumPos": 361, + "NumEnd": 368, "Literal": "5000000", "Base": 10 } @@ -273,8 +273,8 @@ ] }, { - "AlterPos": 379, - "StatementEnd": 436, + "AlterPos": 370, + "StatementEnd": 427, "IfExists": false, "RoleRenamePairs": [ { @@ -282,14 +282,14 @@ "Name": { "Name": "r5_01293", "QuoteType": 1, - "NamePos": 390, - "NameEnd": 398 + "NamePos": 381, + "NameEnd": 389 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 398 + "StatementEnd": 389 } ], "Settings": [ @@ -299,8 +299,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 408, - "NameEnd": 424 + "NamePos": 399, + "NameEnd": 415 }, "Operation": "", "Value": null @@ -309,13 +309,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 425, - "NameEnd": 428 + "NamePos": 416, + "NameEnd": 419 }, "Operation": "=", "Value": { - "NumPos": 429, - "NumEnd": 436, + "NumPos": 420, + "NumEnd": 427, "Literal": "5000000", "Base": 10 } @@ -326,8 +326,8 @@ ] }, { - "AlterPos": 439, - "StatementEnd": 490, + "AlterPos": 429, + "StatementEnd": 480, "IfExists": false, "RoleRenamePairs": [ { @@ -335,14 +335,14 @@ "Name": { "Name": "r6_01293", "QuoteType": 1, - "NamePos": 450, - "NameEnd": 458 + "NamePos": 440, + "NameEnd": 448 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 458 + "StatementEnd": 448 } ], "Settings": [ @@ -352,8 +352,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 468, - "NameEnd": 484 + "NamePos": 458, + "NameEnd": 474 }, "Operation": "", "Value": null @@ -362,15 +362,15 @@ "Modifier": { "Name": "CONST", "QuoteType": 1, - "NamePos": 485, - "NameEnd": 490 + "NamePos": 475, + "NameEnd": 480 } } ] }, { - "AlterPos": 493, - "StatementEnd": 547, + "AlterPos": 482, + "StatementEnd": 536, "IfExists": false, "RoleRenamePairs": [ { @@ -378,14 +378,14 @@ "Name": { "Name": "r7_01293", "QuoteType": 1, - "NamePos": 504, - "NameEnd": 512 + "NamePos": 493, + "NameEnd": 501 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 512 + "StatementEnd": 501 } ], "Settings": [ @@ -395,8 +395,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 522, - "NameEnd": 538 + "NamePos": 511, + "NameEnd": 527 }, "Operation": "", "Value": null @@ -405,15 +405,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 539, - "NameEnd": 547 + "NamePos": 528, + "NameEnd": 536 } } ] }, { - "AlterPos": 550, - "StatementEnd": 633, + "AlterPos": 538, + "StatementEnd": 621, "IfExists": false, "RoleRenamePairs": [ { @@ -421,14 +421,14 @@ "Name": { "Name": "r8_01293", "QuoteType": 1, - "NamePos": 561, - "NameEnd": 569 + "NamePos": 549, + "NameEnd": 557 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 569 + "StatementEnd": 557 } ], "Settings": [ @@ -438,13 +438,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 579, - "NameEnd": 595 + "NamePos": 567, + "NameEnd": 583 }, "Operation": "=", "Value": { - "NumPos": 596, - "NumEnd": 603, + "NumPos": 584, + "NumEnd": 591, "Literal": "5000000", "Base": 10 } @@ -453,13 +453,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 604, - "NameEnd": 607 + "NamePos": 592, + "NameEnd": 595 }, "Operation": "", "Value": { - "NumPos": 608, - "NumEnd": 615, + "NumPos": 596, + "NumEnd": 603, "Literal": "4000000", "Base": 10 } @@ -468,13 +468,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 616, - "NameEnd": 619 + "NamePos": 604, + "NameEnd": 607 }, "Operation": "", "Value": { - "NumPos": 620, - "NumEnd": 627, + "NumPos": 608, + "NumEnd": 615, "Literal": "6000000", "Base": 10 } @@ -483,15 +483,15 @@ "Modifier": { "Name": "CONST", "QuoteType": 1, - "NamePos": 628, - "NameEnd": 633 + "NamePos": 616, + "NameEnd": 621 } } ] }, { - "AlterPos": 636, - "StatementEnd": 717, + "AlterPos": 623, + "StatementEnd": 704, "IfExists": false, "RoleRenamePairs": [ { @@ -499,14 +499,14 @@ "Name": { "Name": "r9_01293", "QuoteType": 1, - "NamePos": 647, - "NameEnd": 655 + "NamePos": 634, + "NameEnd": 642 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 655 + "StatementEnd": 642 } ], "Settings": [ @@ -516,13 +516,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 665, - "NameEnd": 672 + "NamePos": 652, + "NameEnd": 659 }, "Operation": "", "Value": { - "LiteralPos": 674, - "LiteralEnd": 681, + "LiteralPos": 661, + "LiteralEnd": 668, "Literal": "default" } } @@ -535,13 +535,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 684, - "NameEnd": 700 + "NamePos": 671, + "NameEnd": 687 }, "Operation": "=", "Value": { - "NumPos": 701, - "NumEnd": 708, + "NumPos": 688, + "NumEnd": 695, "Literal": "5000000", "Base": 10 } @@ -550,15 +550,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 709, - "NameEnd": 717 + "NamePos": 696, + "NameEnd": 704 } } ] }, { - "AlterPos": 720, - "StatementEnd": 749, + "AlterPos": 706, + "StatementEnd": 735, "IfExists": false, "RoleRenamePairs": [ { @@ -566,35 +566,35 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 731, - "NameEnd": 739 + "NamePos": 717, + "NameEnd": 725 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 739 + "StatementEnd": 725 }, { "RoleName": { "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 741, - "NameEnd": 749 + "NamePos": 727, + "NameEnd": 735 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 749 + "StatementEnd": 735 } ], "Settings": null }, { - "AlterPos": 752, - "StatementEnd": 791, + "AlterPos": 737, + "StatementEnd": 776, "IfExists": false, "RoleRenamePairs": [ { @@ -602,14 +602,14 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 763, - "NameEnd": 771 + "NamePos": 748, + "NameEnd": 756 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 771 + "StatementEnd": 756 } ], "Settings": [ @@ -619,13 +619,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 781, - "NameEnd": 789 + "NamePos": 766, + "NameEnd": 774 }, "Operation": "=", "Value": { - "NumPos": 790, - "NumEnd": 791, + "NumPos": 775, + "NumEnd": 776, "Literal": "1", "Base": 10 } @@ -636,8 +636,8 @@ ] }, { - "AlterPos": 794, - "StatementEnd": 839, + "AlterPos": 778, + "StatementEnd": 823, "IfExists": false, "RoleRenamePairs": [ { @@ -645,14 +645,14 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 805, - "NameEnd": 813 + "NamePos": 789, + "NameEnd": 797 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 813 + "StatementEnd": 797 } ], "Settings": [ @@ -662,13 +662,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 823, - "NameEnd": 830 + "NamePos": 807, + "NameEnd": 814 }, "Operation": "", "Value": { - "LiteralPos": 832, - "LiteralEnd": 839, + "LiteralPos": 816, + "LiteralEnd": 823, "Literal": "default" } } @@ -678,8 +678,8 @@ ] }, { - "AlterPos": 843, - "StatementEnd": 929, + "AlterPos": 826, + "StatementEnd": 912, "IfExists": false, "RoleRenamePairs": [ { @@ -687,14 +687,14 @@ "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 854, - "NameEnd": 862 + "NamePos": 837, + "NameEnd": 845 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 862 + "StatementEnd": 845 } ], "Settings": [ @@ -704,13 +704,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 872, - "NameEnd": 888 + "NamePos": 855, + "NameEnd": 871 }, "Operation": "=", "Value": { - "NumPos": 889, - "NumEnd": 896, + "NumPos": 872, + "NumEnd": 879, "Literal": "5000000", "Base": 10 } @@ -719,13 +719,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 897, - "NameEnd": 900 + "NamePos": 880, + "NameEnd": 883 }, "Operation": "", "Value": { - "NumPos": 901, - "NumEnd": 908, + "NumPos": 884, + "NumEnd": 891, "Literal": "4000000", "Base": 10 } @@ -734,13 +734,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 909, - "NameEnd": 912 + "NamePos": 892, + "NameEnd": 895 }, "Operation": "", "Value": { - "NumPos": 913, - "NumEnd": 920, + "NumPos": 896, + "NumEnd": 903, "Literal": "6000000", "Base": 10 } @@ -749,15 +749,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 921, - "NameEnd": 929 + "NamePos": 904, + "NameEnd": 912 } } ] }, { - "AlterPos": 932, - "StatementEnd": 1016, + "AlterPos": 914, + "StatementEnd": 998, "IfExists": false, "RoleRenamePairs": [ { @@ -765,14 +765,14 @@ "Name": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 943, - "NameEnd": 951 + "NamePos": 925, + "NameEnd": 933 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 951 + "StatementEnd": 933 } ], "Settings": [ @@ -782,13 +782,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 961, - "NameEnd": 968 + "NamePos": 943, + "NameEnd": 950 }, "Operation": "", "Value": { - "LiteralPos": 970, - "LiteralEnd": 977, + "LiteralPos": 952, + "LiteralEnd": 959, "Literal": "default" } } @@ -801,13 +801,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 980, - "NameEnd": 996 + "NamePos": 962, + "NameEnd": 978 }, "Operation": "=", "Value": { - "NumPos": 997, - "NumEnd": 1004, + "NumPos": 979, + "NumEnd": 986, "Literal": "5000000", "Base": 10 } @@ -821,13 +821,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 1006, - "NameEnd": 1014 + "NamePos": 988, + "NameEnd": 996 }, "Operation": "=", "Value": { - "NumPos": 1015, - "NumEnd": 1016, + "NumPos": 997, + "NumEnd": 998, "Literal": "1", "Base": 10 } @@ -838,8 +838,8 @@ ] }, { - "AlterPos": 1019, - "StatementEnd": 1052, + "AlterPos": 1000, + "StatementEnd": 1033, "IfExists": false, "RoleRenamePairs": [ { @@ -847,14 +847,14 @@ "Name": { "Name": "r5_01293", "QuoteType": 1, - "NamePos": 1030, - "NameEnd": 1038 + "NamePos": 1011, + "NameEnd": 1019 }, "Scope": null, "OnCluster": null }, "NewName": null, - "StatementEnd": 1038 + "StatementEnd": 1019 } ], "Settings": [ @@ -863,15 +863,15 @@ "Modifier": { "Name": "NONE", "QuoteType": 1, - "NamePos": 1048, - "NameEnd": 1052 + "NamePos": 1029, + "NameEnd": 1033 } } ] }, { - "AlterPos": 1055, - "StatementEnd": 1077, + "AlterPos": 1035, + "StatementEnd": 1057, "IfExists": false, "RoleRenamePairs": [ { @@ -879,25 +879,25 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 1066, - "NameEnd": 1074 + "NamePos": 1046, + "NameEnd": 1054 }, "Scope": { - "LiteralPos": 1076, - "LiteralEnd": 1077, + "LiteralPos": 1056, + "LiteralEnd": 1057, "Literal": "%" }, "OnCluster": null }, "NewName": null, - "StatementEnd": 1077 + "StatementEnd": 1057 } ], "Settings": null }, { - "AlterPos": 1081, - "StatementEnd": 1114, + "AlterPos": 1060, + "StatementEnd": 1093, "IfExists": false, "RoleRenamePairs": [ { @@ -905,18 +905,18 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 1092, - "NameEnd": 1100 + "NamePos": 1071, + "NameEnd": 1079 }, "Scope": { - "LiteralPos": 1102, - "LiteralEnd": 1114, + "LiteralPos": 1081, + "LiteralEnd": 1093, "Literal": "%.myhost.com" }, "OnCluster": null }, "NewName": null, - "StatementEnd": 1114 + "StatementEnd": 1093 } ], "Settings": null diff --git a/parser/testdata/ddl/output/alter_table_add_index.sql.golden.json b/parser/testdata/ddl/output/alter_table_add_index.sql.golden.json index 7e1efde..569f618 100644 --- a/parser/testdata/ddl/output/alter_table_add_index.sql.golden.json +++ b/parser/testdata/ddl/output/alter_table_add_index.sql.golden.json @@ -84,42 +84,42 @@ ] }, { - "AlterPos": 113, - "StatementEnd": 227, + "AlterPos": 112, + "StatementEnd": 226, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 129 + "NamePos": 124, + "NameEnd": 128 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 130, - "NameEnd": 142 + "NamePos": 129, + "NameEnd": 141 } }, "OnCluster": { - "OnPos": 143, + "OnPos": 142, "Expr": { - "LiteralPos": 155, - "LiteralEnd": 170, + "LiteralPos": 154, + "LiteralEnd": 169, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 172, - "StatementEnd": 227, + "AddPos": 171, + "StatementEnd": 226, "Index": { - "IndexPos": 176, + "IndexPos": 175, "Name": { "Ident": { "Name": "api_id_idx", "QuoteType": 1, - "NamePos": 182, - "NameEnd": 192 + "NamePos": 181, + "NameEnd": 191 }, "DotIdent": null }, @@ -127,32 +127,32 @@ "Expr": { "Name": "api_id", "QuoteType": 1, - "NamePos": 193, - "NameEnd": 199 + "NamePos": 192, + "NameEnd": 198 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 209, - "RightParenPos": 212, + "LeftParenPos": 208, + "RightParenPos": 211, "Name": { "Name": "set", "QuoteType": 1, - "NamePos": 205, - "NameEnd": 208 + "NamePos": 204, + "NameEnd": 207 }, "Params": [ { - "NumPos": 209, - "NumEnd": 212, + "NumPos": 208, + "NumEnd": 211, "Literal": "100", "Base": 10 } ] }, "Granularity": { - "NumPos": 226, - "NumEnd": 227, + "NumPos": 225, + "NumEnd": 226, "Literal": "2", "Base": 10 } @@ -163,42 +163,42 @@ ] }, { - "AlterPos": 230, - "StatementEnd": 348, + "AlterPos": 228, + "StatementEnd": 346, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 242, - "NameEnd": 246 + "NamePos": 240, + "NameEnd": 244 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 247, - "NameEnd": 259 + "NamePos": 245, + "NameEnd": 257 } }, "OnCluster": { - "OnPos": 260, + "OnPos": 258, "Expr": { - "LiteralPos": 272, - "LiteralEnd": 287, + "LiteralPos": 270, + "LiteralEnd": 285, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 289, - "StatementEnd": 348, + "AddPos": 287, + "StatementEnd": 346, "Index": { - "IndexPos": 293, + "IndexPos": 291, "Name": { "Ident": { "Name": "arr_idx", "QuoteType": 1, - "NamePos": 299, - "NameEnd": 306 + "NamePos": 297, + "NameEnd": 304 }, "DotIdent": null }, @@ -206,32 +206,32 @@ "Expr": { "Name": "arr", "QuoteType": 1, - "NamePos": 307, - "NameEnd": 310 + "NamePos": 305, + "NameEnd": 308 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 329, - "RightParenPos": 333, + "LeftParenPos": 327, + "RightParenPos": 331, "Name": { "Name": "bloom_filter", "QuoteType": 1, - "NamePos": 316, - "NameEnd": 328 + "NamePos": 314, + "NameEnd": 326 }, "Params": [ { - "NumPos": 329, - "NumEnd": 333, + "NumPos": 327, + "NumEnd": 331, "Literal": "0.01", "Base": 10 } ] }, "Granularity": { - "NumPos": 347, - "NumEnd": 348, + "NumPos": 345, + "NumEnd": 346, "Literal": "3", "Base": 10 } @@ -242,42 +242,42 @@ ] }, { - "AlterPos": 351, - "StatementEnd": 482, + "AlterPos": 348, + "StatementEnd": 479, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 363, - "NameEnd": 367 + "NamePos": 360, + "NameEnd": 364 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 368, - "NameEnd": 380 + "NamePos": 365, + "NameEnd": 377 } }, "OnCluster": { - "OnPos": 381, + "OnPos": 378, "Expr": { - "LiteralPos": 393, - "LiteralEnd": 408, + "LiteralPos": 390, + "LiteralEnd": 405, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 410, - "StatementEnd": 482, + "AddPos": 407, + "StatementEnd": 479, "Index": { - "IndexPos": 414, + "IndexPos": 411, "Name": { "Ident": { "Name": "content_idx", "QuoteType": 1, - "NamePos": 420, - "NameEnd": 431 + "NamePos": 417, + "NameEnd": 428 }, "DotIdent": null }, @@ -285,44 +285,44 @@ "Expr": { "Name": "content", "QuoteType": 1, - "NamePos": 432, - "NameEnd": 439 + "NamePos": 429, + "NameEnd": 436 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 456, - "RightParenPos": 467, + "LeftParenPos": 453, + "RightParenPos": 464, "Name": { "Name": "tokenbf_v1", "QuoteType": 1, - "NamePos": 445, - "NameEnd": 455 + "NamePos": 442, + "NameEnd": 452 }, "Params": [ { - "NumPos": 456, - "NumEnd": 461, + "NumPos": 453, + "NumEnd": 458, "Literal": "30720", "Base": 10 }, { - "NumPos": 463, - "NumEnd": 464, + "NumPos": 460, + "NumEnd": 461, "Literal": "2", "Base": 10 }, { - "NumPos": 466, - "NumEnd": 467, + "NumPos": 463, + "NumEnd": 464, "Literal": "0", "Base": 10 } ] }, "Granularity": { - "NumPos": 481, - "NumEnd": 482, + "NumPos": 478, + "NumEnd": 479, "Literal": "1", "Base": 10 } @@ -333,42 +333,42 @@ ] }, { - "AlterPos": 485, - "StatementEnd": 617, + "AlterPos": 481, + "StatementEnd": 613, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 497, - "NameEnd": 501 + "NamePos": 493, + "NameEnd": 497 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 502, - "NameEnd": 514 + "NamePos": 498, + "NameEnd": 510 } }, "OnCluster": { - "OnPos": 515, + "OnPos": 511, "Expr": { - "LiteralPos": 527, - "LiteralEnd": 542, + "LiteralPos": 523, + "LiteralEnd": 538, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 544, - "StatementEnd": 617, + "AddPos": 540, + "StatementEnd": 613, "Index": { - "IndexPos": 548, + "IndexPos": 544, "Name": { "Ident": { "Name": "output_idx", "QuoteType": 1, - "NamePos": 554, - "NameEnd": 564 + "NamePos": 550, + "NameEnd": 560 }, "DotIdent": null }, @@ -376,50 +376,50 @@ "Expr": { "Name": "output", "QuoteType": 1, - "NamePos": 565, - "NameEnd": 571 + "NamePos": 561, + "NameEnd": 567 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 588, - "RightParenPos": 602, + "LeftParenPos": 584, + "RightParenPos": 598, "Name": { "Name": "ngrambf_v1", "QuoteType": 1, - "NamePos": 577, - "NameEnd": 587 + "NamePos": 573, + "NameEnd": 583 }, "Params": [ { - "NumPos": 588, - "NumEnd": 589, + "NumPos": 584, + "NumEnd": 585, "Literal": "3", "Base": 10 }, { - "NumPos": 591, - "NumEnd": 596, + "NumPos": 587, + "NumEnd": 592, "Literal": "10000", "Base": 10 }, { - "NumPos": 598, - "NumEnd": 599, + "NumPos": 594, + "NumEnd": 595, "Literal": "2", "Base": 10 }, { - "NumPos": 601, - "NumEnd": 602, + "NumPos": 597, + "NumEnd": 598, "Literal": "1", "Base": 10 } ] }, "Granularity": { - "NumPos": 616, - "NumEnd": 617, + "NumPos": 612, + "NumEnd": 613, "Literal": "2", "Base": 10 } diff --git a/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json b/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json index 2f23a00..fbe03cf 100644 --- a/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json +++ b/parser/testdata/ddl/output/alter_table_add_projection.sql.golden.json @@ -1,7 +1,7 @@ [ { "AlterPos": 0, - "StatementEnd": 142, + "StatementEnd": 140, "TableIdentifier": { "Database": null, "Table": { @@ -14,56 +14,56 @@ "OnCluster": null, "AlterExprs": [ { - "AddPos": 26, - "StatementEnd": 142, + "AddPos": 25, + "StatementEnd": 140, "IfNotExists": true, "TableProjection": { "IncludeProjectionKeyword": false, - "ProjectionPos": 56, + "ProjectionPos": 55, "Identifier": { "Ident": { "Name": "user_name_projection", "QuoteType": 1, - "NamePos": 56, - "NameEnd": 76 + "NamePos": 55, + "NameEnd": 75 }, "DotIdent": null }, "Select": { - "LeftParenPos": 78, - "RightParenPos": 125, + "LeftParenPos": 76, + "RightParenPos": 123, "With": null, "SelectColumns": { - "ListPos": 86, - "ListEnd": 86, + "ListPos": 84, + "ListEnd": 84, "HasDistinct": false, "Items": [ { "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 86, - "NameEnd": 86 + "NamePos": 84, + "NameEnd": 84 }, "Alias": null } ] }, "GroupBy": { - "GroupByPos": 88, - "GroupByEnd": 107, + "GroupByPos": 86, + "GroupByEnd": 105, "AggregateType": "", "Expr": { - "ListPos": 97, - "ListEnd": 106, + "ListPos": 95, + "ListEnd": 104, "HasDistinct": false, "Items": [ { "Expr": { "Name": "user_name", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 106 + "NamePos": 95, + "NameEnd": 104 }, "Alias": null } @@ -74,18 +74,18 @@ "WithTotals": false }, "OrderBy": { - "OrderByPos": 107, + "OrderByPos": 105, "Columns": { - "ListPos": 116, - "ListEnd": 125, + "ListPos": 114, + "ListEnd": 123, "HasDistinct": false, "Items": [ { "Expr": { "Name": "user_name", "QuoteType": 1, - "NamePos": 116, - "NameEnd": 125 + "NamePos": 114, + "NameEnd": 123 }, "Alias": null } @@ -98,14 +98,14 @@ "Ident": { "Name": "a", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 134 + "NamePos": 131, + "NameEnd": 132 }, "DotIdent": { "Name": "user_id", "QuoteType": 1, - "NamePos": 135, - "NameEnd": 142 + "NamePos": 133, + "NameEnd": 140 } } } diff --git a/parser/testdata/ddl/output/alter_table_attach_partition.sql.golden.json b/parser/testdata/ddl/output/alter_table_attach_partition.sql.golden.json index 7dbf6ea..dc0f400 100644 --- a/parser/testdata/ddl/output/alter_table_attach_partition.sql.golden.json +++ b/parser/testdata/ddl/output/alter_table_attach_partition.sql.golden.json @@ -30,26 +30,26 @@ ] }, { - "AlterPos": 47, - "StatementEnd": 102, + "AlterPos": 46, + "StatementEnd": 101, "TableIdentifier": { "Database": null, "Table": { "Name": "test", "QuoteType": 1, - "NamePos": 59, - "NameEnd": 63 + "NamePos": 58, + "NameEnd": 62 } }, "OnCluster": null, "AlterExprs": [ { - "AttachPos": 64, + "AttachPos": 63, "Partition": { - "PartitionPos": 71, + "PartitionPos": 70, "Expr": { - "LiteralPos": 82, - "LiteralEnd": 90, + "LiteralPos": 81, + "LiteralEnd": 89, "Literal": "20210114" }, "ID": null, @@ -60,35 +60,35 @@ "Table": { "Name": "test1", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 102 + "NamePos": 96, + "NameEnd": 101 } } } ] }, { - "AlterPos": 105, - "StatementEnd": 151, + "AlterPos": 103, + "StatementEnd": 149, "TableIdentifier": { "Database": null, "Table": { "Name": "test", "QuoteType": 1, - "NamePos": 117, - "NameEnd": 121 + "NamePos": 115, + "NameEnd": 119 } }, "OnCluster": null, "AlterExprs": [ { - "AttachPos": 122, + "AttachPos": 120, "Partition": { - "PartitionPos": 129, + "PartitionPos": 127, "Expr": null, "ID": { - "LiteralPos": 143, - "LiteralEnd": 151, + "LiteralPos": 141, + "LiteralEnd": 149, "Literal": "20210114" }, "All": false diff --git a/parser/testdata/ddl/output/attach_table_basic.sql.golden.json b/parser/testdata/ddl/output/attach_table_basic.sql.golden.json index be8d6c6..6c5024f 100644 --- a/parser/testdata/ddl/output/attach_table_basic.sql.golden.json +++ b/parser/testdata/ddl/output/attach_table_basic.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 411, + "StatementEnd": 399, "OrReplace": false, "Name": { "Database": { @@ -29,17 +29,17 @@ }, "TableSchema": { "SchemaPos": 74, - "SchemaEnd": 236, + "SchemaEnd": 227, "Columns": [ { - "NamePos": 81, - "ColumnEnd": 90, + "NamePos": 80, + "ColumnEnd": 89, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 81, - "NameEnd": 83 + "NamePos": 80, + "NameEnd": 82 }, "DotIdent": null }, @@ -47,8 +47,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 84, - "NameEnd": 90 + "NamePos": 83, + "NameEnd": 89 } }, "NotNull": null, @@ -62,14 +62,14 @@ "CompressionCodec": null }, { - "NamePos": 97, - "ColumnEnd": 106, + "NamePos": 95, + "ColumnEnd": 104, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 99 + "NamePos": 95, + "NameEnd": 97 }, "DotIdent": null }, @@ -77,8 +77,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 100, - "NameEnd": 106 + "NamePos": 98, + "NameEnd": 104 } }, "NotNull": null, @@ -92,14 +92,14 @@ "CompressionCodec": null }, { - "NamePos": 113, - "ColumnEnd": 122, + "NamePos": 110, + "ColumnEnd": 119, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 113, - "NameEnd": 115 + "NamePos": 110, + "NameEnd": 112 }, "DotIdent": null }, @@ -107,8 +107,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 116, - "NameEnd": 122 + "NamePos": 113, + "NameEnd": 119 } }, "NotNull": null, @@ -122,14 +122,14 @@ "CompressionCodec": null }, { - "NamePos": 129, - "ColumnEnd": 140, + "NamePos": 125, + "ColumnEnd": 136, "Name": { "Ident": { "Name": "f3", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 131 + "NamePos": 125, + "NameEnd": 127 }, "DotIdent": null }, @@ -137,8 +137,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 132, - "NameEnd": 140 + "NamePos": 128, + "NameEnd": 136 } }, "NotNull": null, @@ -152,14 +152,14 @@ "CompressionCodec": null }, { - "NamePos": 147, - "ColumnEnd": 158, + "NamePos": 142, + "ColumnEnd": 153, "Name": { "Ident": { "Name": "f4", "QuoteType": 1, - "NamePos": 147, - "NameEnd": 149 + "NamePos": 142, + "NameEnd": 144 }, "DotIdent": null }, @@ -167,8 +167,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 150, - "NameEnd": 158 + "NamePos": 145, + "NameEnd": 153 } }, "NotNull": null, @@ -182,41 +182,41 @@ "CompressionCodec": null }, { - "NamePos": 165, - "ColumnEnd": 185, + "NamePos": 159, + "ColumnEnd": 179, "Name": { "Ident": { "Name": "f5", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 167 + "NamePos": 159, + "NameEnd": 161 }, "DotIdent": null }, "Type": { - "LeftParenPos": 172, - "RightParenPos": 185, + "LeftParenPos": 166, + "RightParenPos": 179, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 168, - "NameEnd": 171 + "NamePos": 162, + "NameEnd": 165 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 172, - "NameEnd": 178 + "NamePos": 166, + "NameEnd": 172 } }, { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 179, - "NameEnd": 185 + "NamePos": 173, + "NameEnd": 179 } } ] @@ -232,14 +232,14 @@ "CompressionCodec": null }, { - "NamePos": 193, - "ColumnEnd": 202, + "NamePos": 186, + "ColumnEnd": 195, "Name": { "Ident": { "Name": "f6", "QuoteType": 1, - "NamePos": 193, - "NameEnd": 195 + "NamePos": 186, + "NameEnd": 188 }, "DotIdent": null }, @@ -247,8 +247,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 196, - "NameEnd": 202 + "NamePos": 189, + "NameEnd": 195 } }, "NotNull": null, @@ -262,14 +262,14 @@ "CompressionCodec": null }, { - "NamePos": 209, - "ColumnEnd": 233, + "NamePos": 201, + "ColumnEnd": 225, "Name": { "Ident": { "Name": "f7", "QuoteType": 1, - "NamePos": 209, - "NameEnd": 211 + "NamePos": 201, + "NameEnd": 203 }, "DotIdent": null }, @@ -277,8 +277,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 212, - "NameEnd": 220 + "NamePos": 204, + "NameEnd": 212 } }, "NotNull": null, @@ -287,15 +287,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 229, - "NameEnd": 232 + "NamePos": 221, + "NameEnd": 224 }, "Params": { - "LeftParenPos": 232, - "RightParenPos": 233, + "LeftParenPos": 224, + "RightParenPos": 225, "Items": { - "ListPos": 233, - "ListEnd": 233, + "ListPos": 225, + "ListEnd": 225, "HasDistinct": false, "Items": [] }, @@ -314,29 +314,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 238, - "EngineEnd": 411, + "EnginePos": 229, + "EngineEnd": 399, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 266, - "RightParenPos": 334, + "LeftParenPos": 257, + "RightParenPos": 325, "Items": { - "ListPos": 268, - "ListEnd": 333, + "ListPos": 259, + "ListEnd": 324, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 268, - "LiteralEnd": 320, + "LiteralPos": 259, + "LiteralEnd": 311, "Literal": "/clickhouse/tables/{layer}-{shard}/test/events_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 324, - "LiteralEnd": 333, + "LiteralPos": 315, + "LiteralEnd": 324, "Literal": "{replica}" }, "Alias": null @@ -347,10 +347,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 364, + "PartitionPos": 353, "Expr": { - "ListPos": 377, - "ListEnd": 390, + "ListPos": 366, + "ListEnd": 379, "HasDistinct": false, "Items": [ { @@ -358,23 +358,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 377, - "NameEnd": 387 + "NamePos": 366, + "NameEnd": 376 }, "Params": { - "LeftParenPos": 387, - "RightParenPos": 390, + "LeftParenPos": 376, + "RightParenPos": 379, "Items": { - "ListPos": 388, - "ListEnd": 390, + "ListPos": 377, + "ListEnd": 379, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 388, - "NameEnd": 390 + "NamePos": 377, + "NameEnd": 379 }, "Alias": null } @@ -390,32 +390,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 337, - "ListEnd": 362, + "TTLPos": 327, + "ListEnd": 352, "Items": [ { - "TTLPos": 337, + "TTLPos": 327, "Expr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 341, - "NameEnd": 343 + "NamePos": 331, + "NameEnd": 333 }, "Operation": "+", "RightExpr": { - "IntervalPos": 346, + "IntervalPos": 336, "Expr": { - "NumPos": 355, - "NumEnd": 356, + "NumPos": 345, + "NumEnd": 346, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 357, - "NameEnd": 362 + "NamePos": 347, + "NameEnd": 352 } }, "HasGlobal": false, @@ -427,25 +427,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 393, - "ListEnd": 411, + "OrderPos": 381, + "ListEnd": 399, "Items": [ { - "OrderPos": 393, + "OrderPos": 381, "Expr": { - "LeftParenPos": 402, - "RightParenPos": 411, + "LeftParenPos": 390, + "RightParenPos": 399, "Items": { - "ListPos": 403, - "ListEnd": 411, + "ListPos": 391, + "ListEnd": 399, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 403, - "NameEnd": 405 + "NamePos": 391, + "NameEnd": 393 }, "Alias": null }, @@ -453,8 +453,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 406, - "NameEnd": 408 + "NamePos": 394, + "NameEnd": 396 }, "Alias": null }, @@ -462,8 +462,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 409, - "NameEnd": 411 + "NamePos": 397, + "NameEnd": 399 }, "Alias": null } diff --git a/parser/testdata/ddl/output/bug_001.sql.golden.json b/parser/testdata/ddl/output/bug_001.sql.golden.json index 1d3276b..2668bdd 100644 --- a/parser/testdata/ddl/output/bug_001.sql.golden.json +++ b/parser/testdata/ddl/output/bug_001.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 651, + "StatementEnd": 635, "Name": { "Database": { "Name": "db", @@ -18,10 +18,10 @@ }, "IfNotExists": true, "OnCluster": { - "OnPos": 61, + "OnPos": 60, "Expr": { - "LiteralPos": 73, - "LiteralEnd": 88, + "LiteralPos": 72, + "LiteralEnd": 87, "Literal": "default_cluster" } }, @@ -33,19 +33,19 @@ "Engine": null, "HasEmpty": false, "Destination": { - "ToPos": 90, + "ToPos": 89, "TableIdentifier": { "Database": { "Name": "db", "QuoteType": 1, - "NamePos": 93, - "NameEnd": 95 + "NamePos": 92, + "NameEnd": 94 }, "Table": { "Name": "table_mv", "QuoteType": 1, - "NamePos": 96, - "NameEnd": 104 + "NamePos": 95, + "NameEnd": 103 } }, "TableSchema": null @@ -53,8 +53,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 110, - "StatementEnd": 651, + "SelectPos": 107, + "StatementEnd": 635, "With": null, "Top": null, "HasDistinct": false, @@ -64,8 +64,8 @@ "Expr": { "Name": "event_ts", "QuoteType": 1, - "NamePos": 122, - "NameEnd": 130 + "NamePos": 118, + "NameEnd": 126 }, "Modifiers": [], "Alias": null @@ -74,8 +74,8 @@ "Expr": { "Name": "org_id", "QuoteType": 1, - "NamePos": 137, - "NameEnd": 143 + "NamePos": 132, + "NameEnd": 138 }, "Modifiers": [], "Alias": null @@ -85,30 +85,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 150, - "NameEnd": 173 + "NamePos": 144, + "NameEnd": 167 }, "Params": { - "LeftParenPos": 173, - "RightParenPos": 189, + "LeftParenPos": 167, + "RightParenPos": 183, "Items": { - "ListPos": 174, - "ListEnd": 188, + "ListPos": 168, + "ListEnd": 182, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 174, - "NameEnd": 184 + "NamePos": 168, + "NameEnd": 178 }, "Alias": null }, { "Expr": { - "LiteralPos": 187, - "LiteralEnd": 188, + "LiteralPos": 181, + "LiteralEnd": 182, "Literal": "x" }, "Alias": null @@ -122,8 +122,8 @@ "Alias": { "Name": "x", "QuoteType": 1, - "NamePos": 194, - "NameEnd": 195 + "NamePos": 188, + "NameEnd": 189 } }, { @@ -131,30 +131,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 202, - "NameEnd": 225 + "NamePos": 195, + "NameEnd": 218 }, "Params": { - "LeftParenPos": 225, - "RightParenPos": 241, + "LeftParenPos": 218, + "RightParenPos": 234, "Items": { - "ListPos": 226, - "ListEnd": 240, + "ListPos": 219, + "ListEnd": 233, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 226, - "NameEnd": 236 + "NamePos": 219, + "NameEnd": 229 }, "Alias": null }, { "Expr": { - "LiteralPos": 239, - "LiteralEnd": 240, + "LiteralPos": 232, + "LiteralEnd": 233, "Literal": "y" }, "Alias": null @@ -168,8 +168,8 @@ "Alias": { "Name": "y", "QuoteType": 1, - "NamePos": 246, - "NameEnd": 247 + "NamePos": 239, + "NameEnd": 240 } }, { @@ -177,30 +177,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 254, - "NameEnd": 277 + "NamePos": 246, + "NameEnd": 269 }, "Params": { - "LeftParenPos": 277, - "RightParenPos": 293, + "LeftParenPos": 269, + "RightParenPos": 285, "Items": { - "ListPos": 278, - "ListEnd": 292, + "ListPos": 270, + "ListEnd": 284, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 278, - "NameEnd": 288 + "NamePos": 270, + "NameEnd": 280 }, "Alias": null }, { "Expr": { - "LiteralPos": 291, - "LiteralEnd": 292, + "LiteralPos": 283, + "LiteralEnd": 284, "Literal": "z" }, "Alias": null @@ -214,8 +214,8 @@ "Alias": { "Name": "z", "QuoteType": 1, - "NamePos": 298, - "NameEnd": 299 + "NamePos": 290, + "NameEnd": 291 } }, { @@ -223,30 +223,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 306, - "NameEnd": 329 + "NamePos": 297, + "NameEnd": 320 }, "Params": { - "LeftParenPos": 329, - "RightParenPos": 345, + "LeftParenPos": 320, + "RightParenPos": 336, "Items": { - "ListPos": 330, - "ListEnd": 344, + "ListPos": 321, + "ListEnd": 335, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 330, - "NameEnd": 340 + "NamePos": 321, + "NameEnd": 331 }, "Alias": null }, { "Expr": { - "LiteralPos": 343, - "LiteralEnd": 344, + "LiteralPos": 334, + "LiteralEnd": 335, "Literal": "a" }, "Alias": null @@ -260,8 +260,8 @@ "Alias": { "Name": "a", "QuoteType": 1, - "NamePos": 350, - "NameEnd": 351 + "NamePos": 341, + "NameEnd": 342 } }, { @@ -269,30 +269,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 358, - "NameEnd": 381 + "NamePos": 348, + "NameEnd": 371 }, "Params": { - "LeftParenPos": 381, - "RightParenPos": 397, + "LeftParenPos": 371, + "RightParenPos": 387, "Items": { - "ListPos": 382, - "ListEnd": 396, + "ListPos": 372, + "ListEnd": 386, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 382, - "NameEnd": 392 + "NamePos": 372, + "NameEnd": 382 }, "Alias": null }, { "Expr": { - "LiteralPos": 395, - "LiteralEnd": 396, + "LiteralPos": 385, + "LiteralEnd": 386, "Literal": "b" }, "Alias": null @@ -306,8 +306,8 @@ "Alias": { "Name": "b", "QuoteType": 1, - "NamePos": 402, - "NameEnd": 403 + "NamePos": 392, + "NameEnd": 393 } }, { @@ -315,30 +315,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 410, - "NameEnd": 433 + "NamePos": 399, + "NameEnd": 422 }, "Params": { - "LeftParenPos": 433, - "RightParenPos": 449, + "LeftParenPos": 422, + "RightParenPos": 438, "Items": { - "ListPos": 434, - "ListEnd": 448, + "ListPos": 423, + "ListEnd": 437, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 434, - "NameEnd": 444 + "NamePos": 423, + "NameEnd": 433 }, "Alias": null }, { "Expr": { - "LiteralPos": 447, - "LiteralEnd": 448, + "LiteralPos": 436, + "LiteralEnd": 437, "Literal": "c" }, "Alias": null @@ -352,8 +352,8 @@ "Alias": { "Name": "c", "QuoteType": 1, - "NamePos": 454, - "NameEnd": 455 + "NamePos": 443, + "NameEnd": 444 } }, { @@ -361,30 +361,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 462, - "NameEnd": 485 + "NamePos": 450, + "NameEnd": 473 }, "Params": { - "LeftParenPos": 485, - "RightParenPos": 501, + "LeftParenPos": 473, + "RightParenPos": 489, "Items": { - "ListPos": 486, - "ListEnd": 500, + "ListPos": 474, + "ListEnd": 488, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 486, - "NameEnd": 496 + "NamePos": 474, + "NameEnd": 484 }, "Alias": null }, { "Expr": { - "LiteralPos": 499, - "LiteralEnd": 500, + "LiteralPos": 487, + "LiteralEnd": 488, "Literal": "d" }, "Alias": null @@ -398,8 +398,8 @@ "Alias": { "Name": "d", "QuoteType": 1, - "NamePos": 506, - "NameEnd": 507 + "NamePos": 494, + "NameEnd": 495 } }, { @@ -407,30 +407,30 @@ "Name": { "Name": "visitParamExtractInt", "QuoteType": 1, - "NamePos": 514, - "NameEnd": 534 + "NamePos": 501, + "NameEnd": 521 }, "Params": { - "LeftParenPos": 534, - "RightParenPos": 550, + "LeftParenPos": 521, + "RightParenPos": 537, "Items": { - "ListPos": 535, - "ListEnd": 549, + "ListPos": 522, + "ListEnd": 536, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 535, - "NameEnd": 545 + "NamePos": 522, + "NameEnd": 532 }, "Alias": null }, { "Expr": { - "LiteralPos": 548, - "LiteralEnd": 549, + "LiteralPos": 535, + "LiteralEnd": 536, "Literal": "e" }, "Alias": null @@ -444,8 +444,8 @@ "Alias": { "Name": "e", "QuoteType": 1, - "NamePos": 555, - "NameEnd": 556 + "NamePos": 542, + "NameEnd": 543 } }, { @@ -453,30 +453,30 @@ "Name": { "Name": "visitParamExtractInt", "QuoteType": 1, - "NamePos": 563, - "NameEnd": 583 + "NamePos": 549, + "NameEnd": 569 }, "Params": { - "LeftParenPos": 583, - "RightParenPos": 599, + "LeftParenPos": 569, + "RightParenPos": 585, "Items": { - "ListPos": 584, - "ListEnd": 598, + "ListPos": 570, + "ListEnd": 584, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 584, - "NameEnd": 594 + "NamePos": 570, + "NameEnd": 580 }, "Alias": null }, { "Expr": { - "LiteralPos": 597, - "LiteralEnd": 598, + "LiteralPos": 583, + "LiteralEnd": 584, "Literal": "f" }, "Alias": null @@ -490,35 +490,35 @@ "Alias": { "Name": "f", "QuoteType": 1, - "NamePos": 604, - "NameEnd": 605 + "NamePos": 590, + "NameEnd": 591 } } ], "From": { - "FromPos": 607, + "FromPos": 592, "Expr": { "Table": { - "TablePos": 612, - "TableEnd": 620, + "TablePos": 597, + "TableEnd": 605, "Alias": null, "Expr": { "Database": { "Name": "db", "QuoteType": 1, - "NamePos": 612, - "NameEnd": 614 + "NamePos": 597, + "NameEnd": 599 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 615, - "NameEnd": 620 + "NamePos": 600, + "NameEnd": 605 } }, "HasFinal": false }, - "StatementEnd": 620, + "StatementEnd": 605, "SampleRatio": null, "HasFinal": false } @@ -527,34 +527,34 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 622, + "WherePos": 606, "Expr": { "LeftExpr": { "Fields": [ { "Name": "db", "QuoteType": 1, - "NamePos": 628, - "NameEnd": 630 + "NamePos": 612, + "NameEnd": 614 }, { "Name": "table", "QuoteType": 1, - "NamePos": 631, - "NameEnd": 636 + "NamePos": 615, + "NameEnd": 620 }, { "Name": "event", "QuoteType": 1, - "NamePos": 637, - "NameEnd": 642 + "NamePos": 621, + "NameEnd": 626 } ] }, "Operation": "=", "RightExpr": { - "LiteralPos": 646, - "LiteralEnd": 651, + "LiteralPos": 630, + "LiteralEnd": 635, "Literal": "hello" }, "HasGlobal": false, diff --git a/parser/testdata/ddl/output/check.sql.golden.json b/parser/testdata/ddl/output/check.sql.golden.json index c778fb4..f09030e 100644 --- a/parser/testdata/ddl/output/check.sql.golden.json +++ b/parser/testdata/ddl/output/check.sql.golden.json @@ -13,21 +13,21 @@ "Partition": null }, { - "CheckPos": 25, + "CheckPos": 24, "Table": { "Database": null, "Table": { "Name": "test_table", "QuoteType": 1, - "NamePos": 37, - "NameEnd": 47 + "NamePos": 36, + "NameEnd": 46 } }, "Partition": { - "PartitionPos": 48, + "PartitionPos": 47, "Expr": { - "LiteralPos": 59, - "LiteralEnd": 62, + "LiteralPos": 58, + "LiteralEnd": 61, "Literal": "col" }, "ID": null, diff --git a/parser/testdata/ddl/output/create_dictionary_basic.sql.golden.json b/parser/testdata/ddl/output/create_dictionary_basic.sql.golden.json index 669febc..b3a1018 100644 --- a/parser/testdata/ddl/output/create_dictionary_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_dictionary_basic.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 463, + "StatementEnd": 444, "OrReplace": false, "Name": { "Database": { @@ -24,19 +24,19 @@ "SchemaPos": 31, "Attributes": [ { - "NamePos": 38, + "NamePos": 37, "Name": { "Name": "id", "QuoteType": 1, - "NamePos": 38, - "NameEnd": 40 + "NamePos": 37, + "NameEnd": 39 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 41, - "NameEnd": 47 + "NamePos": 40, + "NameEnd": 46 } }, "Default": null, @@ -46,24 +46,24 @@ "IsObjectId": false }, { - "NamePos": 54, + "NamePos": 52, "Name": { "Name": "name", "QuoteType": 1, - "NamePos": 54, - "NameEnd": 58 + "NamePos": 52, + "NameEnd": 56 }, "Type": { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 59, - "NameEnd": 65 + "NamePos": 57, + "NameEnd": 63 } }, "Default": { - "LiteralPos": 75, - "LiteralEnd": 75, + "LiteralPos": 73, + "LiteralEnd": 73, "Literal": "" }, "Expression": null, @@ -72,19 +72,19 @@ "IsObjectId": false }, { - "NamePos": 83, + "NamePos": 80, "Name": { "Name": "value", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 88 + "NamePos": 80, + "NameEnd": 85 }, "Type": { "Name": { "Name": "Float64", "QuoteType": 1, - "NamePos": 89, - "NameEnd": 96 + "NamePos": 86, + "NameEnd": 93 } }, "Default": null, @@ -92,23 +92,23 @@ "Name": { "Name": "toFloat64OrZero", "QuoteType": 1, - "NamePos": 108, - "NameEnd": 123 + "NamePos": 105, + "NameEnd": 120 }, "Params": { - "LeftParenPos": 123, - "RightParenPos": 128, + "LeftParenPos": 120, + "RightParenPos": 125, "Items": { - "ListPos": 124, - "ListEnd": 128, + "ListPos": 121, + "ListEnd": 125, "HasDistinct": false, "Items": [ { "Expr": { "Name": "name", "QuoteType": 1, - "NamePos": 124, - "NameEnd": 128 + "NamePos": 121, + "NameEnd": 125 }, "Alias": null } @@ -122,19 +122,19 @@ "IsObjectId": false }, { - "NamePos": 136, + "NamePos": 132, "Name": { "Name": "parent_id", "QuoteType": 1, - "NamePos": 136, - "NameEnd": 145 + "NamePos": 132, + "NameEnd": 141 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 146, - "NameEnd": 152 + "NamePos": 142, + "NameEnd": 148 } }, "Default": null, @@ -144,19 +144,19 @@ "IsObjectId": false }, { - "NamePos": 172, + "NamePos": 167, "Name": { "Name": "is_active", "QuoteType": 1, - "NamePos": 172, - "NameEnd": 181 + "NamePos": 167, + "NameEnd": 176 }, "Type": { "Name": { "Name": "UInt8", "QuoteType": 1, - "NamePos": 182, - "NameEnd": 187 + "NamePos": 177, + "NameEnd": 182 } }, "Default": null, @@ -166,19 +166,19 @@ "IsObjectId": false }, { - "NamePos": 204, + "NamePos": 198, "Name": { "Name": "object_id", "QuoteType": 1, - "NamePos": 204, - "NameEnd": 213 + "NamePos": 198, + "NameEnd": 207 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 214, - "NameEnd": 220 + "NamePos": 208, + "NameEnd": 214 } }, "Default": null, @@ -188,171 +188,171 @@ "IsObjectId": true } ], - "RParenPos": 235 + "RParenPos": 228 }, "Engine": { - "EnginePos": 238, + "EnginePos": 230, "PrimaryKey": { - "PrimaryKeyPos": 238, + "PrimaryKeyPos": 230, "Keys": { - "ListPos": 250, - "ListEnd": 252, + "ListPos": 242, + "ListEnd": 244, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 250, - "NameEnd": 252 + "NamePos": 242, + "NameEnd": 244 }, "Alias": null } ] }, - "RParenPos": 251 + "RParenPos": 243 }, "Source": { - "SourcePos": 254, + "SourcePos": 245, "Source": { "Name": "MYSQL", "QuoteType": 1, - "NamePos": 261, - "NameEnd": 266 + "NamePos": 252, + "NameEnd": 257 }, "Args": [ { - "ArgPos": 273, + "ArgPos": 263, "Name": { "Name": "host", "QuoteType": 1, - "NamePos": 273, - "NameEnd": 277 + "NamePos": 263, + "NameEnd": 267 }, "Value": { - "LiteralPos": 279, - "LiteralEnd": 288, + "LiteralPos": 269, + "LiteralEnd": 278, "Literal": "localhost" } }, { - "ArgPos": 295, + "ArgPos": 284, "Name": { "Name": "port", "QuoteType": 1, - "NamePos": 295, - "NameEnd": 299 + "NamePos": 284, + "NameEnd": 288 }, "Value": { - "NumPos": 300, - "NumEnd": 304, + "NumPos": 289, + "NumEnd": 293, "Literal": "3306", "Base": 10 } }, { - "ArgPos": 310, + "ArgPos": 298, "Name": { "Name": "user", "QuoteType": 1, - "NamePos": 310, - "NameEnd": 314 + "NamePos": 298, + "NameEnd": 302 }, "Value": { - "LiteralPos": 316, - "LiteralEnd": 323, + "LiteralPos": 304, + "LiteralEnd": 311, "Literal": "default" } }, { - "ArgPos": 330, + "ArgPos": 317, "Name": { "Name": "password", "QuoteType": 1, - "NamePos": 330, - "NameEnd": 338 + "NamePos": 317, + "NameEnd": 325 }, "Value": { - "LiteralPos": 340, - "LiteralEnd": 340, + "LiteralPos": 327, + "LiteralEnd": 327, "Literal": "" } }, { - "ArgPos": 347, + "ArgPos": 333, "Name": { "Name": "db", "QuoteType": 1, - "NamePos": 347, - "NameEnd": 349 + "NamePos": 333, + "NameEnd": 335 }, "Value": { - "LiteralPos": 351, - "LiteralEnd": 355, + "LiteralPos": 337, + "LiteralEnd": 341, "Literal": "test" } }, { - "ArgPos": 362, + "ArgPos": 347, "Name": { "Name": "table", "QuoteType": 1, - "NamePos": 362, - "NameEnd": 367 + "NamePos": 347, + "NameEnd": 352 }, "Value": { - "LiteralPos": 369, - "LiteralEnd": 379, + "LiteralPos": 354, + "LiteralEnd": 364, "Literal": "dict_table" } } ], - "RParenPos": 383 + "RParenPos": 367 }, "Lifetime": { - "LifetimePos": 386, + "LifetimePos": 369, "Min": { - "NumPos": 399, - "NumEnd": 403, + "NumPos": 382, + "NumEnd": 386, "Literal": "1000", "Base": 10 }, "Max": { - "NumPos": 408, - "NumEnd": 412, + "NumPos": 391, + "NumEnd": 395, "Literal": "2000", "Base": 10 }, "Value": null, - "RParenPos": 412 + "RParenPos": 395 }, "Layout": { - "LayoutPos": 415, + "LayoutPos": 397, "Layout": { "Name": "HASHED", "QuoteType": 1, - "NamePos": 422, - "NameEnd": 428 + "NamePos": 404, + "NameEnd": 410 }, "Args": null, - "RParenPos": 430 + "RParenPos": 412 }, "Range": null, "Settings": { - "SettingsPos": 433, - "ListEnd": 463, + "SettingsPos": 414, + "ListEnd": 444, "Items": [ { - "SettingsPos": 442, + "SettingsPos": 423, "Name": { "Name": "max_block_size", "QuoteType": 1, - "NamePos": 442, - "NameEnd": 456 + "NamePos": 423, + "NameEnd": 437 }, "Expr": { - "NumPos": 459, - "NumEnd": 463, + "NumPos": 440, + "NumEnd": 444, "Literal": "8192", "Base": 10 } diff --git a/parser/testdata/ddl/output/create_dictionary_comprehensive.sql.golden.json b/parser/testdata/ddl/output/create_dictionary_comprehensive.sql.golden.json index 5523ea2..4e463bf 100644 --- a/parser/testdata/ddl/output/create_dictionary_comprehensive.sql.golden.json +++ b/parser/testdata/ddl/output/create_dictionary_comprehensive.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 608, + "StatementEnd": 586, "OrReplace": true, "Name": { "Database": { @@ -20,37 +20,37 @@ "IfNotExists": false, "UUID": { "Value": { - "LiteralPos": 61, - "LiteralEnd": 97, + "LiteralPos": 60, + "LiteralEnd": 96, "Literal": "12345678-1234-1234-1234-123456789012" } }, "OnCluster": { - "OnPos": 100, + "OnPos": 98, "Expr": { "Name": "production_cluster", "QuoteType": 1, - "NamePos": 111, - "NameEnd": 129 + "NamePos": 109, + "NameEnd": 127 } }, "Schema": { - "SchemaPos": 131, + "SchemaPos": 128, "Attributes": [ { - "NamePos": 138, + "NamePos": 134, "Name": { "Name": "id", "QuoteType": 1, - "NamePos": 138, - "NameEnd": 140 + "NamePos": 134, + "NameEnd": 136 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 141, - "NameEnd": 147 + "NamePos": 137, + "NameEnd": 143 } }, "Default": null, @@ -60,24 +60,24 @@ "IsObjectId": false }, { - "NamePos": 154, + "NamePos": 149, "Name": { "Name": "name", "QuoteType": 1, - "NamePos": 154, - "NameEnd": 158 + "NamePos": 149, + "NameEnd": 153 }, "Type": { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 159, - "NameEnd": 165 + "NamePos": 154, + "NameEnd": 160 } }, "Default": { - "LiteralPos": 175, - "LiteralEnd": 175, + "LiteralPos": 170, + "LiteralEnd": 170, "Literal": "" }, "Expression": null, @@ -86,19 +86,19 @@ "IsObjectId": false }, { - "NamePos": 183, + "NamePos": 177, "Name": { "Name": "value", "QuoteType": 1, - "NamePos": 183, - "NameEnd": 188 + "NamePos": 177, + "NameEnd": 182 }, "Type": { "Name": { "Name": "Float64", "QuoteType": 1, - "NamePos": 189, - "NameEnd": 196 + "NamePos": 183, + "NameEnd": 190 } }, "Default": null, @@ -106,23 +106,23 @@ "Name": { "Name": "toFloat64OrZero", "QuoteType": 1, - "NamePos": 208, - "NameEnd": 223 + "NamePos": 202, + "NameEnd": 217 }, "Params": { - "LeftParenPos": 223, - "RightParenPos": 228, + "LeftParenPos": 217, + "RightParenPos": 222, "Items": { - "ListPos": 224, - "ListEnd": 228, + "ListPos": 218, + "ListEnd": 222, "HasDistinct": false, "Items": [ { "Expr": { "Name": "name", "QuoteType": 1, - "NamePos": 224, - "NameEnd": 228 + "NamePos": 218, + "NameEnd": 222 }, "Alias": null } @@ -136,19 +136,19 @@ "IsObjectId": false }, { - "NamePos": 236, + "NamePos": 229, "Name": { "Name": "parent_id", "QuoteType": 1, - "NamePos": 236, - "NameEnd": 245 + "NamePos": 229, + "NameEnd": 238 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 246, - "NameEnd": 252 + "NamePos": 239, + "NameEnd": 245 } }, "Default": null, @@ -158,19 +158,19 @@ "IsObjectId": false }, { - "NamePos": 272, + "NamePos": 264, "Name": { "Name": "is_active", "QuoteType": 1, - "NamePos": 272, - "NameEnd": 281 + "NamePos": 264, + "NameEnd": 273 }, "Type": { "Name": { "Name": "UInt8", "QuoteType": 1, - "NamePos": 282, - "NameEnd": 287 + "NamePos": 274, + "NameEnd": 279 } }, "Default": null, @@ -180,19 +180,19 @@ "IsObjectId": false }, { - "NamePos": 304, + "NamePos": 295, "Name": { "Name": "object_id", "QuoteType": 1, - "NamePos": 304, - "NameEnd": 313 + "NamePos": 295, + "NameEnd": 304 }, "Type": { "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 314, - "NameEnd": 320 + "NamePos": 305, + "NameEnd": 311 } }, "Default": null, @@ -202,186 +202,186 @@ "IsObjectId": true } ], - "RParenPos": 335 + "RParenPos": 325 }, "Engine": { - "EnginePos": 338, + "EnginePos": 327, "PrimaryKey": { - "PrimaryKeyPos": 338, + "PrimaryKeyPos": 327, "Keys": { - "ListPos": 350, - "ListEnd": 352, + "ListPos": 339, + "ListEnd": 341, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 350, - "NameEnd": 352 + "NamePos": 339, + "NameEnd": 341 }, "Alias": null } ] }, - "RParenPos": 351 + "RParenPos": 340 }, "Source": { - "SourcePos": 354, + "SourcePos": 342, "Source": { "Name": "MYSQL", "QuoteType": 1, - "NamePos": 361, - "NameEnd": 366 + "NamePos": 349, + "NameEnd": 354 }, "Args": [ { - "ArgPos": 373, + "ArgPos": 360, "Name": { "Name": "host", "QuoteType": 1, - "NamePos": 373, - "NameEnd": 377 + "NamePos": 360, + "NameEnd": 364 }, "Value": { - "LiteralPos": 379, - "LiteralEnd": 388, + "LiteralPos": 366, + "LiteralEnd": 375, "Literal": "localhost" } }, { - "ArgPos": 395, + "ArgPos": 381, "Name": { "Name": "port", "QuoteType": 1, - "NamePos": 395, - "NameEnd": 399 + "NamePos": 381, + "NameEnd": 385 }, "Value": { - "NumPos": 400, - "NumEnd": 404, + "NumPos": 386, + "NumEnd": 390, "Literal": "3306", "Base": 10 } }, { - "ArgPos": 410, + "ArgPos": 395, "Name": { "Name": "user", "QuoteType": 1, - "NamePos": 410, - "NameEnd": 414 + "NamePos": 395, + "NameEnd": 399 }, "Value": { - "LiteralPos": 416, - "LiteralEnd": 420, + "LiteralPos": 401, + "LiteralEnd": 405, "Literal": "root" } }, { - "ArgPos": 427, + "ArgPos": 411, "Name": { "Name": "password", "QuoteType": 1, - "NamePos": 427, - "NameEnd": 435 + "NamePos": 411, + "NameEnd": 419 }, "Value": { - "LiteralPos": 437, - "LiteralEnd": 443, + "LiteralPos": 421, + "LiteralEnd": 427, "Literal": "secret" } }, { - "ArgPos": 450, + "ArgPos": 433, "Name": { "Name": "db", "QuoteType": 1, - "NamePos": 450, - "NameEnd": 452 + "NamePos": 433, + "NameEnd": 435 }, "Value": { - "LiteralPos": 454, - "LiteralEnd": 461, + "LiteralPos": 437, + "LiteralEnd": 444, "Literal": "test_db" } }, { - "ArgPos": 468, + "ArgPos": 450, "Name": { "Name": "table", "QuoteType": 1, - "NamePos": 468, - "NameEnd": 473 + "NamePos": 450, + "NameEnd": 455 }, "Value": { - "LiteralPos": 475, - "LiteralEnd": 491, + "LiteralPos": 457, + "LiteralEnd": 473, "Literal": "dictionary_table" } } ], - "RParenPos": 495 + "RParenPos": 476 }, "Lifetime": { - "LifetimePos": 498, + "LifetimePos": 478, "Min": { - "NumPos": 511, - "NumEnd": 515, + "NumPos": 491, + "NumEnd": 495, "Literal": "1000", "Base": 10 }, "Max": { - "NumPos": 520, - "NumEnd": 524, + "NumPos": 500, + "NumEnd": 504, "Literal": "2000", "Base": 10 }, "Value": null, - "RParenPos": 524 + "RParenPos": 504 }, "Layout": { - "LayoutPos": 527, + "LayoutPos": 506, "Layout": { "Name": "HASHED", "QuoteType": 1, - "NamePos": 534, - "NameEnd": 540 + "NamePos": 513, + "NameEnd": 519 }, "Args": null, - "RParenPos": 542 + "RParenPos": 521 }, "Range": null, "Settings": { - "SettingsPos": 545, - "ListEnd": 608, + "SettingsPos": 523, + "ListEnd": 586, "Items": [ { - "SettingsPos": 554, + "SettingsPos": 532, "Name": { "Name": "max_block_size", "QuoteType": 1, - "NamePos": 554, - "NameEnd": 568 + "NamePos": 532, + "NameEnd": 546 }, "Expr": { - "NumPos": 571, - "NumEnd": 575, + "NumPos": 549, + "NumEnd": 553, "Literal": "8192", "Base": 10 } }, { - "SettingsPos": 577, + "SettingsPos": 555, "Name": { "Name": "max_insert_block_size", "QuoteType": 1, - "NamePos": 577, - "NameEnd": 598 + "NamePos": 555, + "NameEnd": 576 }, "Expr": { - "NumPos": 601, - "NumEnd": 608, + "NumPos": 579, + "NumEnd": 586, "Literal": "1048576", "Base": 10 } diff --git a/parser/testdata/ddl/output/create_distributed_table.sql.golden.json b/parser/testdata/ddl/output/create_distributed_table.sql.golden.json index 697dece..fa6352b 100644 --- a/parser/testdata/ddl/output/create_distributed_table.sql.golden.json +++ b/parser/testdata/ddl/output/create_distributed_table.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 199, + "StatementEnd": 191, "OrReplace": false, "Name": { "Database": { @@ -20,51 +20,51 @@ "IfNotExists": false, "UUID": null, "OnCluster": { - "OnPos": 29, + "OnPos": 28, "Expr": { - "LiteralPos": 41, - "LiteralEnd": 56, + "LiteralPos": 40, + "LiteralEnd": 55, "Literal": "default_cluster" } }, "TableSchema": { - "SchemaPos": 59, - "SchemaEnd": 79, + "SchemaPos": 57, + "SchemaEnd": 77, "Columns": null, "AliasTable": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 62, - "NameEnd": 66 + "NamePos": 60, + "NameEnd": 64 }, "Table": { "Name": "evnets_local", "QuoteType": 1, - "NamePos": 67, - "NameEnd": 79 + "NamePos": 65, + "NameEnd": 77 } }, "TableFunction": null }, "Engine": { - "EnginePos": 81, - "EngineEnd": 199, + "EnginePos": 78, + "EngineEnd": 191, "Name": "Distributed", "Params": { - "LeftParenPos": 101, - "RightParenPos": 168, + "LeftParenPos": 98, + "RightParenPos": 160, "Items": { - "ListPos": 108, - "ListEnd": 165, + "ListPos": 104, + "ListEnd": 158, "HasDistinct": false, "Items": [ { "Expr": { "Name": "default_cluster", "QuoteType": 1, - "NamePos": 108, - "NameEnd": 123 + "NamePos": 104, + "NameEnd": 119 }, "Alias": null }, @@ -72,8 +72,8 @@ "Expr": { "Name": "test", "QuoteType": 1, - "NamePos": 130, - "NameEnd": 134 + "NamePos": 125, + "NameEnd": 129 }, "Alias": null }, @@ -81,8 +81,8 @@ "Expr": { "Name": "events_local", "QuoteType": 1, - "NamePos": 141, - "NameEnd": 153 + "NamePos": 135, + "NameEnd": 147 }, "Alias": null }, @@ -91,15 +91,15 @@ "Name": { "Name": "rand", "QuoteType": 1, - "NamePos": 160, - "NameEnd": 164 + "NamePos": 153, + "NameEnd": 157 }, "Params": { - "LeftParenPos": 164, - "RightParenPos": 165, + "LeftParenPos": 157, + "RightParenPos": 158, "Items": { - "ListPos": 165, - "ListEnd": 165, + "ListPos": 158, + "ListEnd": 158, "HasDistinct": false, "Items": [] }, @@ -117,20 +117,20 @@ "SampleBy": null, "TTL": null, "Settings": { - "SettingsPos": 170, - "ListEnd": 199, + "SettingsPos": 162, + "ListEnd": 191, "Items": [ { - "SettingsPos": 179, + "SettingsPos": 171, "Name": { "Name": "fsync_after_insert", "QuoteType": 1, - "NamePos": 179, - "NameEnd": 197 + "NamePos": 171, + "NameEnd": 189 }, "Expr": { - "NumPos": 198, - "NumEnd": 199, + "NumPos": 190, + "NumEnd": 191, "Literal": "0", "Base": 10 } diff --git a/parser/testdata/ddl/output/create_live_view_basic.sql.golden.json b/parser/testdata/ddl/output/create_live_view_basic.sql.golden.json index 7a437ca..9daf472 100644 --- a/parser/testdata/ddl/output/create_live_view_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_live_view_basic.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 103, + "StatementEnd": 101, "Name": { "Database": null, "Table": { @@ -15,31 +15,31 @@ "UUID": null, "OnCluster": null, "Destination": { - "ToPos": 47, + "ToPos": 46, "TableIdentifier": { "Database": null, "Table": { "Name": "my_destination", "QuoteType": 1, - "NamePos": 50, - "NameEnd": 64 + "NamePos": 49, + "NameEnd": 63 } }, "TableSchema": null }, "TableSchema": { - "SchemaPos": 64, - "SchemaEnd": 74, + "SchemaPos": 63, + "SchemaEnd": 73, "Columns": [ { - "NamePos": 65, - "ColumnEnd": 74, + "NamePos": 64, + "ColumnEnd": 73, "Name": { "Ident": { "Name": "id", "QuoteType": 1, - "NamePos": 65, - "NameEnd": 67 + "NamePos": 64, + "NameEnd": 66 }, "DotIdent": null }, @@ -47,8 +47,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 68, - "NameEnd": 74 + "NamePos": 67, + "NameEnd": 73 } }, "NotNull": null, @@ -66,11 +66,11 @@ "TableFunction": null }, "WithTimeout": { - "WithTimeoutPos": 31, + "WithTimeoutPos": 30, "Expr": null, "Number": { - "NumPos": 44, - "NumEnd": 46, + "NumPos": 43, + "NumEnd": 45, "Literal": "10", "Base": 10 } @@ -78,8 +78,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 80, - "StatementEnd": 103, + "SelectPos": 78, + "StatementEnd": 101, "With": null, "Top": null, "HasDistinct": false, @@ -89,32 +89,32 @@ "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 87, - "NameEnd": 89 + "NamePos": 85, + "NameEnd": 87 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 90, + "FromPos": 88, "Expr": { "Table": { - "TablePos": 95, - "TableEnd": 103, + "TablePos": 93, + "TableEnd": 101, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "my_table", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 103 + "NamePos": 93, + "NameEnd": 101 } }, "HasFinal": false }, - "StatementEnd": 103, + "StatementEnd": 101, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/ddl/output/create_materialized_view_basic.sql.golden.json b/parser/testdata/ddl/output/create_materialized_view_basic.sql.golden.json index 8e60dd8..cee5c64 100644 --- a/parser/testdata/ddl/output/create_materialized_view_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_materialized_view_basic.sql.golden.json @@ -1,27 +1,27 @@ [ { "CreatePos": 0, - "StatementEnd": 557, + "StatementEnd": 537, "Name": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 26, - "NameEnd": 34 + "NamePos": 25, + "NameEnd": 33 }, "Table": { "Name": "view_name", "QuoteType": 1, - "NamePos": 35, - "NameEnd": 44 + "NamePos": 34, + "NameEnd": 43 } }, "IfNotExists": false, "OnCluster": { - "OnPos": 51, + "OnPos": 49, "Expr": { - "LiteralPos": 63, - "LiteralEnd": 78, + "LiteralPos": 61, + "LiteralEnd": 76, "Literal": "default_cluster" } }, @@ -33,50 +33,50 @@ "Engine": null, "HasEmpty": false, "Destination": { - "ToPos": 80, + "ToPos": 78, "TableIdentifier": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 91 + "NamePos": 81, + "NameEnd": 89 }, "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 102 + "NamePos": 90, + "NameEnd": 100 } }, "TableSchema": { - "SchemaPos": 104, - "SchemaEnd": 213, + "SchemaPos": 101, + "SchemaEnd": 203, "Columns": [ { - "NamePos": 110, - "ColumnEnd": 126, + "NamePos": 106, + "ColumnEnd": 122, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 110, - "NameEnd": 112 + "NamePos": 106, + "NameEnd": 108 }, "DotIdent": null }, "Type": { - "LeftParenPos": 125, - "RightParenPos": 126, + "LeftParenPos": 121, + "RightParenPos": 122, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 114, - "NameEnd": 124 + "NamePos": 110, + "NameEnd": 120 }, "Params": [ { - "NumPos": 125, - "NumEnd": 126, + "NumPos": 121, + "NumEnd": 122, "Literal": "3", "Base": 10 } @@ -93,14 +93,14 @@ "CompressionCodec": null }, { - "NamePos": 134, - "ColumnEnd": 144, + "NamePos": 129, + "ColumnEnd": 139, "Name": { "Ident": { "Name": "f2", "QuoteType": 3, - "NamePos": 134, - "NameEnd": 136 + "NamePos": 129, + "NameEnd": 131 }, "DotIdent": null }, @@ -108,8 +108,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 138, - "NameEnd": 144 + "NamePos": 133, + "NameEnd": 139 } }, "NotNull": null, @@ -123,14 +123,14 @@ "CompressionCodec": null }, { - "NamePos": 151, - "ColumnEnd": 161, + "NamePos": 145, + "ColumnEnd": 155, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 151, - "NameEnd": 153 + "NamePos": 145, + "NameEnd": 147 }, "DotIdent": null }, @@ -138,8 +138,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 155, - "NameEnd": 161 + "NamePos": 149, + "NameEnd": 155 } }, "NotNull": null, @@ -153,14 +153,14 @@ "CompressionCodec": null }, { - "NamePos": 168, - "ColumnEnd": 178, + "NamePos": 161, + "ColumnEnd": 171, "Name": { "Ident": { "Name": "f4", "QuoteType": 3, - "NamePos": 168, - "NameEnd": 170 + "NamePos": 161, + "NameEnd": 163 }, "DotIdent": null }, @@ -168,8 +168,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 172, - "NameEnd": 178 + "NamePos": 165, + "NameEnd": 171 } }, "NotNull": null, @@ -183,14 +183,14 @@ "CompressionCodec": null }, { - "NamePos": 185, - "ColumnEnd": 195, + "NamePos": 177, + "ColumnEnd": 187, "Name": { "Ident": { "Name": "f5", "QuoteType": 3, - "NamePos": 185, - "NameEnd": 187 + "NamePos": 177, + "NameEnd": 179 }, "DotIdent": null }, @@ -198,8 +198,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 189, - "NameEnd": 195 + "NamePos": 181, + "NameEnd": 187 } }, "NotNull": null, @@ -213,14 +213,14 @@ "CompressionCodec": null }, { - "NamePos": 202, - "ColumnEnd": 211, + "NamePos": 193, + "ColumnEnd": 202, "Name": { "Ident": { "Name": "f6", "QuoteType": 3, - "NamePos": 202, - "NameEnd": 204 + "NamePos": 193, + "NameEnd": 195 }, "DotIdent": null }, @@ -228,8 +228,8 @@ "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 206, - "NameEnd": 211 + "NamePos": 197, + "NameEnd": 202 } }, "NotNull": null, @@ -250,8 +250,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 219, - "StatementEnd": 557, + "SelectPos": 208, + "StatementEnd": 537, "With": null, "Top": null, "HasDistinct": false, @@ -261,8 +261,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 226, - "NameEnd": 228 + "NamePos": 215, + "NameEnd": 217 }, "Modifiers": [], "Alias": null @@ -271,8 +271,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 238, - "NameEnd": 240 + "NamePos": 226, + "NameEnd": 228 }, "Modifiers": [], "Alias": null @@ -282,30 +282,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 250, - "NameEnd": 273 + "NamePos": 237, + "NameEnd": 260 }, "Params": { - "LeftParenPos": 273, - "RightParenPos": 290, + "LeftParenPos": 260, + "RightParenPos": 277, "Items": { - "ListPos": 274, - "ListEnd": 289, + "ListPos": 261, + "ListEnd": 276, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 274, - "NameEnd": 284 + "NamePos": 261, + "NameEnd": 271 }, "Alias": null }, { "Expr": { - "LiteralPos": 287, - "LiteralEnd": 289, + "LiteralPos": 274, + "LiteralEnd": 276, "Literal": "f3" }, "Alias": null @@ -319,8 +319,8 @@ "Alias": { "Name": "f3", "QuoteType": 1, - "NamePos": 297, - "NameEnd": 299 + "NamePos": 284, + "NameEnd": 286 } }, { @@ -328,30 +328,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 309, - "NameEnd": 332 + "NamePos": 295, + "NameEnd": 318 }, "Params": { - "LeftParenPos": 332, - "RightParenPos": 349, + "LeftParenPos": 318, + "RightParenPos": 335, "Items": { - "ListPos": 333, - "ListEnd": 348, + "ListPos": 319, + "ListEnd": 334, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 333, - "NameEnd": 343 + "NamePos": 319, + "NameEnd": 329 }, "Alias": null }, { "Expr": { - "LiteralPos": 346, - "LiteralEnd": 348, + "LiteralPos": 332, + "LiteralEnd": 334, "Literal": "f4" }, "Alias": null @@ -365,8 +365,8 @@ "Alias": { "Name": "f4", "QuoteType": 1, - "NamePos": 359, - "NameEnd": 361 + "NamePos": 345, + "NameEnd": 347 } }, { @@ -374,30 +374,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 371, - "NameEnd": 394 + "NamePos": 356, + "NameEnd": 379 }, "Params": { - "LeftParenPos": 394, - "RightParenPos": 411, + "LeftParenPos": 379, + "RightParenPos": 396, "Items": { - "ListPos": 395, - "ListEnd": 410, + "ListPos": 380, + "ListEnd": 395, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 395, - "NameEnd": 405 + "NamePos": 380, + "NameEnd": 390 }, "Alias": null }, { "Expr": { - "LiteralPos": 408, - "LiteralEnd": 410, + "LiteralPos": 393, + "LiteralEnd": 395, "Literal": "f5" }, "Alias": null @@ -411,8 +411,8 @@ "Alias": { "Name": "f5", "QuoteType": 1, - "NamePos": 419, - "NameEnd": 421 + "NamePos": 404, + "NameEnd": 406 } }, { @@ -420,30 +420,30 @@ "Name": { "Name": "visitParamExtractInt", "QuoteType": 1, - "NamePos": 428, - "NameEnd": 448 + "NamePos": 412, + "NameEnd": 432 }, "Params": { - "LeftParenPos": 448, - "RightParenPos": 465, + "LeftParenPos": 432, + "RightParenPos": 449, "Items": { - "ListPos": 449, - "ListEnd": 464, + "ListPos": 433, + "ListEnd": 448, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 449, - "NameEnd": 459 + "NamePos": 433, + "NameEnd": 443 }, "Alias": null }, { "Expr": { - "LiteralPos": 462, - "LiteralEnd": 464, + "LiteralPos": 446, + "LiteralEnd": 448, "Literal": "f6" }, "Alias": null @@ -457,35 +457,35 @@ "Alias": { "Name": "f6", "QuoteType": 1, - "NamePos": 470, - "NameEnd": 472 + "NamePos": 454, + "NameEnd": 456 } } ], "From": { - "FromPos": 474, + "FromPos": 457, "Expr": { "Table": { - "TablePos": 484, - "TableEnd": 504, + "TablePos": 466, + "TableEnd": 486, "Alias": null, "Expr": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 484, - "NameEnd": 492 + "NamePos": 466, + "NameEnd": 474 }, "Table": { "Name": "table_name1", "QuoteType": 1, - "NamePos": 493, - "NameEnd": 504 + "NamePos": 475, + "NameEnd": 486 } }, "HasFinal": false }, - "StatementEnd": 504, + "StatementEnd": 486, "SampleRatio": null, "HasFinal": false } @@ -494,34 +494,34 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 506, + "WherePos": 487, "Expr": { "LeftExpr": { "Fields": [ { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 517, - "NameEnd": 525 + "NamePos": 497, + "NameEnd": 505 }, { "Name": "table_name1", "QuoteType": 1, - "NamePos": 526, - "NameEnd": 537 + "NamePos": 506, + "NameEnd": 517 }, { "Name": "event", "QuoteType": 1, - "NamePos": 538, - "NameEnd": 543 + "NamePos": 518, + "NameEnd": 523 } ] }, "Operation": "=", "RightExpr": { - "LiteralPos": 547, - "LiteralEnd": 557, + "LiteralPos": 527, + "LiteralEnd": 537, "Literal": "test-event" }, "HasGlobal": false, @@ -543,8 +543,8 @@ }, "Populate": false, "Comment": { - "LiteralPos": 569, - "LiteralEnd": 586, + "LiteralPos": 548, + "LiteralEnd": 565, "Literal": "Comment for table" }, "Definer": null, diff --git a/parser/testdata/ddl/output/create_materialized_view_with_definer.sql.golden.json b/parser/testdata/ddl/output/create_materialized_view_with_definer.sql.golden.json index 79ca911..2200154 100644 --- a/parser/testdata/ddl/output/create_materialized_view_with_definer.sql.golden.json +++ b/parser/testdata/ddl/output/create_materialized_view_with_definer.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 368, + "StatementEnd": 355, "Name": { "Database": null, "Table": { @@ -14,36 +14,36 @@ "IfNotExists": false, "OnCluster": null, "Refresh": { - "RefreshPos": 35, + "RefreshPos": 34, "Frequency": "EVERY", "Interval": { "IntervalPos": 0, "Expr": { - "NumPos": 49, - "NumEnd": 50, + "NumPos": 48, + "NumEnd": 49, "Literal": "1", "Base": 10 }, "Unit": { "Name": "HOUR", "QuoteType": 1, - "NamePos": 51, - "NameEnd": 55 + "NamePos": 50, + "NameEnd": 54 } }, "Offset": { "IntervalPos": 0, "Expr": { - "NumPos": 63, - "NumEnd": 65, + "NumPos": 62, + "NumEnd": 64, "Literal": "10", "Base": 10 }, "Unit": { "Name": "MINUTE", "QuoteType": 1, - "NamePos": 66, - "NameEnd": 72 + "NamePos": 65, + "NameEnd": 71 } } }, @@ -54,45 +54,45 @@ "Engine": null, "HasEmpty": false, "Destination": { - "ToPos": 80, + "ToPos": 79, "TableIdentifier": { "Database": null, "Table": { "Name": "events_export", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 96 + "NamePos": 82, + "NameEnd": 95 } }, "TableSchema": { - "SchemaPos": 98, - "SchemaEnd": 179, + "SchemaPos": 96, + "SchemaEnd": 173, "Columns": [ { - "NamePos": 106, - "ColumnEnd": 129, + "NamePos": 103, + "ColumnEnd": 126, "Name": { "Ident": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 106, - "NameEnd": 115 + "NamePos": 103, + "NameEnd": 112 }, "DotIdent": null }, "Type": { - "LeftParenPos": 128, - "RightParenPos": 129, + "LeftParenPos": 125, + "RightParenPos": 126, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 117, - "NameEnd": 127 + "NamePos": 114, + "NameEnd": 124 }, "Params": [ { - "NumPos": 128, - "NumEnd": 129, + "NumPos": 125, + "NumEnd": 126, "Literal": "9", "Base": 10 } @@ -109,14 +109,14 @@ "CompressionCodec": null }, { - "NamePos": 138, - "ColumnEnd": 153, + "NamePos": 134, + "ColumnEnd": 149, "Name": { "Ident": { "Name": "field_1", "QuoteType": 3, - "NamePos": 138, - "NameEnd": 145 + "NamePos": 134, + "NameEnd": 141 }, "DotIdent": null }, @@ -124,8 +124,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 147, - "NameEnd": 153 + "NamePos": 143, + "NameEnd": 149 } }, "NotNull": null, @@ -139,14 +139,14 @@ "CompressionCodec": null }, { - "NamePos": 161, - "ColumnEnd": 176, + "NamePos": 156, + "ColumnEnd": 171, "Name": { "Ident": { "Name": "field_2", "QuoteType": 3, - "NamePos": 161, - "NameEnd": 168 + "NamePos": 156, + "NameEnd": 163 }, "DotIdent": null }, @@ -154,8 +154,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 170, - "NameEnd": 176 + "NamePos": 165, + "NameEnd": 171 } }, "NotNull": null, @@ -176,8 +176,8 @@ "SubQuery": { "HasParen": true, "Select": { - "SelectPos": 226, - "StatementEnd": 368, + "SelectPos": 218, + "StatementEnd": 355, "With": null, "Top": null, "HasDistinct": false, @@ -187,8 +187,8 @@ "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 238, - "NameEnd": 247 + "NamePos": 229, + "NameEnd": 238 }, "Modifiers": [], "Alias": null @@ -197,8 +197,8 @@ "Expr": { "Name": "field_1", "QuoteType": 1, - "NamePos": 254, - "NameEnd": 261 + "NamePos": 244, + "NameEnd": 251 }, "Modifiers": [], "Alias": null @@ -207,8 +207,8 @@ "Expr": { "Name": "field_2", "QuoteType": 1, - "NamePos": 268, - "NameEnd": 275 + "NamePos": 257, + "NameEnd": 264 }, "Modifiers": [], "Alias": null @@ -217,15 +217,15 @@ "Expr": { "Name": "FROM", "QuoteType": 1, - "NamePos": 278, - "NameEnd": 282 + "NamePos": 266, + "NameEnd": 270 }, "Modifiers": [], "Alias": { "Name": "event_table", "QuoteType": 1, - "NamePos": 283, - "NameEnd": 294 + "NamePos": 271, + "NameEnd": 282 } } ], @@ -234,29 +234,29 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 296, + "WherePos": 283, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 302, - "NameEnd": 315 + "NamePos": 289, + "NameEnd": 302 }, "Params": { - "LeftParenPos": 315, - "RightParenPos": 325, + "LeftParenPos": 302, + "RightParenPos": 312, "Items": { - "ListPos": 316, - "ListEnd": 325, + "ListPos": 303, + "ListEnd": 312, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 316, - "NameEnd": 325 + "NamePos": 303, + "NameEnd": 312 }, "Alias": null } @@ -270,15 +270,15 @@ "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 329, - "NameEnd": 342 + "NamePos": 316, + "NameEnd": 329 }, "Params": { - "LeftParenPos": 342, - "RightParenPos": 368, + "LeftParenPos": 329, + "RightParenPos": 355, "Items": { - "ListPos": 343, - "ListEnd": 367, + "ListPos": 330, + "ListEnd": 354, "HasDistinct": false, "Items": [ { @@ -287,15 +287,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 343, - "NameEnd": 346 + "NamePos": 330, + "NameEnd": 333 }, "Params": { - "LeftParenPos": 346, - "RightParenPos": 347, + "LeftParenPos": 333, + "RightParenPos": 334, "Items": { - "ListPos": 347, - "ListEnd": 347, + "ListPos": 334, + "ListEnd": 334, "HasDistinct": false, "Items": [] }, @@ -307,21 +307,21 @@ "Name": { "Name": "toIntervalHour", "QuoteType": 1, - "NamePos": 351, - "NameEnd": 365 + "NamePos": 338, + "NameEnd": 352 }, "Params": { - "LeftParenPos": 365, - "RightParenPos": 367, + "LeftParenPos": 352, + "RightParenPos": 354, "Items": { - "ListPos": 366, - "ListEnd": 367, + "ListPos": 353, + "ListEnd": 354, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 366, - "NumEnd": 367, + "NumPos": 353, + "NumEnd": 354, "Literal": "1", "Base": 10 }, @@ -361,15 +361,15 @@ }, "Populate": false, "Comment": { - "LiteralPos": 381, - "LiteralEnd": 393, + "LiteralPos": 367, + "LiteralEnd": 379, "Literal": "Test comment" }, "Definer": { "Name": "default", "QuoteType": 1, - "NamePos": 192, - "NameEnd": 199 + "NamePos": 185, + "NameEnd": 192 }, "SQLSecurity": "DEFINER" } diff --git a/parser/testdata/ddl/output/create_materialized_view_with_empty_table_schema.sql.golden.json b/parser/testdata/ddl/output/create_materialized_view_with_empty_table_schema.sql.golden.json index 306b4d5..a5dfc85 100644 --- a/parser/testdata/ddl/output/create_materialized_view_with_empty_table_schema.sql.golden.json +++ b/parser/testdata/ddl/output/create_materialized_view_with_empty_table_schema.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 474, + "StatementEnd": 460, "Name": { "Database": { "Name": "test", @@ -32,29 +32,29 @@ "Settings": null, "HasAppend": false, "Engine": { - "EnginePos": 61, - "EngineEnd": 193, + "EnginePos": 60, + "EngineEnd": 190, "Name": "ReplicatedAggregatingMergeTree", "Params": { - "LeftParenPos": 100, - "RightParenPos": 151, + "LeftParenPos": 99, + "RightParenPos": 150, "Items": { - "ListPos": 102, - "ListEnd": 150, + "ListPos": 101, + "ListEnd": 149, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 102, - "LiteralEnd": 137, + "LiteralPos": 101, + "LiteralEnd": 136, "Literal": "/clickhouse/{layer}-{shard}/test/t0" }, "Alias": null }, { "Expr": { - "LiteralPos": 141, - "LiteralEnd": 150, + "LiteralPos": 140, + "LiteralEnd": 149, "Literal": "{replica}" }, "Alias": null @@ -65,10 +65,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 154, + "PartitionPos": 152, "Expr": { - "ListPos": 167, - "ListEnd": 178, + "ListPos": 165, + "ListEnd": 176, "HasDistinct": false, "Items": [ { @@ -76,23 +76,23 @@ "Name": { "Name": "toYYYYMM", "QuoteType": 1, - "NamePos": 167, - "NameEnd": 175 + "NamePos": 165, + "NameEnd": 173 }, "Params": { - "LeftParenPos": 175, - "RightParenPos": 178, + "LeftParenPos": 173, + "RightParenPos": 176, "Items": { - "ListPos": 176, - "ListEnd": 178, + "ListPos": 174, + "ListEnd": 176, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 176, - "NameEnd": 178 + "NamePos": 174, + "NameEnd": 176 }, "Alias": null } @@ -110,25 +110,25 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 181, - "ListEnd": 193, + "OrderPos": 178, + "ListEnd": 190, "Items": [ { - "OrderPos": 181, + "OrderPos": 178, "Expr": { - "LeftParenPos": 190, - "RightParenPos": 193, + "LeftParenPos": 187, + "RightParenPos": 190, "Items": { - "ListPos": 191, - "ListEnd": 193, + "ListPos": 188, + "ListEnd": 190, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 191, - "NameEnd": 193 + "NamePos": 188, + "NameEnd": 190 }, "Alias": null } @@ -147,8 +147,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 209, - "StatementEnd": 474, + "SelectPos": 204, + "StatementEnd": 460, "With": null, "Top": null, "HasDistinct": false, @@ -158,8 +158,8 @@ "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 216, - "NameEnd": 218 + "NamePos": 211, + "NameEnd": 213 }, "Modifiers": [], "Alias": null @@ -168,8 +168,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 219, - "NameEnd": 221 + "NamePos": 214, + "NameEnd": 216 }, "Modifiers": [], "Alias": null @@ -178,8 +178,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 222, - "NameEnd": 224 + "NamePos": 217, + "NameEnd": 219 }, "Modifiers": [], "Alias": null @@ -189,23 +189,23 @@ "Name": { "Name": "coalesce", "QuoteType": 1, - "NamePos": 225, - "NameEnd": 233 + "NamePos": 220, + "NameEnd": 228 }, "Params": { - "LeftParenPos": 233, - "RightParenPos": 239, + "LeftParenPos": 228, + "RightParenPos": 234, "Items": { - "ListPos": 234, - "ListEnd": 239, + "ListPos": 229, + "ListEnd": 234, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 234, - "NameEnd": 236 + "NamePos": 229, + "NameEnd": 231 }, "Alias": null }, @@ -213,8 +213,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 237, - "NameEnd": 239 + "NamePos": 232, + "NameEnd": 234 }, "Alias": null } @@ -227,24 +227,24 @@ "Alias": { "Name": "f333", "QuoteType": 1, - "NamePos": 244, - "NameEnd": 248 + "NamePos": 239, + "NameEnd": 243 } } ], "From": { - "FromPos": 250, + "FromPos": 244, "Expr": { "Table": { - "TablePos": 260, - "TableEnd": 460, + "TablePos": 253, + "TableEnd": 447, "Alias": null, "Expr": { "Expr": { "HasParen": true, "Select": { - "SelectPos": 261, - "StatementEnd": 445, + "SelectPos": 254, + "StatementEnd": 433, "With": null, "Top": null, "HasDistinct": false, @@ -254,8 +254,8 @@ "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 278, - "NameEnd": 280 + "NamePos": 270, + "NameEnd": 272 }, "Modifiers": [], "Alias": null @@ -264,8 +264,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 281, - "NameEnd": 283 + "NamePos": 273, + "NameEnd": 275 }, "Modifiers": [], "Alias": null @@ -274,8 +274,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 284, - "NameEnd": 286 + "NamePos": 276, + "NameEnd": 278 }, "Modifiers": [], "Alias": null @@ -286,38 +286,38 @@ "Name": { "Name": "ROW_NUMBER", "QuoteType": 1, - "NamePos": 298, - "NameEnd": 308 + "NamePos": 289, + "NameEnd": 299 }, "Params": { - "LeftParenPos": 308, - "RightParenPos": 309, + "LeftParenPos": 299, + "RightParenPos": 300, "Items": { - "ListPos": 309, - "ListEnd": 309, + "ListPos": 300, + "ListEnd": 300, "HasDistinct": false, "Items": [] }, "ColumnArgList": null } }, - "OverPos": 311, + "OverPos": 302, "OverExpr": { - "LeftParenPos": 315, - "RightParenPos": 356, + "LeftParenPos": 306, + "RightParenPos": 347, "PartitionBy": { - "PartitionPos": 315, + "PartitionPos": 306, "Expr": { - "ListPos": 329, - "ListEnd": 331, + "ListPos": 320, + "ListEnd": 322, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 329, - "NameEnd": 331 + "NamePos": 320, + "NameEnd": 322 }, "Alias": null } @@ -325,32 +325,32 @@ } }, "OrderBy": { - "OrderPos": 332, - "ListEnd": 355, + "OrderPos": 323, + "ListEnd": 346, "Items": [ { - "OrderPos": 332, + "OrderPos": 323, "Expr": { "Name": { "Name": "coalesce", "QuoteType": 1, - "NamePos": 341, - "NameEnd": 349 + "NamePos": 332, + "NameEnd": 340 }, "Params": { - "LeftParenPos": 349, - "RightParenPos": 355, + "LeftParenPos": 340, + "RightParenPos": 346, "Items": { - "ListPos": 350, - "ListEnd": 355, + "ListPos": 341, + "ListEnd": 346, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 350, - "NameEnd": 352 + "NamePos": 341, + "NameEnd": 343 }, "Alias": null }, @@ -358,8 +358,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 353, - "NameEnd": 355 + "NamePos": 344, + "NameEnd": 346 }, "Alias": null } @@ -380,35 +380,35 @@ "Alias": { "Name": "rn", "QuoteType": 1, - "NamePos": 361, - "NameEnd": 363 + "NamePos": 352, + "NameEnd": 354 } } ], "From": { - "FromPos": 370, + "FromPos": 360, "Expr": { "Table": { - "TablePos": 375, - "TableEnd": 381, + "TablePos": 365, + "TableEnd": 371, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 375, - "NameEnd": 379 + "NamePos": 365, + "NameEnd": 369 }, "Table": { "Name": "t", "QuoteType": 1, - "NamePos": 380, - "NameEnd": 381 + "NamePos": 370, + "NameEnd": 371 } }, "HasFinal": false }, - "StatementEnd": 381, + "StatementEnd": 371, "SampleRatio": null, "HasFinal": false } @@ -417,44 +417,44 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 388, + "WherePos": 377, "Expr": { "LeftExpr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 394, - "NameEnd": 396 + "NamePos": 383, + "NameEnd": 385 }, "Operation": "IN", "RightExpr": { - "LeftParenPos": 400, - "RightParenPos": 421, + "LeftParenPos": 389, + "RightParenPos": 410, "Items": { - "ListPos": 402, - "ListEnd": 420, + "ListPos": 391, + "ListEnd": 409, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 402, - "LiteralEnd": 405, + "LiteralPos": 391, + "LiteralEnd": 394, "Literal": "foo" }, "Alias": null }, { "Expr": { - "LiteralPos": 409, - "LiteralEnd": 412, + "LiteralPos": 398, + "LiteralEnd": 401, "Literal": "bar" }, "Alias": null }, { "Expr": { - "LiteralPos": 416, - "LiteralEnd": 420, + "LiteralPos": 405, + "LiteralEnd": 409, "Literal": "test" }, "Alias": null @@ -471,13 +471,13 @@ "LeftExpr": { "Name": "env", "QuoteType": 1, - "NamePos": 435, - "NameEnd": 438 + "NamePos": 423, + "NameEnd": 426 }, "Operation": "=", "RightExpr": { - "LiteralPos": 441, - "LiteralEnd": 445, + "LiteralPos": 429, + "LiteralEnd": 433, "Literal": "test" }, "HasGlobal": false, @@ -500,17 +500,17 @@ "Except": null } }, - "AliasPos": 457, + "AliasPos": 444, "Alias": { "Name": "tmp", "QuoteType": 1, - "NamePos": 457, - "NameEnd": 460 + "NamePos": 444, + "NameEnd": 447 } }, "HasFinal": false }, - "StatementEnd": 460, + "StatementEnd": 447, "SampleRatio": null, "HasFinal": false } @@ -519,18 +519,18 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 462, + "WherePos": 448, "Expr": { "LeftExpr": { "Name": "rn", "QuoteType": 1, - "NamePos": 468, - "NameEnd": 470 + "NamePos": 454, + "NameEnd": 456 }, "Operation": "=", "RightExpr": { - "NumPos": 473, - "NumEnd": 474, + "NumPos": 459, + "NumEnd": 460, "Literal": "1", "Base": 10 }, diff --git a/parser/testdata/ddl/output/create_materialized_view_with_refresh.sql.golden.json b/parser/testdata/ddl/output/create_materialized_view_with_refresh.sql.golden.json index 5ca4f95..0d54ed8 100644 --- a/parser/testdata/ddl/output/create_materialized_view_with_refresh.sql.golden.json +++ b/parser/testdata/ddl/output/create_materialized_view_with_refresh.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 316, + "StatementEnd": 302, "Name": { "Database": null, "Table": { @@ -14,52 +14,52 @@ "IfNotExists": false, "OnCluster": null, "Refresh": { - "RefreshPos": 35, + "RefreshPos": 34, "Frequency": "EVERY", "Interval": { "IntervalPos": 0, "Expr": { - "NumPos": 49, - "NumEnd": 50, + "NumPos": 48, + "NumEnd": 49, "Literal": "1", "Base": 10 }, "Unit": { "Name": "HOUR", "QuoteType": 1, - "NamePos": 51, - "NameEnd": 55 + "NamePos": 50, + "NameEnd": 54 } }, "Offset": { "IntervalPos": 0, "Expr": { - "NumPos": 63, - "NumEnd": 65, + "NumPos": 62, + "NumEnd": 64, "Literal": "10", "Base": 10 }, "Unit": { "Name": "MINUTE", "QuoteType": 1, - "NamePos": 66, - "NameEnd": 72 + "NamePos": 65, + "NameEnd": 71 } } }, "RandomizeFor": { "IntervalPos": 0, "Expr": { - "NumPos": 88, - "NumEnd": 89, + "NumPos": 86, + "NumEnd": 87, "Literal": "1", "Base": 10 }, "Unit": { "Name": "SECOND", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 96 + "NamePos": 88, + "NameEnd": 94 } }, "DependsOn": [ @@ -68,56 +68,56 @@ "Table": { "Name": "table_v5", "QuoteType": 1, - "NamePos": 110, - "NameEnd": 118 + "NamePos": 107, + "NameEnd": 115 } } ], "Settings": { - "SettingsPos": 120, - "ListEnd": 206, + "SettingsPos": 116, + "ListEnd": 199, "Items": [ { - "SettingsPos": 134, + "SettingsPos": 129, "Name": { "Name": "randomize_for", "QuoteType": 1, - "NamePos": 134, - "NameEnd": 147 + "NamePos": 129, + "NameEnd": 142 }, "Expr": { - "NumPos": 150, - "NumEnd": 151, + "NumPos": 145, + "NumEnd": 146, "Literal": "1", "Base": 10 } }, { - "SettingsPos": 158, + "SettingsPos": 152, "Name": { "Name": "randomize_offset", "QuoteType": 1, - "NamePos": 158, - "NameEnd": 174 + "NamePos": 152, + "NameEnd": 168 }, "Expr": { - "NumPos": 177, - "NumEnd": 179, + "NumPos": 171, + "NumEnd": 173, "Literal": "10", "Base": 10 } }, { - "SettingsPos": 186, + "SettingsPos": 179, "Name": { "Name": "randomize_period", "QuoteType": 1, - "NamePos": 186, - "NameEnd": 202 + "NamePos": 179, + "NameEnd": 195 }, "Expr": { - "NumPos": 205, - "NumEnd": 206, + "NumPos": 198, + "NumEnd": 199, "Literal": "1", "Base": 10 } @@ -128,14 +128,14 @@ "Engine": null, "HasEmpty": true, "Destination": { - "ToPos": 215, + "ToPos": 207, "TableIdentifier": { "Database": null, "Table": { "Name": "target_table_name", "QuoteType": 1, - "NamePos": 218, - "NameEnd": 235 + "NamePos": 210, + "NameEnd": 227 } }, "TableSchema": null @@ -143,8 +143,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 247, - "StatementEnd": 316, + "SelectPos": 237, + "StatementEnd": 302, "With": null, "Top": null, "HasDistinct": false, @@ -154,8 +154,8 @@ "Expr": { "Name": "field_1", "QuoteType": 3, - "NamePos": 260, - "NameEnd": 267 + "NamePos": 249, + "NameEnd": 256 }, "Modifiers": [], "Alias": null @@ -164,8 +164,8 @@ "Expr": { "Name": "field_2", "QuoteType": 3, - "NamePos": 276, - "NameEnd": 283 + "NamePos": 264, + "NameEnd": 271 }, "Modifiers": [], "Alias": null @@ -174,8 +174,8 @@ "Expr": { "Name": "field_3", "QuoteType": 3, - "NamePos": 292, - "NameEnd": 299 + "NamePos": 279, + "NameEnd": 286 }, "Modifiers": [], "Alias": null @@ -184,15 +184,15 @@ "Expr": { "Name": "FROM", "QuoteType": 1, - "NamePos": 303, - "NameEnd": 307 + "NamePos": 289, + "NameEnd": 293 }, "Modifiers": [], "Alias": { "Name": "table_v5", "QuoteType": 1, - "NamePos": 308, - "NameEnd": 316 + "NamePos": 294, + "NameEnd": 302 } } ], diff --git a/parser/testdata/ddl/output/create_mv_with_not_op.sql.golden.json b/parser/testdata/ddl/output/create_mv_with_not_op.sql.golden.json index 27515b8..2420185 100644 --- a/parser/testdata/ddl/output/create_mv_with_not_op.sql.golden.json +++ b/parser/testdata/ddl/output/create_mv_with_not_op.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 577, + "StatementEnd": 559, "Name": { "Database": { "Name": "infra_bm", @@ -18,10 +18,10 @@ }, "IfNotExists": false, "OnCluster": { - "OnPos": 49, + "OnPos": 48, "Expr": { - "LiteralPos": 61, - "LiteralEnd": 76, + "LiteralPos": 60, + "LiteralEnd": 75, "Literal": "default_cluster" } }, @@ -33,50 +33,50 @@ "Engine": null, "HasEmpty": false, "Destination": { - "ToPos": 78, + "ToPos": 77, "TableIdentifier": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 81, - "NameEnd": 89 + "NamePos": 80, + "NameEnd": 88 }, "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 100 + "NamePos": 89, + "NameEnd": 99 } }, "TableSchema": { - "SchemaPos": 102, - "SchemaEnd": 206, + "SchemaPos": 100, + "SchemaEnd": 197, "Columns": [ { - "NamePos": 108, - "ColumnEnd": 124, + "NamePos": 105, + "ColumnEnd": 121, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 108, - "NameEnd": 110 + "NamePos": 105, + "NameEnd": 107 }, "DotIdent": null }, "Type": { - "LeftParenPos": 123, - "RightParenPos": 124, + "LeftParenPos": 120, + "RightParenPos": 121, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 112, - "NameEnd": 122 + "NamePos": 109, + "NameEnd": 119 }, "Params": [ { - "NumPos": 123, - "NumEnd": 124, + "NumPos": 120, + "NumEnd": 121, "Literal": "3", "Base": 10 } @@ -93,14 +93,14 @@ "CompressionCodec": null }, { - "NamePos": 131, - "ColumnEnd": 141, + "NamePos": 127, + "ColumnEnd": 137, "Name": { "Ident": { "Name": "f2", "QuoteType": 3, - "NamePos": 131, - "NameEnd": 133 + "NamePos": 127, + "NameEnd": 129 }, "DotIdent": null }, @@ -108,8 +108,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 135, - "NameEnd": 141 + "NamePos": 131, + "NameEnd": 137 } }, "NotNull": null, @@ -123,14 +123,14 @@ "CompressionCodec": null }, { - "NamePos": 147, - "ColumnEnd": 157, + "NamePos": 142, + "ColumnEnd": 152, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 147, - "NameEnd": 149 + "NamePos": 142, + "NameEnd": 144 }, "DotIdent": null }, @@ -138,8 +138,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 151, - "NameEnd": 157 + "NamePos": 146, + "NameEnd": 152 } }, "NotNull": null, @@ -153,14 +153,14 @@ "CompressionCodec": null }, { - "NamePos": 163, - "ColumnEnd": 173, + "NamePos": 157, + "ColumnEnd": 167, "Name": { "Ident": { "Name": "f4", "QuoteType": 3, - "NamePos": 163, - "NameEnd": 165 + "NamePos": 157, + "NameEnd": 159 }, "DotIdent": null }, @@ -168,8 +168,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 167, - "NameEnd": 173 + "NamePos": 161, + "NameEnd": 167 } }, "NotNull": null, @@ -183,14 +183,14 @@ "CompressionCodec": null }, { - "NamePos": 179, - "ColumnEnd": 189, + "NamePos": 172, + "ColumnEnd": 182, "Name": { "Ident": { "Name": "f5", "QuoteType": 3, - "NamePos": 179, - "NameEnd": 181 + "NamePos": 172, + "NameEnd": 174 }, "DotIdent": null }, @@ -198,8 +198,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 183, - "NameEnd": 189 + "NamePos": 176, + "NameEnd": 182 } }, "NotNull": null, @@ -213,14 +213,14 @@ "CompressionCodec": null }, { - "NamePos": 195, - "ColumnEnd": 204, + "NamePos": 187, + "ColumnEnd": 196, "Name": { "Ident": { "Name": "f6", "QuoteType": 3, - "NamePos": 195, - "NameEnd": 197 + "NamePos": 187, + "NameEnd": 189 }, "DotIdent": null }, @@ -228,8 +228,8 @@ "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 199, - "NameEnd": 204 + "NamePos": 191, + "NameEnd": 196 } }, "NotNull": null, @@ -250,8 +250,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 212, - "StatementEnd": 577, + "SelectPos": 202, + "StatementEnd": 559, "With": null, "Top": null, "HasDistinct": false, @@ -261,8 +261,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 219, - "NameEnd": 221 + "NamePos": 209, + "NameEnd": 211 }, "Modifiers": [], "Alias": null @@ -271,8 +271,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 231, - "NameEnd": 233 + "NamePos": 220, + "NameEnd": 222 }, "Modifiers": [], "Alias": null @@ -282,30 +282,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 243, - "NameEnd": 266 + "NamePos": 231, + "NameEnd": 254 }, "Params": { - "LeftParenPos": 266, - "RightParenPos": 283, + "LeftParenPos": 254, + "RightParenPos": 271, "Items": { - "ListPos": 267, - "ListEnd": 282, + "ListPos": 255, + "ListEnd": 270, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 267, - "NameEnd": 277 + "NamePos": 255, + "NameEnd": 265 }, "Alias": null }, { "Expr": { - "LiteralPos": 280, - "LiteralEnd": 282, + "LiteralPos": 268, + "LiteralEnd": 270, "Literal": "f3" }, "Alias": null @@ -319,8 +319,8 @@ "Alias": { "Name": "f3", "QuoteType": 1, - "NamePos": 288, - "NameEnd": 290 + "NamePos": 276, + "NameEnd": 278 } }, { @@ -328,30 +328,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 300, - "NameEnd": 323 + "NamePos": 287, + "NameEnd": 310 }, "Params": { - "LeftParenPos": 323, - "RightParenPos": 340, + "LeftParenPos": 310, + "RightParenPos": 327, "Items": { - "ListPos": 324, - "ListEnd": 339, + "ListPos": 311, + "ListEnd": 326, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 324, - "NameEnd": 334 + "NamePos": 311, + "NameEnd": 321 }, "Alias": null }, { "Expr": { - "LiteralPos": 337, - "LiteralEnd": 339, + "LiteralPos": 324, + "LiteralEnd": 326, "Literal": "f4" }, "Alias": null @@ -365,8 +365,8 @@ "Alias": { "Name": "f4", "QuoteType": 1, - "NamePos": 345, - "NameEnd": 347 + "NamePos": 332, + "NameEnd": 334 } }, { @@ -374,30 +374,30 @@ "Name": { "Name": "visitParamExtractString", "QuoteType": 1, - "NamePos": 357, - "NameEnd": 380 + "NamePos": 343, + "NameEnd": 366 }, "Params": { - "LeftParenPos": 380, - "RightParenPos": 397, + "LeftParenPos": 366, + "RightParenPos": 383, "Items": { - "ListPos": 381, - "ListEnd": 396, + "ListPos": 367, + "ListEnd": 382, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 381, - "NameEnd": 391 + "NamePos": 367, + "NameEnd": 377 }, "Alias": null }, { "Expr": { - "LiteralPos": 394, - "LiteralEnd": 396, + "LiteralPos": 380, + "LiteralEnd": 382, "Literal": "f5" }, "Alias": null @@ -411,8 +411,8 @@ "Alias": { "Name": "f5", "QuoteType": 1, - "NamePos": 402, - "NameEnd": 404 + "NamePos": 388, + "NameEnd": 390 } }, { @@ -420,30 +420,30 @@ "Name": { "Name": "visitParamExtractInt", "QuoteType": 1, - "NamePos": 414, - "NameEnd": 434 + "NamePos": 399, + "NameEnd": 419 }, "Params": { - "LeftParenPos": 434, - "RightParenPos": 451, + "LeftParenPos": 419, + "RightParenPos": 436, "Items": { - "ListPos": 435, - "ListEnd": 450, + "ListPos": 420, + "ListEnd": 435, "HasDistinct": false, "Items": [ { "Expr": { "Name": "properties", "QuoteType": 1, - "NamePos": 435, - "NameEnd": 445 + "NamePos": 420, + "NameEnd": 430 }, "Alias": null }, { "Expr": { - "LiteralPos": 448, - "LiteralEnd": 450, + "LiteralPos": 433, + "LiteralEnd": 435, "Literal": "f6" }, "Alias": null @@ -457,35 +457,35 @@ "Alias": { "Name": "f6", "QuoteType": 1, - "NamePos": 456, - "NameEnd": 458 + "NamePos": 441, + "NameEnd": 443 } } ], "From": { - "FromPos": 460, + "FromPos": 444, "Expr": { "Table": { - "TablePos": 465, - "TableEnd": 485, + "TablePos": 449, + "TableEnd": 469, "Alias": null, "Expr": { "Database": { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 465, - "NameEnd": 473 + "NamePos": 449, + "NameEnd": 457 }, "Table": { "Name": "table_name1", "QuoteType": 1, - "NamePos": 474, - "NameEnd": 485 + "NamePos": 458, + "NameEnd": 469 } }, "HasFinal": false }, - "StatementEnd": 485, + "StatementEnd": 469, "SampleRatio": null, "HasFinal": false } @@ -494,7 +494,7 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 487, + "WherePos": 470, "Expr": { "LeftExpr": { "LeftExpr": { @@ -503,27 +503,27 @@ { "Name": "infra_bm", "QuoteType": 1, - "NamePos": 493, - "NameEnd": 501 + "NamePos": 476, + "NameEnd": 484 }, { "Name": "table_name1", "QuoteType": 1, - "NamePos": 502, - "NameEnd": 513 + "NamePos": 485, + "NameEnd": 496 }, { "Name": "event", "QuoteType": 1, - "NamePos": 514, - "NameEnd": 519 + "NamePos": 497, + "NameEnd": 502 } ] }, "Operation": "=", "RightExpr": { - "LiteralPos": 523, - "LiteralEnd": 533, + "LiteralPos": 506, + "LiteralEnd": 516, "Literal": "test-event" }, "HasGlobal": false, @@ -531,29 +531,29 @@ }, "Operation": "AND", "RightExpr": { - "UnaryPos": 544, + "UnaryPos": 526, "Kind": "NOT", "Expr": { "Name": { "Name": "isZeroOrNull", "QuoteType": 1, - "NamePos": 548, - "NameEnd": 560 + "NamePos": 530, + "NameEnd": 542 }, "Params": { - "LeftParenPos": 560, - "RightParenPos": 563, + "LeftParenPos": 542, + "RightParenPos": 545, "Items": { - "ListPos": 561, - "ListEnd": 563, + "ListPos": 543, + "ListEnd": 545, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 561, - "NameEnd": 563 + "NamePos": 543, + "NameEnd": 545 }, "Alias": null } @@ -572,13 +572,13 @@ "LeftExpr": { "Name": "f6", "QuoteType": 1, - "NamePos": 569, - "NameEnd": 571 + "NamePos": 551, + "NameEnd": 553 }, "Operation": "-", "RightExpr": { - "NumPos": 572, - "NumEnd": 573, + "NumPos": 554, + "NumEnd": 555, "Literal": "2", "Base": 10 }, @@ -587,8 +587,8 @@ }, "Operation": "\u003e", "RightExpr": { - "NumPos": 576, - "NumEnd": 577, + "NumPos": 558, + "NumEnd": 559, "Literal": "0", "Base": 10 }, diff --git a/parser/testdata/ddl/output/create_mv_with_order_by.sql.golden.json b/parser/testdata/ddl/output/create_mv_with_order_by.sql.golden.json index e5bdae5..d9ce15d 100644 --- a/parser/testdata/ddl/output/create_mv_with_order_by.sql.golden.json +++ b/parser/testdata/ddl/output/create_mv_with_order_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 140, + "StatementEnd": 135, "Name": { "Database": null, "Table": { @@ -19,36 +19,36 @@ "Settings": null, "HasAppend": false, "Engine": { - "EnginePos": 48, - "EngineEnd": 109, + "EnginePos": 47, + "EngineEnd": 106, "Name": "ReplacingMergeTree", "Params": { - "LeftParenPos": 75, - "RightParenPos": 76, + "LeftParenPos": 74, + "RightParenPos": 75, "Items": { - "ListPos": 76, - "ListEnd": 76, + "ListPos": 75, + "ListEnd": 75, "HasDistinct": false, "Items": [] }, "ColumnArgList": null }, "PrimaryKey": { - "PrimaryPos": 79, + "PrimaryPos": 77, "Expr": { - "LeftParenPos": 91, - "RightParenPos": 94, + "LeftParenPos": 89, + "RightParenPos": 92, "Items": { - "ListPos": 92, - "ListEnd": 94, + "ListPos": 90, + "ListEnd": 92, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 94 + "NamePos": 90, + "NameEnd": 92 }, "Alias": null } @@ -62,25 +62,25 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 97, - "ListEnd": 109, + "OrderPos": 94, + "ListEnd": 106, "Items": [ { - "OrderPos": 97, + "OrderPos": 94, "Expr": { - "LeftParenPos": 106, - "RightParenPos": 109, + "LeftParenPos": 103, + "RightParenPos": 106, "Items": { - "ListPos": 107, - "ListEnd": 109, + "ListPos": 104, + "ListEnd": 106, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 107, - "NameEnd": 109 + "NamePos": 104, + "NameEnd": 106 }, "Alias": null } @@ -99,8 +99,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 116, - "StatementEnd": 140, + "SelectPos": 111, + "StatementEnd": 135, "With": null, "Top": null, "HasDistinct": false, @@ -110,32 +110,32 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 123, - "NameEnd": 123 + "NamePos": 118, + "NameEnd": 118 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 125, + "FromPos": 120, "Expr": { "Table": { - "TablePos": 130, - "TableEnd": 140, + "TablePos": 125, + "TableEnd": 135, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "test_table", "QuoteType": 1, - "NamePos": 130, - "NameEnd": 140 + "NamePos": 125, + "NameEnd": 135 } }, "HasFinal": false }, - "StatementEnd": 140, + "StatementEnd": 135, "SampleRatio": null, "HasFinal": false } @@ -163,15 +163,15 @@ "SQLSecurity": "" }, { - "CreatePos": 145, - "StatementEnd": 270, + "CreatePos": 138, + "StatementEnd": 259, "Name": { "Database": null, "Table": { "Name": "test_mv", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 191 + "NamePos": 177, + "NameEnd": 184 } }, "IfNotExists": true, @@ -182,36 +182,36 @@ "Settings": null, "HasAppend": false, "Engine": { - "EnginePos": 193, - "EngineEnd": 239, + "EnginePos": 185, + "EngineEnd": 230, "Name": "ReplacingMergeTree", "Params": { - "LeftParenPos": 220, - "RightParenPos": 221, + "LeftParenPos": 212, + "RightParenPos": 213, "Items": { - "ListPos": 221, - "ListEnd": 221, + "ListPos": 213, + "ListEnd": 213, "HasDistinct": false, "Items": [] }, "ColumnArgList": null }, "PrimaryKey": { - "PrimaryPos": 224, + "PrimaryPos": 215, "Expr": { - "LeftParenPos": 236, - "RightParenPos": 239, + "LeftParenPos": 227, + "RightParenPos": 230, "Items": { - "ListPos": 237, - "ListEnd": 239, + "ListPos": 228, + "ListEnd": 230, "HasDistinct": false, "Items": [ { "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 237, - "NameEnd": 239 + "NamePos": 228, + "NameEnd": 230 }, "Alias": null } @@ -231,8 +231,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 246, - "StatementEnd": 270, + "SelectPos": 235, + "StatementEnd": 259, "With": null, "Top": null, "HasDistinct": false, @@ -242,32 +242,32 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 253, - "NameEnd": 253 + "NamePos": 242, + "NameEnd": 242 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 255, + "FromPos": 244, "Expr": { "Table": { - "TablePos": 260, - "TableEnd": 270, + "TablePos": 249, + "TableEnd": 259, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "test_table", "QuoteType": 1, - "NamePos": 260, - "NameEnd": 270 + "NamePos": 249, + "NameEnd": 259 } }, "HasFinal": false }, - "StatementEnd": 270, + "StatementEnd": 259, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/ddl/output/create_or_replace.sql.golden.json b/parser/testdata/ddl/output/create_or_replace.sql.golden.json index 533bae7..52389ca 100644 --- a/parser/testdata/ddl/output/create_or_replace.sql.golden.json +++ b/parser/testdata/ddl/output/create_or_replace.sql.golden.json @@ -1,38 +1,38 @@ [ { - "CreatePos": 127, - "StatementEnd": 374, + "CreatePos": 122, + "StatementEnd": 361, "OrReplace": true, "Name": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 169 + "NamePos": 160, + "NameEnd": 164 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 170, - "NameEnd": 182 + "NamePos": 165, + "NameEnd": 177 } }, "IfNotExists": true, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 183, - "SchemaEnd": 255, + "SchemaPos": 178, + "SchemaEnd": 246, "Columns": [ { - "NamePos": 190, - "ColumnEnd": 199, + "NamePos": 184, + "ColumnEnd": 193, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 190, - "NameEnd": 192 + "NamePos": 184, + "NameEnd": 186 }, "DotIdent": null }, @@ -40,8 +40,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 193, - "NameEnd": 199 + "NamePos": 187, + "NameEnd": 193 } }, "NotNull": null, @@ -55,14 +55,14 @@ "CompressionCodec": null }, { - "NamePos": 206, - "ColumnEnd": 230, + "NamePos": 199, + "ColumnEnd": 223, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 206, - "NameEnd": 208 + "NamePos": 199, + "NameEnd": 201 }, "DotIdent": null }, @@ -70,8 +70,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 209, - "NameEnd": 215 + "NamePos": 202, + "NameEnd": 208 } }, "NotNull": null, @@ -80,19 +80,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 216, - "RightParenPos": 230, + "CodecPos": 209, + "RightParenPos": 223, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 222, - "NameEnd": 226 + "NamePos": 215, + "NameEnd": 219 }, "Level": { - "NumPos": 226, - "NumEnd": 228, + "NumPos": 219, + "NumEnd": 221, "Literal": "1", "Base": 10 } @@ -102,30 +102,30 @@ "CompressionCodec": null }, { - "NamePos": 237, - "ColumnEnd": 251, + "NamePos": 229, + "ColumnEnd": 243, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 237, - "NameEnd": 239 + "NamePos": 229, + "NameEnd": 231 }, "DotIdent": null }, "Type": { - "LeftParenPos": 248, - "RightParenPos": 251, + "LeftParenPos": 240, + "RightParenPos": 243, "Name": { "Name": "VARCHAR", "QuoteType": 1, - "NamePos": 240, - "NameEnd": 247 + "NamePos": 232, + "NameEnd": 239 }, "Params": [ { - "NumPos": 248, - "NumEnd": 251, + "NumPos": 240, + "NumEnd": 243, "Literal": "255", "Base": 10 } @@ -146,26 +146,26 @@ "TableFunction": null }, "Engine": { - "EnginePos": 257, - "EngineEnd": 374, + "EnginePos": 248, + "EngineEnd": 361, "Name": "MergeTree", "Params": null, "PrimaryKey": { - "PrimaryPos": 277, + "PrimaryPos": 267, "Expr": { - "LeftParenPos": 289, - "RightParenPos": 300, + "LeftParenPos": 279, + "RightParenPos": 290, "Items": { - "ListPos": 290, - "ListEnd": 300, + "ListPos": 280, + "ListEnd": 290, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 290, - "NameEnd": 292 + "NamePos": 280, + "NameEnd": 282 }, "Alias": null }, @@ -173,8 +173,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 294, - "NameEnd": 296 + "NamePos": 284, + "NameEnd": 286 }, "Alias": null }, @@ -182,8 +182,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 298, - "NameEnd": 300 + "NamePos": 288, + "NameEnd": 290 }, "Alias": null } @@ -193,10 +193,10 @@ } }, "PartitionBy": { - "PartitionPos": 303, + "PartitionPos": 292, "Expr": { - "ListPos": 316, - "ListEnd": 329, + "ListPos": 305, + "ListEnd": 318, "HasDistinct": false, "Items": [ { @@ -204,23 +204,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 316, - "NameEnd": 326 + "NamePos": 305, + "NameEnd": 315 }, "Params": { - "LeftParenPos": 326, - "RightParenPos": 329, + "LeftParenPos": 315, + "RightParenPos": 318, "Items": { - "ListPos": 327, - "ListEnd": 329, + "ListPos": 316, + "ListEnd": 318, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 327, - "NameEnd": 329 + "NamePos": 316, + "NameEnd": 318 }, "Alias": null } @@ -236,32 +236,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 332, - "ListEnd": 357, + "TTLPos": 320, + "ListEnd": 345, "Items": [ { - "TTLPos": 332, + "TTLPos": 320, "Expr": { "LeftExpr": { "Name": "f1", "QuoteType": 1, - "NamePos": 336, - "NameEnd": 338 + "NamePos": 324, + "NameEnd": 326 }, "Operation": "+", "RightExpr": { - "IntervalPos": 341, + "IntervalPos": 329, "Expr": { - "NumPos": 350, - "NumEnd": 351, + "NumPos": 338, + "NumEnd": 339, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 352, - "NameEnd": 357 + "NamePos": 340, + "NameEnd": 345 } }, "HasGlobal": false, @@ -273,25 +273,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 359, - "ListEnd": 374, + "OrderPos": 346, + "ListEnd": 361, "Items": [ { - "OrderPos": 359, + "OrderPos": 346, "Expr": { - "LeftParenPos": 368, - "RightParenPos": 374, + "LeftParenPos": 355, + "RightParenPos": 361, "Items": { - "ListPos": 369, - "ListEnd": 374, + "ListPos": 356, + "ListEnd": 361, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 369, - "NameEnd": 371 + "NamePos": 356, + "NameEnd": 358 }, "Alias": null }, @@ -299,8 +299,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 372, - "NameEnd": 374 + "NamePos": 359, + "NameEnd": 361 }, "Alias": null } @@ -317,40 +317,40 @@ "SubQuery": null, "HasTemporary": false, "Comment": { - "LiteralPos": 386, - "LiteralEnd": 403, + "LiteralPos": 372, + "LiteralEnd": 389, "Literal": "Comment for table" } }, { - "CreatePos": 409, - "StatementEnd": 530, + "CreatePos": 393, + "StatementEnd": 508, "OrReplace": true, "Name": { "Database": null, "Table": { "Name": "my_view", "QuoteType": 1, - "NamePos": 446, - "NameEnd": 453 + "NamePos": 430, + "NameEnd": 437 } }, "IfNotExists": true, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 453, - "SchemaEnd": 478, + "SchemaPos": 437, + "SchemaEnd": 462, "Columns": [ { - "NamePos": 454, - "ColumnEnd": 465, + "NamePos": 438, + "ColumnEnd": 449, "Name": { "Ident": { "Name": "col1", "QuoteType": 1, - "NamePos": 454, - "NameEnd": 458 + "NamePos": 438, + "NameEnd": 442 }, "DotIdent": null }, @@ -358,8 +358,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 459, - "NameEnd": 465 + "NamePos": 443, + "NameEnd": 449 } }, "NotNull": null, @@ -373,14 +373,14 @@ "CompressionCodec": null }, { - "NamePos": 467, - "ColumnEnd": 478, + "NamePos": 451, + "ColumnEnd": 462, "Name": { "Ident": { "Name": "col2", "QuoteType": 1, - "NamePos": 467, - "NameEnd": 471 + "NamePos": 451, + "NameEnd": 455 }, "DotIdent": null }, @@ -388,8 +388,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 472, - "NameEnd": 478 + "NamePos": 456, + "NameEnd": 462 } }, "NotNull": null, @@ -409,8 +409,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 485, - "StatementEnd": 530, + "SelectPos": 467, + "StatementEnd": 508, "With": null, "Top": null, "HasDistinct": false, @@ -420,8 +420,8 @@ "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 497, - "NameEnd": 499 + "NamePos": 478, + "NameEnd": 480 }, "Modifiers": [], "Alias": null @@ -430,32 +430,32 @@ "Expr": { "Name": "name", "QuoteType": 1, - "NamePos": 506, - "NameEnd": 510 + "NamePos": 486, + "NameEnd": 490 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 512, + "FromPos": 491, "Expr": { "Table": { - "TablePos": 522, - "TableEnd": 530, + "TablePos": 500, + "TableEnd": 508, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "my_table", "QuoteType": 1, - "NamePos": 522, - "NameEnd": 530 + "NamePos": 500, + "NameEnd": 508 } }, "HasFinal": false }, - "StatementEnd": 530, + "StatementEnd": 508, "SampleRatio": null, "HasFinal": false } @@ -479,30 +479,30 @@ } }, { - "CreatePos": 535, + "CreatePos": 511, "OrReplace": true, "IfNotExists": true, "FunctionName": { "Name": "my_function", "QuoteType": 1, - "NamePos": 576, - "NameEnd": 587 + "NamePos": 552, + "NameEnd": 563 }, "OnCluster": null, "Params": { - "LeftParenPos": 591, - "RightParenPos": 596, + "LeftParenPos": 567, + "RightParenPos": 572, "Items": { - "ListPos": 592, - "ListEnd": 596, + "ListPos": 568, + "ListEnd": 572, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 592, - "NameEnd": 593 + "NamePos": 568, + "NameEnd": 569 }, "Alias": null }, @@ -510,8 +510,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 595, - "NameEnd": 596 + "NamePos": 571, + "NameEnd": 572 }, "Alias": null } @@ -523,15 +523,15 @@ "LeftExpr": { "Name": "x", "QuoteType": 1, - "NamePos": 601, - "NameEnd": 602 + "NamePos": 577, + "NameEnd": 578 }, "Operation": "+", "RightExpr": { "Name": "y", "QuoteType": 1, - "NamePos": 605, - "NameEnd": 606 + "NamePos": 581, + "NameEnd": 582 }, "HasGlobal": false, "HasNot": false diff --git a/parser/testdata/ddl/output/create_role.sql.golden.json b/parser/testdata/ddl/output/create_role.sql.golden.json index 675fb36..d0d6449 100644 --- a/parser/testdata/ddl/output/create_role.sql.golden.json +++ b/parser/testdata/ddl/output/create_role.sql.golden.json @@ -1,7 +1,7 @@ [ { - "CreatePos": 24, - "StatementEnd": 44, + "CreatePos": 22, + "StatementEnd": 42, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -9,8 +9,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 44 + "NamePos": 34, + "NameEnd": 42 }, "Scope": null, "OnCluster": null @@ -20,8 +20,8 @@ "Settings": null }, { - "CreatePos": 47, - "StatementEnd": 88, + "CreatePos": 44, + "StatementEnd": 85, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -29,17 +29,17 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 59, - "NameEnd": 67 + "NamePos": 56, + "NameEnd": 64 }, "Scope": null, "OnCluster": { - "OnPos": 68, + "OnPos": 65, "Expr": { "Name": "cluster_1", "QuoteType": 1, - "NamePos": 79, - "NameEnd": 88 + "NamePos": 76, + "NameEnd": 85 } } } @@ -48,8 +48,8 @@ "Settings": null }, { - "CreatePos": 91, - "StatementEnd": 121, + "CreatePos": 87, + "StatementEnd": 117, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -57,8 +57,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 103, - "NameEnd": 111 + "NamePos": 99, + "NameEnd": 107 }, "Scope": null, "OnCluster": null @@ -67,8 +67,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 113, - "NameEnd": 121 + "NamePos": 109, + "NameEnd": 117 }, "Scope": null, "OnCluster": null @@ -78,8 +78,8 @@ "Settings": null }, { - "CreatePos": 124, - "StatementEnd": 175, + "CreatePos": 119, + "StatementEnd": 170, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -87,17 +87,17 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 136, - "NameEnd": 144 + "NamePos": 131, + "NameEnd": 139 }, "Scope": null, "OnCluster": { - "OnPos": 145, + "OnPos": 140, "Expr": { "Name": "cluster_1", "QuoteType": 1, - "NamePos": 156, - "NameEnd": 165 + "NamePos": 151, + "NameEnd": 160 } } }, @@ -105,8 +105,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 167, - "NameEnd": 175 + "NamePos": 162, + "NameEnd": 170 }, "Scope": null, "OnCluster": null @@ -116,8 +116,8 @@ "Settings": null }, { - "CreatePos": 178, - "StatementEnd": 250, + "CreatePos": 172, + "StatementEnd": 244, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -125,17 +125,17 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 190, - "NameEnd": 198 + "NamePos": 184, + "NameEnd": 192 }, "Scope": null, "OnCluster": { - "OnPos": 199, + "OnPos": 193, "Expr": { "Name": "cluster_1", "QuoteType": 1, - "NamePos": 210, - "NameEnd": 219 + "NamePos": 204, + "NameEnd": 213 } } }, @@ -143,17 +143,17 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 221, - "NameEnd": 229 + "NamePos": 215, + "NameEnd": 223 }, "Scope": null, "OnCluster": { - "OnPos": 230, + "OnPos": 224, "Expr": { "Name": "cluster_2", "QuoteType": 1, - "NamePos": 241, - "NameEnd": 250 + "NamePos": 235, + "NameEnd": 244 } } } @@ -162,8 +162,8 @@ "Settings": null }, { - "CreatePos": 253, - "StatementEnd": 287, + "CreatePos": 246, + "StatementEnd": 280, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -171,8 +171,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 265, - "NameEnd": 273 + "NamePos": 258, + "NameEnd": 266 }, "Scope": null, "OnCluster": null @@ -185,15 +185,15 @@ "Modifier": { "Name": "NONE", "QuoteType": 1, - "NamePos": 283, - "NameEnd": 287 + "NamePos": 276, + "NameEnd": 280 } } ] }, { - "CreatePos": 290, - "StatementEnd": 336, + "CreatePos": 282, + "StatementEnd": 328, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -201,8 +201,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 302, - "NameEnd": 310 + "NamePos": 294, + "NameEnd": 302 }, "Scope": null, "OnCluster": null @@ -216,13 +216,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 320, - "NameEnd": 327 + "NamePos": 312, + "NameEnd": 319 }, "Operation": "", "Value": { - "LiteralPos": 329, - "LiteralEnd": 336, + "LiteralPos": 321, + "LiteralEnd": 328, "Literal": "default" } } @@ -232,8 +232,8 @@ ] }, { - "CreatePos": 340, - "StatementEnd": 394, + "CreatePos": 331, + "StatementEnd": 385, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -241,8 +241,8 @@ "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 352, - "NameEnd": 360 + "NamePos": 343, + "NameEnd": 351 }, "Scope": null, "OnCluster": null @@ -256,13 +256,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 370, - "NameEnd": 386 + "NamePos": 361, + "NameEnd": 377 }, "Operation": "=", "Value": { - "NumPos": 387, - "NumEnd": 394, + "NumPos": 378, + "NumEnd": 385, "Literal": "5000000", "Base": 10 } @@ -273,8 +273,8 @@ ] }, { - "CreatePos": 397, - "StatementEnd": 455, + "CreatePos": 387, + "StatementEnd": 445, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -282,8 +282,8 @@ "Name": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 409, - "NameEnd": 417 + "NamePos": 399, + "NameEnd": 407 }, "Scope": null, "OnCluster": null @@ -297,8 +297,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 427, - "NameEnd": 443 + "NamePos": 417, + "NameEnd": 433 }, "Operation": "", "Value": null @@ -307,13 +307,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 444, - "NameEnd": 447 + "NamePos": 434, + "NameEnd": 437 }, "Operation": "=", "Value": { - "NumPos": 448, - "NumEnd": 455, + "NumPos": 438, + "NumEnd": 445, "Literal": "5000000", "Base": 10 } @@ -324,8 +324,8 @@ ] }, { - "CreatePos": 458, - "StatementEnd": 516, + "CreatePos": 447, + "StatementEnd": 505, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -333,8 +333,8 @@ "Name": { "Name": "r5_01293", "QuoteType": 1, - "NamePos": 470, - "NameEnd": 478 + "NamePos": 459, + "NameEnd": 467 }, "Scope": null, "OnCluster": null @@ -348,8 +348,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 488, - "NameEnd": 504 + "NamePos": 477, + "NameEnd": 493 }, "Operation": "", "Value": null @@ -358,13 +358,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 505, - "NameEnd": 508 + "NamePos": 494, + "NameEnd": 497 }, "Operation": "=", "Value": { - "NumPos": 509, - "NumEnd": 516, + "NumPos": 498, + "NumEnd": 505, "Literal": "5000000", "Base": 10 } @@ -375,8 +375,8 @@ ] }, { - "CreatePos": 519, - "StatementEnd": 571, + "CreatePos": 507, + "StatementEnd": 559, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -384,8 +384,8 @@ "Name": { "Name": "r6_01293", "QuoteType": 1, - "NamePos": 531, - "NameEnd": 539 + "NamePos": 519, + "NameEnd": 527 }, "Scope": null, "OnCluster": null @@ -399,8 +399,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 549, - "NameEnd": 565 + "NamePos": 537, + "NameEnd": 553 }, "Operation": "", "Value": null @@ -409,15 +409,15 @@ "Modifier": { "Name": "CONST", "QuoteType": 1, - "NamePos": 566, - "NameEnd": 571 + "NamePos": 554, + "NameEnd": 559 } } ] }, { - "CreatePos": 574, - "StatementEnd": 629, + "CreatePos": 561, + "StatementEnd": 616, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -425,8 +425,8 @@ "Name": { "Name": "r7_01293", "QuoteType": 1, - "NamePos": 586, - "NameEnd": 594 + "NamePos": 573, + "NameEnd": 581 }, "Scope": null, "OnCluster": null @@ -440,8 +440,8 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 604, - "NameEnd": 620 + "NamePos": 591, + "NameEnd": 607 }, "Operation": "", "Value": null @@ -450,15 +450,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 621, - "NameEnd": 629 + "NamePos": 608, + "NameEnd": 616 } } ] }, { - "CreatePos": 632, - "StatementEnd": 716, + "CreatePos": 618, + "StatementEnd": 702, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -466,8 +466,8 @@ "Name": { "Name": "r8_01293", "QuoteType": 1, - "NamePos": 644, - "NameEnd": 652 + "NamePos": 630, + "NameEnd": 638 }, "Scope": null, "OnCluster": null @@ -481,13 +481,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 662, - "NameEnd": 678 + "NamePos": 648, + "NameEnd": 664 }, "Operation": "=", "Value": { - "NumPos": 679, - "NumEnd": 686, + "NumPos": 665, + "NumEnd": 672, "Literal": "5000000", "Base": 10 } @@ -496,13 +496,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 687, - "NameEnd": 690 + "NamePos": 673, + "NameEnd": 676 }, "Operation": "", "Value": { - "NumPos": 691, - "NumEnd": 698, + "NumPos": 677, + "NumEnd": 684, "Literal": "4000000", "Base": 10 } @@ -511,13 +511,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 699, - "NameEnd": 702 + "NamePos": 685, + "NameEnd": 688 }, "Operation": "", "Value": { - "NumPos": 703, - "NumEnd": 710, + "NumPos": 689, + "NumEnd": 696, "Literal": "6000000", "Base": 10 } @@ -526,15 +526,15 @@ "Modifier": { "Name": "CONST", "QuoteType": 1, - "NamePos": 711, - "NameEnd": 716 + "NamePos": 697, + "NameEnd": 702 } } ] }, { - "CreatePos": 719, - "StatementEnd": 801, + "CreatePos": 704, + "StatementEnd": 786, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -542,8 +542,8 @@ "Name": { "Name": "r9_01293", "QuoteType": 1, - "NamePos": 731, - "NameEnd": 739 + "NamePos": 716, + "NameEnd": 724 }, "Scope": null, "OnCluster": null @@ -557,13 +557,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 749, - "NameEnd": 756 + "NamePos": 734, + "NameEnd": 741 }, "Operation": "", "Value": { - "LiteralPos": 758, - "LiteralEnd": 765, + "LiteralPos": 743, + "LiteralEnd": 750, "Literal": "default" } } @@ -576,13 +576,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 768, - "NameEnd": 784 + "NamePos": 753, + "NameEnd": 769 }, "Operation": "=", "Value": { - "NumPos": 785, - "NumEnd": 792, + "NumPos": 770, + "NumEnd": 777, "Literal": "5000000", "Base": 10 } @@ -591,15 +591,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 793, - "NameEnd": 801 + "NamePos": 778, + "NameEnd": 786 } } ] }, { - "CreatePos": 804, - "StatementEnd": 834, + "CreatePos": 788, + "StatementEnd": 818, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -607,8 +607,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 816, - "NameEnd": 824 + "NamePos": 800, + "NameEnd": 808 }, "Scope": null, "OnCluster": null @@ -617,8 +617,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 826, - "NameEnd": 834 + "NamePos": 810, + "NameEnd": 818 }, "Scope": null, "OnCluster": null @@ -628,8 +628,8 @@ "Settings": null }, { - "CreatePos": 837, - "StatementEnd": 877, + "CreatePos": 820, + "StatementEnd": 860, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -637,8 +637,8 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 849, - "NameEnd": 857 + "NamePos": 832, + "NameEnd": 840 }, "Scope": null, "OnCluster": null @@ -652,13 +652,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 867, - "NameEnd": 875 + "NamePos": 850, + "NameEnd": 858 }, "Operation": "=", "Value": { - "NumPos": 876, - "NumEnd": 877, + "NumPos": 859, + "NumEnd": 860, "Literal": "1", "Base": 10 } @@ -669,8 +669,8 @@ ] }, { - "CreatePos": 880, - "StatementEnd": 926, + "CreatePos": 862, + "StatementEnd": 908, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -678,8 +678,8 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 892, - "NameEnd": 900 + "NamePos": 874, + "NameEnd": 882 }, "Scope": null, "OnCluster": null @@ -693,13 +693,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 910, - "NameEnd": 917 + "NamePos": 892, + "NameEnd": 899 }, "Operation": "", "Value": { - "LiteralPos": 919, - "LiteralEnd": 926, + "LiteralPos": 901, + "LiteralEnd": 908, "Literal": "default" } } @@ -709,8 +709,8 @@ ] }, { - "CreatePos": 930, - "StatementEnd": 1017, + "CreatePos": 911, + "StatementEnd": 998, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -718,8 +718,8 @@ "Name": { "Name": "r3_01293", "QuoteType": 1, - "NamePos": 942, - "NameEnd": 950 + "NamePos": 923, + "NameEnd": 931 }, "Scope": null, "OnCluster": null @@ -733,13 +733,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 960, - "NameEnd": 976 + "NamePos": 941, + "NameEnd": 957 }, "Operation": "=", "Value": { - "NumPos": 977, - "NumEnd": 984, + "NumPos": 958, + "NumEnd": 965, "Literal": "5000000", "Base": 10 } @@ -748,13 +748,13 @@ "Name": { "Name": "MIN", "QuoteType": 1, - "NamePos": 985, - "NameEnd": 988 + "NamePos": 966, + "NameEnd": 969 }, "Operation": "", "Value": { - "NumPos": 989, - "NumEnd": 996, + "NumPos": 970, + "NumEnd": 977, "Literal": "4000000", "Base": 10 } @@ -763,13 +763,13 @@ "Name": { "Name": "MAX", "QuoteType": 1, - "NamePos": 997, - "NameEnd": 1000 + "NamePos": 978, + "NameEnd": 981 }, "Operation": "", "Value": { - "NumPos": 1001, - "NumEnd": 1008, + "NumPos": 982, + "NumEnd": 989, "Literal": "6000000", "Base": 10 } @@ -778,15 +778,15 @@ "Modifier": { "Name": "WRITABLE", "QuoteType": 1, - "NamePos": 1009, - "NameEnd": 1017 + "NamePos": 990, + "NameEnd": 998 } } ] }, { - "CreatePos": 1020, - "StatementEnd": 1105, + "CreatePos": 1000, + "StatementEnd": 1085, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -794,8 +794,8 @@ "Name": { "Name": "r4_01293", "QuoteType": 1, - "NamePos": 1032, - "NameEnd": 1040 + "NamePos": 1012, + "NameEnd": 1020 }, "Scope": null, "OnCluster": null @@ -809,13 +809,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 1050, - "NameEnd": 1057 + "NamePos": 1030, + "NameEnd": 1037 }, "Operation": "", "Value": { - "LiteralPos": 1059, - "LiteralEnd": 1066, + "LiteralPos": 1039, + "LiteralEnd": 1046, "Literal": "default" } } @@ -828,13 +828,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 1069, - "NameEnd": 1085 + "NamePos": 1049, + "NameEnd": 1065 }, "Operation": "=", "Value": { - "NumPos": 1086, - "NumEnd": 1093, + "NumPos": 1066, + "NumEnd": 1073, "Literal": "5000000", "Base": 10 } @@ -848,13 +848,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 1095, - "NameEnd": 1103 + "NamePos": 1075, + "NameEnd": 1083 }, "Operation": "=", "Value": { - "NumPos": 1104, - "NumEnd": 1105, + "NumPos": 1084, + "NumEnd": 1085, "Literal": "1", "Base": 10 } @@ -865,8 +865,8 @@ ] }, { - "CreatePos": 1108, - "StatementEnd": 1142, + "CreatePos": 1087, + "StatementEnd": 1121, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -874,8 +874,8 @@ "Name": { "Name": "r5_01293", "QuoteType": 1, - "NamePos": 1120, - "NameEnd": 1128 + "NamePos": 1099, + "NameEnd": 1107 }, "Scope": null, "OnCluster": null @@ -888,15 +888,15 @@ "Modifier": { "Name": "NONE", "QuoteType": 1, - "NamePos": 1138, - "NameEnd": 1142 + "NamePos": 1117, + "NameEnd": 1121 } } ] }, { - "CreatePos": 1145, - "StatementEnd": 1168, + "CreatePos": 1123, + "StatementEnd": 1146, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -904,12 +904,12 @@ "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 1157, - "NameEnd": 1165 + "NamePos": 1135, + "NameEnd": 1143 }, "Scope": { - "LiteralPos": 1167, - "LiteralEnd": 1168, + "LiteralPos": 1145, + "LiteralEnd": 1146, "Literal": "%" }, "OnCluster": null @@ -919,8 +919,8 @@ "Settings": null }, { - "CreatePos": 1172, - "StatementEnd": 1206, + "CreatePos": 1149, + "StatementEnd": 1183, "IfNotExists": false, "OrReplace": false, "RoleNames": [ @@ -928,12 +928,12 @@ "Name": { "Name": "r2_01293", "QuoteType": 1, - "NamePos": 1184, - "NameEnd": 1192 + "NamePos": 1161, + "NameEnd": 1169 }, "Scope": { - "LiteralPos": 1194, - "LiteralEnd": 1206, + "LiteralPos": 1171, + "LiteralEnd": 1183, "Literal": "%.myhost.com" }, "OnCluster": null diff --git a/parser/testdata/ddl/output/create_table_basic.sql.golden.json b/parser/testdata/ddl/output/create_table_basic.sql.golden.json index 0b601d8..fc79f87 100644 --- a/parser/testdata/ddl/output/create_table_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_basic.sql.golden.json @@ -1,38 +1,38 @@ [ { - "CreatePos": 127, - "StatementEnd": 803, + "CreatePos": 122, + "StatementEnd": 774, "OrReplace": false, "Name": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 154, - "NameEnd": 158 + "NamePos": 149, + "NameEnd": 153 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 159, - "NameEnd": 171 + "NamePos": 154, + "NameEnd": 166 } }, "IfNotExists": true, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 172, - "SchemaEnd": 681, + "SchemaPos": 167, + "SchemaEnd": 656, "Columns": [ { - "NamePos": 179, - "ColumnEnd": 188, + "NamePos": 173, + "ColumnEnd": 182, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 179, - "NameEnd": 181 + "NamePos": 173, + "NameEnd": 175 }, "DotIdent": null }, @@ -40,8 +40,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 182, - "NameEnd": 188 + "NamePos": 176, + "NameEnd": 182 } }, "NotNull": null, @@ -55,14 +55,14 @@ "CompressionCodec": null }, { - "NamePos": 195, - "ColumnEnd": 219, + "NamePos": 188, + "ColumnEnd": 212, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 195, - "NameEnd": 197 + "NamePos": 188, + "NameEnd": 190 }, "DotIdent": null }, @@ -70,8 +70,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 198, - "NameEnd": 204 + "NamePos": 191, + "NameEnd": 197 } }, "NotNull": null, @@ -80,19 +80,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 205, - "RightParenPos": 219, + "CodecPos": 198, + "RightParenPos": 212, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 211, - "NameEnd": 215 + "NamePos": 204, + "NameEnd": 208 }, "Level": { - "NumPos": 215, - "NumEnd": 217, + "NumPos": 208, + "NumEnd": 210, "Literal": "1", "Base": 10 } @@ -102,30 +102,30 @@ "CompressionCodec": null }, { - "NamePos": 226, - "ColumnEnd": 240, + "NamePos": 218, + "ColumnEnd": 232, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 226, - "NameEnd": 228 + "NamePos": 218, + "NameEnd": 220 }, "DotIdent": null }, "Type": { - "LeftParenPos": 237, - "RightParenPos": 240, + "LeftParenPos": 229, + "RightParenPos": 232, "Name": { "Name": "VARCHAR", "QuoteType": 1, - "NamePos": 229, - "NameEnd": 236 + "NamePos": 221, + "NameEnd": 228 }, "Params": [ { - "NumPos": 237, - "NumEnd": 240, + "NumPos": 229, + "NumEnd": 232, "Literal": "255", "Base": 10 } @@ -142,14 +142,14 @@ "CompressionCodec": null }, { - "NamePos": 248, - "ColumnEnd": 259, + "NamePos": 239, + "ColumnEnd": 250, "Name": { "Ident": { "Name": "f3", "QuoteType": 1, - "NamePos": 248, - "NameEnd": 250 + "NamePos": 239, + "NameEnd": 241 }, "DotIdent": null }, @@ -157,8 +157,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 251, - "NameEnd": 259 + "NamePos": 242, + "NameEnd": 250 } }, "NotNull": null, @@ -172,14 +172,14 @@ "CompressionCodec": null }, { - "NamePos": 266, - "ColumnEnd": 277, + "NamePos": 256, + "ColumnEnd": 267, "Name": { "Ident": { "Name": "f4", "QuoteType": 1, - "NamePos": 266, - "NameEnd": 268 + "NamePos": 256, + "NameEnd": 258 }, "DotIdent": null }, @@ -187,8 +187,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 269, - "NameEnd": 277 + "NamePos": 259, + "NameEnd": 267 } }, "NotNull": null, @@ -202,41 +202,41 @@ "CompressionCodec": null }, { - "NamePos": 284, - "ColumnEnd": 304, + "NamePos": 273, + "ColumnEnd": 293, "Name": { "Ident": { "Name": "f5", "QuoteType": 1, - "NamePos": 284, - "NameEnd": 286 + "NamePos": 273, + "NameEnd": 275 }, "DotIdent": null }, "Type": { - "LeftParenPos": 291, - "RightParenPos": 304, + "LeftParenPos": 280, + "RightParenPos": 293, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 287, - "NameEnd": 290 + "NamePos": 276, + "NameEnd": 279 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 291, - "NameEnd": 297 + "NamePos": 280, + "NameEnd": 286 } }, { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 298, - "NameEnd": 304 + "NamePos": 287, + "NameEnd": 293 } } ] @@ -252,14 +252,14 @@ "CompressionCodec": null }, { - "NamePos": 312, - "ColumnEnd": 321, + "NamePos": 300, + "ColumnEnd": 309, "Name": { "Ident": { "Name": "f6", "QuoteType": 1, - "NamePos": 312, - "NameEnd": 314 + "NamePos": 300, + "NameEnd": 302 }, "DotIdent": null }, @@ -267,8 +267,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 315, - "NameEnd": 321 + "NamePos": 303, + "NameEnd": 309 } }, "NotNull": null, @@ -282,36 +282,36 @@ "CompressionCodec": null }, { - "NamePos": 328, - "ColumnEnd": 470, + "NamePos": 315, + "ColumnEnd": 450, "Name": { "Ident": { "Name": "f7", "QuoteType": 1, - "NamePos": 328, - "NameEnd": 330 + "NamePos": 315, + "NameEnd": 317 }, "DotIdent": null }, "Type": { - "LeftParenPos": 349, - "RightParenPos": 470, + "LeftParenPos": 335, + "RightParenPos": 450, "Name": { "Name": "Nested", "QuoteType": 1, - "NamePos": 331, - "NameEnd": 337 + "NamePos": 318, + "NameEnd": 324 }, "Columns": [ { - "NamePos": 349, - "ColumnEnd": 359, + "NamePos": 335, + "ColumnEnd": 345, "Name": { "Ident": { "Name": "f70", "QuoteType": 1, - "NamePos": 349, - "NameEnd": 352 + "NamePos": 335, + "NameEnd": 338 }, "DotIdent": null }, @@ -319,8 +319,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 353, - "NameEnd": 359 + "NamePos": 339, + "NameEnd": 345 } }, "NotNull": null, @@ -334,14 +334,14 @@ "CompressionCodec": null }, { - "NamePos": 370, - "ColumnEnd": 380, + "NamePos": 355, + "ColumnEnd": 365, "Name": { "Ident": { "Name": "f71", "QuoteType": 1, - "NamePos": 370, - "NameEnd": 373 + "NamePos": 355, + "NameEnd": 358 }, "DotIdent": null }, @@ -349,8 +349,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 374, - "NameEnd": 380 + "NamePos": 359, + "NameEnd": 365 } }, "NotNull": null, @@ -364,14 +364,14 @@ "CompressionCodec": null }, { - "NamePos": 391, - "ColumnEnd": 403, + "NamePos": 375, + "ColumnEnd": 387, "Name": { "Ident": { "Name": "f72", "QuoteType": 1, - "NamePos": 391, - "NameEnd": 394 + "NamePos": 375, + "NameEnd": 378 }, "DotIdent": null }, @@ -379,8 +379,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 395, - "NameEnd": 403 + "NamePos": 379, + "NameEnd": 387 } }, "NotNull": null, @@ -394,14 +394,14 @@ "CompressionCodec": null }, { - "NamePos": 414, - "ColumnEnd": 423, + "NamePos": 397, + "ColumnEnd": 406, "Name": { "Ident": { "Name": "f73", "QuoteType": 1, - "NamePos": 414, - "NameEnd": 417 + "NamePos": 397, + "NameEnd": 400 }, "DotIdent": null }, @@ -409,8 +409,8 @@ "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 418, - "NameEnd": 423 + "NamePos": 401, + "NameEnd": 406 } }, "NotNull": null, @@ -424,14 +424,14 @@ "CompressionCodec": null }, { - "NamePos": 434, - "ColumnEnd": 443, + "NamePos": 416, + "ColumnEnd": 425, "Name": { "Ident": { "Name": "f74", "QuoteType": 1, - "NamePos": 434, - "NameEnd": 437 + "NamePos": 416, + "NameEnd": 419 }, "DotIdent": null }, @@ -439,8 +439,8 @@ "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 438, - "NameEnd": 443 + "NamePos": 420, + "NameEnd": 425 } }, "NotNull": null, @@ -454,14 +454,14 @@ "CompressionCodec": null }, { - "NamePos": 454, - "ColumnEnd": 464, + "NamePos": 435, + "ColumnEnd": 445, "Name": { "Ident": { "Name": "f75", "QuoteType": 1, - "NamePos": 454, - "NameEnd": 457 + "NamePos": 435, + "NameEnd": 438 }, "DotIdent": null }, @@ -469,8 +469,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 458, - "NameEnd": 464 + "NamePos": 439, + "NameEnd": 445 } }, "NotNull": null, @@ -496,14 +496,14 @@ "CompressionCodec": null }, { - "NamePos": 478, - "ColumnEnd": 502, + "NamePos": 457, + "ColumnEnd": 481, "Name": { "Ident": { "Name": "f8", "QuoteType": 1, - "NamePos": 478, - "NameEnd": 480 + "NamePos": 457, + "NameEnd": 459 }, "DotIdent": null }, @@ -511,8 +511,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 481, - "NameEnd": 489 + "NamePos": 460, + "NameEnd": 468 } }, "NotNull": null, @@ -521,15 +521,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 498, - "NameEnd": 501 + "NamePos": 477, + "NameEnd": 480 }, "Params": { - "LeftParenPos": 501, - "RightParenPos": 502, + "LeftParenPos": 480, + "RightParenPos": 481, "Items": { - "ListPos": 502, - "ListEnd": 502, + "ListPos": 481, + "ListEnd": 481, "HasDistinct": false, "Items": [] }, @@ -544,14 +544,14 @@ "CompressionCodec": null }, { - "NamePos": 510, - "ColumnEnd": 551, + "NamePos": 488, + "ColumnEnd": 529, "Name": { "Ident": { "Name": "f9", "QuoteType": 1, - "NamePos": 510, - "NameEnd": 512 + "NamePos": 488, + "NameEnd": 490 }, "DotIdent": null }, @@ -559,8 +559,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 513, - "NameEnd": 519 + "NamePos": 491, + "NameEnd": 497 } }, "NotNull": null, @@ -570,15 +570,15 @@ "Name": { "Name": "toString", "QuoteType": 1, - "NamePos": 533, - "NameEnd": 541 + "NamePos": 511, + "NameEnd": 519 }, "Params": { - "LeftParenPos": 541, - "RightParenPos": 551, + "LeftParenPos": 519, + "RightParenPos": 529, "Items": { - "ListPos": 542, - "ListEnd": 550, + "ListPos": 520, + "ListEnd": 528, "HasDistinct": false, "Items": [ { @@ -586,21 +586,21 @@ "Object": { "Name": "f7", "QuoteType": 1, - "NamePos": 542, - "NameEnd": 544 + "NamePos": 520, + "NameEnd": 522 }, "Params": { - "LeftBracketPos": 544, - "RightBracketPos": 550, + "LeftBracketPos": 522, + "RightBracketPos": 528, "Items": { - "ListPos": 546, - "ListEnd": 549, + "ListPos": 524, + "ListEnd": 527, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 546, - "LiteralEnd": 549, + "LiteralPos": 524, + "LiteralEnd": 527, "Literal": "f70" }, "Alias": null @@ -623,14 +623,14 @@ "CompressionCodec": null }, { - "NamePos": 559, - "ColumnEnd": 579, + "NamePos": 536, + "ColumnEnd": 556, "Name": { "Ident": { "Name": "f10", "QuoteType": 1, - "NamePos": 559, - "NameEnd": 562 + "NamePos": 536, + "NameEnd": 539 }, "DotIdent": null }, @@ -638,8 +638,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 563, - "NameEnd": 569 + "NamePos": 540, + "NameEnd": 546 } }, "NotNull": null, @@ -649,8 +649,8 @@ "AliasExpr": { "Name": "f11", "QuoteType": 1, - "NamePos": 576, - "NameEnd": 579 + "NamePos": 553, + "NameEnd": 556 }, "Codec": null, "TTL": null, @@ -658,14 +658,14 @@ "CompressionCodec": null }, { - "NamePos": 586, - "ColumnEnd": 677, + "NamePos": 562, + "ColumnEnd": 653, "Name": { "Ident": { "Name": "f12", "QuoteType": 1, - "NamePos": 586, - "NameEnd": 589 + "NamePos": 562, + "NameEnd": 565 }, "DotIdent": null }, @@ -673,20 +673,20 @@ "Name": { "Name": "JSON", "QuoteType": 1, - "NamePos": 590, - "NameEnd": 594 + "NamePos": 566, + "NameEnd": 570 }, "Options": { - "LParen": 595, - "RParen": 677, + "LParen": 571, + "RParen": 653, "Items": [ { "SkipPath": null, "SkipRegex": null, "MaxDynamicPaths": null, "MaxDynamicTypes": { - "NumPos": 613, - "NumEnd": 615, + "NumPos": 589, + "NumEnd": 591, "Literal": "10", "Base": 10 }, @@ -696,8 +696,8 @@ "SkipPath": null, "SkipRegex": null, "MaxDynamicPaths": { - "NumPos": 635, - "NumEnd": 636, + "NumPos": 611, + "NumEnd": 612, "Literal": "3", "Base": 10 }, @@ -710,8 +710,8 @@ { "Name": "a", "QuoteType": 1, - "NamePos": 643, - "NameEnd": 644 + "NamePos": 619, + "NameEnd": 620 } ] }, @@ -726,20 +726,20 @@ { "Name": "a", "QuoteType": 1, - "NamePos": 651, - "NameEnd": 652 + "NamePos": 627, + "NameEnd": 628 }, { "Name": "b", "QuoteType": 1, - "NamePos": 653, - "NameEnd": 654 + "NamePos": 629, + "NameEnd": 630 }, { "Name": "c", "QuoteType": 1, - "NamePos": 655, - "NameEnd": 656 + "NamePos": 631, + "NameEnd": 632 } ] }, @@ -751,8 +751,8 @@ { "SkipPath": null, "SkipRegex": { - "LiteralPos": 671, - "LiteralEnd": 676, + "LiteralPos": 647, + "LiteralEnd": 652, "Literal": "hello" }, "MaxDynamicPaths": null, @@ -777,26 +777,26 @@ "TableFunction": null }, "Engine": { - "EnginePos": 683, - "EngineEnd": 803, + "EnginePos": 658, + "EngineEnd": 774, "Name": "MergeTree", "Params": null, "PrimaryKey": { - "PrimaryPos": 703, + "PrimaryPos": 677, "Expr": { - "LeftParenPos": 715, - "RightParenPos": 726, + "LeftParenPos": 689, + "RightParenPos": 700, "Items": { - "ListPos": 716, - "ListEnd": 726, + "ListPos": 690, + "ListEnd": 700, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 716, - "NameEnd": 718 + "NamePos": 690, + "NameEnd": 692 }, "Alias": null }, @@ -804,8 +804,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 720, - "NameEnd": 722 + "NamePos": 694, + "NameEnd": 696 }, "Alias": null }, @@ -813,8 +813,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 724, - "NameEnd": 726 + "NamePos": 698, + "NameEnd": 700 }, "Alias": null } @@ -824,10 +824,10 @@ } }, "PartitionBy": { - "PartitionPos": 729, + "PartitionPos": 702, "Expr": { - "ListPos": 742, - "ListEnd": 755, + "ListPos": 715, + "ListEnd": 728, "HasDistinct": false, "Items": [ { @@ -835,23 +835,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 742, - "NameEnd": 752 + "NamePos": 715, + "NameEnd": 725 }, "Params": { - "LeftParenPos": 752, - "RightParenPos": 755, + "LeftParenPos": 725, + "RightParenPos": 728, "Items": { - "ListPos": 753, - "ListEnd": 755, + "ListPos": 726, + "ListEnd": 728, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 753, - "NameEnd": 755 + "NamePos": 726, + "NameEnd": 728 }, "Alias": null } @@ -867,32 +867,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 758, - "ListEnd": 783, + "TTLPos": 730, + "ListEnd": 755, "Items": [ { - "TTLPos": 758, + "TTLPos": 730, "Expr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 762, - "NameEnd": 764 + "NamePos": 734, + "NameEnd": 736 }, "Operation": "+", "RightExpr": { - "IntervalPos": 767, + "IntervalPos": 739, "Expr": { - "NumPos": 776, - "NumEnd": 777, + "NumPos": 748, + "NumEnd": 749, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 778, - "NameEnd": 783 + "NamePos": 750, + "NameEnd": 755 } }, "HasGlobal": false, @@ -904,25 +904,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 785, - "ListEnd": 803, + "OrderPos": 756, + "ListEnd": 774, "Items": [ { - "OrderPos": 785, + "OrderPos": 756, "Expr": { - "LeftParenPos": 794, - "RightParenPos": 803, + "LeftParenPos": 765, + "RightParenPos": 774, "Items": { - "ListPos": 795, - "ListEnd": 803, + "ListPos": 766, + "ListEnd": 774, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 795, - "NameEnd": 797 + "NamePos": 766, + "NameEnd": 768 }, "Alias": null }, @@ -930,8 +930,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 798, - "NameEnd": 800 + "NamePos": 769, + "NameEnd": 771 }, "Alias": null }, @@ -939,8 +939,8 @@ "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 801, - "NameEnd": 803 + "NamePos": 772, + "NameEnd": 774 }, "Alias": null } @@ -957,8 +957,8 @@ "SubQuery": null, "HasTemporary": false, "Comment": { - "LiteralPos": 815, - "LiteralEnd": 832, + "LiteralPos": 785, + "LiteralEnd": 802, "Literal": "Comment for table" } } diff --git a/parser/testdata/ddl/output/create_table_json_typehints.sql.golden.json b/parser/testdata/ddl/output/create_table_json_typehints.sql.golden.json index ba5d72b..9d2644c 100644 --- a/parser/testdata/ddl/output/create_table_json_typehints.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_json_typehints.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 142, + "StatementEnd": 139, "OrReplace": false, "Name": { "Database": null, @@ -17,17 +17,17 @@ "OnCluster": null, "TableSchema": { "SchemaPos": 15, - "SchemaEnd": 105, + "SchemaEnd": 103, "Columns": [ { - "NamePos": 22, - "ColumnEnd": 102, + "NamePos": 21, + "ColumnEnd": 101, "Name": { "Ident": { "Name": "j", "QuoteType": 1, - "NamePos": 22, - "NameEnd": 23 + "NamePos": 21, + "NameEnd": 22 }, "DotIdent": null }, @@ -35,12 +35,12 @@ "Name": { "Name": "JSON", "QuoteType": 1, - "NamePos": 24, - "NameEnd": 28 + "NamePos": 23, + "NameEnd": 27 }, "Options": { - "LParen": 29, - "RParen": 102, + "LParen": 28, + "RParen": 101, "Items": [ { "SkipPath": null, @@ -53,8 +53,8 @@ { "Name": "message", "QuoteType": 1, - "NamePos": 29, - "NameEnd": 36 + "NamePos": 28, + "NameEnd": 35 } ] }, @@ -62,8 +62,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 37, - "NameEnd": 43 + "NamePos": 36, + "NameEnd": 42 } } } @@ -79,14 +79,14 @@ { "Name": "a", "QuoteType": 1, - "NamePos": 45, - "NameEnd": 46 + "NamePos": 44, + "NameEnd": 45 }, { "Name": "b", "QuoteType": 1, - "NamePos": 47, - "NameEnd": 48 + "NamePos": 46, + "NameEnd": 47 } ] }, @@ -94,8 +94,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 49, - "NameEnd": 55 + "NamePos": 48, + "NameEnd": 54 } } } @@ -104,8 +104,8 @@ "SkipPath": null, "SkipRegex": null, "MaxDynamicPaths": { - "NumPos": 75, - "NumEnd": 76, + "NumPos": 74, + "NumEnd": 75, "Literal": "0", "Base": 10 }, @@ -118,8 +118,8 @@ { "Name": "x", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 84 + "NamePos": 82, + "NameEnd": 83 } ] }, @@ -131,8 +131,8 @@ { "SkipPath": null, "SkipRegex": { - "LiteralPos": 99, - "LiteralEnd": 101, + "LiteralPos": 98, + "LiteralEnd": 100, "Literal": "re" }, "MaxDynamicPaths": null, @@ -157,8 +157,8 @@ "TableFunction": null }, "Engine": { - "EnginePos": 107, - "EngineEnd": 142, + "EnginePos": 105, + "EngineEnd": 139, "Name": "MergeTree", "Params": null, "PrimaryKey": null, @@ -167,24 +167,24 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 127, - "ListEnd": 142, + "OrderPos": 124, + "ListEnd": 139, "Items": [ { - "OrderPos": 127, + "OrderPos": 124, "Expr": { "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 136, - "NameEnd": 141 + "NamePos": 133, + "NameEnd": 138 }, "Params": { - "LeftParenPos": 141, - "RightParenPos": 142, + "LeftParenPos": 138, + "RightParenPos": 139, "Items": { - "ListPos": 142, - "ListEnd": 142, + "ListPos": 139, + "ListEnd": 139, "HasDistinct": false, "Items": [] }, diff --git a/parser/testdata/ddl/output/create_table_with_codec_delta.sql.golden.json b/parser/testdata/ddl/output/create_table_with_codec_delta.sql.golden.json index e0e8cc1..4f61143 100644 --- a/parser/testdata/ddl/output/create_table_with_codec_delta.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_codec_delta.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 827, + "StatementEnd": 812, "OrReplace": false, "Name": { "Database": null, @@ -16,18 +16,18 @@ "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 39, - "SchemaEnd": 385, + "SchemaPos": 38, + "SchemaEnd": 375, "Columns": [ { - "NamePos": 44, - "ColumnEnd": 76, + "NamePos": 42, + "ColumnEnd": 74, "Name": { "Ident": { "Name": "id", "QuoteType": 3, - "NamePos": 44, - "NameEnd": 46 + "NamePos": 42, + "NameEnd": 44 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 48, - "NameEnd": 54 + "NamePos": 46, + "NameEnd": 52 } }, "NotNull": null, @@ -45,24 +45,24 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 55, - "RightParenPos": 76, + "CodecPos": 53, + "RightParenPos": 74, "Type": { "Name": "Delta", "QuoteType": 1, - "NamePos": 61, - "NameEnd": 66 + "NamePos": 59, + "NameEnd": 64 }, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 68, - "NameEnd": 72 + "NamePos": 66, + "NameEnd": 70 }, "Level": { - "NumPos": 72, - "NumEnd": 74, + "NumPos": 70, + "NumEnd": 72, "Literal": "1", "Base": 10 } @@ -72,14 +72,14 @@ "CompressionCodec": null }, { - "NamePos": 81, - "ColumnEnd": 110, + "NamePos": 78, + "ColumnEnd": 107, "Name": { "Ident": { "Name": "api_id", "QuoteType": 3, - "NamePos": 81, - "NameEnd": 87 + "NamePos": 78, + "NameEnd": 84 }, "DotIdent": null }, @@ -87,8 +87,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 89, - "NameEnd": 95 + "NamePos": 86, + "NameEnd": 92 } }, "NotNull": null, @@ -97,19 +97,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 96, - "RightParenPos": 110, + "CodecPos": 93, + "RightParenPos": 107, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 102, - "NameEnd": 106 + "NamePos": 99, + "NameEnd": 103 }, "Level": { - "NumPos": 106, - "NumEnd": 108, + "NumPos": 103, + "NumEnd": 105, "Literal": "1", "Base": 10 } @@ -119,14 +119,14 @@ "CompressionCodec": null }, { - "NamePos": 115, - "ColumnEnd": 154, + "NamePos": 111, + "ColumnEnd": 150, "Name": { "Ident": { "Name": "app_id", "QuoteType": 3, - "NamePos": 115, - "NameEnd": 121 + "NamePos": 111, + "NameEnd": 117 }, "DotIdent": null }, @@ -134,8 +134,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 123, - "NameEnd": 129 + "NamePos": 119, + "NameEnd": 125 } }, "NotNull": null, @@ -144,29 +144,29 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 130, - "RightParenPos": 154, + "CodecPos": 126, + "RightParenPos": 150, "Type": { "Name": "Delta", "QuoteType": 1, - "NamePos": 136, - "NameEnd": 141 + "NamePos": 132, + "NameEnd": 137 }, "TypeLevel": { - "NumPos": 141, - "NumEnd": 143, + "NumPos": 137, + "NumEnd": 139, "Literal": "9", "Base": 10 }, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 146, - "NameEnd": 150 + "NamePos": 142, + "NameEnd": 146 }, "Level": { - "NumPos": 150, - "NumEnd": 152, + "NumPos": 146, + "NumEnd": 148, "Literal": "1", "Base": 10 } @@ -176,14 +176,14 @@ "CompressionCodec": null }, { - "NamePos": 159, - "ColumnEnd": 204, + "NamePos": 154, + "ColumnEnd": 199, "Name": { "Ident": { "Name": "device_id", "QuoteType": 3, - "NamePos": 159, - "NameEnd": 168 + "NamePos": 154, + "NameEnd": 163 }, "DotIdent": null }, @@ -191,8 +191,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 170, - "NameEnd": 176 + "NamePos": 165, + "NameEnd": 171 } }, "NotNull": null, @@ -201,24 +201,24 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 177, - "RightParenPos": 204, + "CodecPos": 172, + "RightParenPos": 199, "Type": { "Name": "DoubleDelta", "QuoteType": 1, - "NamePos": 183, - "NameEnd": 194 + "NamePos": 178, + "NameEnd": 189 }, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 196, - "NameEnd": 200 + "NamePos": 191, + "NameEnd": 195 }, "Level": { - "NumPos": 200, - "NumEnd": 202, + "NumPos": 195, + "NumEnd": 197, "Literal": "1", "Base": 10 } @@ -228,14 +228,14 @@ "CompressionCodec": null }, { - "NamePos": 209, - "ColumnEnd": 243, + "NamePos": 203, + "ColumnEnd": 237, "Name": { "Ident": { "Name": "guage", "QuoteType": 3, - "NamePos": 209, - "NameEnd": 214 + "NamePos": 203, + "NameEnd": 208 }, "DotIdent": null }, @@ -243,8 +243,8 @@ "Name": { "Name": "Float64", "QuoteType": 1, - "NamePos": 216, - "NameEnd": 223 + "NamePos": 210, + "NameEnd": 217 } }, "NotNull": null, @@ -253,20 +253,20 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 224, - "RightParenPos": 243, + "CodecPos": 218, + "RightParenPos": 237, "Type": { "Name": "Gorilla", "QuoteType": 1, - "NamePos": 230, - "NameEnd": 237 + "NamePos": 224, + "NameEnd": 231 }, "TypeLevel": null, "Name": { "Name": "LZ4", "QuoteType": 1, - "NamePos": 239, - "NameEnd": 242 + "NamePos": 233, + "NameEnd": 236 }, "Level": null }, @@ -275,14 +275,14 @@ "CompressionCodec": null }, { - "NamePos": 248, - "ColumnEnd": 277, + "NamePos": 241, + "ColumnEnd": 270, "Name": { "Ident": { "Name": "value", "QuoteType": 3, - "NamePos": 248, - "NameEnd": 253 + "NamePos": 241, + "NameEnd": 246 }, "DotIdent": null }, @@ -290,8 +290,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 255, - "NameEnd": 261 + "NamePos": 248, + "NameEnd": 254 } }, "NotNull": null, @@ -300,20 +300,20 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 262, - "RightParenPos": 277, + "CodecPos": 255, + "RightParenPos": 270, "Type": { "Name": "T64", "QuoteType": 1, - "NamePos": 268, - "NameEnd": 271 + "NamePos": 261, + "NameEnd": 264 }, "TypeLevel": null, "Name": { "Name": "LZ4", "QuoteType": 1, - "NamePos": 273, - "NameEnd": 276 + "NamePos": 266, + "NameEnd": 269 }, "Level": null }, @@ -322,30 +322,30 @@ "CompressionCodec": null }, { - "NamePos": 282, - "ColumnEnd": 321, + "NamePos": 274, + "ColumnEnd": 313, "Name": { "Ident": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 282, - "NameEnd": 291 + "NamePos": 274, + "NameEnd": 283 }, "DotIdent": null }, "Type": { - "LeftParenPos": 304, - "RightParenPos": 305, + "LeftParenPos": 296, + "RightParenPos": 297, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 293, - "NameEnd": 303 + "NamePos": 285, + "NameEnd": 295 }, "Params": [ { - "NumPos": 304, - "NumEnd": 305, + "NumPos": 296, + "NumEnd": 297, "Literal": "9", "Base": 10 } @@ -357,19 +357,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 307, - "RightParenPos": 321, + "CodecPos": 299, + "RightParenPos": 313, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 313, - "NameEnd": 317 + "NamePos": 305, + "NameEnd": 309 }, "Level": { - "NumPos": 317, - "NumEnd": 319, + "NumPos": 309, + "NumEnd": 311, "Literal": "1", "Base": 10 } @@ -379,31 +379,31 @@ "CompressionCodec": null }, { - "IndexPos": 325, + "IndexPos": 316, "Name": { "Ident": { "Name": "timestamp_index", "QuoteType": 1, - "NamePos": 331, - "NameEnd": 346 + "NamePos": 322, + "NameEnd": 337 }, "DotIdent": null }, "ColumnExpr": { "Expr": { - "LeftParenPos": 346, - "RightParenPos": 356, + "LeftParenPos": 337, + "RightParenPos": 347, "Items": { - "ListPos": 347, - "ListEnd": 356, + "ListPos": 338, + "ListEnd": 347, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 347, - "NameEnd": 356 + "NamePos": 338, + "NameEnd": 347 }, "Alias": null } @@ -417,13 +417,13 @@ "Name": { "Name": "minmax", "QuoteType": 1, - "NamePos": 363, - "NameEnd": 369 + "NamePos": 354, + "NameEnd": 360 } }, "Granularity": { - "NumPos": 382, - "NumEnd": 383, + "NumPos": 373, + "NumEnd": 374, "Literal": "4", "Base": 10 } @@ -433,29 +433,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 388, - "EngineEnd": 827, + "EnginePos": 377, + "EngineEnd": 812, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 416, - "RightParenPos": 448, + "LeftParenPos": 405, + "RightParenPos": 437, "Items": { - "ListPos": 418, - "ListEnd": 447, + "ListPos": 407, + "ListEnd": 436, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 418, - "LiteralEnd": 434, + "LiteralPos": 407, + "LiteralEnd": 423, "Literal": "/root/test_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 438, - "LiteralEnd": 447, + "LiteralPos": 427, + "LiteralEnd": 436, "Literal": "{replica}" }, "Alias": null @@ -466,10 +466,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 451, + "PartitionPos": 439, "Expr": { - "ListPos": 464, - "ListEnd": 489, + "ListPos": 452, + "ListEnd": 477, "HasDistinct": false, "Items": [ { @@ -477,23 +477,23 @@ "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 464, - "NameEnd": 477 + "NamePos": 452, + "NameEnd": 465 }, "Params": { - "LeftParenPos": 477, - "RightParenPos": 489, + "LeftParenPos": 465, + "RightParenPos": 477, "Items": { - "ListPos": 479, - "ListEnd": 488, + "ListPos": 467, + "ListEnd": 476, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 479, - "NameEnd": 488 + "NamePos": 467, + "NameEnd": 476 }, "Alias": null } @@ -509,33 +509,33 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 549, - "ListEnd": 640, + "TTLPos": 535, + "ListEnd": 626, "Items": [ { - "TTLPos": 549, + "TTLPos": 535, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 553, - "NameEnd": 566 + "NamePos": 539, + "NameEnd": 552 }, "Params": { - "LeftParenPos": 566, - "RightParenPos": 578, + "LeftParenPos": 552, + "RightParenPos": 564, "Items": { - "ListPos": 568, - "ListEnd": 577, + "ListPos": 554, + "ListEnd": 563, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 568, - "NameEnd": 577 + "NamePos": 554, + "NameEnd": 563 }, "Alias": null } @@ -546,18 +546,18 @@ }, "Operation": "+", "RightExpr": { - "IntervalPos": 582, + "IntervalPos": 568, "Expr": { - "NumPos": 591, - "NumEnd": 592, + "NumPos": 577, + "NumEnd": 578, "Literal": "7", "Base": 10 }, "Unit": { "Name": "DAY", "QuoteType": 1, - "NamePos": 593, - "NameEnd": 596 + "NamePos": 579, + "NameEnd": 582 } }, "HasGlobal": false, @@ -566,29 +566,29 @@ "Policy": null }, { - "TTLPos": 549, + "TTLPos": 535, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 597, - "NameEnd": 610 + "NamePos": 583, + "NameEnd": 596 }, "Params": { - "LeftParenPos": 610, - "RightParenPos": 622, + "LeftParenPos": 596, + "RightParenPos": 608, "Items": { - "ListPos": 612, - "ListEnd": 621, + "ListPos": 598, + "ListEnd": 607, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 612, - "NameEnd": 621 + "NamePos": 598, + "NameEnd": 607 }, "Alias": null } @@ -599,18 +599,18 @@ }, "Operation": "+", "RightExpr": { - "IntervalPos": 626, + "IntervalPos": 612, "Expr": { - "NumPos": 635, - "NumEnd": 636, + "NumPos": 621, + "NumEnd": 622, "Literal": "2", "Base": 10 }, "Unit": { "Name": "DAY", "QuoteType": 1, - "NamePos": 637, - "NameEnd": 640 + "NamePos": 623, + "NameEnd": 626 } }, "HasGlobal": false, @@ -621,79 +621,79 @@ ] }, "Settings": { - "SettingsPos": 642, - "ListEnd": 827, + "SettingsPos": 627, + "ListEnd": 812, "Items": [ { - "SettingsPos": 651, + "SettingsPos": 636, "Name": { "Name": "execute_merges_on_single_replica_time_threshold", "QuoteType": 1, - "NamePos": 651, - "NameEnd": 698 + "NamePos": 636, + "NameEnd": 683 }, "Expr": { - "NumPos": 699, - "NumEnd": 703, + "NumPos": 684, + "NumEnd": 688, "Literal": "1200", "Base": 10 } }, { - "SettingsPos": 705, + "SettingsPos": 690, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 705, - "NameEnd": 722 + "NamePos": 690, + "NameEnd": 707 }, "Expr": { - "NumPos": 723, - "NumEnd": 728, + "NumPos": 708, + "NumEnd": 713, "Literal": "16384", "Base": 10 } }, { - "SettingsPos": 730, + "SettingsPos": 715, "Name": { "Name": "max_bytes_to_merge_at_max_space_in_pool", "QuoteType": 1, - "NamePos": 730, - "NameEnd": 769 + "NamePos": 715, + "NameEnd": 754 }, "Expr": { - "NumPos": 770, - "NumEnd": 781, + "NumPos": 755, + "NumEnd": 766, "Literal": "64424509440", "Base": 10 } }, { - "SettingsPos": 783, + "SettingsPos": 768, "Name": { "Name": "storage_policy", "QuoteType": 1, - "NamePos": 783, - "NameEnd": 797 + "NamePos": 768, + "NameEnd": 782 }, "Expr": { - "LiteralPos": 799, - "LiteralEnd": 803, + "LiteralPos": 784, + "LiteralEnd": 788, "Literal": "main" } }, { - "SettingsPos": 806, + "SettingsPos": 791, "Name": { "Name": "ttl_only_drop_parts", "QuoteType": 1, - "NamePos": 806, - "NameEnd": 825 + "NamePos": 791, + "NameEnd": 810 }, "Expr": { - "NumPos": 826, - "NumEnd": 827, + "NumPos": 811, + "NumEnd": 812, "Literal": "1", "Base": 10 } @@ -701,17 +701,17 @@ ] }, "OrderBy": { - "OrderPos": 492, - "ListEnd": 546, + "OrderPos": 479, + "ListEnd": 533, "Items": [ { - "OrderPos": 492, + "OrderPos": 479, "Expr": { - "LeftParenPos": 501, - "RightParenPos": 546, + "LeftParenPos": 488, + "RightParenPos": 533, "Items": { - "ListPos": 502, - "ListEnd": 545, + "ListPos": 489, + "ListEnd": 532, "HasDistinct": false, "Items": [ { @@ -719,23 +719,23 @@ "Name": { "Name": "toUnixTimestamp64Nano", "QuoteType": 1, - "NamePos": 502, - "NameEnd": 523 + "NamePos": 489, + "NameEnd": 510 }, "Params": { - "LeftParenPos": 523, - "RightParenPos": 535, + "LeftParenPos": 510, + "RightParenPos": 522, "Items": { - "ListPos": 525, - "ListEnd": 534, + "ListPos": 512, + "ListEnd": 521, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 525, - "NameEnd": 534 + "NamePos": 512, + "NameEnd": 521 }, "Alias": null } @@ -750,8 +750,8 @@ "Expr": { "Name": "api_id", "QuoteType": 3, - "NamePos": 539, - "NameEnd": 545 + "NamePos": 526, + "NameEnd": 532 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_enum_fields.sql.golden.json b/parser/testdata/ddl/output/create_table_with_enum_fields.sql.golden.json index df98331..2e6213c 100644 --- a/parser/testdata/ddl/output/create_table_with_enum_fields.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_enum_fields.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 457, + "StatementEnd": 448, "OrReplace": false, "Name": { "Database": null, @@ -24,18 +24,18 @@ } }, "TableSchema": { - "SchemaPos": 44, - "SchemaEnd": 237, + "SchemaPos": 43, + "SchemaEnd": 233, "Columns": [ { - "NamePos": 52, - "ColumnEnd": 178, + "NamePos": 50, + "ColumnEnd": 176, "Name": { "Ident": { "Name": "method", "QuoteType": 3, - "NamePos": 52, - "NameEnd": 58 + "NamePos": 50, + "NameEnd": 56 }, "DotIdent": null }, @@ -43,125 +43,125 @@ "Name": { "Name": "Enum8", "QuoteType": 1, - "NamePos": 60, - "NameEnd": 65 + "NamePos": 58, + "NameEnd": 63 }, - "ListPos": 67, - "ListEnd": 162, + "ListPos": 65, + "ListEnd": 160, "Values": [ { "Name": { - "LiteralPos": 67, - "LiteralEnd": 70, + "LiteralPos": 65, + "LiteralEnd": 68, "Literal": "GET" }, "Value": { - "NumPos": 72, - "NumEnd": 73, + "NumPos": 70, + "NumEnd": 71, "Literal": "1", "Base": 10 } }, { "Name": { - "LiteralPos": 77, - "LiteralEnd": 81, + "LiteralPos": 75, + "LiteralEnd": 79, "Literal": "POST" }, "Value": { - "NumPos": 83, - "NumEnd": 84, + "NumPos": 81, + "NumEnd": 82, "Literal": "2", "Base": 10 } }, { "Name": { - "LiteralPos": 87, - "LiteralEnd": 91, + "LiteralPos": 85, + "LiteralEnd": 89, "Literal": "HEAD" }, "Value": { - "NumPos": 93, - "NumEnd": 94, + "NumPos": 91, + "NumEnd": 92, "Literal": "3", "Base": 10 } }, { "Name": { - "LiteralPos": 97, - "LiteralEnd": 100, + "LiteralPos": 95, + "LiteralEnd": 98, "Literal": "PUT" }, "Value": { - "NumPos": 102, - "NumEnd": 103, + "NumPos": 100, + "NumEnd": 101, "Literal": "4", "Base": 10 } }, { "Name": { - "LiteralPos": 105, - "LiteralEnd": 110, + "LiteralPos": 103, + "LiteralEnd": 108, "Literal": "PATCH" }, "Value": { - "NumPos": 112, - "NumEnd": 113, + "NumPos": 110, + "NumEnd": 111, "Literal": "5", "Base": 10 } }, { "Name": { - "LiteralPos": 116, - "LiteralEnd": 122, + "LiteralPos": 114, + "LiteralEnd": 120, "Literal": "DELETE" }, "Value": { - "NumPos": 124, - "NumEnd": 125, + "NumPos": 122, + "NumEnd": 123, "Literal": "6", "Base": 10 } }, { "Name": { - "LiteralPos": 128, - "LiteralEnd": 135, + "LiteralPos": 126, + "LiteralEnd": 133, "Literal": "CONNECT" }, "Value": { - "NumPos": 137, - "NumEnd": 138, + "NumPos": 135, + "NumEnd": 136, "Literal": "7", "Base": 10 } }, { "Name": { - "LiteralPos": 141, - "LiteralEnd": 148, + "LiteralPos": 139, + "LiteralEnd": 146, "Literal": "OPTIONS" }, "Value": { - "NumPos": 150, - "NumEnd": 151, + "NumPos": 148, + "NumEnd": 149, "Literal": "8", "Base": 10 } }, { "Name": { - "LiteralPos": 154, - "LiteralEnd": 159, + "LiteralPos": 152, + "LiteralEnd": 157, "Literal": "TRACE" }, "Value": { - "NumPos": 161, - "NumEnd": 162, + "NumPos": 159, + "NumEnd": 160, "Literal": "9", "Base": 10 } @@ -174,19 +174,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 164, - "RightParenPos": 178, + "CodecPos": 162, + "RightParenPos": 176, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 170, - "NameEnd": 174 + "NamePos": 168, + "NameEnd": 172 }, "Level": { - "NumPos": 174, - "NumEnd": 176, + "NumPos": 172, + "NumEnd": 174, "Literal": "1", "Base": 10 } @@ -196,30 +196,30 @@ "CompressionCodec": null }, { - "NamePos": 186, - "ColumnEnd": 235, + "NamePos": 183, + "ColumnEnd": 232, "Name": { "Ident": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 186, - "NameEnd": 195 + "NamePos": 183, + "NameEnd": 192 }, "DotIdent": null }, "Type": { - "LeftParenPos": 208, - "RightParenPos": 209, + "LeftParenPos": 205, + "RightParenPos": 206, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 197, - "NameEnd": 207 + "NamePos": 194, + "NameEnd": 204 }, "Params": [ { - "NumPos": 208, - "NumEnd": 209, + "NumPos": 205, + "NumEnd": 206, "Literal": "3", "Base": 10 } @@ -231,20 +231,20 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 211, - "RightParenPos": 235, + "CodecPos": 208, + "RightParenPos": 232, "Type": { "Name": "DoubleDelta", "QuoteType": 1, - "NamePos": 217, - "NameEnd": 228 + "NamePos": 214, + "NameEnd": 225 }, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 230, - "NameEnd": 234 + "NamePos": 227, + "NameEnd": 231 }, "Level": null }, @@ -257,29 +257,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 240, - "EngineEnd": 457, + "EnginePos": 235, + "EngineEnd": 448, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 268, - "RightParenPos": 318, + "LeftParenPos": 263, + "RightParenPos": 313, "Items": { - "ListPos": 270, - "ListEnd": 317, + "ListPos": 265, + "ListEnd": 312, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 270, - "LiteralEnd": 304, + "LiteralPos": 265, + "LiteralEnd": 299, "Literal": "/clickhouse/tables/{layer}-{shard}" }, "Alias": null }, { "Expr": { - "LiteralPos": 308, - "LiteralEnd": 317, + "LiteralPos": 303, + "LiteralEnd": 312, "Literal": "{replica}" }, "Alias": null @@ -290,10 +290,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 321, + "PartitionPos": 315, "Expr": { - "ListPos": 334, - "ListEnd": 350, + "ListPos": 328, + "ListEnd": 344, "HasDistinct": false, "Items": [ { @@ -301,23 +301,23 @@ "Name": { "Name": "toDate", "QuoteType": 1, - "NamePos": 334, - "NameEnd": 340 + "NamePos": 328, + "NameEnd": 334 }, "Params": { - "LeftParenPos": 340, - "RightParenPos": 350, + "LeftParenPos": 334, + "RightParenPos": 344, "Items": { - "ListPos": 341, - "ListEnd": 350, + "ListPos": 335, + "ListEnd": 344, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 341, - "NameEnd": 350 + "NamePos": 335, + "NameEnd": 344 }, "Alias": null } @@ -333,33 +333,33 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 382, - "ListEnd": 421, + "TTLPos": 374, + "ListEnd": 413, "Items": [ { - "TTLPos": 382, + "TTLPos": 374, "Expr": { "LeftExpr": { "Name": { "Name": "toDate", "QuoteType": 1, - "NamePos": 386, - "NameEnd": 392 + "NamePos": 378, + "NameEnd": 384 }, "Params": { - "LeftParenPos": 392, - "RightParenPos": 402, + "LeftParenPos": 384, + "RightParenPos": 394, "Items": { - "ListPos": 393, - "ListEnd": 402, + "ListPos": 385, + "ListEnd": 394, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 393, - "NameEnd": 402 + "NamePos": 385, + "NameEnd": 394 }, "Alias": null } @@ -373,21 +373,21 @@ "Name": { "Name": "toIntervalDay", "QuoteType": 1, - "NamePos": 406, - "NameEnd": 419 + "NamePos": 398, + "NameEnd": 411 }, "Params": { - "LeftParenPos": 419, - "RightParenPos": 421, + "LeftParenPos": 411, + "RightParenPos": 413, "Items": { - "ListPos": 420, - "ListEnd": 421, + "ListPos": 412, + "ListEnd": 413, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 420, - "NumEnd": 421, + "NumPos": 412, + "NumEnd": 413, "Literal": "3", "Base": 10 }, @@ -406,20 +406,20 @@ ] }, "Settings": { - "SettingsPos": 424, - "ListEnd": 457, + "SettingsPos": 415, + "ListEnd": 448, "Items": [ { - "SettingsPos": 433, + "SettingsPos": 424, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 433, - "NameEnd": 450 + "NamePos": 424, + "NameEnd": 441 }, "Expr": { - "NumPos": 453, - "NumEnd": 457, + "NumPos": 444, + "NumEnd": 448, "Literal": "8192", "Base": 10 } @@ -427,25 +427,25 @@ ] }, "OrderBy": { - "OrderPos": 353, - "ListEnd": 379, + "OrderPos": 346, + "ListEnd": 372, "Items": [ { - "OrderPos": 353, + "OrderPos": 346, "Expr": { - "LeftParenPos": 362, - "RightParenPos": 379, + "LeftParenPos": 355, + "RightParenPos": 372, "Items": { - "ListPos": 363, - "ListEnd": 379, + "ListPos": 356, + "ListEnd": 372, "HasDistinct": false, "Items": [ { "Expr": { "Name": "method", "QuoteType": 1, - "NamePos": 363, - "NameEnd": 369 + "NamePos": 356, + "NameEnd": 362 }, "Alias": null }, @@ -453,8 +453,8 @@ "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 370, - "NameEnd": 379 + "NamePos": 363, + "NameEnd": 372 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_index.sql.golden.json b/parser/testdata/ddl/output/create_table_with_index.sql.golden.json index 3fcad97..123b1ac 100644 --- a/parser/testdata/ddl/output/create_table_with_index.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_index.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 1056, + "StatementEnd": 1037, "OrReplace": false, "Name": { "Database": null, @@ -16,18 +16,18 @@ "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 39, - "SchemaEnd": 614, + "SchemaPos": 38, + "SchemaEnd": 600, "Columns": [ { - "NamePos": 44, - "ColumnEnd": 76, + "NamePos": 42, + "ColumnEnd": 74, "Name": { "Ident": { "Name": "common.id", "QuoteType": 3, - "NamePos": 44, - "NameEnd": 53 + "NamePos": 42, + "NameEnd": 51 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 55, - "NameEnd": 61 + "NamePos": 53, + "NameEnd": 59 } }, "NotNull": null, @@ -45,19 +45,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 62, - "RightParenPos": 76, + "CodecPos": 60, + "RightParenPos": 74, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 68, - "NameEnd": 72 + "NamePos": 66, + "NameEnd": 70 }, "Level": { - "NumPos": 72, - "NumEnd": 74, + "NumPos": 70, + "NumEnd": 72, "Literal": "1", "Base": 10 } @@ -67,14 +67,14 @@ "CompressionCodec": null }, { - "NamePos": 81, - "ColumnEnd": 113, + "NamePos": 78, + "ColumnEnd": 110, "Name": { "Ident": { "Name": "id", "QuoteType": 3, - "NamePos": 81, - "NameEnd": 83 + "NamePos": 78, + "NameEnd": 80 }, "DotIdent": null }, @@ -82,8 +82,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 85, - "NameEnd": 91 + "NamePos": 82, + "NameEnd": 88 } }, "NotNull": null, @@ -92,24 +92,24 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 92, - "RightParenPos": 113, + "CodecPos": 89, + "RightParenPos": 110, "Type": { "Name": "Delta", "QuoteType": 1, - "NamePos": 98, - "NameEnd": 103 + "NamePos": 95, + "NameEnd": 100 }, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 105, - "NameEnd": 109 + "NamePos": 102, + "NameEnd": 106 }, "Level": { - "NumPos": 109, - "NumEnd": 111, + "NumPos": 106, + "NumEnd": 108, "Literal": "1", "Base": 10 } @@ -119,14 +119,14 @@ "CompressionCodec": null }, { - "NamePos": 118, - "ColumnEnd": 147, + "NamePos": 114, + "ColumnEnd": 143, "Name": { "Ident": { "Name": "api_id", "QuoteType": 3, - "NamePos": 118, - "NameEnd": 124 + "NamePos": 114, + "NameEnd": 120 }, "DotIdent": null }, @@ -134,8 +134,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 126, - "NameEnd": 132 + "NamePos": 122, + "NameEnd": 128 } }, "NotNull": null, @@ -144,19 +144,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 133, - "RightParenPos": 147, + "CodecPos": 129, + "RightParenPos": 143, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 139, - "NameEnd": 143 + "NamePos": 135, + "NameEnd": 139 }, "Level": { - "NumPos": 143, - "NumEnd": 145, + "NumPos": 139, + "NumEnd": 141, "Literal": "1", "Base": 10 } @@ -166,33 +166,33 @@ "CompressionCodec": null }, { - "NamePos": 152, - "ColumnEnd": 168, + "NamePos": 147, + "ColumnEnd": 163, "Name": { "Ident": { "Name": "arr", "QuoteType": 3, - "NamePos": 152, - "NameEnd": 155 + "NamePos": 147, + "NameEnd": 150 }, "DotIdent": null }, "Type": { - "LeftParenPos": 163, - "RightParenPos": 168, + "LeftParenPos": 158, + "RightParenPos": 163, "Name": { "Name": "Array", "QuoteType": 1, - "NamePos": 157, - "NameEnd": 162 + "NamePos": 152, + "NameEnd": 157 }, "Params": [ { "Name": { "Name": "Int64", "QuoteType": 1, - "NamePos": 163, - "NameEnd": 168 + "NamePos": 158, + "NameEnd": 163 } } ] @@ -208,14 +208,14 @@ "CompressionCodec": null }, { - "NamePos": 174, - "ColumnEnd": 204, + "NamePos": 168, + "ColumnEnd": 198, "Name": { "Ident": { "Name": "content", "QuoteType": 3, - "NamePos": 174, - "NameEnd": 181 + "NamePos": 168, + "NameEnd": 175 }, "DotIdent": null }, @@ -223,8 +223,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 183, - "NameEnd": 189 + "NamePos": 177, + "NameEnd": 183 } }, "NotNull": null, @@ -233,19 +233,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 190, - "RightParenPos": 204, + "CodecPos": 184, + "RightParenPos": 198, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 196, - "NameEnd": 200 + "NamePos": 190, + "NameEnd": 194 }, "Level": { - "NumPos": 200, - "NumEnd": 202, + "NumPos": 194, + "NumEnd": 196, "Literal": "1", "Base": 10 } @@ -255,14 +255,14 @@ "CompressionCodec": null }, { - "NamePos": 209, - "ColumnEnd": 223, + "NamePos": 202, + "ColumnEnd": 216, "Name": { "Ident": { "Name": "output", "QuoteType": 3, - "NamePos": 209, - "NameEnd": 215 + "NamePos": 202, + "NameEnd": 208 }, "DotIdent": null }, @@ -270,8 +270,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 217, - "NameEnd": 223 + "NamePos": 210, + "NameEnd": 216 } }, "NotNull": null, @@ -285,13 +285,13 @@ "CompressionCodec": null }, { - "IndexPos": 227, + "IndexPos": 219, "Name": { "Ident": { "Name": "id_common_id_bloom_filter", "QuoteType": 1, - "NamePos": 233, - "NameEnd": 258 + "NamePos": 225, + "NameEnd": 250 }, "DotIdent": null }, @@ -301,52 +301,52 @@ { "Name": "common", "QuoteType": 1, - "NamePos": 259, - "NameEnd": 265 + "NamePos": 251, + "NameEnd": 257 }, { "Name": "id", "QuoteType": 1, - "NamePos": 266, - "NameEnd": 268 + "NamePos": 258, + "NameEnd": 260 } ] }, "Alias": null }, "ColumnType": { - "LeftParenPos": 287, - "RightParenPos": 292, + "LeftParenPos": 279, + "RightParenPos": 284, "Name": { "Name": "bloom_filter", "QuoteType": 1, - "NamePos": 274, - "NameEnd": 286 + "NamePos": 266, + "NameEnd": 278 }, "Params": [ { - "NumPos": 287, - "NumEnd": 292, + "NumPos": 279, + "NumEnd": 284, "Literal": "0.001", "Base": 10 } ] }, "Granularity": { - "NumPos": 306, - "NumEnd": 307, + "NumPos": 298, + "NumEnd": 299, "Literal": "1", "Base": 10 } }, { - "IndexPos": 311, + "IndexPos": 302, "Name": { "Ident": { "Name": "id_idx", "QuoteType": 1, - "NamePos": 317, - "NameEnd": 323 + "NamePos": 308, + "NameEnd": 314 }, "DotIdent": null }, @@ -354,8 +354,8 @@ "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 324, - "NameEnd": 326 + "NamePos": 315, + "NameEnd": 317 }, "Alias": null }, @@ -363,25 +363,25 @@ "Name": { "Name": "minmax", "QuoteType": 1, - "NamePos": 332, - "NameEnd": 338 + "NamePos": 323, + "NameEnd": 329 } }, "Granularity": { - "NumPos": 351, - "NumEnd": 353, + "NumPos": 342, + "NumEnd": 344, "Literal": "10", "Base": 10 } }, { - "IndexPos": 357, + "IndexPos": 347, "Name": { "Ident": { "Name": "api_id_idx", "QuoteType": 1, - "NamePos": 363, - "NameEnd": 373 + "NamePos": 353, + "NameEnd": 363 }, "DotIdent": null }, @@ -389,44 +389,44 @@ "Expr": { "Name": "api_id", "QuoteType": 1, - "NamePos": 374, - "NameEnd": 380 + "NamePos": 364, + "NameEnd": 370 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 390, - "RightParenPos": 393, + "LeftParenPos": 380, + "RightParenPos": 383, "Name": { "Name": "set", "QuoteType": 1, - "NamePos": 386, - "NameEnd": 389 + "NamePos": 376, + "NameEnd": 379 }, "Params": [ { - "NumPos": 390, - "NumEnd": 393, + "NumPos": 380, + "NumEnd": 383, "Literal": "100", "Base": 10 } ] }, "Granularity": { - "NumPos": 407, - "NumEnd": 408, + "NumPos": 397, + "NumEnd": 398, "Literal": "2", "Base": 10 } }, { - "IndexPos": 412, + "IndexPos": 401, "Name": { "Ident": { "Name": "arr_idx", "QuoteType": 1, - "NamePos": 418, - "NameEnd": 425 + "NamePos": 407, + "NameEnd": 414 }, "DotIdent": null }, @@ -434,44 +434,44 @@ "Expr": { "Name": "arr", "QuoteType": 1, - "NamePos": 426, - "NameEnd": 429 + "NamePos": 415, + "NameEnd": 418 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 448, - "RightParenPos": 452, + "LeftParenPos": 437, + "RightParenPos": 441, "Name": { "Name": "bloom_filter", "QuoteType": 1, - "NamePos": 435, - "NameEnd": 447 + "NamePos": 424, + "NameEnd": 436 }, "Params": [ { - "NumPos": 448, - "NumEnd": 452, + "NumPos": 437, + "NumEnd": 441, "Literal": "0.01", "Base": 10 } ] }, "Granularity": { - "NumPos": 466, - "NumEnd": 467, + "NumPos": 455, + "NumEnd": 456, "Literal": "3", "Base": 10 } }, { - "IndexPos": 471, + "IndexPos": 459, "Name": { "Ident": { "Name": "content_idx", "QuoteType": 1, - "NamePos": 477, - "NameEnd": 488 + "NamePos": 465, + "NameEnd": 476 }, "DotIdent": null }, @@ -479,56 +479,56 @@ "Expr": { "Name": "content", "QuoteType": 1, - "NamePos": 489, - "NameEnd": 496 + "NamePos": 477, + "NameEnd": 484 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 513, - "RightParenPos": 524, + "LeftParenPos": 501, + "RightParenPos": 512, "Name": { "Name": "tokenbf_v1", "QuoteType": 1, - "NamePos": 502, - "NameEnd": 512 + "NamePos": 490, + "NameEnd": 500 }, "Params": [ { - "NumPos": 513, - "NumEnd": 518, + "NumPos": 501, + "NumEnd": 506, "Literal": "30720", "Base": 10 }, { - "NumPos": 520, - "NumEnd": 521, + "NumPos": 508, + "NumEnd": 509, "Literal": "2", "Base": 10 }, { - "NumPos": 523, - "NumEnd": 524, + "NumPos": 511, + "NumEnd": 512, "Literal": "0", "Base": 10 } ] }, "Granularity": { - "NumPos": 538, - "NumEnd": 539, + "NumPos": 526, + "NumEnd": 527, "Literal": "1", "Base": 10 } }, { - "IndexPos": 543, + "IndexPos": 530, "Name": { "Ident": { "Name": "output_idx", "QuoteType": 1, - "NamePos": 549, - "NameEnd": 559 + "NamePos": 536, + "NameEnd": 546 }, "DotIdent": null }, @@ -536,50 +536,50 @@ "Expr": { "Name": "output", "QuoteType": 1, - "NamePos": 560, - "NameEnd": 566 + "NamePos": 547, + "NameEnd": 553 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 583, - "RightParenPos": 597, + "LeftParenPos": 570, + "RightParenPos": 584, "Name": { "Name": "ngrambf_v1", "QuoteType": 1, - "NamePos": 572, - "NameEnd": 582 + "NamePos": 559, + "NameEnd": 569 }, "Params": [ { - "NumPos": 583, - "NumEnd": 584, + "NumPos": 570, + "NumEnd": 571, "Literal": "3", "Base": 10 }, { - "NumPos": 586, - "NumEnd": 591, + "NumPos": 573, + "NumEnd": 578, "Literal": "10000", "Base": 10 }, { - "NumPos": 593, - "NumEnd": 594, + "NumPos": 580, + "NumEnd": 581, "Literal": "2", "Base": 10 }, { - "NumPos": 596, - "NumEnd": 597, + "NumPos": 583, + "NumEnd": 584, "Literal": "1", "Base": 10 } ] }, "Granularity": { - "NumPos": 611, - "NumEnd": 612, + "NumPos": 598, + "NumEnd": 599, "Literal": "2", "Base": 10 } @@ -589,29 +589,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 617, - "EngineEnd": 1056, + "EnginePos": 602, + "EngineEnd": 1037, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 645, - "RightParenPos": 677, + "LeftParenPos": 630, + "RightParenPos": 662, "Items": { - "ListPos": 647, - "ListEnd": 676, + "ListPos": 632, + "ListEnd": 661, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 647, - "LiteralEnd": 663, + "LiteralPos": 632, + "LiteralEnd": 648, "Literal": "/root/test_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 667, - "LiteralEnd": 676, + "LiteralPos": 652, + "LiteralEnd": 661, "Literal": "{replica}" }, "Alias": null @@ -622,10 +622,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 680, + "PartitionPos": 664, "Expr": { - "ListPos": 693, - "ListEnd": 718, + "ListPos": 677, + "ListEnd": 702, "HasDistinct": false, "Items": [ { @@ -633,23 +633,23 @@ "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 693, - "NameEnd": 706 + "NamePos": 677, + "NameEnd": 690 }, "Params": { - "LeftParenPos": 706, - "RightParenPos": 718, + "LeftParenPos": 690, + "RightParenPos": 702, "Items": { - "ListPos": 708, - "ListEnd": 717, + "ListPos": 692, + "ListEnd": 701, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 708, - "NameEnd": 717 + "NamePos": 692, + "NameEnd": 701 }, "Alias": null } @@ -665,33 +665,33 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 778, - "ListEnd": 869, + "TTLPos": 760, + "ListEnd": 851, "Items": [ { - "TTLPos": 778, + "TTLPos": 760, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 782, - "NameEnd": 795 + "NamePos": 764, + "NameEnd": 777 }, "Params": { - "LeftParenPos": 795, - "RightParenPos": 807, + "LeftParenPos": 777, + "RightParenPos": 789, "Items": { - "ListPos": 797, - "ListEnd": 806, + "ListPos": 779, + "ListEnd": 788, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 797, - "NameEnd": 806 + "NamePos": 779, + "NameEnd": 788 }, "Alias": null } @@ -702,18 +702,18 @@ }, "Operation": "+", "RightExpr": { - "IntervalPos": 811, + "IntervalPos": 793, "Expr": { - "NumPos": 820, - "NumEnd": 821, + "NumPos": 802, + "NumEnd": 803, "Literal": "7", "Base": 10 }, "Unit": { "Name": "DAY", "QuoteType": 1, - "NamePos": 822, - "NameEnd": 825 + "NamePos": 804, + "NameEnd": 807 } }, "HasGlobal": false, @@ -722,29 +722,29 @@ "Policy": null }, { - "TTLPos": 778, + "TTLPos": 760, "Expr": { "LeftExpr": { "Name": { "Name": "toStartOfHour", "QuoteType": 1, - "NamePos": 826, - "NameEnd": 839 + "NamePos": 808, + "NameEnd": 821 }, "Params": { - "LeftParenPos": 839, - "RightParenPos": 851, + "LeftParenPos": 821, + "RightParenPos": 833, "Items": { - "ListPos": 841, - "ListEnd": 850, + "ListPos": 823, + "ListEnd": 832, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 841, - "NameEnd": 850 + "NamePos": 823, + "NameEnd": 832 }, "Alias": null } @@ -755,18 +755,18 @@ }, "Operation": "+", "RightExpr": { - "IntervalPos": 855, + "IntervalPos": 837, "Expr": { - "NumPos": 864, - "NumEnd": 865, + "NumPos": 846, + "NumEnd": 847, "Literal": "2", "Base": 10 }, "Unit": { "Name": "DAY", "QuoteType": 1, - "NamePos": 866, - "NameEnd": 869 + "NamePos": 848, + "NameEnd": 851 } }, "HasGlobal": false, @@ -777,79 +777,79 @@ ] }, "Settings": { - "SettingsPos": 871, - "ListEnd": 1056, + "SettingsPos": 852, + "ListEnd": 1037, "Items": [ { - "SettingsPos": 880, + "SettingsPos": 861, "Name": { "Name": "execute_merges_on_single_replica_time_threshold", "QuoteType": 1, - "NamePos": 880, - "NameEnd": 927 + "NamePos": 861, + "NameEnd": 908 }, "Expr": { - "NumPos": 928, - "NumEnd": 932, + "NumPos": 909, + "NumEnd": 913, "Literal": "1200", "Base": 10 } }, { - "SettingsPos": 934, + "SettingsPos": 915, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 934, - "NameEnd": 951 + "NamePos": 915, + "NameEnd": 932 }, "Expr": { - "NumPos": 952, - "NumEnd": 957, + "NumPos": 933, + "NumEnd": 938, "Literal": "16384", "Base": 10 } }, { - "SettingsPos": 959, + "SettingsPos": 940, "Name": { "Name": "max_bytes_to_merge_at_max_space_in_pool", "QuoteType": 1, - "NamePos": 959, - "NameEnd": 998 + "NamePos": 940, + "NameEnd": 979 }, "Expr": { - "NumPos": 999, - "NumEnd": 1010, + "NumPos": 980, + "NumEnd": 991, "Literal": "64424509440", "Base": 10 } }, { - "SettingsPos": 1012, + "SettingsPos": 993, "Name": { "Name": "storage_policy", "QuoteType": 1, - "NamePos": 1012, - "NameEnd": 1026 + "NamePos": 993, + "NameEnd": 1007 }, "Expr": { - "LiteralPos": 1028, - "LiteralEnd": 1032, + "LiteralPos": 1009, + "LiteralEnd": 1013, "Literal": "main" } }, { - "SettingsPos": 1035, + "SettingsPos": 1016, "Name": { "Name": "ttl_only_drop_parts", "QuoteType": 1, - "NamePos": 1035, - "NameEnd": 1054 + "NamePos": 1016, + "NameEnd": 1035 }, "Expr": { - "NumPos": 1055, - "NumEnd": 1056, + "NumPos": 1036, + "NumEnd": 1037, "Literal": "1", "Base": 10 } @@ -857,17 +857,17 @@ ] }, "OrderBy": { - "OrderPos": 721, - "ListEnd": 775, + "OrderPos": 704, + "ListEnd": 758, "Items": [ { - "OrderPos": 721, + "OrderPos": 704, "Expr": { - "LeftParenPos": 730, - "RightParenPos": 775, + "LeftParenPos": 713, + "RightParenPos": 758, "Items": { - "ListPos": 731, - "ListEnd": 774, + "ListPos": 714, + "ListEnd": 757, "HasDistinct": false, "Items": [ { @@ -875,23 +875,23 @@ "Name": { "Name": "toUnixTimestamp64Nano", "QuoteType": 1, - "NamePos": 731, - "NameEnd": 752 + "NamePos": 714, + "NameEnd": 735 }, "Params": { - "LeftParenPos": 752, - "RightParenPos": 764, + "LeftParenPos": 735, + "RightParenPos": 747, "Items": { - "ListPos": 754, - "ListEnd": 763, + "ListPos": 737, + "ListEnd": 746, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 3, - "NamePos": 754, - "NameEnd": 763 + "NamePos": 737, + "NameEnd": 746 }, "Alias": null } @@ -906,8 +906,8 @@ "Expr": { "Name": "api_id", "QuoteType": 3, - "NamePos": 768, - "NameEnd": 774 + "NamePos": 751, + "NameEnd": 757 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_keyword_partition_by.sql.golden.json b/parser/testdata/ddl/output/create_table_with_keyword_partition_by.sql.golden.json index b0c99f2..b668cd7 100644 --- a/parser/testdata/ddl/output/create_table_with_keyword_partition_by.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_keyword_partition_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 267, + "StatementEnd": 259, "OrReplace": false, "Name": { "Database": { @@ -28,17 +28,17 @@ "OnCluster": null, "TableSchema": { "SchemaPos": 75, - "SchemaEnd": 153, + "SchemaEnd": 148, "Columns": [ { - "NamePos": 83, - "ColumnEnd": 93, + "NamePos": 82, + "ColumnEnd": 92, "Name": { "Ident": { "Name": "date", "QuoteType": 3, - "NamePos": 83, - "NameEnd": 87 + "NamePos": 82, + "NameEnd": 86 }, "DotIdent": null }, @@ -46,8 +46,8 @@ "Name": { "Name": "Date", "QuoteType": 1, - "NamePos": 89, - "NameEnd": 93 + "NamePos": 88, + "NameEnd": 92 } }, "NotNull": null, @@ -61,14 +61,14 @@ "CompressionCodec": null }, { - "NamePos": 101, - "ColumnEnd": 111, + "NamePos": 99, + "ColumnEnd": 109, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 101, - "NameEnd": 103 + "NamePos": 99, + "NameEnd": 101 }, "DotIdent": null }, @@ -76,8 +76,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 105, - "NameEnd": 111 + "NamePos": 103, + "NameEnd": 109 } }, "NotNull": null, @@ -91,14 +91,14 @@ "CompressionCodec": null }, { - "NamePos": 119, - "ColumnEnd": 129, + "NamePos": 116, + "ColumnEnd": 126, "Name": { "Ident": { "Name": "f2", "QuoteType": 3, - "NamePos": 119, - "NameEnd": 121 + "NamePos": 116, + "NameEnd": 118 }, "DotIdent": null }, @@ -106,8 +106,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 123, - "NameEnd": 129 + "NamePos": 120, + "NameEnd": 126 } }, "NotNull": null, @@ -121,14 +121,14 @@ "CompressionCodec": null }, { - "NamePos": 137, - "ColumnEnd": 147, + "NamePos": 133, + "ColumnEnd": 143, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 137, - "NameEnd": 139 + "NamePos": 133, + "NameEnd": 135 }, "DotIdent": null }, @@ -136,8 +136,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 141, - "NameEnd": 147 + "NamePos": 137, + "NameEnd": 143 } }, "NotNull": null, @@ -155,24 +155,24 @@ "TableFunction": null }, "Engine": { - "EnginePos": 155, - "EngineEnd": 267, + "EnginePos": 150, + "EngineEnd": 259, "Name": "ReplacingMergeTree", "Params": null, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 188, + "PartitionPos": 182, "Expr": { - "ListPos": 201, - "ListEnd": 205, + "ListPos": 195, + "ListEnd": 199, "HasDistinct": false, "Items": [ { "Expr": { "Name": "date", "QuoteType": 1, - "NamePos": 201, - "NameEnd": 205 + "NamePos": 195, + "NameEnd": 199 }, "Alias": null } @@ -182,20 +182,20 @@ "SampleBy": null, "TTL": null, "Settings": { - "SettingsPos": 234, - "ListEnd": 267, + "SettingsPos": 226, + "ListEnd": 259, "Items": [ { - "SettingsPos": 243, + "SettingsPos": 235, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 243, - "NameEnd": 260 + "NamePos": 235, + "NameEnd": 252 }, "Expr": { - "NumPos": 263, - "NumEnd": 267, + "NumPos": 255, + "NumEnd": 259, "Literal": "8192", "Base": 10 } @@ -203,25 +203,25 @@ ] }, "OrderBy": { - "OrderPos": 211, - "ListEnd": 227, + "OrderPos": 204, + "ListEnd": 220, "Items": [ { - "OrderPos": 211, + "OrderPos": 204, "Expr": { - "LeftParenPos": 220, - "RightParenPos": 227, + "LeftParenPos": 213, + "RightParenPos": 220, "Items": { - "ListPos": 221, - "ListEnd": 227, + "ListPos": 214, + "ListEnd": 220, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 221, - "NameEnd": 223 + "NamePos": 214, + "NameEnd": 216 }, "Alias": null }, @@ -229,8 +229,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 225, - "NameEnd": 227 + "NamePos": 218, + "NameEnd": 220 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_null_engine.sql.golden.json b/parser/testdata/ddl/output/create_table_with_null_engine.sql.golden.json index 54de2e9..e609b2d 100644 --- a/parser/testdata/ddl/output/create_table_with_null_engine.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_null_engine.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 176, + "StatementEnd": 172, "OrReplace": false, "Name": { "Database": { @@ -29,18 +29,18 @@ } }, "TableSchema": { - "SchemaPos": 41, - "SchemaEnd": 161, + "SchemaPos": 40, + "SchemaEnd": 157, "Columns": [ { - "NamePos": 49, - "ColumnEnd": 80, + "NamePos": 47, + "ColumnEnd": 78, "Name": { "Ident": { "Name": "trace_id", "QuoteType": 3, - "NamePos": 49, - "NameEnd": 57 + "NamePos": 47, + "NameEnd": 55 }, "DotIdent": null }, @@ -48,8 +48,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 59, - "NameEnd": 65 + "NamePos": 57, + "NameEnd": 63 } }, "NotNull": null, @@ -58,19 +58,19 @@ "MaterializedExpr": null, "AliasExpr": null, "Codec": { - "CodecPos": 66, - "RightParenPos": 80, + "CodecPos": 64, + "RightParenPos": 78, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 72, - "NameEnd": 76 + "NamePos": 70, + "NameEnd": 74 }, "Level": { - "NumPos": 76, - "NumEnd": 78, + "NumPos": 74, + "NumEnd": 76, "Literal": "1", "Base": 10 } @@ -80,13 +80,13 @@ "CompressionCodec": null }, { - "IndexPos": 87, + "IndexPos": 84, "Name": { "Ident": { "Name": "trace_id_bloom_idx", "QuoteType": 1, - "NamePos": 93, - "NameEnd": 111 + "NamePos": 90, + "NameEnd": 108 }, "DotIdent": null }, @@ -94,32 +94,32 @@ "Expr": { "Name": "trace_id", "QuoteType": 1, - "NamePos": 112, - "NameEnd": 120 + "NamePos": 109, + "NameEnd": 117 }, "Alias": null }, "ColumnType": { - "LeftParenPos": 139, - "RightParenPos": 143, + "LeftParenPos": 136, + "RightParenPos": 140, "Name": { "Name": "bloom_filter", "QuoteType": 1, - "NamePos": 126, - "NameEnd": 138 + "NamePos": 123, + "NameEnd": 135 }, "Params": [ { - "NumPos": 139, - "NumEnd": 143, + "NumPos": 136, + "NumEnd": 140, "Literal": "0.01", "Base": 10 } ] }, "Granularity": { - "NumPos": 157, - "NumEnd": 159, + "NumPos": 154, + "NumEnd": 156, "Literal": "64", "Base": 10 } @@ -129,15 +129,15 @@ "TableFunction": null }, "Engine": { - "EnginePos": 163, - "EngineEnd": 176, + "EnginePos": 159, + "EngineEnd": 172, "Name": "Null", "Params": { - "LeftParenPos": 176, - "RightParenPos": 177, + "LeftParenPos": 172, + "RightParenPos": 173, "Items": { - "ListPos": 177, - "ListEnd": 177, + "ListPos": 173, + "ListEnd": 173, "HasDistinct": false, "Items": [] }, diff --git a/parser/testdata/ddl/output/create_table_with_nullable.sql.golden.json b/parser/testdata/ddl/output/create_table_with_nullable.sql.golden.json index d0f1319..3e88e89 100644 --- a/parser/testdata/ddl/output/create_table_with_nullable.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_nullable.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 432, + "StatementEnd": 420, "OrReplace": false, "Name": { "Database": { @@ -20,25 +20,25 @@ "IfNotExists": false, "UUID": { "Value": { - "LiteralPos": 75, - "LiteralEnd": 111, + "LiteralPos": 74, + "LiteralEnd": 110, "Literal": "27673372-7973-44f5-a767-33727973c4f5" } }, "OnCluster": null, "TableSchema": { - "SchemaPos": 113, - "SchemaEnd": 322, + "SchemaPos": 112, + "SchemaEnd": 313, "Columns": [ { - "NamePos": 121, - "ColumnEnd": 131, + "NamePos": 119, + "ColumnEnd": 129, "Name": { "Ident": { "Name": "f0", "QuoteType": 3, - "NamePos": 121, - "NameEnd": 123 + "NamePos": 119, + "NameEnd": 121 }, "DotIdent": null }, @@ -46,8 +46,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 131 + "NamePos": 123, + "NameEnd": 129 } }, "NotNull": null, @@ -61,14 +61,14 @@ "CompressionCodec": null }, { - "NamePos": 139, - "ColumnEnd": 149, + "NamePos": 136, + "ColumnEnd": 146, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 139, - "NameEnd": 141 + "NamePos": 136, + "NameEnd": 138 }, "DotIdent": null }, @@ -76,8 +76,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 143, - "NameEnd": 149 + "NamePos": 140, + "NameEnd": 146 } }, "NotNull": null, @@ -91,33 +91,33 @@ "CompressionCodec": null }, { - "NamePos": 157, - "ColumnEnd": 182, + "NamePos": 153, + "ColumnEnd": 178, "Name": { "Ident": { "Name": "f2", "QuoteType": 3, - "NamePos": 157, - "NameEnd": 159 + "NamePos": 153, + "NameEnd": 155 }, "DotIdent": null }, "Type": { - "LeftParenPos": 176, - "RightParenPos": 182, + "LeftParenPos": 172, + "RightParenPos": 178, "Name": { "Name": "LowCardinality", "QuoteType": 1, - "NamePos": 161, - "NameEnd": 175 + "NamePos": 157, + "NameEnd": 171 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 176, - "NameEnd": 182 + "NamePos": 172, + "NameEnd": 178 } } ] @@ -133,33 +133,33 @@ "CompressionCodec": null }, { - "NamePos": 191, - "ColumnEnd": 216, + "NamePos": 186, + "ColumnEnd": 211, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 191, - "NameEnd": 193 + "NamePos": 186, + "NameEnd": 188 }, "DotIdent": null }, "Type": { - "LeftParenPos": 210, - "RightParenPos": 216, + "LeftParenPos": 205, + "RightParenPos": 211, "Name": { "Name": "LowCardinality", "QuoteType": 1, - "NamePos": 195, - "NameEnd": 209 + "NamePos": 190, + "NameEnd": 204 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 210, - "NameEnd": 216 + "NamePos": 205, + "NameEnd": 211 } } ] @@ -175,30 +175,30 @@ "CompressionCodec": null }, { - "NamePos": 225, - "ColumnEnd": 241, + "NamePos": 219, + "ColumnEnd": 235, "Name": { "Ident": { "Name": "f4", "QuoteType": 3, - "NamePos": 225, - "NameEnd": 227 + "NamePos": 219, + "NameEnd": 221 }, "DotIdent": null }, "Type": { - "LeftParenPos": 240, - "RightParenPos": 241, + "LeftParenPos": 234, + "RightParenPos": 235, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 229, - "NameEnd": 239 + "NamePos": 223, + "NameEnd": 233 }, "Params": [ { - "NumPos": 240, - "NumEnd": 241, + "NumPos": 234, + "NumEnd": 235, "Literal": "3", "Base": 10 } @@ -215,40 +215,40 @@ "CompressionCodec": null }, { - "NamePos": 250, - "ColumnEnd": 276, + "NamePos": 243, + "ColumnEnd": 269, "Name": { "Ident": { "Name": "f5", "QuoteType": 3, - "NamePos": 250, - "NameEnd": 252 + "NamePos": 243, + "NameEnd": 245 }, "DotIdent": null }, "Type": { - "LeftParenPos": 263, - "RightParenPos": 276, + "LeftParenPos": 256, + "RightParenPos": 269, "Name": { "Name": "Nullable", "QuoteType": 1, - "NamePos": 254, - "NameEnd": 262 + "NamePos": 247, + "NameEnd": 255 }, "Params": [ { - "LeftParenPos": 274, - "RightParenPos": 275, + "LeftParenPos": 267, + "RightParenPos": 268, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 263, - "NameEnd": 273 + "NamePos": 256, + "NameEnd": 266 }, "Params": [ { - "NumPos": 274, - "NumEnd": 275, + "NumPos": 267, + "NumEnd": 268, "Literal": "3", "Base": 10 } @@ -267,40 +267,40 @@ "CompressionCodec": null }, { - "NamePos": 285, - "ColumnEnd": 319, + "NamePos": 277, + "ColumnEnd": 311, "Name": { "Ident": { "Name": "succeed_at", "QuoteType": 3, - "NamePos": 285, - "NameEnd": 295 + "NamePos": 277, + "NameEnd": 287 }, "DotIdent": null }, "Type": { - "LeftParenPos": 306, - "RightParenPos": 319, + "LeftParenPos": 298, + "RightParenPos": 311, "Name": { "Name": "Nullable", "QuoteType": 1, - "NamePos": 297, - "NameEnd": 305 + "NamePos": 289, + "NameEnd": 297 }, "Params": [ { - "LeftParenPos": 317, - "RightParenPos": 318, + "LeftParenPos": 309, + "RightParenPos": 310, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 306, - "NameEnd": 316 + "NamePos": 298, + "NameEnd": 308 }, "Params": [ { - "NumPos": 317, - "NumEnd": 318, + "NumPos": 309, + "NumEnd": 310, "Literal": "3", "Base": 10 } @@ -323,16 +323,16 @@ "TableFunction": null }, "Engine": { - "EnginePos": 324, - "EngineEnd": 432, + "EnginePos": 315, + "EngineEnd": 420, "Name": "MergeTree", "Params": null, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 344, + "PartitionPos": 334, "Expr": { - "ListPos": 357, - "ListEnd": 378, + "ListPos": 347, + "ListEnd": 368, "HasDistinct": false, "Items": [ { @@ -341,23 +341,23 @@ "Name": { "Name": "xxHash32", "QuoteType": 1, - "NamePos": 357, - "NameEnd": 365 + "NamePos": 347, + "NameEnd": 355 }, "Params": { - "LeftParenPos": 365, - "RightParenPos": 372, + "LeftParenPos": 355, + "RightParenPos": 362, "Items": { - "ListPos": 366, - "ListEnd": 372, + "ListPos": 356, + "ListEnd": 362, "HasDistinct": false, "Items": [ { "Expr": { "Name": "tag_id", "QuoteType": 1, - "NamePos": 366, - "NameEnd": 372 + "NamePos": 356, + "NameEnd": 362 }, "Alias": null } @@ -368,8 +368,8 @@ }, "Operation": "%", "RightExpr": { - "NumPos": 376, - "NumEnd": 378, + "NumPos": 366, + "NumEnd": 368, "Literal": "20", "Base": 10 }, @@ -384,20 +384,20 @@ "SampleBy": null, "TTL": null, "Settings": { - "SettingsPos": 399, - "ListEnd": 432, + "SettingsPos": 387, + "ListEnd": 420, "Items": [ { - "SettingsPos": 408, + "SettingsPos": 396, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 408, - "NameEnd": 425 + "NamePos": 396, + "NameEnd": 413 }, "Expr": { - "NumPos": 428, - "NumEnd": 432, + "NumPos": 416, + "NumEnd": 420, "Literal": "8192", "Base": 10 } @@ -405,16 +405,16 @@ ] }, "OrderBy": { - "OrderPos": 380, - "ListEnd": 397, + "OrderPos": 369, + "ListEnd": 386, "Items": [ { - "OrderPos": 380, + "OrderPos": 369, "Expr": { "Name": "label_id", "QuoteType": 1, - "NamePos": 389, - "NameEnd": 397 + "NamePos": 378, + "NameEnd": 386 }, "Alias": null, "Direction": "" diff --git a/parser/testdata/ddl/output/create_table_with_on_clsuter.sql.golden.json b/parser/testdata/ddl/output/create_table_with_on_clsuter.sql.golden.json index be8d6c6..6c5024f 100644 --- a/parser/testdata/ddl/output/create_table_with_on_clsuter.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_on_clsuter.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 411, + "StatementEnd": 399, "OrReplace": false, "Name": { "Database": { @@ -29,17 +29,17 @@ }, "TableSchema": { "SchemaPos": 74, - "SchemaEnd": 236, + "SchemaEnd": 227, "Columns": [ { - "NamePos": 81, - "ColumnEnd": 90, + "NamePos": 80, + "ColumnEnd": 89, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 81, - "NameEnd": 83 + "NamePos": 80, + "NameEnd": 82 }, "DotIdent": null }, @@ -47,8 +47,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 84, - "NameEnd": 90 + "NamePos": 83, + "NameEnd": 89 } }, "NotNull": null, @@ -62,14 +62,14 @@ "CompressionCodec": null }, { - "NamePos": 97, - "ColumnEnd": 106, + "NamePos": 95, + "ColumnEnd": 104, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 99 + "NamePos": 95, + "NameEnd": 97 }, "DotIdent": null }, @@ -77,8 +77,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 100, - "NameEnd": 106 + "NamePos": 98, + "NameEnd": 104 } }, "NotNull": null, @@ -92,14 +92,14 @@ "CompressionCodec": null }, { - "NamePos": 113, - "ColumnEnd": 122, + "NamePos": 110, + "ColumnEnd": 119, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 113, - "NameEnd": 115 + "NamePos": 110, + "NameEnd": 112 }, "DotIdent": null }, @@ -107,8 +107,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 116, - "NameEnd": 122 + "NamePos": 113, + "NameEnd": 119 } }, "NotNull": null, @@ -122,14 +122,14 @@ "CompressionCodec": null }, { - "NamePos": 129, - "ColumnEnd": 140, + "NamePos": 125, + "ColumnEnd": 136, "Name": { "Ident": { "Name": "f3", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 131 + "NamePos": 125, + "NameEnd": 127 }, "DotIdent": null }, @@ -137,8 +137,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 132, - "NameEnd": 140 + "NamePos": 128, + "NameEnd": 136 } }, "NotNull": null, @@ -152,14 +152,14 @@ "CompressionCodec": null }, { - "NamePos": 147, - "ColumnEnd": 158, + "NamePos": 142, + "ColumnEnd": 153, "Name": { "Ident": { "Name": "f4", "QuoteType": 1, - "NamePos": 147, - "NameEnd": 149 + "NamePos": 142, + "NameEnd": 144 }, "DotIdent": null }, @@ -167,8 +167,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 150, - "NameEnd": 158 + "NamePos": 145, + "NameEnd": 153 } }, "NotNull": null, @@ -182,41 +182,41 @@ "CompressionCodec": null }, { - "NamePos": 165, - "ColumnEnd": 185, + "NamePos": 159, + "ColumnEnd": 179, "Name": { "Ident": { "Name": "f5", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 167 + "NamePos": 159, + "NameEnd": 161 }, "DotIdent": null }, "Type": { - "LeftParenPos": 172, - "RightParenPos": 185, + "LeftParenPos": 166, + "RightParenPos": 179, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 168, - "NameEnd": 171 + "NamePos": 162, + "NameEnd": 165 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 172, - "NameEnd": 178 + "NamePos": 166, + "NameEnd": 172 } }, { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 179, - "NameEnd": 185 + "NamePos": 173, + "NameEnd": 179 } } ] @@ -232,14 +232,14 @@ "CompressionCodec": null }, { - "NamePos": 193, - "ColumnEnd": 202, + "NamePos": 186, + "ColumnEnd": 195, "Name": { "Ident": { "Name": "f6", "QuoteType": 1, - "NamePos": 193, - "NameEnd": 195 + "NamePos": 186, + "NameEnd": 188 }, "DotIdent": null }, @@ -247,8 +247,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 196, - "NameEnd": 202 + "NamePos": 189, + "NameEnd": 195 } }, "NotNull": null, @@ -262,14 +262,14 @@ "CompressionCodec": null }, { - "NamePos": 209, - "ColumnEnd": 233, + "NamePos": 201, + "ColumnEnd": 225, "Name": { "Ident": { "Name": "f7", "QuoteType": 1, - "NamePos": 209, - "NameEnd": 211 + "NamePos": 201, + "NameEnd": 203 }, "DotIdent": null }, @@ -277,8 +277,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 212, - "NameEnd": 220 + "NamePos": 204, + "NameEnd": 212 } }, "NotNull": null, @@ -287,15 +287,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 229, - "NameEnd": 232 + "NamePos": 221, + "NameEnd": 224 }, "Params": { - "LeftParenPos": 232, - "RightParenPos": 233, + "LeftParenPos": 224, + "RightParenPos": 225, "Items": { - "ListPos": 233, - "ListEnd": 233, + "ListPos": 225, + "ListEnd": 225, "HasDistinct": false, "Items": [] }, @@ -314,29 +314,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 238, - "EngineEnd": 411, + "EnginePos": 229, + "EngineEnd": 399, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 266, - "RightParenPos": 334, + "LeftParenPos": 257, + "RightParenPos": 325, "Items": { - "ListPos": 268, - "ListEnd": 333, + "ListPos": 259, + "ListEnd": 324, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 268, - "LiteralEnd": 320, + "LiteralPos": 259, + "LiteralEnd": 311, "Literal": "/clickhouse/tables/{layer}-{shard}/test/events_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 324, - "LiteralEnd": 333, + "LiteralPos": 315, + "LiteralEnd": 324, "Literal": "{replica}" }, "Alias": null @@ -347,10 +347,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 364, + "PartitionPos": 353, "Expr": { - "ListPos": 377, - "ListEnd": 390, + "ListPos": 366, + "ListEnd": 379, "HasDistinct": false, "Items": [ { @@ -358,23 +358,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 377, - "NameEnd": 387 + "NamePos": 366, + "NameEnd": 376 }, "Params": { - "LeftParenPos": 387, - "RightParenPos": 390, + "LeftParenPos": 376, + "RightParenPos": 379, "Items": { - "ListPos": 388, - "ListEnd": 390, + "ListPos": 377, + "ListEnd": 379, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 388, - "NameEnd": 390 + "NamePos": 377, + "NameEnd": 379 }, "Alias": null } @@ -390,32 +390,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 337, - "ListEnd": 362, + "TTLPos": 327, + "ListEnd": 352, "Items": [ { - "TTLPos": 337, + "TTLPos": 327, "Expr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 341, - "NameEnd": 343 + "NamePos": 331, + "NameEnd": 333 }, "Operation": "+", "RightExpr": { - "IntervalPos": 346, + "IntervalPos": 336, "Expr": { - "NumPos": 355, - "NumEnd": 356, + "NumPos": 345, + "NumEnd": 346, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 357, - "NameEnd": 362 + "NamePos": 347, + "NameEnd": 352 } }, "HasGlobal": false, @@ -427,25 +427,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 393, - "ListEnd": 411, + "OrderPos": 381, + "ListEnd": 399, "Items": [ { - "OrderPos": 393, + "OrderPos": 381, "Expr": { - "LeftParenPos": 402, - "RightParenPos": 411, + "LeftParenPos": 390, + "RightParenPos": 399, "Items": { - "ListPos": 403, - "ListEnd": 411, + "ListPos": 391, + "ListEnd": 399, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 403, - "NameEnd": 405 + "NamePos": 391, + "NameEnd": 393 }, "Alias": null }, @@ -453,8 +453,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 406, - "NameEnd": 408 + "NamePos": 394, + "NameEnd": 396 }, "Alias": null }, @@ -462,8 +462,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 409, - "NameEnd": 411 + "NamePos": 397, + "NameEnd": 399 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_projection.sql.golden.json b/parser/testdata/ddl/output/create_table_with_projection.sql.golden.json index d2312f7..e008540 100644 --- a/parser/testdata/ddl/output/create_table_with_projection.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_projection.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 284, + "StatementEnd": 270, "OrReplace": false, "Name": { "Database": null, @@ -16,18 +16,18 @@ "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 21, - "SchemaEnd": 241, + "SchemaPos": 20, + "SchemaEnd": 229, "Columns": [ { - "NamePos": 29, - "ColumnEnd": 49, + "NamePos": 27, + "ColumnEnd": 47, "Name": { "Ident": { "Name": "event_time", "QuoteType": 3, - "NamePos": 29, - "NameEnd": 39 + "NamePos": 27, + "NameEnd": 37 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 41, - "NameEnd": 49 + "NamePos": 39, + "NameEnd": 47 } }, "NotNull": null, @@ -50,14 +50,14 @@ "CompressionCodec": null }, { - "NamePos": 57, - "ColumnEnd": 73, + "NamePos": 54, + "ColumnEnd": 70, "Name": { "Ident": { "Name": "event_id", "QuoteType": 3, - "NamePos": 57, - "NameEnd": 65 + "NamePos": 54, + "NameEnd": 62 }, "DotIdent": null }, @@ -65,8 +65,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 67, - "NameEnd": 73 + "NamePos": 64, + "NameEnd": 70 } }, "NotNull": null, @@ -80,14 +80,14 @@ "CompressionCodec": null }, { - "NamePos": 81, - "ColumnEnd": 96, + "NamePos": 77, + "ColumnEnd": 92, "Name": { "Ident": { "Name": "user_id", "QuoteType": 3, - "NamePos": 81, - "NameEnd": 88 + "NamePos": 77, + "NameEnd": 84 }, "DotIdent": null }, @@ -95,8 +95,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 96 + "NamePos": 86, + "NameEnd": 92 } }, "NotNull": null, @@ -110,14 +110,14 @@ "CompressionCodec": null }, { - "NamePos": 104, - "ColumnEnd": 123, + "NamePos": 99, + "ColumnEnd": 118, "Name": { "Ident": { "Name": "huge_string", "QuoteType": 3, - "NamePos": 104, - "NameEnd": 115 + "NamePos": 99, + "NameEnd": 110 }, "DotIdent": null }, @@ -125,8 +125,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 117, - "NameEnd": 123 + "NamePos": 112, + "NameEnd": 118 } }, "NotNull": null, @@ -141,31 +141,31 @@ }, { "IncludeProjectionKeyword": true, - "ProjectionPos": 130, + "ProjectionPos": 124, "Identifier": { "Ident": { "Name": "order_by_user_id", "QuoteType": 1, - "NamePos": 141, - "NameEnd": 157 + "NamePos": 135, + "NameEnd": 151 }, "DotIdent": null }, "Select": { - "LeftParenPos": 163, - "RightParenPos": 238, + "LeftParenPos": 156, + "RightParenPos": 227, "With": null, "SelectColumns": { - "ListPos": 194, - "ListEnd": 206, + "ListPos": 185, + "ListEnd": 197, "HasDistinct": false, "Items": [ { "Expr": { "Name": "_part_offset", "QuoteType": 1, - "NamePos": 194, - "NameEnd": 206 + "NamePos": 185, + "NameEnd": 197 }, "Alias": null } @@ -173,18 +173,18 @@ }, "GroupBy": null, "OrderBy": { - "OrderByPos": 216, + "OrderByPos": 206, "Columns": { - "ListPos": 225, - "ListEnd": 232, + "ListPos": 215, + "ListEnd": 222, "HasDistinct": false, "Items": [ { "Expr": { "Name": "user_id", "QuoteType": 1, - "NamePos": 225, - "NameEnd": 232 + "NamePos": 215, + "NameEnd": 222 }, "Alias": null } @@ -198,15 +198,15 @@ "TableFunction": null }, "Engine": { - "EnginePos": 244, - "EngineEnd": 284, + "EnginePos": 231, + "EngineEnd": 270, "Name": "MergeTree", "Params": { - "LeftParenPos": 262, - "RightParenPos": 263, + "LeftParenPos": 249, + "RightParenPos": 250, "Items": { - "ListPos": 263, - "ListEnd": 263, + "ListPos": 250, + "ListEnd": 250, "HasDistinct": false, "Items": [] }, @@ -218,25 +218,25 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 266, - "ListEnd": 284, + "OrderPos": 252, + "ListEnd": 270, "Items": [ { - "OrderPos": 266, + "OrderPos": 252, "Expr": { - "LeftParenPos": 275, - "RightParenPos": 284, + "LeftParenPos": 261, + "RightParenPos": 270, "Items": { - "ListPos": 276, - "ListEnd": 284, + "ListPos": 262, + "ListEnd": 270, "HasDistinct": false, "Items": [ { "Expr": { "Name": "event_id", "QuoteType": 1, - "NamePos": 276, - "NameEnd": 284 + "NamePos": 262, + "NameEnd": 270 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_sample_by.sql.golden.json b/parser/testdata/ddl/output/create_table_with_sample_by.sql.golden.json index c72c8b1..0cf7845 100644 --- a/parser/testdata/ddl/output/create_table_with_sample_by.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_sample_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 361, + "StatementEnd": 351, "OrReplace": false, "Name": { "Database": { @@ -27,18 +27,18 @@ }, "OnCluster": null, "TableSchema": { - "SchemaPos": 71, - "SchemaEnd": 129, + "SchemaPos": 70, + "SchemaEnd": 124, "Columns": [ { - "NamePos": 79, - "ColumnEnd": 91, + "NamePos": 77, + "ColumnEnd": 89, "Name": { "Ident": { "Name": "f0", "QuoteType": 3, - "NamePos": 79, - "NameEnd": 81 + "NamePos": 77, + "NameEnd": 79 }, "DotIdent": null }, @@ -46,8 +46,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 91 + "NamePos": 81, + "NameEnd": 89 } }, "NotNull": null, @@ -61,14 +61,14 @@ "CompressionCodec": null }, { - "NamePos": 99, - "ColumnEnd": 109, + "NamePos": 96, + "ColumnEnd": 106, "Name": { "Ident": { "Name": "f1", "QuoteType": 3, - "NamePos": 99, - "NameEnd": 101 + "NamePos": 96, + "NameEnd": 98 }, "DotIdent": null }, @@ -76,8 +76,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 103, - "NameEnd": 109 + "NamePos": 100, + "NameEnd": 106 } }, "NotNull": null, @@ -91,14 +91,14 @@ "CompressionCodec": null }, { - "NamePos": 117, - "ColumnEnd": 127, + "NamePos": 113, + "ColumnEnd": 123, "Name": { "Ident": { "Name": "f3", "QuoteType": 3, - "NamePos": 117, - "NameEnd": 119 + "NamePos": 113, + "NameEnd": 115 }, "DotIdent": null }, @@ -106,8 +106,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 121, - "NameEnd": 127 + "NamePos": 117, + "NameEnd": 123 } }, "NotNull": null, @@ -125,29 +125,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 132, - "EngineEnd": 361, + "EnginePos": 126, + "EngineEnd": 351, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 160, - "RightParenPos": 223, + "LeftParenPos": 154, + "RightParenPos": 217, "Items": { - "ListPos": 162, - "ListEnd": 222, + "ListPos": 156, + "ListEnd": 216, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 162, - "LiteralEnd": 209, + "LiteralPos": 156, + "LiteralEnd": 203, "Literal": "/clickhouse/tables/{layer}/{shard}/default/test" }, "Alias": null }, { "Expr": { - "LiteralPos": 213, - "LiteralEnd": 222, + "LiteralPos": 207, + "LiteralEnd": 216, "Literal": "{replica}" }, "Alias": null @@ -158,10 +158,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 226, + "PartitionPos": 219, "Expr": { - "ListPos": 239, - "ListEnd": 257, + "ListPos": 232, + "ListEnd": 250, "HasDistinct": false, "Items": [ { @@ -169,23 +169,23 @@ "Name": { "Name": "toYYYYMM", "QuoteType": 1, - "NamePos": 239, - "NameEnd": 247 + "NamePos": 232, + "NameEnd": 240 }, "Params": { - "LeftParenPos": 247, - "RightParenPos": 257, + "LeftParenPos": 240, + "RightParenPos": 250, "Items": { - "ListPos": 248, - "ListEnd": 257, + "ListPos": 241, + "ListEnd": 250, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 248, - "NameEnd": 257 + "NamePos": 241, + "NameEnd": 250 }, "Alias": null } @@ -200,30 +200,30 @@ } }, "SampleBy": { - "SamplePos": 310, + "SamplePos": 301, "Expr": { "Name": "userid", "QuoteType": 1, - "NamePos": 320, - "NameEnd": 326 + "NamePos": 311, + "NameEnd": 317 } }, "TTL": null, "Settings": { - "SettingsPos": 328, - "ListEnd": 361, + "SettingsPos": 318, + "ListEnd": 351, "Items": [ { - "SettingsPos": 337, + "SettingsPos": 327, "Name": { "Name": "index_granularity", "QuoteType": 1, - "NamePos": 337, - "NameEnd": 354 + "NamePos": 327, + "NameEnd": 344 }, "Expr": { - "NumPos": 357, - "NumEnd": 361, + "NumPos": 347, + "NumEnd": 351, "Literal": "8192", "Base": 10 } @@ -231,25 +231,25 @@ ] }, "OrderBy": { - "OrderPos": 260, - "ListEnd": 307, + "OrderPos": 252, + "ListEnd": 299, "Items": [ { - "OrderPos": 260, + "OrderPos": 252, "Expr": { - "LeftParenPos": 269, - "RightParenPos": 307, + "LeftParenPos": 261, + "RightParenPos": 299, "Items": { - "ListPos": 270, - "ListEnd": 307, + "ListPos": 262, + "ListEnd": 299, "HasDistinct": false, "Items": [ { "Expr": { "Name": "contractid", "QuoteType": 1, - "NamePos": 270, - "NameEnd": 280 + "NamePos": 262, + "NameEnd": 272 }, "Alias": null }, @@ -258,23 +258,23 @@ "Name": { "Name": "toDate", "QuoteType": 1, - "NamePos": 282, - "NameEnd": 288 + "NamePos": 274, + "NameEnd": 280 }, "Params": { - "LeftParenPos": 288, - "RightParenPos": 298, + "LeftParenPos": 280, + "RightParenPos": 290, "Items": { - "ListPos": 289, - "ListEnd": 298, + "ListPos": 281, + "ListEnd": 290, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 289, - "NameEnd": 298 + "NamePos": 281, + "NameEnd": 290 }, "Alias": null } @@ -289,8 +289,8 @@ "Expr": { "Name": "userid", "QuoteType": 1, - "NamePos": 301, - "NameEnd": 307 + "NamePos": 293, + "NameEnd": 299 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_table_with_ttl_policy.sql.golden.json b/parser/testdata/ddl/output/create_table_with_ttl_policy.sql.golden.json index e9346fb..0670392 100644 --- a/parser/testdata/ddl/output/create_table_with_ttl_policy.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_ttl_policy.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 213, + "StatementEnd": 203, "OrReplace": false, "Name": { "Database": null, @@ -16,18 +16,18 @@ "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 18, - "SchemaEnd": 49, + "SchemaPos": 17, + "SchemaEnd": 45, "Columns": [ { - "NamePos": 25, - "ColumnEnd": 35, + "NamePos": 23, + "ColumnEnd": 33, "Name": { "Ident": { "Name": "d", "QuoteType": 1, - "NamePos": 25, - "NameEnd": 26 + "NamePos": 23, + "NameEnd": 24 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 27, - "NameEnd": 35 + "NamePos": 25, + "NameEnd": 33 } }, "NotNull": null, @@ -50,14 +50,14 @@ "CompressionCodec": null }, { - "NamePos": 42, - "ColumnEnd": 47, + "NamePos": 39, + "ColumnEnd": 44, "Name": { "Ident": { "Name": "a", "QuoteType": 1, - "NamePos": 42, - "NameEnd": 43 + "NamePos": 39, + "NameEnd": 40 }, "DotIdent": null }, @@ -65,8 +65,8 @@ "Name": { "Name": "Int", "QuoteType": 1, - "NamePos": 44, - "NameEnd": 47 + "NamePos": 41, + "NameEnd": 44 } }, "NotNull": null, @@ -84,16 +84,16 @@ "TableFunction": null }, "Engine": { - "EnginePos": 56, - "EngineEnd": 213, + "EnginePos": 51, + "EngineEnd": 203, "Name": "MergeTree", "Params": null, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 76, + "PartitionPos": 70, "Expr": { - "ListPos": 89, - "ListEnd": 99, + "ListPos": 83, + "ListEnd": 93, "HasDistinct": false, "Items": [ { @@ -101,23 +101,23 @@ "Name": { "Name": "toYYYYMM", "QuoteType": 1, - "NamePos": 89, - "NameEnd": 97 + "NamePos": 83, + "NameEnd": 91 }, "Params": { - "LeftParenPos": 97, - "RightParenPos": 99, + "LeftParenPos": 91, + "RightParenPos": 93, "Items": { - "ListPos": 98, - "ListEnd": 99, + "ListPos": 92, + "ListEnd": 93, "HasDistinct": false, "Items": [ { "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 98, - "NameEnd": 99 + "NamePos": 92, + "NameEnd": 93 }, "Alias": null } @@ -133,32 +133,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 114, - "ListEnd": 213, + "TTLPos": 106, + "ListEnd": 203, "Items": [ { - "TTLPos": 114, + "TTLPos": 106, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 118, - "NameEnd": 119 + "NamePos": 110, + "NameEnd": 111 }, "Operation": "+", "RightExpr": { - "IntervalPos": 122, + "IntervalPos": 114, "Expr": { - "NumPos": 131, - "NumEnd": 132, + "NumPos": 123, + "NumEnd": 124, "Literal": "1", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 138 + "NamePos": 125, + "NameEnd": 130 } }, "HasGlobal": false, @@ -166,12 +166,12 @@ }, "Policy": { "Item": { - "RulePos": 139, + "RulePos": 131, "ToVolume": null, "ToDisk": null, "Action": { - "ActionPos": 139, - "ActionEnd": 145, + "ActionPos": 131, + "ActionEnd": 137, "Action": "DELETE", "Codec": null } @@ -181,28 +181,28 @@ } }, { - "TTLPos": 114, + "TTLPos": 106, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 152, - "NameEnd": 153 + "NamePos": 143, + "NameEnd": 144 }, "Operation": "+", "RightExpr": { - "IntervalPos": 156, + "IntervalPos": 147, "Expr": { - "NumPos": 165, - "NumEnd": 166, + "NumPos": 156, + "NumEnd": 157, "Literal": "1", "Base": 10 }, "Unit": { "Name": "WEEK", "QuoteType": 1, - "NamePos": 167, - "NameEnd": 171 + "NamePos": 158, + "NameEnd": 162 } }, "HasGlobal": false, @@ -210,10 +210,10 @@ }, "Policy": { "Item": { - "RulePos": 172, + "RulePos": 163, "ToVolume": { - "LiteralPos": 183, - "LiteralEnd": 186, + "LiteralPos": 174, + "LiteralEnd": 177, "Literal": "aaa" }, "ToDisk": null, @@ -224,28 +224,28 @@ } }, { - "TTLPos": 114, + "TTLPos": 106, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 194, - "NameEnd": 195 + "NamePos": 184, + "NameEnd": 185 }, "Operation": "+", "RightExpr": { - "IntervalPos": 198, + "IntervalPos": 188, "Expr": { - "NumPos": 207, - "NumEnd": 208, + "NumPos": 197, + "NumEnd": 198, "Literal": "2", "Base": 10 }, "Unit": { "Name": "WEEK", "QuoteType": 1, - "NamePos": 209, - "NameEnd": 213 + "NamePos": 199, + "NameEnd": 203 } }, "HasGlobal": false, @@ -253,11 +253,11 @@ }, "Policy": { "Item": { - "RulePos": 214, + "RulePos": 204, "ToVolume": null, "ToDisk": { - "LiteralPos": 223, - "LiteralEnd": 226, + "LiteralPos": 213, + "LiteralEnd": 216, "Literal": "bbb" }, "Action": null @@ -270,16 +270,16 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 102, - "ListEnd": 112, + "OrderPos": 95, + "ListEnd": 105, "Items": [ { - "OrderPos": 102, + "OrderPos": 95, "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 111, - "NameEnd": 112 + "NamePos": 104, + "NameEnd": 105 }, "Alias": null, "Direction": "" @@ -292,34 +292,34 @@ "Comment": null }, { - "CreatePos": 234, - "StatementEnd": 385, + "CreatePos": 221, + "StatementEnd": 364, "OrReplace": false, "Name": { "Database": null, "Table": { "Name": "table_with_where", "QuoteType": 1, - "NamePos": 247, - "NameEnd": 263 + "NamePos": 234, + "NameEnd": 250 } }, "IfNotExists": false, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 265, - "SchemaEnd": 296, + "SchemaPos": 251, + "SchemaEnd": 279, "Columns": [ { - "NamePos": 272, - "ColumnEnd": 282, + "NamePos": 257, + "ColumnEnd": 267, "Name": { "Ident": { "Name": "d", "QuoteType": 1, - "NamePos": 272, - "NameEnd": 273 + "NamePos": 257, + "NameEnd": 258 }, "DotIdent": null }, @@ -327,8 +327,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 274, - "NameEnd": 282 + "NamePos": 259, + "NameEnd": 267 } }, "NotNull": null, @@ -342,14 +342,14 @@ "CompressionCodec": null }, { - "NamePos": 289, - "ColumnEnd": 294, + "NamePos": 273, + "ColumnEnd": 278, "Name": { "Ident": { "Name": "a", "QuoteType": 1, - "NamePos": 289, - "NameEnd": 290 + "NamePos": 273, + "NameEnd": 274 }, "DotIdent": null }, @@ -357,8 +357,8 @@ "Name": { "Name": "Int", "QuoteType": 1, - "NamePos": 291, - "NameEnd": 294 + "NamePos": 275, + "NameEnd": 278 } }, "NotNull": null, @@ -376,16 +376,16 @@ "TableFunction": null }, "Engine": { - "EnginePos": 303, - "EngineEnd": 385, + "EnginePos": 285, + "EngineEnd": 364, "Name": "MergeTree", "Params": null, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 323, + "PartitionPos": 304, "Expr": { - "ListPos": 336, - "ListEnd": 346, + "ListPos": 317, + "ListEnd": 327, "HasDistinct": false, "Items": [ { @@ -393,23 +393,23 @@ "Name": { "Name": "toYYYYMM", "QuoteType": 1, - "NamePos": 336, - "NameEnd": 344 + "NamePos": 317, + "NameEnd": 325 }, "Params": { - "LeftParenPos": 344, - "RightParenPos": 346, + "LeftParenPos": 325, + "RightParenPos": 327, "Items": { - "ListPos": 345, - "ListEnd": 346, + "ListPos": 326, + "ListEnd": 327, "HasDistinct": false, "Items": [ { "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 345, - "NameEnd": 346 + "NamePos": 326, + "NameEnd": 327 }, "Alias": null } @@ -425,32 +425,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 361, - "ListEnd": 385, + "TTLPos": 340, + "ListEnd": 364, "Items": [ { - "TTLPos": 361, + "TTLPos": 340, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 365, - "NameEnd": 366 + "NamePos": 344, + "NameEnd": 345 }, "Operation": "+", "RightExpr": { - "IntervalPos": 369, + "IntervalPos": 348, "Expr": { - "NumPos": 378, - "NumEnd": 379, + "NumPos": 357, + "NumEnd": 358, "Literal": "1", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 380, - "NameEnd": 385 + "NamePos": 359, + "NameEnd": 364 } }, "HasGlobal": false, @@ -458,40 +458,40 @@ }, "Policy": { "Item": { - "RulePos": 386, + "RulePos": 365, "ToVolume": null, "ToDisk": null, "Action": { - "ActionPos": 386, - "ActionEnd": 392, + "ActionPos": 365, + "ActionEnd": 371, "Action": "DELETE", "Codec": null } }, "Where": { - "WherePos": 393, + "WherePos": 372, "Expr": { "LeftExpr": { "Name": { "Name": "toDayOfWeek", "QuoteType": 1, - "NamePos": 399, - "NameEnd": 410 + "NamePos": 378, + "NameEnd": 389 }, "Params": { - "LeftParenPos": 410, - "RightParenPos": 412, + "LeftParenPos": 389, + "RightParenPos": 391, "Items": { - "ListPos": 411, - "ListEnd": 412, + "ListPos": 390, + "ListEnd": 391, "HasDistinct": false, "Items": [ { "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 411, - "NameEnd": 412 + "NamePos": 390, + "NameEnd": 391 }, "Alias": null } @@ -502,8 +502,8 @@ }, "Operation": "=", "RightExpr": { - "NumPos": 416, - "NumEnd": 417, + "NumPos": 395, + "NumEnd": 396, "Literal": "1", "Base": 10 }, @@ -518,16 +518,16 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 349, - "ListEnd": 359, + "OrderPos": 329, + "ListEnd": 339, "Items": [ { - "OrderPos": 349, + "OrderPos": 329, "Expr": { "Name": "d", "QuoteType": 1, - "NamePos": 358, - "NameEnd": 359 + "NamePos": 338, + "NameEnd": 339 }, "Alias": null, "Direction": "" @@ -540,34 +540,34 @@ "Comment": null }, { - "CreatePos": 422, - "StatementEnd": 739, + "CreatePos": 399, + "StatementEnd": 707, "OrReplace": false, "Name": { "Database": null, "Table": { "Name": "table_for_recompression", "QuoteType": 1, - "NamePos": 435, - "NameEnd": 458 + "NamePos": 412, + "NameEnd": 435 } }, "IfNotExists": false, "UUID": null, "OnCluster": null, "TableSchema": { - "SchemaPos": 460, - "SchemaEnd": 515, + "SchemaPos": 436, + "SchemaEnd": 487, "Columns": [ { - "NamePos": 467, - "ColumnEnd": 477, + "NamePos": 442, + "ColumnEnd": 452, "Name": { "Ident": { "Name": "d", "QuoteType": 1, - "NamePos": 467, - "NameEnd": 468 + "NamePos": 442, + "NameEnd": 443 }, "DotIdent": null }, @@ -575,8 +575,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 469, - "NameEnd": 477 + "NamePos": 444, + "NameEnd": 452 } }, "NotNull": null, @@ -590,14 +590,14 @@ "CompressionCodec": null }, { - "NamePos": 484, - "ColumnEnd": 494, + "NamePos": 458, + "ColumnEnd": 468, "Name": { "Ident": { "Name": "key", "QuoteType": 1, - "NamePos": 484, - "NameEnd": 487 + "NamePos": 458, + "NameEnd": 461 }, "DotIdent": null }, @@ -605,8 +605,8 @@ "Name": { "Name": "UInt64", "QuoteType": 1, - "NamePos": 488, - "NameEnd": 494 + "NamePos": 462, + "NameEnd": 468 } }, "NotNull": null, @@ -620,14 +620,14 @@ "CompressionCodec": null }, { - "NamePos": 501, - "ColumnEnd": 513, + "NamePos": 474, + "ColumnEnd": 486, "Name": { "Ident": { "Name": "value", "QuoteType": 1, - "NamePos": 501, - "NameEnd": 506 + "NamePos": 474, + "NameEnd": 479 }, "DotIdent": null }, @@ -635,8 +635,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 507, - "NameEnd": 513 + "NamePos": 480, + "NameEnd": 486 } }, "NotNull": null, @@ -654,15 +654,15 @@ "TableFunction": null }, "Engine": { - "EnginePos": 517, - "EngineEnd": 739, + "EnginePos": 489, + "EngineEnd": 707, "Name": "MergeTree", "Params": { - "LeftParenPos": 533, - "RightParenPos": 534, + "LeftParenPos": 505, + "RightParenPos": 506, "Items": { - "ListPos": 534, - "ListEnd": 534, + "ListPos": 506, + "ListEnd": 506, "HasDistinct": false, "Items": [] }, @@ -670,18 +670,18 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 555, + "PartitionPos": 525, "Expr": { - "ListPos": 568, - "ListEnd": 571, + "ListPos": 538, + "ListEnd": 541, "HasDistinct": false, "Items": [ { "Expr": { "Name": "key", "QuoteType": 1, - "NamePos": 568, - "NameEnd": 571 + "NamePos": 538, + "NameEnd": 541 }, "Alias": null } @@ -690,32 +690,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 573, - "ListEnd": 645, + "TTLPos": 542, + "ListEnd": 614, "Items": [ { - "TTLPos": 573, + "TTLPos": 542, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 577, - "NameEnd": 578 + "NamePos": 546, + "NameEnd": 547 }, "Operation": "+", "RightExpr": { - "IntervalPos": 581, + "IntervalPos": 550, "Expr": { - "NumPos": 590, - "NumEnd": 591, + "NumPos": 559, + "NumEnd": 560, "Literal": "1", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 592, - "NameEnd": 597 + "NamePos": 561, + "NameEnd": 566 } }, "HasGlobal": false, @@ -723,27 +723,27 @@ }, "Policy": { "Item": { - "RulePos": 598, + "RulePos": 567, "ToVolume": null, "ToDisk": null, "Action": { - "ActionPos": 598, - "ActionEnd": 608, + "ActionPos": 567, + "ActionEnd": 577, "Action": "RECOMPRESS", "Codec": { - "CodecPos": 609, - "RightParenPos": 624, + "CodecPos": 578, + "RightParenPos": 593, "Type": null, "TypeLevel": null, "Name": { "Name": "ZSTD", "QuoteType": 1, - "NamePos": 615, - "NameEnd": 619 + "NamePos": 584, + "NameEnd": 588 }, "Level": { - "NumPos": 619, - "NumEnd": 622, + "NumPos": 588, + "NumEnd": 591, "Literal": "17", "Base": 10 } @@ -755,28 +755,28 @@ } }, { - "TTLPos": 573, + "TTLPos": 542, "Expr": { "LeftExpr": { "Name": "d", "QuoteType": 1, - "NamePos": 626, - "NameEnd": 627 + "NamePos": 595, + "NameEnd": 596 }, "Operation": "+", "RightExpr": { - "IntervalPos": 630, + "IntervalPos": 599, "Expr": { - "NumPos": 639, - "NumEnd": 640, + "NumPos": 608, + "NumEnd": 609, "Literal": "1", "Base": 10 }, "Unit": { "Name": "YEAR", "QuoteType": 1, - "NamePos": 641, - "NameEnd": 645 + "NamePos": 610, + "NameEnd": 614 } }, "HasGlobal": false, @@ -784,27 +784,27 @@ }, "Policy": { "Item": { - "RulePos": 646, + "RulePos": 615, "ToVolume": null, "ToDisk": null, "Action": { - "ActionPos": 646, - "ActionEnd": 656, + "ActionPos": 615, + "ActionEnd": 625, "Action": "RECOMPRESS", "Codec": { - "CodecPos": 657, - "RightParenPos": 673, + "CodecPos": 626, + "RightParenPos": 642, "Type": null, "TypeLevel": null, "Name": { "Name": "LZ4HC", "QuoteType": 1, - "NamePos": 663, - "NameEnd": 668 + "NamePos": 632, + "NameEnd": 637 }, "Level": { - "NumPos": 668, - "NumEnd": 671, + "NumPos": 637, + "NumEnd": 640, "Literal": "10", "Base": 10 } @@ -818,35 +818,35 @@ ] }, "Settings": { - "SettingsPos": 675, - "ListEnd": 739, + "SettingsPos": 643, + "ListEnd": 707, "Items": [ { - "SettingsPos": 684, + "SettingsPos": 652, "Name": { "Name": "min_rows_for_wide_part", "QuoteType": 1, - "NamePos": 684, - "NameEnd": 706 + "NamePos": 652, + "NameEnd": 674 }, "Expr": { - "NumPos": 709, - "NumEnd": 710, + "NumPos": 677, + "NumEnd": 678, "Literal": "0", "Base": 10 } }, { - "SettingsPos": 712, + "SettingsPos": 680, "Name": { "Name": "min_bytes_for_wide_part", "QuoteType": 1, - "NamePos": 712, - "NameEnd": 735 + "NamePos": 680, + "NameEnd": 703 }, "Expr": { - "NumPos": 738, - "NumEnd": 739, + "NumPos": 706, + "NumEnd": 707, "Literal": "0", "Base": 10 } @@ -854,24 +854,24 @@ ] }, "OrderBy": { - "OrderPos": 537, - "ListEnd": 552, + "OrderPos": 508, + "ListEnd": 523, "Items": [ { - "OrderPos": 537, + "OrderPos": 508, "Expr": { "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 546, - "NameEnd": 551 + "NamePos": 517, + "NameEnd": 522 }, "Params": { - "LeftParenPos": 551, - "RightParenPos": 552, + "LeftParenPos": 522, + "RightParenPos": 523, "Items": { - "ListPos": 552, - "ListEnd": 552, + "ListPos": 523, + "ListEnd": 523, "HasDistinct": false, "Items": [] }, diff --git a/parser/testdata/ddl/output/create_table_with_uuid.sql.golden.json b/parser/testdata/ddl/output/create_table_with_uuid.sql.golden.json index 7e0b24c..2fbe878 100644 --- a/parser/testdata/ddl/output/create_table_with_uuid.sql.golden.json +++ b/parser/testdata/ddl/output/create_table_with_uuid.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 423, + "StatementEnd": 411, "OrReplace": false, "Name": { "Database": { @@ -35,17 +35,17 @@ }, "TableSchema": { "SchemaPos": 86, - "SchemaEnd": 248, + "SchemaEnd": 239, "Columns": [ { - "NamePos": 93, - "ColumnEnd": 102, + "NamePos": 92, + "ColumnEnd": 101, "Name": { "Ident": { "Name": "f0", "QuoteType": 1, - "NamePos": 93, - "NameEnd": 95 + "NamePos": 92, + "NameEnd": 94 }, "DotIdent": null }, @@ -53,8 +53,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 96, - "NameEnd": 102 + "NamePos": 95, + "NameEnd": 101 } }, "NotNull": null, @@ -68,14 +68,14 @@ "CompressionCodec": null }, { - "NamePos": 109, - "ColumnEnd": 118, + "NamePos": 107, + "ColumnEnd": 116, "Name": { "Ident": { "Name": "f1", "QuoteType": 1, - "NamePos": 109, - "NameEnd": 111 + "NamePos": 107, + "NameEnd": 109 }, "DotIdent": null }, @@ -83,8 +83,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 112, - "NameEnd": 118 + "NamePos": 110, + "NameEnd": 116 } }, "NotNull": null, @@ -98,14 +98,14 @@ "CompressionCodec": null }, { - "NamePos": 125, - "ColumnEnd": 134, + "NamePos": 122, + "ColumnEnd": 131, "Name": { "Ident": { "Name": "f2", "QuoteType": 1, - "NamePos": 125, - "NameEnd": 127 + "NamePos": 122, + "NameEnd": 124 }, "DotIdent": null }, @@ -113,8 +113,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 128, - "NameEnd": 134 + "NamePos": 125, + "NameEnd": 131 } }, "NotNull": null, @@ -128,14 +128,14 @@ "CompressionCodec": null }, { - "NamePos": 141, - "ColumnEnd": 152, + "NamePos": 137, + "ColumnEnd": 148, "Name": { "Ident": { "Name": "f3", "QuoteType": 1, - "NamePos": 141, - "NameEnd": 143 + "NamePos": 137, + "NameEnd": 139 }, "DotIdent": null }, @@ -143,8 +143,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 144, - "NameEnd": 152 + "NamePos": 140, + "NameEnd": 148 } }, "NotNull": null, @@ -158,14 +158,14 @@ "CompressionCodec": null }, { - "NamePos": 159, - "ColumnEnd": 170, + "NamePos": 154, + "ColumnEnd": 165, "Name": { "Ident": { "Name": "f4", "QuoteType": 1, - "NamePos": 159, - "NameEnd": 161 + "NamePos": 154, + "NameEnd": 156 }, "DotIdent": null }, @@ -173,8 +173,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 162, - "NameEnd": 170 + "NamePos": 157, + "NameEnd": 165 } }, "NotNull": null, @@ -188,41 +188,41 @@ "CompressionCodec": null }, { - "NamePos": 177, - "ColumnEnd": 197, + "NamePos": 171, + "ColumnEnd": 191, "Name": { "Ident": { "Name": "f5", "QuoteType": 1, - "NamePos": 177, - "NameEnd": 179 + "NamePos": 171, + "NameEnd": 173 }, "DotIdent": null }, "Type": { - "LeftParenPos": 184, - "RightParenPos": 197, + "LeftParenPos": 178, + "RightParenPos": 191, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 180, - "NameEnd": 183 + "NamePos": 174, + "NameEnd": 177 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 190 + "NamePos": 178, + "NameEnd": 184 } }, { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 191, - "NameEnd": 197 + "NamePos": 185, + "NameEnd": 191 } } ] @@ -238,14 +238,14 @@ "CompressionCodec": null }, { - "NamePos": 205, - "ColumnEnd": 214, + "NamePos": 198, + "ColumnEnd": 207, "Name": { "Ident": { "Name": "f6", "QuoteType": 1, - "NamePos": 205, - "NameEnd": 207 + "NamePos": 198, + "NameEnd": 200 }, "DotIdent": null }, @@ -253,8 +253,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 208, - "NameEnd": 214 + "NamePos": 201, + "NameEnd": 207 } }, "NotNull": null, @@ -268,14 +268,14 @@ "CompressionCodec": null }, { - "NamePos": 221, - "ColumnEnd": 245, + "NamePos": 213, + "ColumnEnd": 237, "Name": { "Ident": { "Name": "f7", "QuoteType": 1, - "NamePos": 221, - "NameEnd": 223 + "NamePos": 213, + "NameEnd": 215 }, "DotIdent": null }, @@ -283,8 +283,8 @@ "Name": { "Name": "Datetime", "QuoteType": 1, - "NamePos": 224, - "NameEnd": 232 + "NamePos": 216, + "NameEnd": 224 } }, "NotNull": null, @@ -293,15 +293,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 241, - "NameEnd": 244 + "NamePos": 233, + "NameEnd": 236 }, "Params": { - "LeftParenPos": 244, - "RightParenPos": 245, + "LeftParenPos": 236, + "RightParenPos": 237, "Items": { - "ListPos": 245, - "ListEnd": 245, + "ListPos": 237, + "ListEnd": 237, "HasDistinct": false, "Items": [] }, @@ -320,29 +320,29 @@ "TableFunction": null }, "Engine": { - "EnginePos": 250, - "EngineEnd": 423, + "EnginePos": 241, + "EngineEnd": 411, "Name": "ReplicatedMergeTree", "Params": { - "LeftParenPos": 278, - "RightParenPos": 346, + "LeftParenPos": 269, + "RightParenPos": 337, "Items": { - "ListPos": 280, - "ListEnd": 345, + "ListPos": 271, + "ListEnd": 336, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 280, - "LiteralEnd": 332, + "LiteralPos": 271, + "LiteralEnd": 323, "Literal": "/clickhouse/tables/{layer}-{shard}/test/events_local" }, "Alias": null }, { "Expr": { - "LiteralPos": 336, - "LiteralEnd": 345, + "LiteralPos": 327, + "LiteralEnd": 336, "Literal": "{replica}" }, "Alias": null @@ -353,10 +353,10 @@ }, "PrimaryKey": null, "PartitionBy": { - "PartitionPos": 376, + "PartitionPos": 365, "Expr": { - "ListPos": 389, - "ListEnd": 402, + "ListPos": 378, + "ListEnd": 391, "HasDistinct": false, "Items": [ { @@ -364,23 +364,23 @@ "Name": { "Name": "toYYYYMMDD", "QuoteType": 1, - "NamePos": 389, - "NameEnd": 399 + "NamePos": 378, + "NameEnd": 388 }, "Params": { - "LeftParenPos": 399, - "RightParenPos": 402, + "LeftParenPos": 388, + "RightParenPos": 391, "Items": { - "ListPos": 400, - "ListEnd": 402, + "ListPos": 389, + "ListEnd": 391, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 400, - "NameEnd": 402 + "NamePos": 389, + "NameEnd": 391 }, "Alias": null } @@ -396,32 +396,32 @@ }, "SampleBy": null, "TTL": { - "TTLPos": 349, - "ListEnd": 374, + "TTLPos": 339, + "ListEnd": 364, "Items": [ { - "TTLPos": 349, + "TTLPos": 339, "Expr": { "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 353, - "NameEnd": 355 + "NamePos": 343, + "NameEnd": 345 }, "Operation": "+", "RightExpr": { - "IntervalPos": 358, + "IntervalPos": 348, "Expr": { - "NumPos": 367, - "NumEnd": 368, + "NumPos": 357, + "NumEnd": 358, "Literal": "6", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 369, - "NameEnd": 374 + "NamePos": 359, + "NameEnd": 364 } }, "HasGlobal": false, @@ -433,25 +433,25 @@ }, "Settings": null, "OrderBy": { - "OrderPos": 405, - "ListEnd": 423, + "OrderPos": 393, + "ListEnd": 411, "Items": [ { - "OrderPos": 405, + "OrderPos": 393, "Expr": { - "LeftParenPos": 414, - "RightParenPos": 423, + "LeftParenPos": 402, + "RightParenPos": 411, "Items": { - "ListPos": 415, - "ListEnd": 423, + "ListPos": 403, + "ListEnd": 411, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 415, - "NameEnd": 417 + "NamePos": 403, + "NameEnd": 405 }, "Alias": null }, @@ -459,8 +459,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 418, - "NameEnd": 420 + "NamePos": 406, + "NameEnd": 408 }, "Alias": null }, @@ -468,8 +468,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 421, - "NameEnd": 423 + "NamePos": 409, + "NameEnd": 411 }, "Alias": null } diff --git a/parser/testdata/ddl/output/create_user.sql.golden.json b/parser/testdata/ddl/output/create_user.sql.golden.json index 03eef33..25cdc84 100644 --- a/parser/testdata/ddl/output/create_user.sql.golden.json +++ b/parser/testdata/ddl/output/create_user.sql.golden.json @@ -1,7 +1,7 @@ [ { - "CreatePos": 30, - "StatementEnd": 47, + "CreatePos": 28, + "StatementEnd": 45, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -9,8 +9,8 @@ "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 42, - "NameEnd": 47 + "NamePos": 40, + "NameEnd": 45 }, "Scope": null, "OnCluster": null @@ -25,8 +25,8 @@ "Settings": null }, { - "CreatePos": 50, - "StatementEnd": 81, + "CreatePos": 47, + "StatementEnd": 78, "IfNotExists": true, "OrReplace": false, "UserNames": [ @@ -34,8 +34,8 @@ "Name": { "Name": "user2", "QuoteType": 1, - "NamePos": 76, - "NameEnd": 81 + "NamePos": 73, + "NameEnd": 78 }, "Scope": null, "OnCluster": null @@ -50,8 +50,8 @@ "Settings": null }, { - "CreatePos": 84, - "StatementEnd": 112, + "CreatePos": 80, + "StatementEnd": 108, "IfNotExists": false, "OrReplace": true, "UserNames": [ @@ -59,8 +59,8 @@ "Name": { "Name": "user3", "QuoteType": 1, - "NamePos": 107, - "NameEnd": 112 + "NamePos": 103, + "NameEnd": 108 }, "Scope": null, "OnCluster": null @@ -75,8 +75,8 @@ "Settings": null }, { - "CreatePos": 115, - "StatementEnd": 139, + "CreatePos": 110, + "StatementEnd": 134, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -84,8 +84,8 @@ "Name": { "Name": "user4", "QuoteType": 1, - "NamePos": 127, - "NameEnd": 132 + "NamePos": 122, + "NameEnd": 127 }, "Scope": null, "OnCluster": null @@ -94,8 +94,8 @@ "Name": { "Name": "user5", "QuoteType": 1, - "NamePos": 134, - "NameEnd": 139 + "NamePos": 129, + "NameEnd": 134 }, "Scope": null, "OnCluster": null @@ -110,8 +110,8 @@ "Settings": null }, { - "CreatePos": 180, - "StatementEnd": 213, + "CreatePos": 172, + "StatementEnd": 205, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -119,16 +119,16 @@ "Name": { "Name": "user6", "QuoteType": 1, - "NamePos": 192, - "NameEnd": 197 + "NamePos": 184, + "NameEnd": 189 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 198, - "AuthEnd": 213, + "AuthPos": 190, + "AuthEnd": 205, "NotIdentified": true, "AuthType": "", "AuthValue": null, @@ -144,8 +144,8 @@ "Settings": null }, { - "CreatePos": 215, - "StatementEnd": 283, + "CreatePos": 206, + "StatementEnd": 274, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -153,21 +153,21 @@ "Name": { "Name": "user7", "QuoteType": 1, - "NamePos": 227, - "NameEnd": 232 + "NamePos": 218, + "NameEnd": 223 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 233, - "AuthEnd": 283, + "AuthPos": 224, + "AuthEnd": 274, "NotIdentified": false, "AuthType": "plaintext_password", "AuthValue": { - "LiteralPos": 272, - "LiteralEnd": 283, + "LiteralPos": 263, + "LiteralEnd": 274, "Literal": "password123" }, "LdapServer": null, @@ -182,8 +182,8 @@ "Settings": null }, { - "CreatePos": 287, - "StatementEnd": 348, + "CreatePos": 277, + "StatementEnd": 338, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -191,21 +191,21 @@ "Name": { "Name": "user8", "QuoteType": 1, - "NamePos": 299, - "NameEnd": 304 + "NamePos": 289, + "NameEnd": 294 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 305, - "AuthEnd": 348, + "AuthPos": 295, + "AuthEnd": 338, "NotIdentified": false, "AuthType": "sha256_password", "AuthValue": { - "LiteralPos": 341, - "LiteralEnd": 348, + "LiteralPos": 331, + "LiteralEnd": 338, "Literal": "hash123" }, "LdapServer": null, @@ -220,8 +220,8 @@ "Settings": null }, { - "CreatePos": 352, - "StatementEnd": 410, + "CreatePos": 341, + "StatementEnd": 399, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -229,22 +229,22 @@ "Name": { "Name": "user9", "QuoteType": 1, - "NamePos": 364, - "NameEnd": 369 + "NamePos": 353, + "NameEnd": 358 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 370, - "AuthEnd": 410, + "AuthPos": 359, + "AuthEnd": 399, "NotIdentified": false, "AuthType": "", "AuthValue": null, "LdapServer": { - "LiteralPos": 399, - "LiteralEnd": 410, + "LiteralPos": 388, + "LiteralEnd": 399, "Literal": "ldap_server" }, "KerberosRealm": null, @@ -258,8 +258,8 @@ "Settings": null }, { - "CreatePos": 414, - "StatementEnd": 458, + "CreatePos": 402, + "StatementEnd": 446, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -267,16 +267,16 @@ "Name": { "Name": "user10", "QuoteType": 1, - "NamePos": 426, - "NameEnd": 432 + "NamePos": 414, + "NameEnd": 420 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 433, - "AuthEnd": 458, + "AuthPos": 421, + "AuthEnd": 446, "NotIdentified": false, "AuthType": "", "AuthValue": null, @@ -292,8 +292,8 @@ "Settings": null }, { - "CreatePos": 460, - "StatementEnd": 522, + "CreatePos": 447, + "StatementEnd": 509, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -301,23 +301,23 @@ "Name": { "Name": "user11", "QuoteType": 1, - "NamePos": 472, - "NameEnd": 478 + "NamePos": 459, + "NameEnd": 465 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 479, - "AuthEnd": 522, + "AuthPos": 466, + "AuthEnd": 509, "NotIdentified": false, "AuthType": "", "AuthValue": null, "LdapServer": null, "KerberosRealm": { - "LiteralPos": 511, - "LiteralEnd": 522, + "LiteralPos": 498, + "LiteralEnd": 509, "Literal": "EXAMPLE.COM" }, "IsKerberos": true @@ -330,8 +330,8 @@ "Settings": null }, { - "CreatePos": 567, - "StatementEnd": 597, + "CreatePos": 551, + "StatementEnd": 581, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -339,8 +339,8 @@ "Name": { "Name": "user12", "QuoteType": 1, - "NamePos": 579, - "NameEnd": 585 + "NamePos": 563, + "NameEnd": 569 }, "Scope": null, "OnCluster": null @@ -349,8 +349,8 @@ "Authentication": null, "Hosts": [ { - "HostPos": 586, - "HostEnd": 597, + "HostPos": 570, + "HostEnd": 581, "HostType": "LOCAL", "HostValue": null } @@ -362,8 +362,8 @@ "Settings": null }, { - "CreatePos": 599, - "StatementEnd": 627, + "CreatePos": 582, + "StatementEnd": 610, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -371,8 +371,8 @@ "Name": { "Name": "user13", "QuoteType": 1, - "NamePos": 611, - "NameEnd": 617 + "NamePos": 594, + "NameEnd": 600 }, "Scope": null, "OnCluster": null @@ -381,8 +381,8 @@ "Authentication": null, "Hosts": [ { - "HostPos": 618, - "HostEnd": 627, + "HostPos": 601, + "HostEnd": 610, "HostType": "ANY", "HostValue": null } @@ -394,8 +394,8 @@ "Settings": null }, { - "CreatePos": 629, - "StatementEnd": 658, + "CreatePos": 611, + "StatementEnd": 640, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -403,8 +403,8 @@ "Name": { "Name": "user14", "QuoteType": 1, - "NamePos": 641, - "NameEnd": 647 + "NamePos": 623, + "NameEnd": 629 }, "Scope": null, "OnCluster": null @@ -413,8 +413,8 @@ "Authentication": null, "Hosts": [ { - "HostPos": 648, - "HostEnd": 658, + "HostPos": 630, + "HostEnd": 640, "HostType": "NONE", "HostValue": null } @@ -426,8 +426,8 @@ "Settings": null }, { - "CreatePos": 660, - "StatementEnd": 699, + "CreatePos": 641, + "StatementEnd": 680, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -435,8 +435,8 @@ "Name": { "Name": "user15", "QuoteType": 1, - "NamePos": 672, - "NameEnd": 678 + "NamePos": 653, + "NameEnd": 659 }, "Scope": null, "OnCluster": null @@ -445,12 +445,12 @@ "Authentication": null, "Hosts": [ { - "HostPos": 679, - "HostEnd": 699, + "HostPos": 660, + "HostEnd": 680, "HostType": "NAME", "HostValue": { - "LiteralPos": 690, - "LiteralEnd": 699, + "LiteralPos": 671, + "LiteralEnd": 680, "Literal": "localhost" } } @@ -462,8 +462,8 @@ "Settings": null }, { - "CreatePos": 703, - "StatementEnd": 751, + "CreatePos": 683, + "StatementEnd": 731, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -471,8 +471,8 @@ "Name": { "Name": "user16", "QuoteType": 1, - "NamePos": 715, - "NameEnd": 721 + "NamePos": 695, + "NameEnd": 701 }, "Scope": null, "OnCluster": null @@ -481,12 +481,12 @@ "Authentication": null, "Hosts": [ { - "HostPos": 722, - "HostEnd": 751, + "HostPos": 702, + "HostEnd": 731, "HostType": "REGEXP", "HostValue": { - "LiteralPos": 735, - "LiteralEnd": 751, + "LiteralPos": 715, + "LiteralEnd": 731, "Literal": ".*\\.example\\.com" } } @@ -498,8 +498,8 @@ "Settings": null }, { - "CreatePos": 755, - "StatementEnd": 794, + "CreatePos": 734, + "StatementEnd": 773, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -507,8 +507,8 @@ "Name": { "Name": "user17", "QuoteType": 1, - "NamePos": 767, - "NameEnd": 773 + "NamePos": 746, + "NameEnd": 752 }, "Scope": null, "OnCluster": null @@ -517,12 +517,12 @@ "Authentication": null, "Hosts": [ { - "HostPos": 774, - "HostEnd": 794, + "HostPos": 753, + "HostEnd": 773, "HostType": "IP", "HostValue": { - "LiteralPos": 783, - "LiteralEnd": 794, + "LiteralPos": 762, + "LiteralEnd": 773, "Literal": "192.168.1.1" } } @@ -534,8 +534,8 @@ "Settings": null }, { - "CreatePos": 798, - "StatementEnd": 833, + "CreatePos": 776, + "StatementEnd": 811, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -543,8 +543,8 @@ "Name": { "Name": "user18", "QuoteType": 1, - "NamePos": 810, - "NameEnd": 816 + "NamePos": 788, + "NameEnd": 794 }, "Scope": null, "OnCluster": null @@ -553,12 +553,12 @@ "Authentication": null, "Hosts": [ { - "HostPos": 817, - "HostEnd": 833, + "HostPos": 795, + "HostEnd": 811, "HostType": "LIKE", "HostValue": { - "LiteralPos": 828, - "LiteralEnd": 833, + "LiteralPos": 806, + "LiteralEnd": 811, "Literal": "test%" } } @@ -570,8 +570,8 @@ "Settings": null }, { - "CreatePos": 874, - "StatementEnd": 911, + "CreatePos": 849, + "StatementEnd": 886, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -579,8 +579,8 @@ "Name": { "Name": "user19", "QuoteType": 1, - "NamePos": 886, - "NameEnd": 892 + "NamePos": 861, + "NameEnd": 867 }, "Scope": null, "OnCluster": null @@ -589,15 +589,15 @@ "Authentication": null, "Hosts": null, "DefaultRole": { - "DefaultPos": 893, - "DefaultEnd": 911, + "DefaultPos": 868, + "DefaultEnd": 886, "Roles": [ { "Name": { "Name": "role1", "QuoteType": 1, - "NamePos": 906, - "NameEnd": 911 + "NamePos": 881, + "NameEnd": 886 }, "Scope": null, "OnCluster": null @@ -611,8 +611,8 @@ "Settings": null }, { - "CreatePos": 914, - "StatementEnd": 958, + "CreatePos": 888, + "StatementEnd": 932, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -620,8 +620,8 @@ "Name": { "Name": "user20", "QuoteType": 1, - "NamePos": 926, - "NameEnd": 932 + "NamePos": 900, + "NameEnd": 906 }, "Scope": null, "OnCluster": null @@ -630,15 +630,15 @@ "Authentication": null, "Hosts": null, "DefaultRole": { - "DefaultPos": 933, - "DefaultEnd": 958, + "DefaultPos": 907, + "DefaultEnd": 932, "Roles": [ { "Name": { "Name": "role1", "QuoteType": 1, - "NamePos": 946, - "NameEnd": 951 + "NamePos": 920, + "NameEnd": 925 }, "Scope": null, "OnCluster": null @@ -647,8 +647,8 @@ "Name": { "Name": "role2", "QuoteType": 1, - "NamePos": 953, - "NameEnd": 958 + "NamePos": 927, + "NameEnd": 932 }, "Scope": null, "OnCluster": null @@ -662,8 +662,8 @@ "Settings": null }, { - "CreatePos": 961, - "StatementEnd": 998, + "CreatePos": 934, + "StatementEnd": 971, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -671,8 +671,8 @@ "Name": { "Name": "user21", "QuoteType": 1, - "NamePos": 973, - "NameEnd": 979 + "NamePos": 946, + "NameEnd": 952 }, "Scope": null, "OnCluster": null @@ -681,8 +681,8 @@ "Authentication": null, "Hosts": null, "DefaultRole": { - "DefaultPos": 980, - "DefaultEnd": 998, + "DefaultPos": 953, + "DefaultEnd": 971, "Roles": null, "None": true }, @@ -692,8 +692,8 @@ "Settings": null }, { - "CreatePos": 1040, - "StatementEnd": 1083, + "CreatePos": 1010, + "StatementEnd": 1053, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -701,8 +701,8 @@ "Name": { "Name": "user22", "QuoteType": 1, - "NamePos": 1052, - "NameEnd": 1058 + "NamePos": 1022, + "NameEnd": 1028 }, "Scope": null, "OnCluster": null @@ -714,16 +714,16 @@ "DefaultDatabase": { "Name": "test_db", "QuoteType": 1, - "NamePos": 1076, - "NameEnd": 1083 + "NamePos": 1046, + "NameEnd": 1053 }, "DefaultDbNone": false, "Grantees": null, "Settings": null }, { - "CreatePos": 1086, - "StatementEnd": 1127, + "CreatePos": 1055, + "StatementEnd": 1096, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -731,8 +731,8 @@ "Name": { "Name": "user23", "QuoteType": 1, - "NamePos": 1098, - "NameEnd": 1104 + "NamePos": 1067, + "NameEnd": 1073 }, "Scope": null, "OnCluster": null @@ -747,8 +747,8 @@ "Settings": null }, { - "CreatePos": 1161, - "StatementEnd": 1194, + "CreatePos": 1127, + "StatementEnd": 1160, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -756,8 +756,8 @@ "Name": { "Name": "user24", "QuoteType": 1, - "NamePos": 1173, - "NameEnd": 1179 + "NamePos": 1139, + "NameEnd": 1145 }, "Scope": null, "OnCluster": null @@ -769,15 +769,15 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1180, - "GranteesEnd": 1194, + "GranteesPos": 1146, + "GranteesEnd": 1160, "Grantees": [ { "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 1189, - "NameEnd": 1194 + "NamePos": 1155, + "NameEnd": 1160 }, "Scope": null, "OnCluster": null @@ -790,8 +790,8 @@ "Settings": null }, { - "CreatePos": 1197, - "StatementEnd": 1237, + "CreatePos": 1162, + "StatementEnd": 1202, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -799,8 +799,8 @@ "Name": { "Name": "user25", "QuoteType": 1, - "NamePos": 1209, - "NameEnd": 1215 + "NamePos": 1174, + "NameEnd": 1180 }, "Scope": null, "OnCluster": null @@ -812,15 +812,15 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1216, - "GranteesEnd": 1237, + "GranteesPos": 1181, + "GranteesEnd": 1202, "Grantees": [ { "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 1225, - "NameEnd": 1230 + "NamePos": 1190, + "NameEnd": 1195 }, "Scope": null, "OnCluster": null @@ -829,8 +829,8 @@ "Name": { "Name": "user2", "QuoteType": 1, - "NamePos": 1232, - "NameEnd": 1237 + "NamePos": 1197, + "NameEnd": 1202 }, "Scope": null, "OnCluster": null @@ -843,8 +843,8 @@ "Settings": null }, { - "CreatePos": 1240, - "StatementEnd": 1272, + "CreatePos": 1204, + "StatementEnd": 1236, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -852,8 +852,8 @@ "Name": { "Name": "user26", "QuoteType": 1, - "NamePos": 1252, - "NameEnd": 1258 + "NamePos": 1216, + "NameEnd": 1222 }, "Scope": null, "OnCluster": null @@ -865,8 +865,8 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1259, - "GranteesEnd": 1272, + "GranteesPos": 1223, + "GranteesEnd": 1236, "Grantees": null, "ExceptUsers": null, "Any": true, @@ -875,8 +875,8 @@ "Settings": null }, { - "CreatePos": 1274, - "StatementEnd": 1307, + "CreatePos": 1237, + "StatementEnd": 1270, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -884,8 +884,8 @@ "Name": { "Name": "user27", "QuoteType": 1, - "NamePos": 1286, - "NameEnd": 1292 + "NamePos": 1249, + "NameEnd": 1255 }, "Scope": null, "OnCluster": null @@ -897,8 +897,8 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1293, - "GranteesEnd": 1307, + "GranteesPos": 1256, + "GranteesEnd": 1270, "Grantees": null, "ExceptUsers": null, "Any": false, @@ -907,8 +907,8 @@ "Settings": null }, { - "CreatePos": 1309, - "StatementEnd": 1362, + "CreatePos": 1271, + "StatementEnd": 1324, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -916,8 +916,8 @@ "Name": { "Name": "user28", "QuoteType": 1, - "NamePos": 1321, - "NameEnd": 1327 + "NamePos": 1283, + "NameEnd": 1289 }, "Scope": null, "OnCluster": null @@ -929,15 +929,15 @@ "DefaultDatabase": null, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1328, - "GranteesEnd": 1362, + "GranteesPos": 1290, + "GranteesEnd": 1324, "Grantees": [ { "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 1337, - "NameEnd": 1342 + "NamePos": 1299, + "NameEnd": 1304 }, "Scope": null, "OnCluster": null @@ -946,8 +946,8 @@ "Name": { "Name": "user2", "QuoteType": 1, - "NamePos": 1344, - "NameEnd": 1349 + "NamePos": 1306, + "NameEnd": 1311 }, "Scope": null, "OnCluster": null @@ -958,8 +958,8 @@ "Name": { "Name": "user3", "QuoteType": 1, - "NamePos": 1357, - "NameEnd": 1362 + "NamePos": 1319, + "NameEnd": 1324 }, "Scope": null, "OnCluster": null @@ -971,8 +971,8 @@ "Settings": null }, { - "CreatePos": 1397, - "StatementEnd": 1449, + "CreatePos": 1356, + "StatementEnd": 1408, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -980,8 +980,8 @@ "Name": { "Name": "user29", "QuoteType": 1, - "NamePos": 1409, - "NameEnd": 1415 + "NamePos": 1368, + "NameEnd": 1374 }, "Scope": null, "OnCluster": null @@ -1000,13 +1000,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 1425, - "NameEnd": 1441 + "NamePos": 1384, + "NameEnd": 1400 }, "Operation": "=", "Value": { - "NumPos": 1442, - "NumEnd": 1449, + "NumPos": 1401, + "NumEnd": 1408, "Literal": "5000000", "Base": 10 } @@ -1017,8 +1017,8 @@ ] }, { - "CreatePos": 1452, - "StatementEnd": 1496, + "CreatePos": 1410, + "StatementEnd": 1454, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -1026,8 +1026,8 @@ "Name": { "Name": "user30", "QuoteType": 1, - "NamePos": 1464, - "NameEnd": 1470 + "NamePos": 1422, + "NameEnd": 1428 }, "Scope": null, "OnCluster": null @@ -1046,13 +1046,13 @@ "Name": { "Name": "PROFILE", "QuoteType": 1, - "NamePos": 1480, - "NameEnd": 1487 + "NamePos": 1438, + "NameEnd": 1445 }, "Operation": "", "Value": { - "LiteralPos": 1489, - "LiteralEnd": 1496, + "LiteralPos": 1447, + "LiteralEnd": 1454, "Literal": "default" } } @@ -1062,8 +1062,8 @@ ] }, { - "CreatePos": 1500, - "StatementEnd": 1564, + "CreatePos": 1457, + "StatementEnd": 1521, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -1071,8 +1071,8 @@ "Name": { "Name": "user31", "QuoteType": 1, - "NamePos": 1512, - "NameEnd": 1518 + "NamePos": 1469, + "NameEnd": 1475 }, "Scope": null, "OnCluster": null @@ -1091,13 +1091,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 1528, - "NameEnd": 1536 + "NamePos": 1485, + "NameEnd": 1493 }, "Operation": "=", "Value": { - "NumPos": 1537, - "NumEnd": 1538, + "NumPos": 1494, + "NumEnd": 1495, "Literal": "1", "Base": 10 } @@ -1111,13 +1111,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 1540, - "NameEnd": 1556 + "NamePos": 1497, + "NameEnd": 1513 }, "Operation": "=", "Value": { - "NumPos": 1557, - "NumEnd": 1564, + "NumPos": 1514, + "NumEnd": 1521, "Literal": "5000000", "Base": 10 } @@ -1128,8 +1128,8 @@ ] }, { - "CreatePos": 1615, - "StatementEnd": 1867, + "CreatePos": 1569, + "StatementEnd": 1815, "IfNotExists": false, "OrReplace": false, "UserNames": [ @@ -1137,21 +1137,21 @@ "Name": { "Name": "user32", "QuoteType": 1, - "NamePos": 1627, - "NameEnd": 1633 + "NamePos": 1581, + "NameEnd": 1587 }, "Scope": null, "OnCluster": null } ], "Authentication": { - "AuthPos": 1640, - "AuthEnd": 1687, + "AuthPos": 1593, + "AuthEnd": 1640, "NotIdentified": false, "AuthType": "plaintext_password", "AuthValue": { - "LiteralPos": 1679, - "LiteralEnd": 1687, + "LiteralPos": 1632, + "LiteralEnd": 1640, "Literal": "password" }, "LdapServer": null, @@ -1160,26 +1160,26 @@ }, "Hosts": [ { - "HostPos": 1694, - "HostEnd": 1714, + "HostPos": 1646, + "HostEnd": 1666, "HostType": "NAME", "HostValue": { - "LiteralPos": 1705, - "LiteralEnd": 1714, + "LiteralPos": 1657, + "LiteralEnd": 1666, "Literal": "localhost" } } ], "DefaultRole": { - "DefaultPos": 1721, - "DefaultEnd": 1746, + "DefaultPos": 1672, + "DefaultEnd": 1697, "Roles": [ { "Name": { "Name": "role1", "QuoteType": 1, - "NamePos": 1734, - "NameEnd": 1739 + "NamePos": 1685, + "NameEnd": 1690 }, "Scope": null, "OnCluster": null @@ -1188,8 +1188,8 @@ "Name": { "Name": "role2", "QuoteType": 1, - "NamePos": 1741, - "NameEnd": 1746 + "NamePos": 1692, + "NameEnd": 1697 }, "Scope": null, "OnCluster": null @@ -1200,20 +1200,20 @@ "DefaultDatabase": { "Name": "test_db", "QuoteType": 1, - "NamePos": 1769, - "NameEnd": 1776 + "NamePos": 1719, + "NameEnd": 1726 }, "DefaultDbNone": false, "Grantees": { - "GranteesPos": 1782, - "GranteesEnd": 1816, + "GranteesPos": 1731, + "GranteesEnd": 1765, "Grantees": [ { "Name": { "Name": "user1", "QuoteType": 1, - "NamePos": 1791, - "NameEnd": 1796 + "NamePos": 1740, + "NameEnd": 1745 }, "Scope": null, "OnCluster": null @@ -1222,8 +1222,8 @@ "Name": { "Name": "user2", "QuoteType": 1, - "NamePos": 1798, - "NameEnd": 1803 + "NamePos": 1747, + "NameEnd": 1752 }, "Scope": null, "OnCluster": null @@ -1234,8 +1234,8 @@ "Name": { "Name": "user3", "QuoteType": 1, - "NamePos": 1811, - "NameEnd": 1816 + "NamePos": 1760, + "NameEnd": 1765 }, "Scope": null, "OnCluster": null @@ -1251,13 +1251,13 @@ "Name": { "Name": "max_memory_usage", "QuoteType": 1, - "NamePos": 1831, - "NameEnd": 1847 + "NamePos": 1779, + "NameEnd": 1795 }, "Operation": "=", "Value": { - "NumPos": 1848, - "NumEnd": 1855, + "NumPos": 1796, + "NumEnd": 1803, "Literal": "5000000", "Base": 10 } @@ -1271,13 +1271,13 @@ "Name": { "Name": "readonly", "QuoteType": 1, - "NamePos": 1857, - "NameEnd": 1865 + "NamePos": 1805, + "NameEnd": 1813 }, "Operation": "=", "Value": { - "NumPos": 1866, - "NumEnd": 1867, + "NumPos": 1814, + "NumEnd": 1815, "Literal": "1", "Base": 10 } diff --git a/parser/testdata/ddl/output/create_view_basic.sql.golden.json b/parser/testdata/ddl/output/create_view_basic.sql.golden.json index 9e99d2e..c05c781 100644 --- a/parser/testdata/ddl/output/create_view_basic.sql.golden.json +++ b/parser/testdata/ddl/output/create_view_basic.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 110, + "StatementEnd": 104, "OrReplace": false, "Name": { "Database": null, @@ -86,8 +86,8 @@ "SubQuery": { "HasParen": false, "Select": { - "SelectPos": 65, - "StatementEnd": 110, + "SelectPos": 63, + "StatementEnd": 104, "With": null, "Top": null, "HasDistinct": false, @@ -97,8 +97,8 @@ "Expr": { "Name": "id", "QuoteType": 1, - "NamePos": 77, - "NameEnd": 79 + "NamePos": 74, + "NameEnd": 76 }, "Modifiers": [], "Alias": null @@ -107,32 +107,32 @@ "Expr": { "Name": "name", "QuoteType": 1, - "NamePos": 86, - "NameEnd": 90 + "NamePos": 82, + "NameEnd": 86 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 92, + "FromPos": 87, "Expr": { "Table": { - "TablePos": 102, - "TableEnd": 110, + "TablePos": 96, + "TableEnd": 104, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "my_table", "QuoteType": 1, - "NamePos": 102, - "NameEnd": 110 + "NamePos": 96, + "NameEnd": 104 } }, "HasFinal": false }, - "StatementEnd": 110, + "StatementEnd": 104, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/ddl/output/create_view_on_cluster_with_uuid.sql.golden.json b/parser/testdata/ddl/output/create_view_on_cluster_with_uuid.sql.golden.json index 44b5449..f5ec828 100644 --- a/parser/testdata/ddl/output/create_view_on_cluster_with_uuid.sql.golden.json +++ b/parser/testdata/ddl/output/create_view_on_cluster_with_uuid.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 207, + "StatementEnd": 199, "OrReplace": false, "Name": { "Database": { @@ -20,16 +20,16 @@ "IfNotExists": true, "UUID": { "Value": { - "LiteralPos": 62, - "LiteralEnd": 98, + "LiteralPos": 61, + "LiteralEnd": 97, "Literal": "3493e374-e2bb-481b-b493-e374e2bb981b" } }, "OnCluster": { - "OnPos": 109, + "OnPos": 107, "Expr": { - "LiteralPos": 121, - "LiteralEnd": 131, + "LiteralPos": 119, + "LiteralEnd": 129, "Literal": "my_cluster" } }, @@ -37,8 +37,8 @@ "SubQuery": { "HasParen": true, "Select": { - "SelectPos": 144, - "StatementEnd": 207, + "SelectPos": 140, + "StatementEnd": 199, "With": null, "Top": null, "HasDistinct": false, @@ -48,8 +48,8 @@ "Expr": { "Name": "column1", "QuoteType": 1, - "NamePos": 156, - "NameEnd": 163 + "NamePos": 151, + "NameEnd": 158 }, "Modifiers": [], "Alias": null @@ -58,32 +58,32 @@ "Expr": { "Name": "column2", "QuoteType": 1, - "NamePos": 170, - "NameEnd": 177 + "NamePos": 164, + "NameEnd": 171 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 183, + "FromPos": 176, "Expr": { "Table": { - "TablePos": 193, - "TableEnd": 207, + "TablePos": 185, + "TableEnd": 199, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "my_other_table", "QuoteType": 1, - "NamePos": 193, - "NameEnd": 207 + "NamePos": 185, + "NameEnd": 199 } }, "HasFinal": false }, - "StatementEnd": 207, + "StatementEnd": 199, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/ddl/output/drop_role.sql.golden.json b/parser/testdata/ddl/output/drop_role.sql.golden.json index 0e49caf..fb43780 100644 --- a/parser/testdata/ddl/output/drop_role.sql.golden.json +++ b/parser/testdata/ddl/output/drop_role.sql.golden.json @@ -100,16 +100,16 @@ "From": null }, { - "DropPos": 111, + "DropPos": 110, "Target": "ROLE", - "StatementEnd": 147, + "StatementEnd": 146, "Names": [ { "Name": { "Name": "r2_01293_renamed", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 147 + "NamePos": 130, + "NameEnd": 146 }, "Scope": null, "OnCluster": null @@ -120,28 +120,28 @@ "From": null }, { - "DropPos": 150, + "DropPos": 148, "Target": "ROLE", - "StatementEnd": 206, + "StatementEnd": 204, "Names": [ { "Name": { "Name": "r1_01293", "QuoteType": 1, - "NamePos": 170, - "NameEnd": 178 + "NamePos": 168, + "NameEnd": 176 }, "Scope": { - "LiteralPos": 180, - "LiteralEnd": 181, + "LiteralPos": 178, + "LiteralEnd": 179, "Literal": "%" }, "OnCluster": null }, { "Name": { - "LiteralPos": 185, - "LiteralEnd": 206, + "LiteralPos": 183, + "LiteralEnd": 204, "Literal": "r2_01293@%.myhost.com" }, "Scope": null, diff --git a/parser/testdata/ddl/output/grant_privilege.sql.golden.json b/parser/testdata/ddl/output/grant_privilege.sql.golden.json index 4a438c8..0a6a7d2 100644 --- a/parser/testdata/ddl/output/grant_privilege.sql.golden.json +++ b/parser/testdata/ddl/output/grant_privilege.sql.golden.json @@ -67,30 +67,30 @@ "WithOptions": [] }, { - "GrantPos": 40, - "StatementEnd": 114, + "GrantPos": 39, + "StatementEnd": 113, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 46, + "PrivilegePos": 45, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 52, - "RightParenPos": 56, + "LeftParenPos": 51, + "RightParenPos": 55, "Items": { - "ListPos": 53, - "ListEnd": 56, + "ListPos": 52, + "ListEnd": 55, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 53, - "NameEnd": 54 + "NamePos": 52, + "NameEnd": 53 }, "Alias": null }, @@ -98,8 +98,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 55, - "NameEnd": 56 + "NamePos": 54, + "NameEnd": 55 }, "Alias": null } @@ -113,22 +113,22 @@ "Database": { "Name": "db", "QuoteType": 1, - "NamePos": 61, - "NameEnd": 63 + "NamePos": 60, + "NameEnd": 62 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 64, - "NameEnd": 69 + "NamePos": 63, + "NameEnd": 68 } }, "To": [ { "Name": "john", "QuoteType": 1, - "NamePos": 73, - "NameEnd": 77 + "NamePos": 72, + "NameEnd": 76 } ], "WithOptions": [ @@ -137,30 +137,30 @@ ] }, { - "GrantPos": 116, - "StatementEnd": 149, + "GrantPos": 114, + "StatementEnd": 147, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 122, + "PrivilegePos": 120, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 128, - "RightParenPos": 132, + "LeftParenPos": 126, + "RightParenPos": 130, "Items": { - "ListPos": 129, - "ListEnd": 132, + "ListPos": 127, + "ListEnd": 130, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 130 + "NamePos": 127, + "NameEnd": 128 }, "Alias": null }, @@ -168,8 +168,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 132 + "NamePos": 129, + "NameEnd": 130 }, "Alias": null } @@ -183,51 +183,51 @@ "Database": { "Name": "db", "QuoteType": 1, - "NamePos": 137, - "NameEnd": 139 + "NamePos": 135, + "NameEnd": 137 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 140, - "NameEnd": 141 + "NamePos": 138, + "NameEnd": 139 } }, "To": [ { "Name": "john", "QuoteType": 1, - "NamePos": 145, - "NameEnd": 149 + "NamePos": 143, + "NameEnd": 147 } ], "WithOptions": [] }, { - "GrantPos": 152, - "StatementEnd": 188, + "GrantPos": 149, + "StatementEnd": 185, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 158, + "PrivilegePos": 155, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 164, - "RightParenPos": 168, + "LeftParenPos": 161, + "RightParenPos": 165, "Items": { - "ListPos": 165, - "ListEnd": 168, + "ListPos": 162, + "ListEnd": 165, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 166 + "NamePos": 162, + "NameEnd": 163 }, "Alias": null }, @@ -235,8 +235,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 167, - "NameEnd": 168 + "NamePos": 164, + "NameEnd": 165 }, "Alias": null } @@ -250,51 +250,51 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 173, - "NameEnd": 174 + "NamePos": 170, + "NameEnd": 171 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 175, - "NameEnd": 180 + "NamePos": 172, + "NameEnd": 177 } }, "To": [ { "Name": "john", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 188 + "NamePos": 181, + "NameEnd": 185 } ], "WithOptions": [] }, { - "GrantPos": 191, - "StatementEnd": 223, + "GrantPos": 187, + "StatementEnd": 219, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 197, + "PrivilegePos": 193, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 203, - "RightParenPos": 207, + "LeftParenPos": 199, + "RightParenPos": 203, "Items": { - "ListPos": 204, - "ListEnd": 207, + "ListPos": 200, + "ListEnd": 203, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 204, - "NameEnd": 205 + "NamePos": 200, + "NameEnd": 201 }, "Alias": null }, @@ -302,8 +302,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 206, - "NameEnd": 207 + "NamePos": 202, + "NameEnd": 203 }, "Alias": null } @@ -317,51 +317,51 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 212, - "NameEnd": 213 + "NamePos": 208, + "NameEnd": 209 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 214, - "NameEnd": 215 + "NamePos": 210, + "NameEnd": 211 } }, "To": [ { "Name": "john", "QuoteType": 1, - "NamePos": 219, - "NameEnd": 223 + "NamePos": 215, + "NameEnd": 219 } ], "WithOptions": [] }, { - "GrantPos": 226, - "StatementEnd": 270, + "GrantPos": 221, + "StatementEnd": 265, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 232, + "PrivilegePos": 227, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 238, - "RightParenPos": 242, + "LeftParenPos": 233, + "RightParenPos": 237, "Items": { - "ListPos": 239, - "ListEnd": 242, + "ListPos": 234, + "ListEnd": 237, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 239, - "NameEnd": 240 + "NamePos": 234, + "NameEnd": 235 }, "Alias": null }, @@ -369,8 +369,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 241, - "NameEnd": 242 + "NamePos": 236, + "NameEnd": 237 }, "Alias": null } @@ -384,51 +384,51 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 247, - "NameEnd": 248 + "NamePos": 242, + "NameEnd": 243 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 249, - "NameEnd": 254 + "NamePos": 244, + "NameEnd": 249 } }, "To": [ { "Name": "CURRENT_USER", "QuoteType": 1, - "NamePos": 258, - "NameEnd": 270 + "NamePos": 253, + "NameEnd": 265 } ], "WithOptions": [] }, { - "GrantPos": 273, - "StatementEnd": 327, + "GrantPos": 267, + "StatementEnd": 321, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 279, + "PrivilegePos": 273, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 285, - "RightParenPos": 289, + "LeftParenPos": 279, + "RightParenPos": 283, "Items": { - "ListPos": 286, - "ListEnd": 289, + "ListPos": 280, + "ListEnd": 283, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 286, - "NameEnd": 287 + "NamePos": 280, + "NameEnd": 281 }, "Alias": null }, @@ -436,8 +436,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 288, - "NameEnd": 289 + "NamePos": 282, + "NameEnd": 283 }, "Alias": null } @@ -451,45 +451,45 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 294, - "NameEnd": 295 + "NamePos": 288, + "NameEnd": 289 }, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 296, - "NameEnd": 301 + "NamePos": 290, + "NameEnd": 295 } }, "To": [ { "Name": "CURRENT_USER", "QuoteType": 1, - "NamePos": 305, - "NameEnd": 317 + "NamePos": 299, + "NameEnd": 311 }, { "Name": "john", "QuoteType": 1, - "NamePos": 318, - "NameEnd": 322 + "NamePos": 312, + "NameEnd": 316 }, { "Name": "mary", "QuoteType": 1, - "NamePos": 323, - "NameEnd": 327 + "NamePos": 317, + "NameEnd": 321 } ], "WithOptions": [] }, { - "GrantPos": 330, - "StatementEnd": 379, + "GrantPos": 323, + "StatementEnd": 372, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 336, + "PrivilegePos": 329, "PrivilegeEnd": 0, "Keywords": [ "ALL" @@ -501,22 +501,22 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 343, - "NameEnd": 344 + "NamePos": 336, + "NameEnd": 337 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 345, - "NameEnd": 346 + "NamePos": 338, + "NameEnd": 339 } }, "To": [ { "Name": "admin_role", "QuoteType": 1, - "NamePos": 350, - "NameEnd": 360 + "NamePos": 343, + "NameEnd": 353 } ], "WithOptions": [ @@ -524,12 +524,12 @@ ] }, { - "GrantPos": 381, - "StatementEnd": 443, + "GrantPos": 373, + "StatementEnd": 435, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 387, + "PrivilegePos": 379, "PrivilegeEnd": 0, "Keywords": [ "SELECT" @@ -537,7 +537,7 @@ "Params": null }, { - "PrivilegePos": 394, + "PrivilegePos": 386, "PrivilegeEnd": 0, "Keywords": [ "INSERT" @@ -549,51 +549,51 @@ "Database": { "Name": "database", "QuoteType": 1, - "NamePos": 404, - "NameEnd": 412 + "NamePos": 396, + "NameEnd": 404 }, "Table": { "Name": "table_1", "QuoteType": 1, - "NamePos": 413, - "NameEnd": 420 + "NamePos": 405, + "NameEnd": 412 } }, "To": [ { "Name": "table_1_select_role", "QuoteType": 1, - "NamePos": 424, - "NameEnd": 443 + "NamePos": 416, + "NameEnd": 435 } ], "WithOptions": [] }, { - "GrantPos": 446, - "StatementEnd": 517, + "GrantPos": 437, + "StatementEnd": 508, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 452, + "PrivilegePos": 443, "PrivilegeEnd": 0, "Keywords": [ "SELECT" ], "Params": { - "LeftParenPos": 458, - "RightParenPos": 466, + "LeftParenPos": 449, + "RightParenPos": 457, "Items": { - "ListPos": 459, - "ListEnd": 466, + "ListPos": 450, + "ListEnd": 457, "HasDistinct": false, "Items": [ { "Expr": { "Name": "x", "QuoteType": 1, - "NamePos": 459, - "NameEnd": 460 + "NamePos": 450, + "NameEnd": 451 }, "Alias": null }, @@ -601,8 +601,8 @@ "Expr": { "Name": "y", "QuoteType": 1, - "NamePos": 462, - "NameEnd": 463 + "NamePos": 453, + "NameEnd": 454 }, "Alias": null }, @@ -610,8 +610,8 @@ "Expr": { "Name": "z", "QuoteType": 1, - "NamePos": 465, - "NameEnd": 466 + "NamePos": 456, + "NameEnd": 457 }, "Alias": null } @@ -621,7 +621,7 @@ } }, { - "PrivilegePos": 468, + "PrivilegePos": 459, "PrivilegeEnd": 0, "Keywords": [ "INSERT" @@ -633,33 +633,33 @@ "Database": { "Name": "database", "QuoteType": 1, - "NamePos": 478, - "NameEnd": 486 + "NamePos": 469, + "NameEnd": 477 }, "Table": { "Name": "table_1", "QuoteType": 1, - "NamePos": 487, - "NameEnd": 494 + "NamePos": 478, + "NameEnd": 485 } }, "To": [ { "Name": "table_1_select_role", "QuoteType": 1, - "NamePos": 498, - "NameEnd": 517 + "NamePos": 489, + "NameEnd": 508 } ], "WithOptions": [] }, { - "GrantPos": 520, - "StatementEnd": 568, + "GrantPos": 510, + "StatementEnd": 558, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 526, + "PrivilegePos": 516, "PrivilegeEnd": 0, "Keywords": [ "SELECT" @@ -667,7 +667,7 @@ "Params": null }, { - "PrivilegePos": 534, + "PrivilegePos": 524, "PrivilegeEnd": 0, "Keywords": [ "dictGet" @@ -679,33 +679,33 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 545, - "NameEnd": 546 + "NamePos": 535, + "NameEnd": 536 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 547, - "NameEnd": 548 + "NamePos": 537, + "NameEnd": 538 } }, "To": [ { "Name": "select_all_role", "QuoteType": 1, - "NamePos": 553, - "NameEnd": 568 + "NamePos": 543, + "NameEnd": 558 } ], "WithOptions": [] }, { - "GrantPos": 571, - "StatementEnd": 616, + "GrantPos": 560, + "StatementEnd": 605, "OnCluster": null, "Privileges": [ { - "PrivilegePos": 577, + "PrivilegePos": 566, "PrivilegeEnd": 0, "Keywords": [ "ADMIN", @@ -718,22 +718,22 @@ "Database": { "Name": "*", "QuoteType": 0, - "NamePos": 593, - "NameEnd": 594 + "NamePos": 582, + "NameEnd": 583 }, "Table": { "Name": "*", "QuoteType": 0, - "NamePos": 595, - "NameEnd": 596 + "NamePos": 584, + "NameEnd": 585 } }, "To": [ { "Name": "select_all_role", "QuoteType": 1, - "NamePos": 601, - "NameEnd": 616 + "NamePos": 590, + "NameEnd": 605 } ], "WithOptions": [] diff --git a/parser/testdata/ddl/output/optimize.sql.golden.json b/parser/testdata/ddl/output/optimize.sql.golden.json index e3d1aae..31a555b 100644 --- a/parser/testdata/ddl/output/optimize.sql.golden.json +++ b/parser/testdata/ddl/output/optimize.sql.golden.json @@ -21,33 +21,33 @@ } }, { - "OptimizePos": 50, - "StatementEnd": 86, + "OptimizePos": 49, + "StatementEnd": 85, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 65, - "NameEnd": 70 + "NamePos": 64, + "NameEnd": 69 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 71, + "DeduplicatePos": 70, "By": { - "ListPos": 86, - "ListEnd": 86, + "ListPos": 85, + "ListEnd": 85, "HasDistinct": false, "Items": [ { "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 86, - "NameEnd": 86 + "NamePos": 85, + "NameEnd": 85 }, "Alias": null } @@ -57,33 +57,33 @@ } }, { - "OptimizePos": 133, - "StatementEnd": 183, + "OptimizePos": 131, + "StatementEnd": 181, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 148, - "NameEnd": 153 + "NamePos": 146, + "NameEnd": 151 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 154, + "DeduplicatePos": 152, "By": { - "ListPos": 169, - "ListEnd": 183, + "ListPos": 167, + "ListEnd": 181, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 169, - "NameEnd": 173 + "NamePos": 167, + "NameEnd": 171 }, "Alias": null }, @@ -91,8 +91,8 @@ "Expr": { "Name": "colY", "QuoteType": 1, - "NamePos": 174, - "NameEnd": 178 + "NamePos": 172, + "NameEnd": 176 }, "Alias": null }, @@ -100,8 +100,8 @@ "Expr": { "Name": "colZ", "QuoteType": 1, - "NamePos": 179, - "NameEnd": 183 + "NamePos": 177, + "NameEnd": 181 }, "Alias": null } @@ -111,49 +111,49 @@ } }, { - "OptimizePos": 186, - "StatementEnd": 222, + "OptimizePos": 183, + "StatementEnd": 219, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 201, - "NameEnd": 206 + "NamePos": 198, + "NameEnd": 203 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 207, + "DeduplicatePos": 204, "By": { - "ListPos": 222, - "ListEnd": 222, + "ListPos": 219, + "ListEnd": 219, "HasDistinct": false, "Items": [ { "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 222, - "NameEnd": 222 + "NamePos": 219, + "NameEnd": 219 }, "Alias": null } ] }, "Except": { - "ListPos": 231, - "ListEnd": 235, + "ListPos": 228, + "ListEnd": 232, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 231, - "NameEnd": 235 + "NamePos": 228, + "NameEnd": 232 }, "Alias": null } @@ -162,58 +162,58 @@ } }, { - "OptimizePos": 238, - "StatementEnd": 274, + "OptimizePos": 234, + "StatementEnd": 270, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 253, - "NameEnd": 258 + "NamePos": 249, + "NameEnd": 254 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 259, + "DeduplicatePos": 255, "By": { - "ListPos": 274, - "ListEnd": 274, + "ListPos": 270, + "ListEnd": 270, "HasDistinct": false, "Items": [ { "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 274, - "NameEnd": 274 + "NamePos": 270, + "NameEnd": 270 }, "Alias": null } ] }, "Except": { - "ListPos": 283, - "ListEnd": 294, + "ListPos": 279, + "ListEnd": 290, "HasDistinct": false, "Items": [ { "Expr": { - "LeftParenPos": 283, - "RightParenPos": 294, + "LeftParenPos": 279, + "RightParenPos": 290, "Items": { - "ListPos": 284, - "ListEnd": 294, + "ListPos": 280, + "ListEnd": 290, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 284, - "NameEnd": 288 + "NamePos": 280, + "NameEnd": 284 }, "Alias": null }, @@ -221,8 +221,8 @@ "Expr": { "Name": "colY", "QuoteType": 1, - "NamePos": 290, - "NameEnd": 294 + "NamePos": 286, + "NameEnd": 290 }, "Alias": null } @@ -237,25 +237,25 @@ } }, { - "OptimizePos": 298, - "StatementEnd": 367, + "OptimizePos": 293, + "StatementEnd": 362, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 313, - "NameEnd": 318 + "NamePos": 308, + "NameEnd": 313 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 319, + "DeduplicatePos": 314, "By": { - "ListPos": 334, - "ListEnd": 367, + "ListPos": 329, + "ListEnd": 362, "HasDistinct": false, "Items": [ { @@ -263,21 +263,21 @@ "Name": { "Name": "COLUMNS", "QuoteType": 1, - "NamePos": 334, - "NameEnd": 341 + "NamePos": 329, + "NameEnd": 336 }, "Params": { - "LeftParenPos": 341, - "RightParenPos": 367, + "LeftParenPos": 336, + "RightParenPos": 362, "Items": { - "ListPos": 343, - "ListEnd": 366, + "ListPos": 338, + "ListEnd": 361, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 343, - "LiteralEnd": 366, + "LiteralPos": 338, + "LiteralEnd": 361, "Literal": "column-matched-by-regex" }, "Alias": null @@ -295,25 +295,25 @@ } }, { - "OptimizePos": 371, - "StatementEnd": 440, + "OptimizePos": 365, + "StatementEnd": 434, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 386, - "NameEnd": 391 + "NamePos": 380, + "NameEnd": 385 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 392, + "DeduplicatePos": 386, "By": { - "ListPos": 407, - "ListEnd": 440, + "ListPos": 401, + "ListEnd": 434, "HasDistinct": false, "Items": [ { @@ -321,21 +321,21 @@ "Name": { "Name": "COLUMNS", "QuoteType": 1, - "NamePos": 407, - "NameEnd": 414 + "NamePos": 401, + "NameEnd": 408 }, "Params": { - "LeftParenPos": 414, - "RightParenPos": 440, + "LeftParenPos": 408, + "RightParenPos": 434, "Items": { - "ListPos": 416, - "ListEnd": 439, + "ListPos": 410, + "ListEnd": 433, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 416, - "LiteralEnd": 439, + "LiteralPos": 410, + "LiteralEnd": 433, "Literal": "column-matched-by-regex" }, "Alias": null @@ -350,16 +350,16 @@ ] }, "Except": { - "ListPos": 449, - "ListEnd": 453, + "ListPos": 443, + "ListEnd": 447, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 449, - "NameEnd": 453 + "NamePos": 443, + "NameEnd": 447 }, "Alias": null } @@ -368,25 +368,25 @@ } }, { - "OptimizePos": 456, - "StatementEnd": 525, + "OptimizePos": 449, + "StatementEnd": 518, "Table": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 471, - "NameEnd": 476 + "NamePos": 464, + "NameEnd": 469 } }, "OnCluster": null, "Partition": null, "HasFinal": false, "Deduplicate": { - "DeduplicatePos": 477, + "DeduplicatePos": 470, "By": { - "ListPos": 492, - "ListEnd": 525, + "ListPos": 485, + "ListEnd": 518, "HasDistinct": false, "Items": [ { @@ -394,21 +394,21 @@ "Name": { "Name": "COLUMNS", "QuoteType": 1, - "NamePos": 492, - "NameEnd": 499 + "NamePos": 485, + "NameEnd": 492 }, "Params": { - "LeftParenPos": 499, - "RightParenPos": 525, + "LeftParenPos": 492, + "RightParenPos": 518, "Items": { - "ListPos": 501, - "ListEnd": 524, + "ListPos": 494, + "ListEnd": 517, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 501, - "LiteralEnd": 524, + "LiteralPos": 494, + "LiteralEnd": 517, "Literal": "column-matched-by-regex" }, "Alias": null @@ -423,25 +423,25 @@ ] }, "Except": { - "ListPos": 534, - "ListEnd": 545, + "ListPos": 527, + "ListEnd": 538, "HasDistinct": false, "Items": [ { "Expr": { - "LeftParenPos": 534, - "RightParenPos": 545, + "LeftParenPos": 527, + "RightParenPos": 538, "Items": { - "ListPos": 535, - "ListEnd": 545, + "ListPos": 528, + "ListEnd": 538, "HasDistinct": false, "Items": [ { "Expr": { "Name": "colX", "QuoteType": 1, - "NamePos": 535, - "NameEnd": 539 + "NamePos": 528, + "NameEnd": 532 }, "Alias": null }, @@ -449,8 +449,8 @@ "Expr": { "Name": "colY", "QuoteType": 1, - "NamePos": 541, - "NameEnd": 545 + "NamePos": 534, + "NameEnd": 538 }, "Alias": null } diff --git a/parser/testdata/ddl/output/rename.sql.golden.json b/parser/testdata/ddl/output/rename.sql.golden.json index 00e2899..dfef0e7 100644 --- a/parser/testdata/ddl/output/rename.sql.golden.json +++ b/parser/testdata/ddl/output/rename.sql.golden.json @@ -1,7 +1,7 @@ [ { - "RenamePos": 17, - "StatementEnd": 39, + "RenamePos": 16, + "StatementEnd": 38, "RenameTarget": "TABLE", "TargetPairList": [ { @@ -10,8 +10,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 30, - "NameEnd": 32 + "NamePos": 29, + "NameEnd": 31 } }, "New": { @@ -19,8 +19,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 39 + "NamePos": 35, + "NameEnd": 38 } } } @@ -28,8 +28,8 @@ "OnCluster": null }, { - "RenamePos": 42, - "StatementEnd": 92, + "RenamePos": 40, + "StatementEnd": 90, "RenameTarget": "TABLE", "TargetPairList": [ { @@ -38,8 +38,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 55, - "NameEnd": 57 + "NamePos": 53, + "NameEnd": 55 } }, "New": { @@ -47,24 +47,24 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 61, - "NameEnd": 64 + "NamePos": 59, + "NameEnd": 62 } } } ], "OnCluster": { - "OnPos": 65, + "OnPos": 63, "Expr": { - "LiteralPos": 77, - "LiteralEnd": 92, + "LiteralPos": 75, + "LiteralEnd": 90, "Literal": "default_cluster" } } }, { - "RenamePos": 96, - "StatementEnd": 129, + "RenamePos": 93, + "StatementEnd": 126, "RenameTarget": "TABLE", "TargetPairList": [ { @@ -73,8 +73,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 109, - "NameEnd": 111 + "NamePos": 106, + "NameEnd": 108 } }, "New": { @@ -82,8 +82,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 115, - "NameEnd": 118 + "NamePos": 112, + "NameEnd": 115 } } }, @@ -93,8 +93,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 120, - "NameEnd": 122 + "NamePos": 117, + "NameEnd": 119 } }, "New": { @@ -102,8 +102,8 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 126, - "NameEnd": 129 + "NamePos": 123, + "NameEnd": 126 } } } @@ -111,8 +111,8 @@ "OnCluster": null }, { - "RenamePos": 132, - "StatementEnd": 193, + "RenamePos": 128, + "StatementEnd": 189, "RenameTarget": "TABLE", "TargetPairList": [ { @@ -121,8 +121,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 145, - "NameEnd": 147 + "NamePos": 141, + "NameEnd": 143 } }, "New": { @@ -130,8 +130,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 151, - "NameEnd": 154 + "NamePos": 147, + "NameEnd": 150 } } }, @@ -141,8 +141,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 156, - "NameEnd": 158 + "NamePos": 152, + "NameEnd": 154 } }, "New": { @@ -150,24 +150,24 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 162, - "NameEnd": 165 + "NamePos": 158, + "NameEnd": 161 } } } ], "OnCluster": { - "OnPos": 166, + "OnPos": 162, "Expr": { - "LiteralPos": 178, - "LiteralEnd": 193, + "LiteralPos": 174, + "LiteralEnd": 189, "Literal": "default_cluster" } } }, { - "RenamePos": 222, - "StatementEnd": 249, + "RenamePos": 216, + "StatementEnd": 243, "RenameTarget": "DICTIONARY", "TargetPairList": [ { @@ -176,8 +176,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 240, - "NameEnd": 242 + "NamePos": 234, + "NameEnd": 236 } }, "New": { @@ -185,8 +185,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 246, - "NameEnd": 249 + "NamePos": 240, + "NameEnd": 243 } } } @@ -194,8 +194,8 @@ "OnCluster": null }, { - "RenamePos": 252, - "StatementEnd": 307, + "RenamePos": 245, + "StatementEnd": 300, "RenameTarget": "DICTIONARY", "TargetPairList": [ { @@ -204,8 +204,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 270, - "NameEnd": 272 + "NamePos": 263, + "NameEnd": 265 } }, "New": { @@ -213,24 +213,24 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 276, - "NameEnd": 279 + "NamePos": 269, + "NameEnd": 272 } } } ], "OnCluster": { - "OnPos": 280, + "OnPos": 273, "Expr": { - "LiteralPos": 292, - "LiteralEnd": 307, + "LiteralPos": 285, + "LiteralEnd": 300, "Literal": "default_cluster" } } }, { - "RenamePos": 311, - "StatementEnd": 349, + "RenamePos": 303, + "StatementEnd": 341, "RenameTarget": "DICTIONARY", "TargetPairList": [ { @@ -239,8 +239,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 329, - "NameEnd": 331 + "NamePos": 321, + "NameEnd": 323 } }, "New": { @@ -248,8 +248,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 335, - "NameEnd": 338 + "NamePos": 327, + "NameEnd": 330 } } }, @@ -259,8 +259,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 340, - "NameEnd": 342 + "NamePos": 332, + "NameEnd": 334 } }, "New": { @@ -268,8 +268,8 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 346, - "NameEnd": 349 + "NamePos": 338, + "NameEnd": 341 } } } @@ -277,8 +277,8 @@ "OnCluster": null }, { - "RenamePos": 352, - "StatementEnd": 418, + "RenamePos": 343, + "StatementEnd": 409, "RenameTarget": "DICTIONARY", "TargetPairList": [ { @@ -287,8 +287,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 370, - "NameEnd": 372 + "NamePos": 361, + "NameEnd": 363 } }, "New": { @@ -296,8 +296,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 376, - "NameEnd": 379 + "NamePos": 367, + "NameEnd": 370 } } }, @@ -307,8 +307,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 381, - "NameEnd": 383 + "NamePos": 372, + "NameEnd": 374 } }, "New": { @@ -316,24 +316,24 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 387, - "NameEnd": 390 + "NamePos": 378, + "NameEnd": 381 } } } ], "OnCluster": { - "OnPos": 391, + "OnPos": 382, "Expr": { - "LiteralPos": 403, - "LiteralEnd": 418, + "LiteralPos": 394, + "LiteralEnd": 409, "Literal": "default_cluster" } } }, { - "RenamePos": 442, - "StatementEnd": 467, + "RenamePos": 431, + "StatementEnd": 456, "RenameTarget": "DATABASE", "TargetPairList": [ { @@ -342,8 +342,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 458, - "NameEnd": 460 + "NamePos": 447, + "NameEnd": 449 } }, "New": { @@ -351,8 +351,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 464, - "NameEnd": 467 + "NamePos": 453, + "NameEnd": 456 } } } @@ -360,8 +360,8 @@ "OnCluster": null }, { - "RenamePos": 470, - "StatementEnd": 523, + "RenamePos": 458, + "StatementEnd": 511, "RenameTarget": "DATABASE", "TargetPairList": [ { @@ -370,8 +370,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 486, - "NameEnd": 488 + "NamePos": 474, + "NameEnd": 476 } }, "New": { @@ -379,24 +379,24 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 492, - "NameEnd": 495 + "NamePos": 480, + "NameEnd": 483 } } } ], "OnCluster": { - "OnPos": 496, + "OnPos": 484, "Expr": { - "LiteralPos": 508, - "LiteralEnd": 523, + "LiteralPos": 496, + "LiteralEnd": 511, "Literal": "default_cluster" } } }, { - "RenamePos": 527, - "StatementEnd": 563, + "RenamePos": 514, + "StatementEnd": 550, "RenameTarget": "DATABASE", "TargetPairList": [ { @@ -405,8 +405,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 543, - "NameEnd": 545 + "NamePos": 530, + "NameEnd": 532 } }, "New": { @@ -414,8 +414,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 549, - "NameEnd": 552 + "NamePos": 536, + "NameEnd": 539 } } }, @@ -425,8 +425,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 554, - "NameEnd": 556 + "NamePos": 541, + "NameEnd": 543 } }, "New": { @@ -434,8 +434,8 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 560, - "NameEnd": 563 + "NamePos": 547, + "NameEnd": 550 } } } @@ -443,8 +443,8 @@ "OnCluster": null }, { - "RenamePos": 566, - "StatementEnd": 630, + "RenamePos": 552, + "StatementEnd": 616, "RenameTarget": "DATABASE", "TargetPairList": [ { @@ -453,8 +453,8 @@ "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 582, - "NameEnd": 584 + "NamePos": 568, + "NameEnd": 570 } }, "New": { @@ -462,8 +462,8 @@ "Table": { "Name": "t11", "QuoteType": 1, - "NamePos": 588, - "NameEnd": 591 + "NamePos": 574, + "NameEnd": 577 } } }, @@ -473,8 +473,8 @@ "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 593, - "NameEnd": 595 + "NamePos": 579, + "NameEnd": 581 } }, "New": { @@ -482,17 +482,17 @@ "Table": { "Name": "t22", "QuoteType": 1, - "NamePos": 599, - "NameEnd": 602 + "NamePos": 585, + "NameEnd": 588 } } } ], "OnCluster": { - "OnPos": 603, + "OnPos": 589, "Expr": { - "LiteralPos": 615, - "LiteralEnd": 630, + "LiteralPos": 601, + "LiteralEnd": 616, "Literal": "default_cluster" } } diff --git a/parser/testdata/ddl/output/systems.sql.golden.json b/parser/testdata/ddl/output/systems.sql.golden.json index 5c1e6e4..6b87597 100644 --- a/parser/testdata/ddl/output/systems.sql.golden.json +++ b/parser/testdata/ddl/output/systems.sql.golden.json @@ -9,18 +9,18 @@ } }, { - "SystemPos": 20, + "SystemPos": 19, "Expr": { - "DropPos": 27, - "StatementEnd": 50, + "DropPos": 26, + "StatementEnd": 49, "Type": "UNCOMPRESSED CACHE" } }, { - "SystemPos": 53, + "SystemPos": 51, "Expr": { - "DropPos": 60, - "StatementEnd": 81, + "DropPos": 58, + "StatementEnd": 79, "Type": "FILESYSTEM CACHE" } } diff --git a/parser/testdata/dml/output/alter_table_with_comment.sql.golden.json b/parser/testdata/dml/output/alter_table_with_comment.sql.golden.json index 8270fc5..b92a2e3 100644 --- a/parser/testdata/dml/output/alter_table_with_comment.sql.golden.json +++ b/parser/testdata/dml/output/alter_table_with_comment.sql.golden.json @@ -77,43 +77,43 @@ ] }, { - "AlterPos": 111, - "StatementEnd": 203, + "AlterPos": 110, + "StatementEnd": 202, "TableIdentifier": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 123, - "NameEnd": 127 + "NamePos": 122, + "NameEnd": 126 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 128, - "NameEnd": 140 + "NamePos": 127, + "NameEnd": 139 } }, "OnCluster": { - "OnPos": 141, + "OnPos": 140, "Expr": { - "LiteralPos": 153, - "LiteralEnd": 168, + "LiteralPos": 152, + "LiteralEnd": 167, "Literal": "default_cluster" } }, "AlterExprs": [ { - "AddPos": 170, - "StatementEnd": 203, + "AddPos": 169, + "StatementEnd": 202, "Column": { - "NamePos": 181, - "ColumnEnd": 203, + "NamePos": 180, + "ColumnEnd": 202, "Name": { "Ident": { "Name": "hello", "QuoteType": 1, - "NamePos": 181, - "NameEnd": 186 + "NamePos": 180, + "NameEnd": 185 }, "DotIdent": null }, @@ -121,15 +121,15 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 187, - "NameEnd": 193 + "NamePos": 186, + "NameEnd": 192 } }, "NotNull": null, "Nullable": null, "DefaultExpr": { - "LiteralPos": 203, - "LiteralEnd": 203, + "LiteralPos": 202, + "LiteralEnd": 202, "Literal": "" }, "MaterializedExpr": null, diff --git a/parser/testdata/dml/output/create_column_with_ttl.sql.golden.json b/parser/testdata/dml/output/create_column_with_ttl.sql.golden.json index 9af9e48..bbd67d5 100644 --- a/parser/testdata/dml/output/create_column_with_ttl.sql.golden.json +++ b/parser/testdata/dml/output/create_column_with_ttl.sql.golden.json @@ -1,7 +1,7 @@ [ { "CreatePos": 0, - "StatementEnd": 182, + "StatementEnd": 176, "OrReplace": false, "Name": { "Database": null, @@ -17,17 +17,17 @@ "OnCluster": null, "TableSchema": { "SchemaPos": 22, - "SchemaEnd": 144, + "SchemaEnd": 140, "Columns": [ { - "NamePos": 29, - "ColumnEnd": 47, + "NamePos": 28, + "ColumnEnd": 46, "Name": { "Ident": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 29, - "NameEnd": 38 + "NamePos": 28, + "NameEnd": 37 }, "DotIdent": null }, @@ -35,8 +35,8 @@ "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 39, - "NameEnd": 47 + "NamePos": 38, + "NameEnd": 46 } }, "NotNull": null, @@ -50,14 +50,14 @@ "CompressionCodec": null }, { - "NamePos": 54, - "ColumnEnd": 95, + "NamePos": 52, + "ColumnEnd": 93, "Name": { "Ident": { "Name": "x", "QuoteType": 1, - "NamePos": 54, - "NameEnd": 55 + "NamePos": 52, + "NameEnd": 53 }, "DotIdent": null }, @@ -65,8 +65,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 56, - "NameEnd": 62 + "NamePos": 54, + "NameEnd": 60 } }, "NotNull": null, @@ -76,32 +76,32 @@ "AliasExpr": null, "Codec": null, "TTL": { - "TTLPos": 63, - "ListEnd": 95, + "TTLPos": 61, + "ListEnd": 93, "Items": [ { - "TTLPos": 63, + "TTLPos": 61, "Expr": { "LeftExpr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 67, - "NameEnd": 76 + "NamePos": 65, + "NameEnd": 74 }, "Operation": "+", "RightExpr": { - "IntervalPos": 79, + "IntervalPos": 77, "Expr": { - "NumPos": 88, - "NumEnd": 89, + "NumPos": 86, + "NumEnd": 87, "Literal": "1", "Base": 10 }, "Unit": { "Name": "MONTH", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 95 + "NamePos": 88, + "NameEnd": 93 } }, "HasGlobal": false, @@ -115,14 +115,14 @@ "CompressionCodec": null }, { - "NamePos": 102, - "ColumnEnd": 142, + "NamePos": 99, + "ColumnEnd": 139, "Name": { "Ident": { "Name": "y", "QuoteType": 1, - "NamePos": 102, - "NameEnd": 103 + "NamePos": 99, + "NameEnd": 100 }, "DotIdent": null }, @@ -130,8 +130,8 @@ "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 104, - "NameEnd": 110 + "NamePos": 101, + "NameEnd": 107 } }, "NotNull": null, @@ -141,32 +141,32 @@ "AliasExpr": null, "Codec": null, "TTL": { - "TTLPos": 111, - "ListEnd": 142, + "TTLPos": 108, + "ListEnd": 139, "Items": [ { - "TTLPos": 111, + "TTLPos": 108, "Expr": { "LeftExpr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 115, - "NameEnd": 124 + "NamePos": 112, + "NameEnd": 121 }, "Operation": "+", "RightExpr": { - "IntervalPos": 127, + "IntervalPos": 124, "Expr": { - "NumPos": 136, - "NumEnd": 137, + "NumPos": 133, + "NumEnd": 134, "Literal": "1", "Base": 10 }, "Unit": { "Name": "WEEK", "QuoteType": 1, - "NamePos": 138, - "NameEnd": 142 + "NamePos": 135, + "NameEnd": 139 } }, "HasGlobal": false, @@ -184,8 +184,8 @@ "TableFunction": null }, "Engine": { - "EnginePos": 147, - "EngineEnd": 182, + "EnginePos": 142, + "EngineEnd": 176, "Name": "MergeTree", "Params": null, "PrimaryKey": null, @@ -194,24 +194,24 @@ "TTL": null, "Settings": null, "OrderBy": { - "OrderPos": 167, - "ListEnd": 182, + "OrderPos": 161, + "ListEnd": 176, "Items": [ { - "OrderPos": 167, + "OrderPos": 161, "Expr": { "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 176, - "NameEnd": 181 + "NamePos": 170, + "NameEnd": 175 }, "Params": { - "LeftParenPos": 181, - "RightParenPos": 182, + "LeftParenPos": 175, + "RightParenPos": 176, "Items": { - "ListPos": 182, - "ListEnd": 182, + "ListPos": 176, + "ListEnd": 176, "HasDistinct": false, "Items": [] }, diff --git a/parser/testdata/dml/output/insert_values.sql.golden.json b/parser/testdata/dml/output/insert_values.sql.golden.json index 42d3acd..3222fc3 100644 --- a/parser/testdata/dml/output/insert_values.sql.golden.json +++ b/parser/testdata/dml/output/insert_values.sql.golden.json @@ -61,33 +61,33 @@ }, "Values": [ { - "LeftParenPos": 88, - "RightParenPos": 169, + "LeftParenPos": 87, + "RightParenPos": 168, "Values": [ { - "NumPos": 89, - "NumEnd": 92, + "NumPos": 88, + "NumEnd": 91, "Literal": "101", "Base": 10 }, { - "LiteralPos": 95, - "LiteralEnd": 113, + "LiteralPos": 94, + "LiteralEnd": 112, "Literal": "Hello, ClickHouse!" }, { "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 148, - "NameEnd": 151 + "NamePos": 147, + "NameEnd": 150 }, "Params": { - "LeftParenPos": 151, - "RightParenPos": 152, + "LeftParenPos": 150, + "RightParenPos": 151, "Items": { - "ListPos": 152, - "ListEnd": 152, + "ListPos": 151, + "ListEnd": 151, "HasDistinct": false, "Items": [] }, @@ -95,41 +95,41 @@ } }, { - "NumPos": 161, - "NumEnd": 165, + "NumPos": 160, + "NumEnd": 164, "Literal": "-1.0", "Base": 10 } ] }, { - "LeftParenPos": 177, - "RightParenPos": 258, + "LeftParenPos": 175, + "RightParenPos": 256, "Values": [ { - "NumPos": 178, - "NumEnd": 181, + "NumPos": 176, + "NumEnd": 179, "Literal": "102", "Base": 10 }, { - "LiteralPos": 184, - "LiteralEnd": 214, + "LiteralPos": 182, + "LiteralEnd": 212, "Literal": "Insert a lot of rows per batch" }, { "Name": { "Name": "yesterday", "QuoteType": 1, - "NamePos": 237, - "NameEnd": 246 + "NamePos": 235, + "NameEnd": 244 }, "Params": { - "LeftParenPos": 246, - "RightParenPos": 247, + "LeftParenPos": 244, + "RightParenPos": 245, "Items": { - "ListPos": 247, - "ListEnd": 247, + "ListPos": 245, + "ListEnd": 245, "HasDistinct": false, "Items": [] }, @@ -137,41 +137,41 @@ } }, { - "NumPos": 250, - "NumEnd": 257, + "NumPos": 248, + "NumEnd": 255, "Literal": "1.41421", "Base": 10 } ] }, { - "LeftParenPos": 266, - "RightParenPos": 347, + "LeftParenPos": 263, + "RightParenPos": 344, "Values": [ { - "NumPos": 267, - "NumEnd": 270, + "NumPos": 264, + "NumEnd": 267, "Literal": "102", "Base": 10 }, { - "LiteralPos": 273, - "LiteralEnd": 323, + "LiteralPos": 270, + "LiteralEnd": 320, "Literal": "Sort your data based on your commonly-used queries" }, { "Name": { "Name": "today", "QuoteType": 1, - "NamePos": 326, - "NameEnd": 331 + "NamePos": 323, + "NameEnd": 328 }, "Params": { - "LeftParenPos": 331, - "RightParenPos": 332, + "LeftParenPos": 328, + "RightParenPos": 329, "Items": { - "ListPos": 332, - "ListEnd": 332, + "ListPos": 329, + "ListEnd": 329, "HasDistinct": false, "Items": [] }, @@ -179,26 +179,26 @@ } }, { - "NumPos": 339, - "NumEnd": 344, + "NumPos": 336, + "NumEnd": 341, "Literal": "2.718", "Base": 10 } ] }, { - "LeftParenPos": 355, - "RightParenPos": 436, + "LeftParenPos": 351, + "RightParenPos": 432, "Values": [ { - "NumPos": 356, - "NumEnd": 359, + "NumPos": 352, + "NumEnd": 355, "Literal": "101", "Base": 10 }, { - "LiteralPos": 362, - "LiteralEnd": 407, + "LiteralPos": 358, + "LiteralEnd": 403, "Literal": "Granules are the smallest chunks of data read" }, { @@ -206,15 +206,15 @@ "Name": { "Name": "now", "QuoteType": 1, - "NamePos": 415, - "NameEnd": 418 + "NamePos": 411, + "NameEnd": 414 }, "Params": { - "LeftParenPos": 418, - "RightParenPos": 419, + "LeftParenPos": 414, + "RightParenPos": 415, "Items": { - "ListPos": 419, - "ListEnd": 419, + "ListPos": 415, + "ListEnd": 415, "HasDistinct": false, "Items": [] }, @@ -223,8 +223,8 @@ }, "Operation": "+", "RightExpr": { - "NumPos": 423, - "NumEnd": 424, + "NumPos": 419, + "NumEnd": 420, "Literal": "5", "Base": 10 }, @@ -232,8 +232,8 @@ "HasNot": false }, { - "NumPos": 428, - "NumEnd": 435, + "NumPos": 424, + "NumEnd": 431, "Literal": "3.14159", "Base": 10 } diff --git a/parser/testdata/dml/output/insert_with_format.sql.golden.json b/parser/testdata/dml/output/insert_with_format.sql.golden.json index b9ef10f..be2ed5d 100644 --- a/parser/testdata/dml/output/insert_with_format.sql.golden.json +++ b/parser/testdata/dml/output/insert_with_format.sql.golden.json @@ -22,33 +22,33 @@ "SelectExpr": null }, { - "InsertPos": 60, + "InsertPos": 59, "Format": null, "HasTableKeyword": false, "Table": { "Database": { "Name": "db", "QuoteType": 2, - "NamePos": 73, - "NameEnd": 75 + "NamePos": 72, + "NameEnd": 74 }, "Table": { "Name": "table_name", "QuoteType": 2, - "NamePos": 78, - "NameEnd": 88 + "NamePos": 77, + "NameEnd": 87 } }, "ColumnNames": { - "LeftParenPos": 90, - "RightParenPos": 101, + "LeftParenPos": 89, + "RightParenPos": 100, "ColumnNames": [ { "Ident": { "Name": "col1", "QuoteType": 1, - "NamePos": 91, - "NameEnd": 95 + "NamePos": 90, + "NameEnd": 94 }, "DotIdent": null }, @@ -56,8 +56,8 @@ "Ident": { "Name": "col2", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 101 + "NamePos": 96, + "NameEnd": 100 }, "DotIdent": null } @@ -65,18 +65,18 @@ }, "Values": [ { - "LeftParenPos": 110, - "RightParenPos": 115, + "LeftParenPos": 109, + "RightParenPos": 114, "Values": [ { - "NumPos": 111, - "NumEnd": 112, + "NumPos": 110, + "NumEnd": 111, "Literal": "1", "Base": 10 }, { - "NumPos": 114, - "NumEnd": 115, + "NumPos": 113, + "NumEnd": 114, "Literal": "2", "Base": 10 } @@ -86,33 +86,33 @@ "SelectExpr": null }, { - "InsertPos": 119, + "InsertPos": 117, "Format": null, "HasTableKeyword": false, "Table": { "Database": { "Name": "_test_1345# $.ДБ", "QuoteType": 3, - "NamePos": 132, - "NameEnd": 150 + "NamePos": 130, + "NameEnd": 148 }, "Table": { "Name": "2. Таблица №2", "QuoteType": 3, - "NamePos": 153, - "NameEnd": 175 + "NamePos": 151, + "NameEnd": 173 } }, "ColumnNames": { - "LeftParenPos": 177, - "RightParenPos": 188, + "LeftParenPos": 175, + "RightParenPos": 186, "ColumnNames": [ { "Ident": { "Name": "col1", "QuoteType": 1, - "NamePos": 178, - "NameEnd": 182 + "NamePos": 176, + "NameEnd": 180 }, "DotIdent": null }, @@ -120,8 +120,8 @@ "Ident": { "Name": "col2", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 188 + "NamePos": 182, + "NameEnd": 186 }, "DotIdent": null } @@ -131,7 +131,7 @@ "SelectExpr": null }, { - "InsertPos": 192, + "InsertPos": 189, "Format": null, "HasTableKeyword": false, "Table": { @@ -139,20 +139,20 @@ "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 204, - "NameEnd": 214 + "NamePos": 201, + "NameEnd": 211 } }, "ColumnNames": { - "LeftParenPos": 215, - "RightParenPos": 226, + "LeftParenPos": 212, + "RightParenPos": 223, "ColumnNames": [ { "Ident": { "Name": "col1", "QuoteType": 1, - "NamePos": 216, - "NameEnd": 220 + "NamePos": 213, + "NameEnd": 217 }, "DotIdent": null }, @@ -160,8 +160,8 @@ "Ident": { "Name": "col2", "QuoteType": 1, - "NamePos": 222, - "NameEnd": 226 + "NamePos": 219, + "NameEnd": 223 }, "DotIdent": null } @@ -169,18 +169,18 @@ }, "Values": [ { - "LeftParenPos": 235, - "RightParenPos": 240, + "LeftParenPos": 232, + "RightParenPos": 237, "Values": [ { - "NumPos": 236, - "NumEnd": 237, + "NumPos": 233, + "NumEnd": 234, "Literal": "1", "Base": 10 }, { - "NumPos": 239, - "NumEnd": 240, + "NumPos": 236, + "NumEnd": 237, "Literal": "2", "Base": 10 } diff --git a/parser/testdata/dml/output/insert_with_placeholder.sql.golden.json b/parser/testdata/dml/output/insert_with_placeholder.sql.golden.json index d3f6efa..7c39114 100644 --- a/parser/testdata/dml/output/insert_with_placeholder.sql.golden.json +++ b/parser/testdata/dml/output/insert_with_placeholder.sql.golden.json @@ -56,61 +56,66 @@ }, "Values": [ { - "LeftParenPos": 64, - "RightParenPos": 75, + "LeftParenPos": 63, + "RightParenPos": 74, "Values": [ { - "PlaceholderPos": 65, - "PlaceHolderEnd": 65, + "PlaceholderPos": 64, + "PlaceHolderEnd": 64, "Type": "?" }, { - "PlaceholderPos": 68, - "PlaceHolderEnd": 68, + "PlaceholderPos": 67, + "PlaceHolderEnd": 67, "Type": "?" }, { - "PlaceholderPos": 71, - "PlaceHolderEnd": 71, + "PlaceholderPos": 70, + "PlaceHolderEnd": 70, "Type": "?" }, { - "PlaceholderPos": 74, - "PlaceHolderEnd": 74, + "PlaceholderPos": 73, + "PlaceHolderEnd": 73, "Type": "?" } ] }, { - "LeftParenPos": 83, - "RightParenPos": 94, + "LeftParenPos": 81, + "RightParenPos": 92, "Values": [ { - "PlaceholderPos": 84, - "PlaceHolderEnd": 84, + "PlaceholderPos": 82, + "PlaceHolderEnd": 82, "Type": "?" }, { - "PlaceholderPos": 87, - "PlaceHolderEnd": 87, + "PlaceholderPos": 85, + "PlaceHolderEnd": 85, "Type": "?" }, { - "PlaceholderPos": 90, - "PlaceHolderEnd": 90, + "PlaceholderPos": 88, + "PlaceHolderEnd": 88, "Type": "?" }, { - "PlaceholderPos": 93, - "PlaceHolderEnd": 93, + "PlaceholderPos": 91, + "PlaceHolderEnd": 91, "Type": "?" } ] }, { - "LeftParenPos": 102, - "RightParenPos": 113, + "LeftParenPos": 99, + "RightParenPos": 110, "Values": [ + { + "PlaceholderPos": 100, + "PlaceHolderEnd": 100, + "Type": "?" + }, { "PlaceholderPos": 103, "PlaceHolderEnd": 103, @@ -125,36 +130,31 @@ "PlaceholderPos": 109, "PlaceHolderEnd": 109, "Type": "?" - }, - { - "PlaceholderPos": 112, - "PlaceHolderEnd": 112, - "Type": "?" } ] }, { - "LeftParenPos": 121, - "RightParenPos": 132, + "LeftParenPos": 117, + "RightParenPos": 128, "Values": [ { - "PlaceholderPos": 122, - "PlaceHolderEnd": 122, + "PlaceholderPos": 118, + "PlaceHolderEnd": 118, "Type": "?" }, { - "PlaceholderPos": 125, - "PlaceHolderEnd": 125, + "PlaceholderPos": 121, + "PlaceHolderEnd": 121, "Type": "?" }, { - "PlaceholderPos": 128, - "PlaceHolderEnd": 128, + "PlaceholderPos": 124, + "PlaceHolderEnd": 124, "Type": "?" }, { - "PlaceholderPos": 131, - "PlaceHolderEnd": 131, + "PlaceholderPos": 127, + "PlaceHolderEnd": 127, "Type": "?" } ] @@ -163,7 +163,7 @@ "SelectExpr": null }, { - "InsertPos": 140, + "InsertPos": 133, "Format": null, "HasTableKeyword": false, "Table": { @@ -171,20 +171,20 @@ "Table": { "Name": "test_with_typed_columns", "QuoteType": 1, - "NamePos": 152, - "NameEnd": 175 + "NamePos": 145, + "NameEnd": 168 } }, "ColumnNames": { - "LeftParenPos": 176, - "RightParenPos": 191, + "LeftParenPos": 169, + "RightParenPos": 184, "ColumnNames": [ { "Ident": { "Name": "id", "QuoteType": 1, - "NamePos": 177, - "NameEnd": 179 + "NamePos": 170, + "NameEnd": 172 }, "DotIdent": null }, @@ -192,8 +192,8 @@ "Ident": { "Name": "created_at", "QuoteType": 1, - "NamePos": 181, - "NameEnd": 191 + "NamePos": 174, + "NameEnd": 184 }, "DotIdent": null } @@ -201,49 +201,49 @@ }, "Values": [ { - "LeftParenPos": 201, - "RightParenPos": 242, + "LeftParenPos": 193, + "RightParenPos": 234, "Values": [ { - "LeftBracePos": 202, - "RightBracePos": 213, + "LeftBracePos": 194, + "RightBracePos": 205, "Name": { "Name": "id", "QuoteType": 1, - "NamePos": 203, - "NameEnd": 205 + "NamePos": 195, + "NameEnd": 197 }, "Type": { "Name": { "Name": "Int32", "QuoteType": 1, - "NamePos": 207, - "NameEnd": 212 + "NamePos": 199, + "NameEnd": 204 } } }, { - "LeftBracePos": 215, - "RightBracePos": 242, + "LeftBracePos": 207, + "RightBracePos": 234, "Name": { "Name": "created_at", "QuoteType": 1, - "NamePos": 216, - "NameEnd": 226 + "NamePos": 208, + "NameEnd": 218 }, "Type": { - "LeftParenPos": 239, - "RightParenPos": 240, + "LeftParenPos": 231, + "RightParenPos": 232, "Name": { "Name": "DateTime64", "QuoteType": 1, - "NamePos": 228, - "NameEnd": 238 + "NamePos": 220, + "NameEnd": 230 }, "Params": [ { - "NumPos": 239, - "NumEnd": 240, + "NumPos": 231, + "NumEnd": 232, "Literal": "6", "Base": 10 } diff --git a/parser/testdata/dml/output/insert_with_select.sql.golden.json b/parser/testdata/dml/output/insert_with_select.sql.golden.json index 3428de2..7739082 100644 --- a/parser/testdata/dml/output/insert_with_select.sql.golden.json +++ b/parser/testdata/dml/output/insert_with_select.sql.golden.json @@ -20,8 +20,8 @@ "ColumnNames": null, "Values": null, "SelectExpr": { - "SelectPos": 30, - "StatementEnd": 109, + "SelectPos": 29, + "StatementEnd": 103, "With": null, "Top": null, "HasDistinct": false, @@ -31,8 +31,8 @@ "Expr": { "Name": "CounterID", "QuoteType": 1, - "NamePos": 42, - "NameEnd": 51 + "NamePos": 40, + "NameEnd": 49 }, "Modifiers": [], "Alias": null @@ -41,8 +41,8 @@ "Expr": { "Name": "StartDate", "QuoteType": 1, - "NamePos": 58, - "NameEnd": 67 + "NamePos": 55, + "NameEnd": 64 }, "Modifiers": [], "Alias": null @@ -51,8 +51,8 @@ "Expr": { "Name": "Sign", "QuoteType": 1, - "NamePos": 74, - "NameEnd": 78 + "NamePos": 70, + "NameEnd": 74 }, "Modifiers": [], "Alias": null @@ -61,37 +61,37 @@ "Expr": { "Name": "UserID", "QuoteType": 1, - "NamePos": 85, - "NameEnd": 91 + "NamePos": 80, + "NameEnd": 86 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 93, + "FromPos": 87, "Expr": { "Table": { - "TablePos": 98, - "TableEnd": 109, + "TablePos": 92, + "TableEnd": 103, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 98, - "NameEnd": 102 + "NamePos": 92, + "NameEnd": 96 }, "Table": { "Name": "visits", "QuoteType": 1, - "NamePos": 103, - "NameEnd": 109 + "NamePos": 97, + "NameEnd": 103 } }, "HasFinal": false }, - "StatementEnd": 109, + "StatementEnd": 103, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/access_tuple_with_dot.sql.golden.json b/parser/testdata/query/output/access_tuple_with_dot.sql.golden.json index f8da868..2291559 100644 --- a/parser/testdata/query/output/access_tuple_with_dot.sql.golden.json +++ b/parser/testdata/query/output/access_tuple_with_dot.sql.golden.json @@ -93,8 +93,8 @@ "Except": null }, { - "SelectPos": 39, - "StatementEnd": 341, + "SelectPos": 37, + "StatementEnd": 336, "With": null, "Top": null, "HasDistinct": false, @@ -105,15 +105,15 @@ "Name": { "Name": "toTypeName", "QuoteType": 1, - "NamePos": 46, - "NameEnd": 56 + "NamePos": 44, + "NameEnd": 54 }, "Params": { - "LeftParenPos": 56, - "RightParenPos": 153, + "LeftParenPos": 54, + "RightParenPos": 151, "Items": { - "ListPos": 58, - "ListEnd": 152, + "ListPos": 56, + "ListEnd": 150, "HasDistinct": false, "Items": [ { @@ -122,54 +122,54 @@ "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 58, - "NameEnd": 63 + "NamePos": 56, + "NameEnd": 61 }, "Params": { - "LeftParenPos": 63, - "RightParenPos": 104, + "LeftParenPos": 61, + "RightParenPos": 102, "Items": { - "ListPos": 65, - "ListEnd": 104, + "ListPos": 63, + "ListEnd": 102, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 65, - "LiteralEnd": 66, + "LiteralPos": 63, + "LiteralEnd": 64, "Literal": "a" }, "Alias": { "Name": "first", "QuoteType": 1, - "NamePos": 71, - "NameEnd": 76 + "NamePos": 69, + "NameEnd": 74 } }, { "Expr": { - "LiteralPos": 78, - "LiteralEnd": 79, + "LiteralPos": 76, + "LiteralEnd": 77, "Literal": "b" }, "Alias": { "Name": "second", "QuoteType": 1, - "NamePos": 84, - "NameEnd": 90 + "NamePos": 82, + "NameEnd": 88 } }, { "Expr": { - "LiteralPos": 93, - "LiteralEnd": 94, + "LiteralPos": 91, + "LiteralEnd": 92, "Literal": "c" }, "Alias": { "Name": "third", "QuoteType": 1, - "NamePos": 99, - "NameEnd": 104 + "NamePos": 97, + "NameEnd": 102 } } ] @@ -179,24 +179,24 @@ }, "Operation": "::", "RightExpr": { - "LeftParenPos": 113, - "RightParenPos": 152, + "LeftParenPos": 111, + "RightParenPos": 150, "Name": { "Name": "Tuple", "QuoteType": 1, - "NamePos": 107, - "NameEnd": 112 + "NamePos": 105, + "NameEnd": 110 }, "Columns": [ { - "NamePos": 113, - "ColumnEnd": 125, + "NamePos": 111, + "ColumnEnd": 123, "Name": { "Ident": { "Name": "first", "QuoteType": 1, - "NamePos": 113, - "NameEnd": 118 + "NamePos": 111, + "NameEnd": 116 }, "DotIdent": null }, @@ -204,8 +204,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 119, - "NameEnd": 125 + "NamePos": 117, + "NameEnd": 123 } }, "NotNull": null, @@ -219,14 +219,14 @@ "CompressionCodec": null }, { - "NamePos": 126, - "ColumnEnd": 139, + "NamePos": 124, + "ColumnEnd": 137, "Name": { "Ident": { "Name": "second", "QuoteType": 1, - "NamePos": 126, - "NameEnd": 132 + "NamePos": 124, + "NameEnd": 130 }, "DotIdent": null }, @@ -234,8 +234,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 139 + "NamePos": 131, + "NameEnd": 137 } }, "NotNull": null, @@ -249,14 +249,14 @@ "CompressionCodec": null }, { - "NamePos": 140, - "ColumnEnd": 152, + "NamePos": 138, + "ColumnEnd": 150, "Name": { "Ident": { "Name": "third", "QuoteType": 1, - "NamePos": 140, - "NameEnd": 145 + "NamePos": 138, + "NameEnd": 143 }, "DotIdent": null }, @@ -264,8 +264,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 146, - "NameEnd": 152 + "NamePos": 144, + "NameEnd": 150 } }, "NotNull": null, @@ -296,11 +296,11 @@ { "Expr": { "Object": { - "LeftParenPos": 164, - "RightParenPos": 260, + "LeftParenPos": 161, + "RightParenPos": 257, "Items": { - "ListPos": 165, - "ListEnd": 259, + "ListPos": 162, + "ListEnd": 256, "HasDistinct": false, "Items": [ { @@ -309,54 +309,54 @@ "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 165, - "NameEnd": 170 + "NamePos": 162, + "NameEnd": 167 }, "Params": { - "LeftParenPos": 170, - "RightParenPos": 211, + "LeftParenPos": 167, + "RightParenPos": 208, "Items": { - "ListPos": 172, - "ListEnd": 211, + "ListPos": 169, + "ListEnd": 208, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 172, - "LiteralEnd": 173, + "LiteralPos": 169, + "LiteralEnd": 170, "Literal": "a" }, "Alias": { "Name": "first", "QuoteType": 1, - "NamePos": 178, - "NameEnd": 183 + "NamePos": 175, + "NameEnd": 180 } }, { "Expr": { - "LiteralPos": 185, - "LiteralEnd": 186, + "LiteralPos": 182, + "LiteralEnd": 183, "Literal": "b" }, "Alias": { "Name": "second", "QuoteType": 1, - "NamePos": 191, - "NameEnd": 197 + "NamePos": 188, + "NameEnd": 194 } }, { "Expr": { - "LiteralPos": 200, - "LiteralEnd": 201, + "LiteralPos": 197, + "LiteralEnd": 198, "Literal": "c" }, "Alias": { "Name": "third", "QuoteType": 1, - "NamePos": 206, - "NameEnd": 211 + "NamePos": 203, + "NameEnd": 208 } } ] @@ -366,24 +366,24 @@ }, "Operation": "::", "RightExpr": { - "LeftParenPos": 220, - "RightParenPos": 259, + "LeftParenPos": 217, + "RightParenPos": 256, "Name": { "Name": "Tuple", "QuoteType": 1, - "NamePos": 214, - "NameEnd": 219 + "NamePos": 211, + "NameEnd": 216 }, "Columns": [ { - "NamePos": 220, - "ColumnEnd": 232, + "NamePos": 217, + "ColumnEnd": 229, "Name": { "Ident": { "Name": "first", "QuoteType": 1, - "NamePos": 220, - "NameEnd": 225 + "NamePos": 217, + "NameEnd": 222 }, "DotIdent": null }, @@ -391,8 +391,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 226, - "NameEnd": 232 + "NamePos": 223, + "NameEnd": 229 } }, "NotNull": null, @@ -406,14 +406,14 @@ "CompressionCodec": null }, { - "NamePos": 233, - "ColumnEnd": 246, + "NamePos": 230, + "ColumnEnd": 243, "Name": { "Ident": { "Name": "second", "QuoteType": 1, - "NamePos": 233, - "NameEnd": 239 + "NamePos": 230, + "NameEnd": 236 }, "DotIdent": null }, @@ -421,8 +421,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 240, - "NameEnd": 246 + "NamePos": 237, + "NameEnd": 243 } }, "NotNull": null, @@ -436,14 +436,14 @@ "CompressionCodec": null }, { - "NamePos": 247, - "ColumnEnd": 259, + "NamePos": 244, + "ColumnEnd": 256, "Name": { "Ident": { "Name": "third", "QuoteType": 1, - "NamePos": 247, - "NameEnd": 252 + "NamePos": 244, + "NameEnd": 249 }, "DotIdent": null }, @@ -451,8 +451,8 @@ "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 253, - "NameEnd": 259 + "NamePos": 250, + "NameEnd": 256 } }, "NotNull": null, @@ -480,8 +480,8 @@ "Index": { "Name": "second", "QuoteType": 1, - "NamePos": 262, - "NameEnd": 268 + "NamePos": 259, + "NameEnd": 265 } }, "Modifiers": [], @@ -493,37 +493,37 @@ "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 278, - "NameEnd": 283 + "NamePos": 274, + "NameEnd": 279 }, "Params": { - "LeftParenPos": 283, - "RightParenPos": 295, + "LeftParenPos": 279, + "RightParenPos": 291, "Items": { - "ListPos": 285, - "ListEnd": 294, + "ListPos": 281, + "ListEnd": 290, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 285, - "LiteralEnd": 286, + "LiteralPos": 281, + "LiteralEnd": 282, "Literal": "a" }, "Alias": null }, { "Expr": { - "LiteralPos": 289, - "LiteralEnd": 290, + "LiteralPos": 285, + "LiteralEnd": 286, "Literal": "b" }, "Alias": null }, { "Expr": { - "LiteralPos": 293, - "LiteralEnd": 294, + "LiteralPos": 289, + "LiteralEnd": 290, "Literal": "c" }, "Alias": null @@ -535,8 +535,8 @@ }, "Operation": ".", "Index": { - "NumPos": 297, - "NumEnd": 298, + "NumPos": 293, + "NumEnd": 294, "Literal": "3", "Base": 10 } @@ -549,15 +549,15 @@ "Name": { "Name": "tupleElement", "QuoteType": 1, - "NamePos": 308, - "NameEnd": 320 + "NamePos": 303, + "NameEnd": 315 }, "Params": { - "LeftParenPos": 320, - "RightParenPos": 341, + "LeftParenPos": 315, + "RightParenPos": 336, "Items": { - "ListPos": 321, - "ListEnd": 341, + "ListPos": 316, + "ListEnd": 336, "HasDistinct": false, "Items": [ { @@ -565,37 +565,37 @@ "Name": { "Name": "tuple", "QuoteType": 1, - "NamePos": 321, - "NameEnd": 326 + "NamePos": 316, + "NameEnd": 321 }, "Params": { - "LeftParenPos": 326, - "RightParenPos": 338, + "LeftParenPos": 321, + "RightParenPos": 333, "Items": { - "ListPos": 328, - "ListEnd": 337, + "ListPos": 323, + "ListEnd": 332, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 328, - "LiteralEnd": 329, + "LiteralPos": 323, + "LiteralEnd": 324, "Literal": "a" }, "Alias": null }, { "Expr": { - "LiteralPos": 332, - "LiteralEnd": 333, + "LiteralPos": 327, + "LiteralEnd": 328, "Literal": "b" }, "Alias": null }, { "Expr": { - "LiteralPos": 336, - "LiteralEnd": 337, + "LiteralPos": 331, + "LiteralEnd": 332, "Literal": "c" }, "Alias": null @@ -609,8 +609,8 @@ }, { "Expr": { - "NumPos": 340, - "NumEnd": 341, + "NumPos": 335, + "NumEnd": 336, "Literal": "1", "Base": 10 }, diff --git a/parser/testdata/query/output/query_with_expr_compare.sql.golden.json b/parser/testdata/query/output/query_with_expr_compare.sql.golden.json index 39dd652..349f1c3 100644 --- a/parser/testdata/query/output/query_with_expr_compare.sql.golden.json +++ b/parser/testdata/query/output/query_with_expr_compare.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 230, + "StatementEnd": 225, "With": null, "Top": null, "HasDistinct": false, @@ -97,17 +97,17 @@ } ], "From": { - "FromPos": 56, + "FromPos": 55, "Expr": { "Table": { - "TablePos": 60, - "TableEnd": 123, + "TablePos": 59, + "TableEnd": 121, "Alias": null, "Expr": { "HasParen": true, "Select": { - "SelectPos": 67, - "StatementEnd": 123, + "SelectPos": 65, + "StatementEnd": 121, "With": null, "Top": null, "HasDistinct": false, @@ -115,30 +115,30 @@ "SelectItems": [ { "Expr": { - "LiteralPos": 75, - "LiteralEnd": 92, + "LiteralPos": 73, + "LiteralEnd": 90, "Literal": "pathA/pathB/pathC" }, "Modifiers": [], "Alias": { "Name": "path", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 101 + "NamePos": 95, + "NameEnd": 99 } }, { "Expr": { - "LiteralPos": 104, - "LiteralEnd": 114, + "LiteralPos": 102, + "LiteralEnd": 112, "Literal": "2024-09-10" }, "Modifiers": [], "Alias": { "Name": "date", "QuoteType": 1, - "NamePos": 119, - "NameEnd": 123 + "NamePos": 117, + "NameEnd": 121 } } ], @@ -162,7 +162,7 @@ }, "HasFinal": false }, - "StatementEnd": 123, + "StatementEnd": 121, "SampleRatio": null, "HasFinal": false } @@ -171,30 +171,30 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 132, + "WherePos": 128, "Expr": { "LeftExpr": { "Expr": { "Name": { "Name": "toDate", "QuoteType": 1, - "NamePos": 138, - "NameEnd": 144 + "NamePos": 134, + "NameEnd": 140 }, "Params": { - "LeftParenPos": 144, - "RightParenPos": 149, + "LeftParenPos": 140, + "RightParenPos": 145, "Items": { - "ListPos": 145, - "ListEnd": 149, + "ListPos": 141, + "ListEnd": 145, "HasDistinct": false, "Items": [ { "Expr": { "Name": "date", "QuoteType": 1, - "NamePos": 145, - "NameEnd": 149 + "NamePos": 141, + "NameEnd": 145 }, "Alias": null } @@ -204,14 +204,14 @@ } }, "Between": { - "LiteralPos": 160, - "LiteralEnd": 170, + "LiteralPos": 156, + "LiteralEnd": 166, "Literal": "2024-09-01" }, - "AndPos": 172, + "AndPos": 168, "And": { - "LiteralPos": 177, - "LiteralEnd": 187, + "LiteralPos": 173, + "LiteralEnd": 183, "Literal": "2024-09-30" } }, @@ -222,21 +222,21 @@ "Name": { "Name": "splitByChar", "QuoteType": 1, - "NamePos": 196, - "NameEnd": 207 + "NamePos": 191, + "NameEnd": 202 }, "Params": { - "LeftParenPos": 207, - "RightParenPos": 217, + "LeftParenPos": 202, + "RightParenPos": 212, "Items": { - "ListPos": 209, - "ListEnd": 217, + "ListPos": 204, + "ListEnd": 212, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 209, - "LiteralEnd": 210, + "LiteralPos": 204, + "LiteralEnd": 205, "Literal": "/" }, "Alias": null @@ -245,8 +245,8 @@ "Expr": { "Name": "path", "QuoteType": 1, - "NamePos": 213, - "NameEnd": 217 + "NamePos": 208, + "NameEnd": 212 }, "Alias": null } @@ -256,17 +256,17 @@ } }, "Params": { - "LeftBracketPos": 218, - "RightBracketPos": 220, + "LeftBracketPos": 213, + "RightBracketPos": 215, "Items": { - "ListPos": 219, - "ListEnd": 220, + "ListPos": 214, + "ListEnd": 215, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 219, - "NumEnd": 220, + "NumPos": 214, + "NumEnd": 215, "Literal": "1", "Base": 10 }, @@ -278,8 +278,8 @@ }, "Operation": "=", "RightExpr": { - "LiteralPos": 225, - "LiteralEnd": 230, + "LiteralPos": 220, + "LiteralEnd": 225, "Literal": "pathA" }, "HasGlobal": false, diff --git a/parser/testdata/query/output/select_case_when_exists.sql.golden.json b/parser/testdata/query/output/select_case_when_exists.sql.golden.json index 59a936e..5a8fa71 100644 --- a/parser/testdata/query/output/select_case_when_exists.sql.golden.json +++ b/parser/testdata/query/output/select_case_when_exists.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 215, + "StatementEnd": 205, "With": null, "Top": null, "HasDistinct": false, @@ -11,40 +11,40 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 12, - "NameEnd": 12 + "NamePos": 11, + "NameEnd": 11 }, "Modifiers": [], "Alias": null }, { "Expr": { - "CasePos": 20, + "CasePos": 18, "EndPos": 0, "Expr": null, "Whens": [ { - "WhenPos": 34, - "ThenPos": 116, + "WhenPos": 31, + "ThenPos": 110, "When": { "Name": { "Name": "EXISTS", "QuoteType": 1, - "NamePos": 39, - "NameEnd": 45 + "NamePos": 36, + "NameEnd": 42 }, "Params": { - "LeftParenPos": 45, - "RightParenPos": 105, + "LeftParenPos": 42, + "RightParenPos": 100, "Items": { - "ListPos": 46, - "ListEnd": 104, + "ListPos": 43, + "ListEnd": 99, "HasDistinct": false, "Items": [ { "Expr": { - "SelectPos": 46, - "StatementEnd": 104, + "SelectPos": 43, + "StatementEnd": 99, "With": null, "Top": null, "HasDistinct": false, @@ -52,8 +52,8 @@ "SelectItems": [ { "Expr": { - "NumPos": 53, - "NumEnd": 54, + "NumPos": 50, + "NumEnd": 51, "Literal": "1", "Base": 10 }, @@ -62,24 +62,24 @@ } ], "From": { - "FromPos": 60, + "FromPos": 56, "Expr": { "Table": { - "TablePos": 65, - "TableEnd": 75, + "TablePos": 61, + "TableEnd": 71, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 65, - "NameEnd": 75 + "NamePos": 61, + "NameEnd": 71 } }, "HasFinal": false }, - "StatementEnd": 75, + "StatementEnd": 71, "SampleRatio": null, "HasFinal": false } @@ -88,18 +88,18 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 81, + "WherePos": 76, "Expr": { "LeftExpr": { "Name": "col1", "QuoteType": 1, - "NamePos": 87, - "NameEnd": 91 + "NamePos": 82, + "NameEnd": 86 }, "Operation": "=", "RightExpr": { - "LiteralPos": 95, - "LiteralEnd": 104, + "LiteralPos": 90, + "LiteralEnd": 99, "Literal": "999999999" }, "HasGlobal": false, @@ -126,18 +126,18 @@ } }, "Then": { - "LiteralPos": 122, - "LiteralEnd": 126, + "LiteralPos": 116, + "LiteralEnd": 120, "Literal": "then" }, "ElsePos": 0, "Else": null } ], - "ElsePos": 137, + "ElsePos": 130, "Else": { - "LiteralPos": 143, - "LiteralEnd": 147, + "LiteralPos": 136, + "LiteralEnd": 140, "Literal": "else" } }, @@ -145,30 +145,30 @@ "Alias": { "Name": "check_result", "QuoteType": 1, - "NamePos": 161, - "NameEnd": 173 + "NamePos": 153, + "NameEnd": 165 } } ], "From": { - "FromPos": 175, + "FromPos": 166, "Expr": { "Table": { - "TablePos": 180, - "TableEnd": 190, + "TablePos": 171, + "TableEnd": 181, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "table_name", "QuoteType": 1, - "NamePos": 180, - "NameEnd": 190 + "NamePos": 171, + "NameEnd": 181 } }, "HasFinal": false }, - "StatementEnd": 190, + "StatementEnd": 181, "SampleRatio": null, "HasFinal": false } @@ -177,18 +177,18 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 192, + "WherePos": 182, "Expr": { "LeftExpr": { "Name": "col1", "QuoteType": 1, - "NamePos": 198, - "NameEnd": 202 + "NamePos": 188, + "NameEnd": 192 }, "Operation": "=", "RightExpr": { - "LiteralPos": 206, - "LiteralEnd": 215, + "LiteralPos": 196, + "LiteralEnd": 205, "Literal": "123456789" }, "HasGlobal": false, diff --git a/parser/testdata/query/output/select_cast.sql.golden.json b/parser/testdata/query/output/select_cast.sql.golden.json index 7a4632b..136b88a 100644 --- a/parser/testdata/query/output/select_cast.sql.golden.json +++ b/parser/testdata/query/output/select_cast.sql.golden.json @@ -54,8 +54,8 @@ "Except": null }, { - "SelectPos": 37, - "StatementEnd": 71, + "SelectPos": 36, + "StatementEnd": 70, "With": null, "Top": null, "HasDistinct": false, @@ -63,18 +63,18 @@ "SelectItems": [ { "Expr": { - "CastPos": 44, + "CastPos": 43, "Expr": { - "NumPos": 49, - "NumEnd": 50, + "NumPos": 48, + "NumEnd": 49, "Literal": "1", "Base": 10 }, "Separator": ",", - "AsPos": 50, + "AsPos": 49, "AsType": { - "LiteralPos": 53, - "LiteralEnd": 60, + "LiteralPos": 52, + "LiteralEnd": 59, "Literal": "Float64" } }, @@ -82,8 +82,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 66, - "NameEnd": 71 + "NamePos": 65, + "NameEnd": 70 } } ], @@ -105,8 +105,8 @@ "Except": null }, { - "SelectPos": 74, - "StatementEnd": 104, + "SelectPos": 72, + "StatementEnd": 102, "With": null, "Top": null, "HasDistinct": false, @@ -114,25 +114,25 @@ "SelectItems": [ { "Expr": { - "LeftParenPos": 81, - "RightParenPos": 94, + "LeftParenPos": 79, + "RightParenPos": 92, "Items": { - "ListPos": 82, - "ListEnd": 94, + "ListPos": 80, + "ListEnd": 92, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 82, - "NumEnd": 83, + "NumPos": 80, + "NumEnd": 81, "Literal": "1", "Base": 10 }, "Alias": { "Name": "Float64", "QuoteType": 1, - "NamePos": 87, - "NameEnd": 94 + "NamePos": 85, + "NameEnd": 92 } } ] @@ -143,8 +143,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 99, - "NameEnd": 104 + "NamePos": 97, + "NameEnd": 102 } } ], @@ -166,8 +166,8 @@ "Except": null }, { - "SelectPos": 107, - "StatementEnd": 133, + "SelectPos": 104, + "StatementEnd": 130, "With": null, "Top": null, "HasDistinct": false, @@ -176,8 +176,8 @@ { "Expr": { "LeftExpr": { - "NumPos": 114, - "NumEnd": 115, + "NumPos": 111, + "NumEnd": 112, "Literal": "1", "Base": 10 }, @@ -185,8 +185,8 @@ "RightExpr": { "Name": "Float64", "QuoteType": 1, - "NamePos": 117, - "NameEnd": 124 + "NamePos": 114, + "NameEnd": 121 }, "HasGlobal": false, "HasNot": false @@ -195,8 +195,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 128, - "NameEnd": 133 + "NamePos": 125, + "NameEnd": 130 } } ], diff --git a/parser/testdata/query/output/select_column_alias_string.sql.golden.json b/parser/testdata/query/output/select_column_alias_string.sql.golden.json index e69e783..891eaf7 100644 --- a/parser/testdata/query/output/select_column_alias_string.sql.golden.json +++ b/parser/testdata/query/output/select_column_alias_string.sql.golden.json @@ -40,8 +40,8 @@ "Except": null }, { - "SelectPos": 29, - "StatementEnd": 54, + "SelectPos": 27, + "StatementEnd": 52, "With": null, "Top": null, "HasDistinct": false, @@ -51,8 +51,8 @@ "Expr": { "Name": "$abc", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 40 + "NamePos": 34, + "NameEnd": 38 }, "Modifiers": [], "Alias": null @@ -61,8 +61,8 @@ "Expr": { "Name": "a$$bc", "QuoteType": 1, - "NamePos": 42, - "NameEnd": 47 + "NamePos": 40, + "NameEnd": 45 }, "Modifiers": [], "Alias": null @@ -71,8 +71,8 @@ "Expr": { "Name": "abc$$", "QuoteType": 1, - "NamePos": 49, - "NameEnd": 54 + "NamePos": 47, + "NameEnd": 52 }, "Modifiers": [], "Alias": null diff --git a/parser/testdata/query/output/select_item_with_modifiers.sql.golden.json b/parser/testdata/query/output/select_item_with_modifiers.sql.golden.json index 796e3a3..0c9402d 100644 --- a/parser/testdata/query/output/select_item_with_modifiers.sql.golden.json +++ b/parser/testdata/query/output/select_item_with_modifiers.sql.golden.json @@ -93,8 +93,8 @@ "Except": null }, { - "SelectPos": 38, - "StatementEnd": 74, + "SelectPos": 37, + "StatementEnd": 73, "With": null, "Top": null, "HasDistinct": false, @@ -104,23 +104,23 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 45, - "NameEnd": 45 + "NamePos": 44, + "NameEnd": 44 }, "Modifiers": [ { "Name": { "Name": "REPLACE", "QuoteType": 1, - "NamePos": 47, - "NameEnd": 54 + "NamePos": 46, + "NameEnd": 53 }, "Params": { - "LeftParenPos": 54, - "RightParenPos": 65, + "LeftParenPos": 53, + "RightParenPos": 64, "Items": { - "ListPos": 55, - "ListEnd": 65, + "ListPos": 54, + "ListEnd": 64, "HasDistinct": false, "Items": [ { @@ -128,13 +128,13 @@ "LeftExpr": { "Name": "i", "QuoteType": 1, - "NamePos": 55, - "NameEnd": 56 + "NamePos": 54, + "NameEnd": 55 }, "Operation": "+", "RightExpr": { - "NumPos": 59, - "NumEnd": 60, + "NumPos": 58, + "NumEnd": 59, "Literal": "1", "Base": 10 }, @@ -144,8 +144,8 @@ "Alias": { "Name": "i", "QuoteType": 1, - "NamePos": 64, - "NameEnd": 65 + "NamePos": 63, + "NameEnd": 64 } } ] @@ -158,24 +158,24 @@ } ], "From": { - "FromPos": 67, + "FromPos": 66, "Expr": { "Table": { - "TablePos": 72, - "TableEnd": 74, + "TablePos": 71, + "TableEnd": 73, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 72, - "NameEnd": 74 + "NamePos": 71, + "NameEnd": 73 } }, "HasFinal": false }, - "StatementEnd": 74, + "StatementEnd": 73, "SampleRatio": null, "HasFinal": false } @@ -197,8 +197,8 @@ "Except": null }, { - "SelectPos": 77, - "StatementEnd": 135, + "SelectPos": 75, + "StatementEnd": 133, "With": null, "Top": null, "HasDistinct": false, @@ -208,23 +208,23 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 84, - "NameEnd": 84 + "NamePos": 82, + "NameEnd": 82 }, "Modifiers": [ { "Name": { "Name": "REPLACE", "QuoteType": 1, - "NamePos": 86, - "NameEnd": 93 + "NamePos": 84, + "NameEnd": 91 }, "Params": { - "LeftParenPos": 93, - "RightParenPos": 104, + "LeftParenPos": 91, + "RightParenPos": 102, "Items": { - "ListPos": 94, - "ListEnd": 104, + "ListPos": 92, + "ListEnd": 102, "HasDistinct": false, "Items": [ { @@ -232,13 +232,13 @@ "LeftExpr": { "Name": "i", "QuoteType": 1, - "NamePos": 94, - "NameEnd": 95 + "NamePos": 92, + "NameEnd": 93 }, "Operation": "+", "RightExpr": { - "NumPos": 98, - "NumEnd": 99, + "NumPos": 96, + "NumEnd": 97, "Literal": "1", "Base": 10 }, @@ -248,8 +248,8 @@ "Alias": { "Name": "i", "QuoteType": 1, - "NamePos": 103, - "NameEnd": 104 + "NamePos": 101, + "NameEnd": 102 } } ] @@ -261,23 +261,23 @@ "Name": { "Name": "EXCEPT", "QuoteType": 1, - "NamePos": 106, - "NameEnd": 112 + "NamePos": 104, + "NameEnd": 110 }, "Params": { - "LeftParenPos": 113, - "RightParenPos": 115, + "LeftParenPos": 111, + "RightParenPos": 113, "Items": { - "ListPos": 114, - "ListEnd": 115, + "ListPos": 112, + "ListEnd": 113, "HasDistinct": false, "Items": [ { "Expr": { "Name": "j", "QuoteType": 1, - "NamePos": 114, - "NameEnd": 115 + "NamePos": 112, + "NameEnd": 113 }, "Alias": null } @@ -290,23 +290,23 @@ "Name": { "Name": "APPLY", "QuoteType": 1, - "NamePos": 117, - "NameEnd": 122 + "NamePos": 115, + "NameEnd": 120 }, "Params": { - "LeftParenPos": 122, - "RightParenPos": 126, + "LeftParenPos": 120, + "RightParenPos": 124, "Items": { - "ListPos": 123, - "ListEnd": 126, + "ListPos": 121, + "ListEnd": 124, "HasDistinct": false, "Items": [ { "Expr": { "Name": "sum", "QuoteType": 1, - "NamePos": 123, - "NameEnd": 126 + "NamePos": 121, + "NameEnd": 124 }, "Alias": null } @@ -320,24 +320,24 @@ } ], "From": { - "FromPos": 128, + "FromPos": 126, "Expr": { "Table": { - "TablePos": 133, - "TableEnd": 135, + "TablePos": 131, + "TableEnd": 133, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 135 + "NamePos": 131, + "NameEnd": 133 } }, "HasFinal": false }, - "StatementEnd": 135, + "StatementEnd": 133, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/select_json_type.sql.golden.json b/parser/testdata/query/output/select_json_type.sql.golden.json index 628f5ac..7f99c09 100644 --- a/parser/testdata/query/output/select_json_type.sql.golden.json +++ b/parser/testdata/query/output/select_json_type.sql.golden.json @@ -94,8 +94,8 @@ "Except": null }, { - "SelectPos": 27, - "StatementEnd": 76, + "SelectPos": 26, + "StatementEnd": 75, "With": null, "Top": null, "HasDistinct": false, @@ -106,29 +106,29 @@ "Name": { "Name": "JSON_TYPE", "QuoteType": 1, - "NamePos": 34, - "NameEnd": 43 + "NamePos": 33, + "NameEnd": 42 }, "Params": { - "LeftParenPos": 43, - "RightParenPos": 76, + "LeftParenPos": 42, + "RightParenPos": 75, "Items": { - "ListPos": 45, - "ListEnd": 75, + "ListPos": 44, + "ListEnd": 74, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 45, - "LiteralEnd": 68, + "LiteralPos": 44, + "LiteralEnd": 67, "Literal": "{\"a\": 1, \"b\": {\"c\": 2}}" }, "Alias": null }, { "Expr": { - "LiteralPos": 72, - "LiteralEnd": 75, + "LiteralPos": 71, + "LiteralEnd": 74, "Literal": "$.b" }, "Alias": null @@ -160,8 +160,8 @@ "Except": null }, { - "SelectPos": 80, - "StatementEnd": 116, + "SelectPos": 78, + "StatementEnd": 114, "With": null, "Top": null, "HasDistinct": false, @@ -169,18 +169,18 @@ "SelectItems": [ { "Expr": { - "CastPos": 87, + "CastPos": 85, "Expr": { "Name": "some", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 96 + "NamePos": 90, + "NameEnd": 94 }, "Separator": ",", - "AsPos": 96, + "AsPos": 94, "AsType": { - "LiteralPos": 99, - "LiteralEnd": 105, + "LiteralPos": 97, + "LiteralEnd": 103, "Literal": "String" } }, @@ -188,8 +188,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 111, - "NameEnd": 116 + "NamePos": 109, + "NameEnd": 114 } } ], @@ -211,8 +211,8 @@ "Except": null }, { - "SelectPos": 119, - "StatementEnd": 160, + "SelectPos": 116, + "StatementEnd": 157, "With": null, "Top": null, "HasDistinct": false, @@ -220,28 +220,28 @@ "SelectItems": [ { "Expr": { - "CastPos": 126, + "CastPos": 123, "Expr": { "Fields": [ { "Name": "some", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 135 + "NamePos": 128, + "NameEnd": 132 }, { "Name": "long", "QuoteType": 1, - "NamePos": 136, - "NameEnd": 140 + "NamePos": 133, + "NameEnd": 137 } ] }, "Separator": ",", - "AsPos": 140, + "AsPos": 137, "AsType": { - "LiteralPos": 143, - "LiteralEnd": 149, + "LiteralPos": 140, + "LiteralEnd": 146, "Literal": "String" } }, @@ -249,8 +249,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 155, - "NameEnd": 160 + "NamePos": 152, + "NameEnd": 157 } } ], @@ -272,8 +272,8 @@ "Except": null }, { - "SelectPos": 163, - "StatementEnd": 209, + "SelectPos": 159, + "StatementEnd": 205, "With": null, "Top": null, "HasDistinct": false, @@ -281,34 +281,34 @@ "SelectItems": [ { "Expr": { - "CastPos": 170, + "CastPos": 166, "Expr": { "Fields": [ { "Name": "some", "QuoteType": 1, - "NamePos": 175, - "NameEnd": 179 + "NamePos": 171, + "NameEnd": 175 }, { "Name": "long", "QuoteType": 1, - "NamePos": 180, - "NameEnd": 184 + "NamePos": 176, + "NameEnd": 180 }, { "Name": "json", "QuoteType": 1, - "NamePos": 185, - "NameEnd": 189 + "NamePos": 181, + "NameEnd": 185 } ] }, "Separator": ",", - "AsPos": 189, + "AsPos": 185, "AsType": { - "LiteralPos": 192, - "LiteralEnd": 198, + "LiteralPos": 188, + "LiteralEnd": 194, "Literal": "String" } }, @@ -316,8 +316,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 204, - "NameEnd": 209 + "NamePos": 200, + "NameEnd": 205 } } ], @@ -339,8 +339,8 @@ "Except": null }, { - "SelectPos": 212, - "StatementEnd": 263, + "SelectPos": 207, + "StatementEnd": 258, "With": null, "Top": null, "HasDistinct": false, @@ -348,40 +348,40 @@ "SelectItems": [ { "Expr": { - "CastPos": 219, + "CastPos": 214, "Expr": { "Fields": [ { "Name": "some", "QuoteType": 1, - "NamePos": 224, - "NameEnd": 228 + "NamePos": 219, + "NameEnd": 223 }, { "Name": "long", "QuoteType": 1, - "NamePos": 229, - "NameEnd": 233 + "NamePos": 224, + "NameEnd": 228 }, { "Name": "json", "QuoteType": 1, - "NamePos": 234, - "NameEnd": 238 + "NamePos": 229, + "NameEnd": 233 }, { "Name": "path", "QuoteType": 1, - "NamePos": 239, - "NameEnd": 243 + "NamePos": 234, + "NameEnd": 238 } ] }, "Separator": ",", - "AsPos": 243, + "AsPos": 238, "AsType": { - "LiteralPos": 246, - "LiteralEnd": 252, + "LiteralPos": 241, + "LiteralEnd": 247, "Literal": "String" } }, @@ -389,8 +389,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 258, - "NameEnd": 263 + "NamePos": 253, + "NameEnd": 258 } } ], diff --git a/parser/testdata/query/output/select_simple.sql.golden.json b/parser/testdata/query/output/select_simple.sql.golden.json index 2c884d2..0b4a323 100644 --- a/parser/testdata/query/output/select_simple.sql.golden.json +++ b/parser/testdata/query/output/select_simple.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 287, + "StatementEnd": 277, "With": null, "Top": null, "HasDistinct": false, @@ -11,8 +11,8 @@ "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 12, - "NameEnd": 14 + "NamePos": 11, + "NameEnd": 13 }, "Modifiers": [], "Alias": null @@ -22,23 +22,23 @@ "Name": { "Name": "coalesce", "QuoteType": 1, - "NamePos": 16, - "NameEnd": 24 + "NamePos": 15, + "NameEnd": 23 }, "Params": { - "LeftParenPos": 24, - "RightParenPos": 31, + "LeftParenPos": 23, + "RightParenPos": 30, "Items": { - "ListPos": 25, - "ListEnd": 31, + "ListPos": 24, + "ListEnd": 30, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 25, - "NameEnd": 27 + "NamePos": 24, + "NameEnd": 26 }, "Alias": null }, @@ -46,8 +46,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 29, - "NameEnd": 31 + "NamePos": 28, + "NameEnd": 30 }, "Alias": null } @@ -60,8 +60,8 @@ "Alias": { "Name": "f3", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 38 + "NamePos": 35, + "NameEnd": 37 } }, { @@ -70,38 +70,38 @@ "Name": { "Name": "row_number", "QuoteType": 1, - "NamePos": 40, - "NameEnd": 50 + "NamePos": 39, + "NameEnd": 49 }, "Params": { - "LeftParenPos": 50, - "RightParenPos": 51, + "LeftParenPos": 49, + "RightParenPos": 50, "Items": { - "ListPos": 51, - "ListEnd": 51, + "ListPos": 50, + "ListEnd": 50, "HasDistinct": false, "Items": [] }, "ColumnArgList": null } }, - "OverPos": 54, + "OverPos": 52, "OverExpr": { - "LeftParenPos": 59, - "RightParenPos": 91, + "LeftParenPos": 57, + "RightParenPos": 89, "PartitionBy": { - "PartitionPos": 59, + "PartitionPos": 57, "Expr": { - "ListPos": 73, - "ListEnd": 75, + "ListPos": 71, + "ListEnd": 73, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 73, - "NameEnd": 75 + "NamePos": 71, + "NameEnd": 73 }, "Alias": null } @@ -109,16 +109,16 @@ } }, "OrderBy": { - "OrderPos": 76, - "ListEnd": 87, + "OrderPos": 74, + "ListEnd": 85, "Items": [ { - "OrderPos": 76, + "OrderPos": 74, "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 85, - "NameEnd": 87 + "NamePos": 83, + "NameEnd": 85 }, "Alias": null, "Direction": "ASC" @@ -132,35 +132,35 @@ "Alias": { "Name": "rn", "QuoteType": 1, - "NamePos": 96, - "NameEnd": 98 + "NamePos": 94, + "NameEnd": 96 } } ], "From": { - "FromPos": 100, + "FromPos": 97, "Expr": { "Table": { - "TablePos": 105, - "TableEnd": 122, + "TablePos": 102, + "TableEnd": 119, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 105, - "NameEnd": 109 + "NamePos": 102, + "NameEnd": 106 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 110, - "NameEnd": 122 + "NamePos": 107, + "NameEnd": 119 } }, "HasFinal": false }, - "StatementEnd": 122, + "StatementEnd": 119, "SampleRatio": null, "HasFinal": false } @@ -169,16 +169,16 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 124, + "WherePos": 120, "Expr": { "LeftExpr": { "LeftExpr": { "LeftExpr": { - "LeftParenPos": 130, - "RightParenPos": 159, + "LeftParenPos": 126, + "RightParenPos": 155, "Items": { - "ListPos": 131, - "ListEnd": 158, + "ListPos": 127, + "ListEnd": 154, "HasDistinct": false, "Items": [ { @@ -186,38 +186,38 @@ "LeftExpr": { "Name": "f0", "QuoteType": 1, - "NamePos": 131, - "NameEnd": 133 + "NamePos": 127, + "NameEnd": 129 }, "Operation": "IN", "RightExpr": { - "LeftParenPos": 137, - "RightParenPos": 158, + "LeftParenPos": 133, + "RightParenPos": 154, "Items": { - "ListPos": 139, - "ListEnd": 157, + "ListPos": 135, + "ListEnd": 153, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 139, - "LiteralEnd": 142, + "LiteralPos": 135, + "LiteralEnd": 138, "Literal": "foo" }, "Alias": null }, { "Expr": { - "LiteralPos": 146, - "LiteralEnd": 149, + "LiteralPos": 142, + "LiteralEnd": 145, "Literal": "bar" }, "Alias": null }, { "Expr": { - "LiteralPos": 153, - "LiteralEnd": 157, + "LiteralPos": 149, + "LiteralEnd": 153, "Literal": "test" }, "Alias": null @@ -237,11 +237,11 @@ }, "Operation": "AND", "RightExpr": { - "LeftParenPos": 165, - "RightParenPos": 180, + "LeftParenPos": 161, + "RightParenPos": 176, "Items": { - "ListPos": 166, - "ListEnd": 179, + "ListPos": 162, + "ListEnd": 175, "HasDistinct": false, "Items": [ { @@ -249,13 +249,13 @@ "LeftExpr": { "Name": "f1", "QuoteType": 1, - "NamePos": 166, - "NameEnd": 168 + "NamePos": 162, + "NameEnd": 164 }, "Operation": "=", "RightExpr": { - "LiteralPos": 172, - "LiteralEnd": 179, + "LiteralPos": 168, + "LiteralEnd": 175, "Literal": "testing" }, "HasGlobal": false, @@ -272,11 +272,11 @@ }, "Operation": "AND", "RightExpr": { - "LeftParenPos": 186, - "RightParenPos": 209, + "LeftParenPos": 182, + "RightParenPos": 205, "Items": { - "ListPos": 187, - "ListEnd": 208, + "ListPos": 183, + "ListEnd": 204, "HasDistinct": false, "Items": [ { @@ -284,13 +284,13 @@ "LeftExpr": { "Name": "f2", "QuoteType": 1, - "NamePos": 187, - "NameEnd": 189 + "NamePos": 183, + "NameEnd": 185 }, "Operation": "NOT LIKE", "RightExpr": { - "LiteralPos": 200, - "LiteralEnd": 208, + "LiteralPos": 196, + "LiteralEnd": 204, "Literal": "testing2" }, "HasGlobal": false, @@ -310,38 +310,38 @@ "LeftExpr": { "Name": "f3", "QuoteType": 1, - "NamePos": 216, - "NameEnd": 218 + "NamePos": 211, + "NameEnd": 213 }, "Operation": "NOT IN", "RightExpr": { - "LeftParenPos": 226, - "RightParenPos": 240, + "LeftParenPos": 221, + "RightParenPos": 235, "Items": { - "ListPos": 228, - "ListEnd": 239, + "ListPos": 223, + "ListEnd": 234, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 228, - "LiteralEnd": 229, + "LiteralPos": 223, + "LiteralEnd": 224, "Literal": "a" }, "Alias": null }, { "Expr": { - "LiteralPos": 233, - "LiteralEnd": 234, + "LiteralPos": 228, + "LiteralEnd": 229, "Literal": "b" }, "Alias": null }, { "Expr": { - "LiteralPos": 238, - "LiteralEnd": 239, + "LiteralPos": 233, + "LiteralEnd": 234, "Literal": "c" }, "Alias": null @@ -358,20 +358,20 @@ } }, "GroupBy": { - "GroupByPos": 247, - "GroupByEnd": 268, + "GroupByPos": 239, + "GroupByEnd": 258, "AggregateType": "", "Expr": { - "ListPos": 256, - "ListEnd": 264, + "ListPos": 248, + "ListEnd": 256, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 256, - "NameEnd": 258 + "NamePos": 248, + "NameEnd": 250 }, "Alias": null }, @@ -379,8 +379,8 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 262, - "NameEnd": 264 + "NamePos": 254, + "NameEnd": 256 }, "Alias": null } @@ -395,31 +395,31 @@ "OrderBy": null, "LimitBy": { "Limit": { - "LimitPos": 268, + "LimitPos": 258, "Limit": { - "NumPos": 279, - "NumEnd": 281, + "NumPos": 269, + "NumEnd": 271, "Literal": "10", "Base": 10 }, "Offset": { - "NumPos": 274, - "NumEnd": 277, + "NumPos": 264, + "NumEnd": 267, "Literal": "100", "Base": 10 } }, "ByExpr": { - "ListPos": 285, - "ListEnd": 287, + "ListPos": 275, + "ListEnd": 277, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f0", "QuoteType": 1, - "NamePos": 285, - "NameEnd": 287 + "NamePos": 275, + "NameEnd": 277 }, "Alias": null } diff --git a/parser/testdata/query/output/select_simple_with_cte_with_column_aliases.sql.golden.json b/parser/testdata/query/output/select_simple_with_cte_with_column_aliases.sql.golden.json index 8be3728..03b1d62 100644 --- a/parser/testdata/query/output/select_simple_with_cte_with_column_aliases.sql.golden.json +++ b/parser/testdata/query/output/select_simple_with_cte_with_column_aliases.sql.golden.json @@ -1,34 +1,34 @@ [ { "SelectPos": 0, - "StatementEnd": 140, + "StatementEnd": 133, "With": { "WithPos": 0, - "EndPos": 25, + "EndPos": 24, "CTEs": [ { - "CTEPos": 10, + "CTEPos": 9, "Expr": { "Name": { "Name": "test", "QuoteType": 1, - "NamePos": 10, - "NameEnd": 14 + "NamePos": 9, + "NameEnd": 13 }, "Params": { - "LeftParenPos": 14, - "RightParenPos": 25, + "LeftParenPos": 13, + "RightParenPos": 24, "Items": { - "ListPos": 15, - "ListEnd": 25, + "ListPos": 14, + "ListEnd": 24, "HasDistinct": false, "Items": [ { "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 15, - "NameEnd": 17 + "NamePos": 14, + "NameEnd": 16 }, "Alias": null }, @@ -36,8 +36,8 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 19, - "NameEnd": 21 + "NamePos": 18, + "NameEnd": 20 }, "Alias": null }, @@ -45,8 +45,8 @@ "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 23, - "NameEnd": 25 + "NamePos": 22, + "NameEnd": 24 }, "Alias": null } @@ -56,8 +56,8 @@ } }, "Alias": { - "SelectPos": 31, - "StatementEnd": 59, + "SelectPos": 30, + "StatementEnd": 58, "With": null, "Top": null, "HasDistinct": false, @@ -67,8 +67,8 @@ "Expr": { "Name": "f4", "QuoteType": 1, - "NamePos": 38, - "NameEnd": 40 + "NamePos": 37, + "NameEnd": 39 }, "Modifiers": [], "Alias": null @@ -77,8 +77,8 @@ "Expr": { "Name": "f5", "QuoteType": 1, - "NamePos": 42, - "NameEnd": 44 + "NamePos": 41, + "NameEnd": 43 }, "Modifiers": [], "Alias": null @@ -87,32 +87,32 @@ "Expr": { "Name": "f6", "QuoteType": 1, - "NamePos": 46, - "NameEnd": 48 + "NamePos": 45, + "NameEnd": 47 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 49, + "FromPos": 48, "Expr": { "Table": { - "TablePos": 54, - "TableEnd": 59, + "TablePos": 53, + "TableEnd": 58, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "sales", "QuoteType": 1, - "NamePos": 54, - "NameEnd": 59 + "NamePos": 53, + "NameEnd": 58 } }, "HasFinal": false }, - "StatementEnd": 59, + "StatementEnd": 58, "SampleRatio": null, "HasFinal": false } @@ -144,67 +144,67 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 74, - "NameEnd": 76 + "NamePos": 71, + "NameEnd": 73 }, "Modifiers": [], "Alias": { "Name": "new_f1", "QuoteType": 1, - "NamePos": 80, - "NameEnd": 86 + "NamePos": 77, + "NameEnd": 83 } }, { "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 93, - "NameEnd": 95 + "NamePos": 89, + "NameEnd": 91 }, "Modifiers": [], "Alias": { "Name": "new_f2", "QuoteType": 1, - "NamePos": 99, - "NameEnd": 105 + "NamePos": 95, + "NameEnd": 101 } }, { "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 112, - "NameEnd": 114 + "NamePos": 107, + "NameEnd": 109 }, "Modifiers": [], "Alias": { "Name": "new_f3", "QuoteType": 1, - "NamePos": 118, - "NameEnd": 124 + "NamePos": 113, + "NameEnd": 119 } } ], "From": { - "FromPos": 126, + "FromPos": 120, "Expr": { "Table": { - "TablePos": 136, - "TableEnd": 140, + "TablePos": 129, + "TableEnd": 133, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "test", "QuoteType": 1, - "NamePos": 136, - "NameEnd": 140 + "NamePos": 129, + "NameEnd": 133 } }, "HasFinal": false }, - "StatementEnd": 140, + "StatementEnd": 133, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/select_simple_with_is_not_null.sql.golden.json b/parser/testdata/query/output/select_simple_with_is_not_null.sql.golden.json index 634779a..34b76ec 100644 --- a/parser/testdata/query/output/select_simple_with_is_not_null.sql.golden.json +++ b/parser/testdata/query/output/select_simple_with_is_not_null.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 138, + "StatementEnd": 133, "With": null, "Top": null, "HasDistinct": false, @@ -54,29 +54,29 @@ } ], "From": { - "FromPos": 26, + "FromPos": 25, "Expr": { "Table": { - "TablePos": 31, - "TableEnd": 48, + "TablePos": 30, + "TableEnd": 47, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 31, - "NameEnd": 35 + "NamePos": 30, + "NameEnd": 34 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 48 + "NamePos": 35, + "NameEnd": 47 } }, "HasFinal": false }, - "StatementEnd": 48, + "StatementEnd": 47, "SampleRatio": null, "HasFinal": false } @@ -85,16 +85,16 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 50, + "WherePos": 48, "Expr": { "LeftExpr": { "LeftExpr": { "LeftExpr": { - "LeftParenPos": 56, - "RightParenPos": 85, + "LeftParenPos": 54, + "RightParenPos": 83, "Items": { - "ListPos": 57, - "ListEnd": 84, + "ListPos": 55, + "ListEnd": 82, "HasDistinct": false, "Items": [ { @@ -102,38 +102,38 @@ "LeftExpr": { "Name": "f0", "QuoteType": 1, - "NamePos": 57, - "NameEnd": 59 + "NamePos": 55, + "NameEnd": 57 }, "Operation": "IN", "RightExpr": { - "LeftParenPos": 63, - "RightParenPos": 84, + "LeftParenPos": 61, + "RightParenPos": 82, "Items": { - "ListPos": 65, - "ListEnd": 83, + "ListPos": 63, + "ListEnd": 81, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 65, - "LiteralEnd": 68, + "LiteralPos": 63, + "LiteralEnd": 66, "Literal": "foo" }, "Alias": null }, { "Expr": { - "LiteralPos": 72, - "LiteralEnd": 75, + "LiteralPos": 70, + "LiteralEnd": 73, "Literal": "bar" }, "Alias": null }, { "Expr": { - "LiteralPos": 79, - "LiteralEnd": 83, + "LiteralPos": 77, + "LiteralEnd": 81, "Literal": "test" }, "Alias": null @@ -153,11 +153,11 @@ }, "Operation": "AND", "RightExpr": { - "LeftParenPos": 94, - "RightParenPos": 109, + "LeftParenPos": 91, + "RightParenPos": 106, "Items": { - "ListPos": 95, - "ListEnd": 108, + "ListPos": 92, + "ListEnd": 105, "HasDistinct": false, "Items": [ { @@ -165,13 +165,13 @@ "LeftExpr": { "Name": "f1", "QuoteType": 1, - "NamePos": 95, - "NameEnd": 97 + "NamePos": 92, + "NameEnd": 94 }, "Operation": "=", "RightExpr": { - "LiteralPos": 101, - "LiteralEnd": 108, + "LiteralPos": 98, + "LiteralEnd": 105, "Literal": "testing" }, "HasGlobal": false, @@ -188,12 +188,12 @@ }, "Operation": "AND", "RightExpr": { - "IsPos": 132, + "IsPos": 127, "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 118, - "NameEnd": 120 + "NamePos": 114, + "NameEnd": 116 } }, "HasGlobal": false, @@ -201,12 +201,12 @@ }, "Operation": "AND", "RightExpr": { - "IsPos": 150, + "IsPos": 145, "Expr": { "Name": "f3", "QuoteType": 1, - "NamePos": 136, - "NameEnd": 138 + "NamePos": 131, + "NameEnd": 133 } }, "HasGlobal": false, diff --git a/parser/testdata/query/output/select_simple_with_is_null.sql.golden.json b/parser/testdata/query/output/select_simple_with_is_null.sql.golden.json index 95c16fc..30d10a6 100644 --- a/parser/testdata/query/output/select_simple_with_is_null.sql.golden.json +++ b/parser/testdata/query/output/select_simple_with_is_null.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 114, + "StatementEnd": 112, "With": null, "Top": null, "HasDistinct": false, @@ -54,29 +54,29 @@ } ], "From": { - "FromPos": 26, + "FromPos": 25, "Expr": { "Table": { - "TablePos": 31, - "TableEnd": 48, + "TablePos": 30, + "TableEnd": 47, "Alias": null, "Expr": { "Database": { "Name": "test", "QuoteType": 1, - "NamePos": 31, - "NameEnd": 35 + "NamePos": 30, + "NameEnd": 34 }, "Table": { "Name": "events_local", "QuoteType": 1, - "NamePos": 36, - "NameEnd": 48 + "NamePos": 35, + "NameEnd": 47 } }, "HasFinal": false }, - "StatementEnd": 48, + "StatementEnd": 47, "SampleRatio": null, "HasFinal": false } @@ -85,15 +85,15 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 50, + "WherePos": 48, "Expr": { "LeftExpr": { "LeftExpr": { - "LeftParenPos": 56, - "RightParenPos": 85, + "LeftParenPos": 54, + "RightParenPos": 83, "Items": { - "ListPos": 57, - "ListEnd": 84, + "ListPos": 55, + "ListEnd": 82, "HasDistinct": false, "Items": [ { @@ -101,38 +101,38 @@ "LeftExpr": { "Name": "f0", "QuoteType": 1, - "NamePos": 57, - "NameEnd": 59 + "NamePos": 55, + "NameEnd": 57 }, "Operation": "IN", "RightExpr": { - "LeftParenPos": 63, - "RightParenPos": 84, + "LeftParenPos": 61, + "RightParenPos": 82, "Items": { - "ListPos": 65, - "ListEnd": 83, + "ListPos": 63, + "ListEnd": 81, "HasDistinct": false, "Items": [ { "Expr": { - "LiteralPos": 65, - "LiteralEnd": 68, + "LiteralPos": 63, + "LiteralEnd": 66, "Literal": "foo" }, "Alias": null }, { "Expr": { - "LiteralPos": 72, - "LiteralEnd": 75, + "LiteralPos": 70, + "LiteralEnd": 73, "Literal": "bar" }, "Alias": null }, { "Expr": { - "LiteralPos": 79, - "LiteralEnd": 83, + "LiteralPos": 77, + "LiteralEnd": 81, "Literal": "test" }, "Alias": null @@ -152,11 +152,11 @@ }, "Operation": "AND", "RightExpr": { - "LeftParenPos": 91, - "RightParenPos": 106, + "LeftParenPos": 89, + "RightParenPos": 104, "Items": { - "ListPos": 92, - "ListEnd": 105, + "ListPos": 90, + "ListEnd": 103, "HasDistinct": false, "Items": [ { @@ -164,13 +164,13 @@ "LeftExpr": { "Name": "f1", "QuoteType": 1, - "NamePos": 92, - "NameEnd": 94 + "NamePos": 90, + "NameEnd": 92 }, "Operation": "=", "RightExpr": { - "LiteralPos": 98, - "LiteralEnd": 105, + "LiteralPos": 96, + "LiteralEnd": 103, "Literal": "testing" }, "HasGlobal": false, @@ -187,12 +187,12 @@ }, "Operation": "AND", "RightExpr": { - "IsPos": 122, + "IsPos": 120, "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 112, - "NameEnd": 114 + "NamePos": 110, + "NameEnd": 112 } }, "HasGlobal": false, diff --git a/parser/testdata/query/output/select_simple_with_with_clause.sql.golden.json b/parser/testdata/query/output/select_simple_with_with_clause.sql.golden.json index 50d4043..0836041 100644 --- a/parser/testdata/query/output/select_simple_with_with_clause.sql.golden.json +++ b/parser/testdata/query/output/select_simple_with_with_clause.sql.golden.json @@ -1,22 +1,22 @@ [ { "SelectPos": 0, - "StatementEnd": 132, + "StatementEnd": 124, "With": { "WithPos": 0, - "EndPos": 48, + "EndPos": 46, "CTEs": [ { - "CTEPos": 10, + "CTEPos": 9, "Expr": { "Name": "cte1", "QuoteType": 1, - "NamePos": 10, - "NameEnd": 14 + "NamePos": 9, + "NameEnd": 13 }, "Alias": { - "SelectPos": 19, - "StatementEnd": 36, + "SelectPos": 18, + "StatementEnd": 35, "With": null, "Top": null, "HasDistinct": false, @@ -26,32 +26,32 @@ "Expr": { "Name": "f1", "QuoteType": 1, - "NamePos": 26, - "NameEnd": 28 + "NamePos": 25, + "NameEnd": 27 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 29, + "FromPos": 28, "Expr": { "Table": { - "TablePos": 34, - "TableEnd": 36, + "TablePos": 33, + "TableEnd": 35, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 34, - "NameEnd": 36 + "NamePos": 33, + "NameEnd": 35 } }, "HasFinal": false }, - "StatementEnd": 36, + "StatementEnd": 35, "SampleRatio": null, "HasFinal": false } @@ -74,16 +74,16 @@ } }, { - "CTEPos": 44, + "CTEPos": 42, "Expr": { "Name": "cte2", "QuoteType": 1, - "NamePos": 44, - "NameEnd": 48 + "NamePos": 42, + "NameEnd": 46 }, "Alias": { - "SelectPos": 53, - "StatementEnd": 70, + "SelectPos": 51, + "StatementEnd": 68, "With": null, "Top": null, "HasDistinct": false, @@ -93,32 +93,32 @@ "Expr": { "Name": "f2", "QuoteType": 1, - "NamePos": 60, - "NameEnd": 62 + "NamePos": 58, + "NameEnd": 60 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 63, + "FromPos": 61, "Expr": { "Table": { - "TablePos": 68, - "TableEnd": 70, + "TablePos": 66, + "TableEnd": 68, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 68, - "NameEnd": 70 + "NamePos": 66, + "NameEnd": 68 } }, "HasFinal": false }, - "StatementEnd": 70, + "StatementEnd": 68, "SampleRatio": null, "HasFinal": false } @@ -152,14 +152,14 @@ { "Name": "cte1", "QuoteType": 1, - "NamePos": 85, - "NameEnd": 89 + "NamePos": 81, + "NameEnd": 85 }, { "Name": "f1", "QuoteType": 1, - "NamePos": 90, - "NameEnd": 92 + "NamePos": 86, + "NameEnd": 88 } ] }, @@ -172,14 +172,14 @@ { "Name": "cte2", "QuoteType": 1, - "NamePos": 99, - "NameEnd": 103 + "NamePos": 94, + "NameEnd": 98 }, { "Name": "f2", "QuoteType": 1, - "NamePos": 104, - "NameEnd": 106 + "NamePos": 99, + "NameEnd": 101 } ] }, @@ -192,14 +192,14 @@ { "Name": "t3", "QuoteType": 1, - "NamePos": 113, - "NameEnd": 115 + "NamePos": 107, + "NameEnd": 109 }, { "Name": "f3", "QuoteType": 1, - "NamePos": 116, - "NameEnd": 118 + "NamePos": 110, + "NameEnd": 112 } ] }, @@ -208,68 +208,68 @@ } ], "From": { - "FromPos": 120, + "FromPos": 113, "Expr": { - "JoinPos": 130, + "JoinPos": 122, "Left": { "Table": { - "TablePos": 130, - "TableEnd": 132, + "TablePos": 122, + "TableEnd": 124, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t3", "QuoteType": 1, - "NamePos": 130, - "NameEnd": 132 + "NamePos": 122, + "NameEnd": 124 } }, "HasFinal": false }, - "StatementEnd": 132, + "StatementEnd": 124, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 133, + "JoinPos": 125, "Left": { "Table": { - "TablePos": 133, - "TableEnd": 137, + "TablePos": 125, + "TableEnd": 129, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "cte1", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 137 + "NamePos": 125, + "NameEnd": 129 } }, "HasFinal": false }, - "StatementEnd": 137, + "StatementEnd": 129, "SampleRatio": null, "HasFinal": false }, "Right": { "Table": { - "TablePos": 138, - "TableEnd": 142, + "TablePos": 130, + "TableEnd": 134, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "cte2", "QuoteType": 1, - "NamePos": 138, - "NameEnd": 142 + "NamePos": 130, + "NameEnd": 134 } }, "HasFinal": false }, - "StatementEnd": 142, + "StatementEnd": 134, "SampleRatio": null, "HasFinal": false }, diff --git a/parser/testdata/query/output/select_table_function_with_query.sql.golden.json b/parser/testdata/query/output/select_table_function_with_query.sql.golden.json index a46ed59..d929838 100644 --- a/parser/testdata/query/output/select_table_function_with_query.sql.golden.json +++ b/parser/testdata/query/output/select_table_function_with_query.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 132, + "StatementEnd": 125, "With": null, "Top": null, "HasDistinct": false, @@ -77,50 +77,50 @@ } ], "From": { - "FromPos": 42, + "FromPos": 41, "Expr": { "Table": { - "TablePos": 48, - "TableEnd": 132, + "TablePos": 46, + "TableEnd": 125, "Alias": null, "Expr": { "Name": { "Name": "numbers", "QuoteType": 1, - "NamePos": 48, - "NameEnd": 55 + "NamePos": 46, + "NameEnd": 53 }, "Args": { - "LeftParenPos": 55, - "RightParenPos": 132, + "LeftParenPos": 53, + "RightParenPos": 125, "Args": [ { "Name": { "Name": "plus", "QuoteType": 1, - "NamePos": 62, - "NameEnd": 66 + "NamePos": 59, + "NameEnd": 63 }, "Args": { - "LeftParenPos": 62, - "RightParenPos": 129, + "LeftParenPos": 59, + "RightParenPos": 123, "Args": [ { "Name": { "Name": "ifNull", "QuoteType": 1, - "NamePos": 77, - "NameEnd": 83 + "NamePos": 73, + "NameEnd": 79 }, "Args": { - "LeftParenPos": 77, - "RightParenPos": 122, + "LeftParenPos": 73, + "RightParenPos": 117, "Args": [ { "HasParen": true, "Select": { - "SelectPos": 85, - "StatementEnd": 109, + "SelectPos": 81, + "StatementEnd": 105, "With": null, "Top": null, "HasDistinct": false, @@ -128,8 +128,8 @@ "SelectItems": [ { "Expr": { - "NumPos": 92, - "NumEnd": 93, + "NumPos": 88, + "NumEnd": 89, "Literal": "1", "Base": 10 }, @@ -137,14 +137,14 @@ "Alias": { "Name": "bin_count", "QuoteType": 1, - "NamePos": 97, - "NameEnd": 106 + "NamePos": 93, + "NameEnd": 102 } }, { "Expr": { - "NumPos": 108, - "NumEnd": 109, + "NumPos": 104, + "NumEnd": 105, "Literal": "1", "Base": 10 }, @@ -171,8 +171,8 @@ } }, { - "NumPos": 121, - "NumEnd": 122, + "NumPos": 116, + "NumEnd": 117, "Literal": "1", "Base": 10 } @@ -187,7 +187,7 @@ }, "HasFinal": false }, - "StatementEnd": 132, + "StatementEnd": 125, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/select_with_group_by.sql.golden.json b/parser/testdata/query/output/select_with_group_by.sql.golden.json index 5c3fc65..136ff44 100644 --- a/parser/testdata/query/output/select_with_group_by.sql.golden.json +++ b/parser/testdata/query/output/select_with_group_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 183, + "StatementEnd": 171, "With": null, "Top": null, "HasDistinct": false, @@ -11,8 +11,8 @@ "Expr": { "Name": "datacenter", "QuoteType": 1, - "NamePos": 12, - "NameEnd": 22 + "NamePos": 11, + "NameEnd": 21 }, "Modifiers": [], "Alias": null @@ -21,8 +21,8 @@ "Expr": { "Name": "distro", "QuoteType": 1, - "NamePos": 29, - "NameEnd": 35 + "NamePos": 27, + "NameEnd": 33 }, "Modifiers": [], "Alias": null @@ -32,23 +32,23 @@ "Name": { "Name": "SUM", "QuoteType": 1, - "NamePos": 42, - "NameEnd": 45 + "NamePos": 39, + "NameEnd": 42 }, "Params": { - "LeftParenPos": 46, - "RightParenPos": 55, + "LeftParenPos": 43, + "RightParenPos": 52, "Items": { - "ListPos": 47, - "ListEnd": 55, + "ListPos": 44, + "ListEnd": 52, "HasDistinct": false, "Items": [ { "Expr": { "Name": "quantity", "QuoteType": 1, - "NamePos": 47, - "NameEnd": 55 + "NamePos": 44, + "NameEnd": 52 }, "Alias": null } @@ -61,30 +61,30 @@ "Alias": { "Name": "qty", "QuoteType": 1, - "NamePos": 60, - "NameEnd": 63 + "NamePos": 57, + "NameEnd": 60 } } ], "From": { - "FromPos": 65, + "FromPos": 61, "Expr": { "Table": { - "TablePos": 75, - "TableEnd": 82, + "TablePos": 70, + "TableEnd": 77, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "servers", "QuoteType": 1, - "NamePos": 75, - "NameEnd": 82 + "NamePos": 70, + "NameEnd": 77 } }, "HasFinal": false }, - "StatementEnd": 82, + "StatementEnd": 77, "SampleRatio": null, "HasFinal": false } @@ -94,32 +94,32 @@ "Prewhere": null, "Where": null, "GroupBy": { - "GroupByPos": 84, - "GroupByEnd": 183, + "GroupByPos": 78, + "GroupByEnd": 171, "AggregateType": "GROUPING SETS", "Expr": { - "LeftParenPos": 111, - "RightParenPos": 182, + "LeftParenPos": 104, + "RightParenPos": 170, "Items": { - "ListPos": 118, - "ListEnd": 179, + "ListPos": 110, + "ListEnd": 168, "HasDistinct": false, "Items": [ { "Expr": { - "LeftParenPos": 118, - "RightParenPos": 136, + "LeftParenPos": 110, + "RightParenPos": 128, "Items": { - "ListPos": 119, - "ListEnd": 136, + "ListPos": 111, + "ListEnd": 128, "HasDistinct": false, "Items": [ { "Expr": { "Name": "datacenter", "QuoteType": 1, - "NamePos": 119, - "NameEnd": 129 + "NamePos": 111, + "NameEnd": 121 }, "Alias": null }, @@ -127,8 +127,8 @@ "Expr": { "Name": "distro", "QuoteType": 1, - "NamePos": 130, - "NameEnd": 136 + "NamePos": 122, + "NameEnd": 128 }, "Alias": null } @@ -140,19 +140,19 @@ }, { "Expr": { - "LeftParenPos": 144, - "RightParenPos": 155, + "LeftParenPos": 135, + "RightParenPos": 146, "Items": { - "ListPos": 145, - "ListEnd": 155, + "ListPos": 136, + "ListEnd": 146, "HasDistinct": false, "Items": [ { "Expr": { "Name": "datacenter", "QuoteType": 1, - "NamePos": 145, - "NameEnd": 155 + "NamePos": 136, + "NameEnd": 146 }, "Alias": null } @@ -164,19 +164,19 @@ }, { "Expr": { - "LeftParenPos": 163, - "RightParenPos": 170, + "LeftParenPos": 153, + "RightParenPos": 160, "Items": { - "ListPos": 164, - "ListEnd": 170, + "ListPos": 154, + "ListEnd": 160, "HasDistinct": false, "Items": [ { "Expr": { "Name": "distro", "QuoteType": 1, - "NamePos": 164, - "NameEnd": 170 + "NamePos": 154, + "NameEnd": 160 }, "Alias": null } @@ -188,11 +188,11 @@ }, { "Expr": { - "LeftParenPos": 178, - "RightParenPos": 179, + "LeftParenPos": 167, + "RightParenPos": 168, "Items": { - "ListPos": 179, - "ListEnd": 179, + "ListPos": 168, + "ListEnd": 168, "HasDistinct": false, "Items": [] }, @@ -220,8 +220,8 @@ "Except": null }, { - "SelectPos": 188, - "StatementEnd": 284, + "SelectPos": 174, + "StatementEnd": 264, "With": null, "Top": null, "HasDistinct": false, @@ -231,8 +231,8 @@ "Expr": { "Name": "datacenter", "QuoteType": 1, - "NamePos": 200, - "NameEnd": 210 + "NamePos": 185, + "NameEnd": 195 }, "Modifiers": [], "Alias": null @@ -241,8 +241,8 @@ "Expr": { "Name": "distro", "QuoteType": 1, - "NamePos": 217, - "NameEnd": 223 + "NamePos": 201, + "NameEnd": 207 }, "Modifiers": [], "Alias": null @@ -252,23 +252,23 @@ "Name": { "Name": "SUM", "QuoteType": 1, - "NamePos": 230, - "NameEnd": 233 + "NamePos": 213, + "NameEnd": 216 }, "Params": { - "LeftParenPos": 234, - "RightParenPos": 243, + "LeftParenPos": 217, + "RightParenPos": 226, "Items": { - "ListPos": 235, - "ListEnd": 243, + "ListPos": 218, + "ListEnd": 226, "HasDistinct": false, "Items": [ { "Expr": { "Name": "quantity", "QuoteType": 1, - "NamePos": 235, - "NameEnd": 243 + "NamePos": 218, + "NameEnd": 226 }, "Alias": null } @@ -281,30 +281,30 @@ "Alias": { "Name": "qty", "QuoteType": 1, - "NamePos": 248, - "NameEnd": 251 + "NamePos": 231, + "NameEnd": 234 } } ], "From": { - "FromPos": 253, + "FromPos": 235, "Expr": { "Table": { - "TablePos": 263, - "TableEnd": 270, + "TablePos": 244, + "TableEnd": 251, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "servers", "QuoteType": 1, - "NamePos": 263, - "NameEnd": 270 + "NamePos": 244, + "NameEnd": 251 } }, "HasFinal": false }, - "StatementEnd": 270, + "StatementEnd": 251, "SampleRatio": null, "HasFinal": false } @@ -314,8 +314,8 @@ "Prewhere": null, "Where": null, "GroupBy": { - "GroupByPos": 272, - "GroupByEnd": 284, + "GroupByPos": 252, + "GroupByEnd": 264, "AggregateType": "ALL", "Expr": null, "WithCube": false, diff --git a/parser/testdata/query/output/select_with_keyword_in_group_by.sql.golden.json b/parser/testdata/query/output/select_with_keyword_in_group_by.sql.golden.json index 20192a2..9957f9a 100644 --- a/parser/testdata/query/output/select_with_keyword_in_group_by.sql.golden.json +++ b/parser/testdata/query/output/select_with_keyword_in_group_by.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 187, + "StatementEnd": 181, "With": null, "Top": null, "HasDistinct": false, @@ -12,23 +12,23 @@ "Name": { "Name": "toStartOfInterval", "QuoteType": 1, - "NamePos": 12, - "NameEnd": 29 + "NamePos": 11, + "NameEnd": 28 }, "Params": { - "LeftParenPos": 29, - "RightParenPos": 60, + "LeftParenPos": 28, + "RightParenPos": 59, "Items": { - "ListPos": 30, - "ListEnd": 59, + "ListPos": 29, + "ListEnd": 58, "HasDistinct": false, "Items": [ { "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 30, - "NameEnd": 39 + "NamePos": 29, + "NameEnd": 38 }, "Alias": null }, @@ -37,21 +37,21 @@ "Name": { "Name": "toIntervalMinute", "QuoteType": 1, - "NamePos": 41, - "NameEnd": 57 + "NamePos": 40, + "NameEnd": 56 }, "Params": { - "LeftParenPos": 57, - "RightParenPos": 59, + "LeftParenPos": 56, + "RightParenPos": 58, "Items": { - "ListPos": 58, - "ListEnd": 59, + "ListPos": 57, + "ListEnd": 58, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 58, - "NumEnd": 59, + "NumPos": 57, + "NumEnd": 58, "Literal": "1", "Base": 10 }, @@ -73,40 +73,40 @@ "Alias": { "Name": "interval", "QuoteType": 1, - "NamePos": 65, - "NameEnd": 73 + "NamePos": 64, + "NameEnd": 72 } }, { "Expr": { "Name": "column_name", "QuoteType": 1, - "NamePos": 80, - "NameEnd": 91 + "NamePos": 78, + "NameEnd": 89 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 93, + "FromPos": 90, "Expr": { "Table": { - "TablePos": 98, - "TableEnd": 103, + "TablePos": 95, + "TableEnd": 100, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "table", "QuoteType": 1, - "NamePos": 98, - "NameEnd": 103 + "NamePos": 95, + "NameEnd": 100 } }, "HasFinal": false }, - "StatementEnd": 103, + "StatementEnd": 100, "SampleRatio": null, "HasFinal": false } @@ -115,38 +115,38 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 105, + "WherePos": 101, "Expr": { "Name": "true", "QuoteType": 1, - "NamePos": 111, - "NameEnd": 115 + "NamePos": 107, + "NameEnd": 111 } }, "GroupBy": { - "GroupByPos": 117, - "GroupByEnd": 151, + "GroupByPos": 112, + "GroupByEnd": 145, "AggregateType": "", "Expr": { - "ListPos": 126, - "ListEnd": 148, + "ListPos": 121, + "ListEnd": 143, "HasDistinct": false, "Items": [ { "Expr": { - "LeftParenPos": 126, - "RightParenPos": 148, + "LeftParenPos": 121, + "RightParenPos": 143, "Items": { - "ListPos": 127, - "ListEnd": 148, + "ListPos": 122, + "ListEnd": 143, "HasDistinct": false, "Items": [ { "Expr": { "Name": "interval", "QuoteType": 1, - "NamePos": 127, - "NameEnd": 135 + "NamePos": 122, + "NameEnd": 130 }, "Alias": null }, @@ -154,8 +154,8 @@ "Expr": { "Name": "column_name", "QuoteType": 1, - "NamePos": 137, - "NameEnd": 148 + "NamePos": 132, + "NameEnd": 143 }, "Alias": null } @@ -174,39 +174,39 @@ "WithTotal": false, "Having": null, "OrderBy": { - "OrderPos": 151, - "ListEnd": 187, + "OrderPos": 145, + "ListEnd": 181, "Items": [ { - "OrderPos": 151, + "OrderPos": 145, "Expr": { - "LeftParenPos": 160, - "RightParenPos": 187, + "LeftParenPos": 154, + "RightParenPos": 181, "Items": { - "ListPos": 161, - "ListEnd": 187, + "ListPos": 155, + "ListEnd": 181, "HasDistinct": false, "Items": [ { "Expr": { "Name": "interval", "QuoteType": 1, - "NamePos": 161, - "NameEnd": 169 + "NamePos": 155, + "NameEnd": 163 }, "Alias": { "Name": "i", "QuoteType": 1, - "NamePos": 173, - "NameEnd": 174 + "NamePos": 167, + "NameEnd": 168 } }, { "Expr": { "Name": "column_name", "QuoteType": 1, - "NamePos": 176, - "NameEnd": 187 + "NamePos": 170, + "NameEnd": 181 }, "Alias": null } diff --git a/parser/testdata/query/output/select_with_left_join.sql.golden.json b/parser/testdata/query/output/select_with_left_join.sql.golden.json index d97638b..d7bc53a 100644 --- a/parser/testdata/query/output/select_with_left_join.sql.golden.json +++ b/parser/testdata/query/output/select_with_left_join.sql.golden.json @@ -1,22 +1,22 @@ [ { "SelectPos": 0, - "StatementEnd": 131, + "StatementEnd": 121, "With": { "WithPos": 0, - "EndPos": 73, + "EndPos": 68, "CTEs": [ { - "CTEPos": 10, + "CTEPos": 9, "Expr": { "Name": "t1", "QuoteType": 1, - "NamePos": 10, - "NameEnd": 12 + "NamePos": 9, + "NameEnd": 11 }, "Alias": { - "SelectPos": 40, - "StatementEnd": 57, + "SelectPos": 37, + "StatementEnd": 54, "With": null, "Top": null, "HasDistinct": false, @@ -24,8 +24,8 @@ "SelectItems": [ { "Expr": { - "NumPos": 47, - "NumEnd": 48, + "NumPos": 44, + "NumEnd": 45, "Literal": "1", "Base": 10 }, @@ -33,8 +33,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 52, - "NameEnd": 57 + "NamePos": 49, + "NameEnd": 54 } } ], @@ -57,16 +57,16 @@ } }, { - "CTEPos": 71, + "CTEPos": 66, "Expr": { "Name": "t2", "QuoteType": 1, - "NamePos": 71, - "NameEnd": 73 + "NamePos": 66, + "NameEnd": 68 }, "Alias": { - "SelectPos": 88, - "StatementEnd": 105, + "SelectPos": 81, + "StatementEnd": 98, "With": null, "Top": null, "HasDistinct": false, @@ -74,8 +74,8 @@ "SelectItems": [ { "Expr": { - "NumPos": 95, - "NumEnd": 96, + "NumPos": 88, + "NumEnd": 89, "Literal": "2", "Base": 10 }, @@ -83,8 +83,8 @@ "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 100, - "NameEnd": 105 + "NamePos": 93, + "NameEnd": 98 } } ], @@ -116,56 +116,56 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 121, - "NameEnd": 121 + "NamePos": 112, + "NameEnd": 112 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 124, + "FromPos": 114, "Expr": { - "JoinPos": 129, + "JoinPos": 119, "Left": { "Table": { - "TablePos": 129, - "TableEnd": 131, + "TablePos": 119, + "TableEnd": 121, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 129, - "NameEnd": 131 + "NamePos": 119, + "NameEnd": 121 } }, "HasFinal": false }, - "StatementEnd": 131, + "StatementEnd": 121, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 142, + "JoinPos": 131, "Left": { "Table": { - "TablePos": 152, - "TableEnd": 154, + "TablePos": 141, + "TableEnd": 143, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 152, - "NameEnd": 154 + "NamePos": 141, + "NameEnd": 143 } }, "HasFinal": false }, - "StatementEnd": 154, + "StatementEnd": 143, "SampleRatio": null, "HasFinal": false }, @@ -175,18 +175,18 @@ "JOIN" ], "Constraints": { - "OnPos": 155, + "OnPos": 144, "On": { - "ListPos": 158, - "ListEnd": 162, + "ListPos": 147, + "ListEnd": 151, "HasDistinct": false, "Items": [ { "Expr": { "Name": "true", "QuoteType": 1, - "NamePos": 158, - "NameEnd": 162 + "NamePos": 147, + "NameEnd": 151 }, "Alias": null } diff --git a/parser/testdata/query/output/select_with_multi_join.sql.golden.json b/parser/testdata/query/output/select_with_multi_join.sql.golden.json index 69674c9..3725e4f 100644 --- a/parser/testdata/query/output/select_with_multi_join.sql.golden.json +++ b/parser/testdata/query/output/select_with_multi_join.sql.golden.json @@ -1,10 +1,10 @@ [ { "SelectPos": 0, - "StatementEnd": 229, + "StatementEnd": 217, "With": { "WithPos": 0, - "EndPos": 95, + "EndPos": 91, "CTEs": [ { "CTEPos": 5, @@ -15,8 +15,8 @@ "NameEnd": 7 }, "Alias": { - "SelectPos": 18, - "StatementEnd": 42, + "SelectPos": 17, + "StatementEnd": 41, "With": null, "Top": null, "HasDistinct": false, @@ -24,16 +24,16 @@ "SelectItems": [ { "Expr": { - "LiteralPos": 26, - "LiteralEnd": 32, + "LiteralPos": 25, + "LiteralEnd": 31, "Literal": "value1" }, "Modifiers": [], "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 37, - "NameEnd": 42 + "NamePos": 36, + "NameEnd": 41 } } ], @@ -56,16 +56,16 @@ } }, { - "CTEPos": 51, + "CTEPos": 49, "Expr": { "Name": "t2", "QuoteType": 1, - "NamePos": 51, - "NameEnd": 53 + "NamePos": 49, + "NameEnd": 51 }, "Alias": { - "SelectPos": 60, - "StatementEnd": 84, + "SelectPos": 57, + "StatementEnd": 81, "With": null, "Top": null, "HasDistinct": false, @@ -73,16 +73,16 @@ "SelectItems": [ { "Expr": { - "LiteralPos": 68, - "LiteralEnd": 74, + "LiteralPos": 65, + "LiteralEnd": 71, "Literal": "value2" }, "Modifiers": [], "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 79, - "NameEnd": 84 + "NamePos": 76, + "NameEnd": 81 } } ], @@ -105,16 +105,16 @@ } }, { - "CTEPos": 93, + "CTEPos": 89, "Expr": { "Name": "t3", "QuoteType": 1, - "NamePos": 93, - "NameEnd": 95 + "NamePos": 89, + "NameEnd": 91 }, "Alias": { - "SelectPos": 102, - "StatementEnd": 126, + "SelectPos": 97, + "StatementEnd": 121, "With": null, "Top": null, "HasDistinct": false, @@ -122,16 +122,16 @@ "SelectItems": [ { "Expr": { - "LiteralPos": 110, - "LiteralEnd": 116, + "LiteralPos": 105, + "LiteralEnd": 111, "Literal": "value3" }, "Modifiers": [], "Alias": { "Name": "value", "QuoteType": 1, - "NamePos": 121, - "NameEnd": 126 + "NamePos": 116, + "NameEnd": 121 } } ], @@ -165,14 +165,14 @@ { "Name": "t1", "QuoteType": 1, - "NamePos": 147, - "NameEnd": 149 + "NamePos": 139, + "NameEnd": 141 }, { "Name": "value", "QuoteType": 1, - "NamePos": 150, - "NameEnd": 155 + "NamePos": 142, + "NameEnd": 147 } ] }, @@ -180,8 +180,8 @@ "Alias": { "Name": "value1", "QuoteType": 1, - "NamePos": 159, - "NameEnd": 165 + "NamePos": 151, + "NameEnd": 157 } }, { @@ -190,14 +190,14 @@ { "Name": "t2", "QuoteType": 1, - "NamePos": 172, - "NameEnd": 174 + "NamePos": 163, + "NameEnd": 165 }, { "Name": "value", "QuoteType": 1, - "NamePos": 175, - "NameEnd": 180 + "NamePos": 166, + "NameEnd": 171 } ] }, @@ -205,8 +205,8 @@ "Alias": { "Name": "value2", "QuoteType": 1, - "NamePos": 184, - "NameEnd": 190 + "NamePos": 175, + "NameEnd": 181 } }, { @@ -215,14 +215,14 @@ { "Name": "t3", "QuoteType": 1, - "NamePos": 197, - "NameEnd": 199 + "NamePos": 187, + "NameEnd": 189 }, { "Name": "value", "QuoteType": 1, - "NamePos": 200, - "NameEnd": 205 + "NamePos": 190, + "NameEnd": 195 } ] }, @@ -230,120 +230,120 @@ "Alias": { "Name": "value3", "QuoteType": 1, - "NamePos": 209, - "NameEnd": 215 + "NamePos": 199, + "NameEnd": 205 } } ], "From": { - "FromPos": 217, + "FromPos": 206, "Expr": { - "JoinPos": 227, + "JoinPos": 215, "Left": { "Table": { - "TablePos": 227, - "TableEnd": 229, + "TablePos": 215, + "TableEnd": 217, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t1", "QuoteType": 1, - "NamePos": 227, - "NameEnd": 229 + "NamePos": 215, + "NameEnd": 217 } }, "HasFinal": false }, - "StatementEnd": 229, + "StatementEnd": 217, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 239, + "JoinPos": 226, "Left": { "Table": { - "TablePos": 244, - "TableEnd": 246, + "TablePos": 231, + "TableEnd": 233, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t2", "QuoteType": 1, - "NamePos": 244, - "NameEnd": 246 + "NamePos": 231, + "NameEnd": 233 } }, "HasFinal": false }, - "StatementEnd": 246, + "StatementEnd": 233, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 264, + "JoinPos": 250, "Left": { "Table": { - "TablePos": 269, - "TableEnd": 271, + "TablePos": 255, + "TableEnd": 257, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t3", "QuoteType": 1, - "NamePos": 269, - "NameEnd": 271 + "NamePos": 255, + "NameEnd": 257 } }, "HasFinal": false }, - "StatementEnd": 271, + "StatementEnd": 257, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 281, + "JoinPos": 266, "Left": { "Table": { - "TablePos": 286, - "TableEnd": 288, + "TablePos": 271, + "TableEnd": 273, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t4", "QuoteType": 1, - "NamePos": 286, - "NameEnd": 288 + "NamePos": 271, + "NameEnd": 273 } }, "HasFinal": false }, - "StatementEnd": 288, + "StatementEnd": 273, "SampleRatio": null, "HasFinal": false }, "Right": { - "JoinPos": 306, + "JoinPos": 290, "Left": { "Table": { - "TablePos": 311, - "TableEnd": 313, + "TablePos": 295, + "TableEnd": 297, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t5", "QuoteType": 1, - "NamePos": 311, - "NameEnd": 313 + "NamePos": 295, + "NameEnd": 297 } }, "HasFinal": false }, - "StatementEnd": 313, + "StatementEnd": 297, "SampleRatio": null, "HasFinal": false }, @@ -357,18 +357,18 @@ "JOIN" ], "Constraints": { - "OnPos": 289, + "OnPos": 274, "On": { - "ListPos": 292, - "ListEnd": 296, + "ListPos": 277, + "ListEnd": 281, "HasDistinct": false, "Items": [ { "Expr": { "Name": "true", "QuoteType": 1, - "NamePos": 292, - "NameEnd": 296 + "NamePos": 277, + "NameEnd": 281 }, "Alias": null } @@ -385,18 +385,18 @@ "JOIN" ], "Constraints": { - "OnPos": 247, + "OnPos": 234, "On": { - "ListPos": 250, - "ListEnd": 254, + "ListPos": 237, + "ListEnd": 241, "HasDistinct": false, "Items": [ { "Expr": { "Name": "true", "QuoteType": 1, - "NamePos": 250, - "NameEnd": 254 + "NamePos": 237, + "NameEnd": 241 }, "Alias": null } diff --git a/parser/testdata/query/output/select_with_multi_line_comment.sql.golden.json b/parser/testdata/query/output/select_with_multi_line_comment.sql.golden.json index fe0b344..4e5a80d 100644 --- a/parser/testdata/query/output/select_with_multi_line_comment.sql.golden.json +++ b/parser/testdata/query/output/select_with_multi_line_comment.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 66, + "StatementEnd": 61, "With": null, "Top": null, "HasDistinct": false, @@ -11,32 +11,32 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 51, - "NameEnd": 51 + "NamePos": 48, + "NameEnd": 48 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 54, + "FromPos": 50, "Expr": { "Table": { - "TablePos": 64, - "TableEnd": 66, + "TablePos": 59, + "TableEnd": 61, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t0", "QuoteType": 1, - "NamePos": 64, - "NameEnd": 66 + "NamePos": 59, + "NameEnd": 61 } }, "HasFinal": false }, - "StatementEnd": 66, + "StatementEnd": 61, "SampleRatio": null, "HasFinal": false } diff --git a/parser/testdata/query/output/select_with_query_parameter.sql.golden.json b/parser/testdata/query/output/select_with_query_parameter.sql.golden.json index 6b5b273..61bd673 100644 --- a/parser/testdata/query/output/select_with_query_parameter.sql.golden.json +++ b/parser/testdata/query/output/select_with_query_parameter.sql.golden.json @@ -24,22 +24,22 @@ } }, { - "SetPos": 19, + "SetPos": 18, "Settings": { - "SettingsPos": 23, - "ListEnd": 37, + "SettingsPos": 22, + "ListEnd": 36, "Items": [ { - "SettingsPos": 23, + "SettingsPos": 22, "Name": { "Name": "param_b", "QuoteType": 1, - "NamePos": 23, - "NameEnd": 30 + "NamePos": 22, + "NameEnd": 29 }, "Expr": { - "LiteralPos": 34, - "LiteralEnd": 37, + "LiteralPos": 33, + "LiteralEnd": 36, "Literal": "str" } } @@ -47,22 +47,22 @@ } }, { - "SetPos": 41, + "SetPos": 39, "Settings": { - "SettingsPos": 45, - "ListEnd": 75, + "SettingsPos": 43, + "ListEnd": 73, "Items": [ { - "SettingsPos": 45, + "SettingsPos": 43, "Name": { "Name": "param_c", "QuoteType": 1, - "NamePos": 45, - "NameEnd": 52 + "NamePos": 43, + "NameEnd": 50 }, "Expr": { - "LiteralPos": 56, - "LiteralEnd": 75, + "LiteralPos": 54, + "LiteralEnd": 73, "Literal": "2022-08-04 18:30:53" } } @@ -70,41 +70,41 @@ } }, { - "SetPos": 79, + "SetPos": 76, "Settings": { - "SettingsPos": 83, - "ListEnd": 124, + "SettingsPos": 80, + "ListEnd": 121, "Items": [ { - "SettingsPos": 83, + "SettingsPos": 80, "Name": { "Name": "param_d", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 90 + "NamePos": 80, + "NameEnd": 87 }, "Expr": { - "LBracePos": 93, - "RBracePos": 124, + "LBracePos": 90, + "RBracePos": 121, "KeyValues": [ { "Key": { - "LiteralPos": 95, - "LiteralEnd": 97, + "LiteralPos": 92, + "LiteralEnd": 94, "Literal": "10" }, "Value": { - "LeftBracketPos": 100, - "RightBracketPos": 107, + "LeftBracketPos": 97, + "RightBracketPos": 104, "Items": { - "ListPos": 101, - "ListEnd": 107, + "ListPos": 98, + "ListEnd": 104, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 101, - "NumEnd": 103, + "NumPos": 98, + "NumEnd": 100, "Literal": "11", "Base": 10 }, @@ -112,8 +112,8 @@ }, { "Expr": { - "NumPos": 105, - "NumEnd": 107, + "NumPos": 102, + "NumEnd": 104, "Literal": "12", "Base": 10 }, @@ -125,22 +125,22 @@ }, { "Key": { - "LiteralPos": 111, - "LiteralEnd": 113, + "LiteralPos": 108, + "LiteralEnd": 110, "Literal": "13" }, "Value": { - "LeftBracketPos": 116, - "RightBracketPos": 123, + "LeftBracketPos": 113, + "RightBracketPos": 120, "Items": { - "ListPos": 117, - "ListEnd": 123, + "ListPos": 114, + "ListEnd": 120, "HasDistinct": false, "Items": [ { "Expr": { - "NumPos": 117, - "NumEnd": 119, + "NumPos": 114, + "NumEnd": 116, "Literal": "14", "Base": 10 }, @@ -148,8 +148,8 @@ }, { "Expr": { - "NumPos": 121, - "NumEnd": 123, + "NumPos": 118, + "NumEnd": 120, "Literal": "15", "Base": 10 }, @@ -166,8 +166,8 @@ } }, { - "SelectPos": 130, - "StatementEnd": 227, + "SelectPos": 125, + "StatementEnd": 218, "With": null, "Top": null, "HasDistinct": false, @@ -175,20 +175,20 @@ "SelectItems": [ { "Expr": { - "LBracePos": 142, - "RBracePos": 152, + "LBracePos": 136, + "RBracePos": 146, "Name": { "Name": "a", "QuoteType": 1, - "NamePos": 143, - "NameEnd": 144 + "NamePos": 137, + "NameEnd": 138 }, "Type": { "Name": { "Name": "UInt32", "QuoteType": 1, - "NamePos": 146, - "NameEnd": 152 + "NamePos": 140, + "NameEnd": 146 } } }, @@ -197,20 +197,20 @@ }, { "Expr": { - "LBracePos": 160, - "RBracePos": 170, + "LBracePos": 153, + "RBracePos": 163, "Name": { "Name": "b", "QuoteType": 1, - "NamePos": 161, - "NameEnd": 162 + "NamePos": 154, + "NameEnd": 155 }, "Type": { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 164, - "NameEnd": 170 + "NamePos": 157, + "NameEnd": 163 } } }, @@ -219,20 +219,20 @@ }, { "Expr": { - "LBracePos": 178, - "RBracePos": 190, + "LBracePos": 170, + "RBracePos": 182, "Name": { "Name": "c", "QuoteType": 1, - "NamePos": 179, - "NameEnd": 180 + "NamePos": 171, + "NameEnd": 172 }, "Type": { "Name": { "Name": "DateTime", "QuoteType": 1, - "NamePos": 182, - "NameEnd": 190 + "NamePos": 174, + "NameEnd": 182 } } }, @@ -241,48 +241,48 @@ }, { "Expr": { - "LBracePos": 198, - "RBracePos": 227, + "LBracePos": 189, + "RBracePos": 218, "Name": { "Name": "d", "QuoteType": 1, - "NamePos": 199, - "NameEnd": 200 + "NamePos": 190, + "NameEnd": 191 }, "Type": { - "LeftParenPos": 206, - "RightParenPos": 226, + "LeftParenPos": 197, + "RightParenPos": 217, "Name": { "Name": "Map", "QuoteType": 1, - "NamePos": 202, - "NameEnd": 205 + "NamePos": 193, + "NameEnd": 196 }, "Params": [ { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 206, - "NameEnd": 212 + "NamePos": 197, + "NameEnd": 203 } }, { - "LeftParenPos": 220, - "RightParenPos": 225, + "LeftParenPos": 211, + "RightParenPos": 216, "Name": { "Name": "Array", "QuoteType": 1, - "NamePos": 214, - "NameEnd": 219 + "NamePos": 205, + "NameEnd": 210 }, "Params": [ { "Name": { "Name": "UInt8", "QuoteType": 1, - "NamePos": 220, - "NameEnd": 225 + "NamePos": 211, + "NameEnd": 216 } } ] @@ -312,8 +312,8 @@ "Except": null }, { - "SelectPos": 233, - "StatementEnd": 294, + "SelectPos": 222, + "StatementEnd": 283, "With": null, "Top": null, "HasDistinct": false, @@ -323,32 +323,32 @@ "Expr": { "Name": "*", "QuoteType": 0, - "NamePos": 240, - "NameEnd": 240 + "NamePos": 229, + "NameEnd": 229 }, "Modifiers": [], "Alias": null } ], "From": { - "FromPos": 242, + "FromPos": 231, "Expr": { "Table": { - "TablePos": 247, - "TableEnd": 257, + "TablePos": 236, + "TableEnd": 246, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "clickhouse", "QuoteType": 1, - "NamePos": 247, - "NameEnd": 257 + "NamePos": 236, + "NameEnd": 246 } }, "HasFinal": false }, - "StatementEnd": 257, + "StatementEnd": 246, "SampleRatio": null, "HasFinal": false } @@ -357,30 +357,30 @@ "Window": null, "Prewhere": null, "Where": { - "WherePos": 258, + "WherePos": 247, "Expr": { "LeftExpr": { "Name": "tenant_id", "QuoteType": 1, - "NamePos": 264, - "NameEnd": 273 + "NamePos": 253, + "NameEnd": 262 }, "Operation": "=", "RightExpr": { - "LBracePos": 276, - "RBracePos": 294, + "LBracePos": 265, + "RBracePos": 283, "Name": { "Name": "tenant_id", "QuoteType": 1, - "NamePos": 277, - "NameEnd": 286 + "NamePos": 266, + "NameEnd": 275 }, "Type": { "Name": { "Name": "String", "QuoteType": 1, - "NamePos": 288, - "NameEnd": 294 + "NamePos": 277, + "NameEnd": 283 } } }, diff --git a/parser/testdata/query/output/select_with_window_function.sql.golden.json b/parser/testdata/query/output/select_with_window_function.sql.golden.json index 8bb49a1..2f0f9a4 100644 --- a/parser/testdata/query/output/select_with_window_function.sql.golden.json +++ b/parser/testdata/query/output/select_with_window_function.sql.golden.json @@ -1,7 +1,7 @@ [ { "SelectPos": 0, - "StatementEnd": 520, + "StatementEnd": 508, "With": null, "Top": null, "HasDistinct": false, @@ -26,90 +26,90 @@ "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 54, - "NameEnd": 63 + "NamePos": 53, + "NameEnd": 62 }, "Modifiers": [], "Alias": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 67, - "NameEnd": 76 + "NamePos": 66, + "NameEnd": 75 } }, { "Expr": { "Name": "step_0", "QuoteType": 1, - "NamePos": 83, - "NameEnd": 89 + "NamePos": 81, + "NameEnd": 87 }, "Modifiers": [], "Alias": { "Name": "step_0", "QuoteType": 1, - "NamePos": 93, - "NameEnd": 99 + "NamePos": 91, + "NameEnd": 97 } }, { "Expr": { "Name": "latest_0", "QuoteType": 1, - "NamePos": 106, - "NameEnd": 114 + "NamePos": 103, + "NameEnd": 111 }, "Modifiers": [], "Alias": { "Name": "latest_0", "QuoteType": 1, - "NamePos": 118, - "NameEnd": 126 + "NamePos": 115, + "NameEnd": 123 } }, { "Expr": { "Name": "step_1", "QuoteType": 1, - "NamePos": 133, - "NameEnd": 139 + "NamePos": 129, + "NameEnd": 135 }, "Modifiers": [], "Alias": { "Name": "step_1", "QuoteType": 1, - "NamePos": 143, - "NameEnd": 149 + "NamePos": 139, + "NameEnd": 145 } }, { "Expr": { "Name": "latest_1", "QuoteType": 1, - "NamePos": 156, - "NameEnd": 164 + "NamePos": 151, + "NameEnd": 159 }, "Modifiers": [], "Alias": { "Name": "latest_1", "QuoteType": 1, - "NamePos": 168, - "NameEnd": 176 + "NamePos": 163, + "NameEnd": 171 } }, { "Expr": { "Name": "step_2", "QuoteType": 1, - "NamePos": 183, - "NameEnd": 189 + "NamePos": 177, + "NameEnd": 183 }, "Modifiers": [], "Alias": { "Name": "step_2", "QuoteType": 1, - "NamePos": 193, - "NameEnd": 199 + "NamePos": 187, + "NameEnd": 193 } }, { @@ -118,23 +118,23 @@ "Name": { "Name": "min", "QuoteType": 1, - "NamePos": 206, - "NameEnd": 209 + "NamePos": 199, + "NameEnd": 202 }, "Params": { - "LeftParenPos": 209, - "RightParenPos": 218, + "LeftParenPos": 202, + "RightParenPos": 211, "Items": { - "ListPos": 210, - "ListEnd": 218, + "ListPos": 203, + "ListEnd": 211, "HasDistinct": false, "Items": [ { "Expr": { "Name": "latest_2", "QuoteType": 1, - "NamePos": 210, - "NameEnd": 218 + "NamePos": 203, + "NameEnd": 211 }, "Alias": null } @@ -143,23 +143,23 @@ "ColumnArgList": null } }, - "OverPos": 220, + "OverPos": 213, "OverExpr": { - "LeftParenPos": 225, - "RightParenPos": 335, + "LeftParenPos": 218, + "RightParenPos": 327, "PartitionBy": { - "PartitionPos": 225, + "PartitionPos": 218, "Expr": { - "ListPos": 239, - "ListEnd": 257, + "ListPos": 232, + "ListEnd": 250, "HasDistinct": false, "Items": [ { "Expr": { "Name": "aggregation_target", "QuoteType": 1, - "NamePos": 239, - "NameEnd": 257 + "NamePos": 232, + "NameEnd": 250 }, "Alias": null } @@ -167,16 +167,16 @@ } }, "OrderBy": { - "OrderPos": 263, - "ListEnd": 281, + "OrderPos": 255, + "ListEnd": 273, "Items": [ { - "OrderPos": 263, + "OrderPos": 255, "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 272, - "NameEnd": 281 + "NamePos": 264, + "NameEnd": 273 }, "Alias": null, "Direction": "DESC" @@ -184,31 +184,31 @@ ] }, "Frame": { - "FramePos": 287, + "FramePos": 279, "Type": "ROWS", "Extend": { "Expr": null, "Between": { - "FramePos": 300, + "FramePos": 292, "Type": "", "Extend": { - "UnboundedPos": 300, + "UnboundedPos": 292, "UnboundedEnd": 0, "Direction": "PRECEDING" } }, - "AndPos": 320, + "AndPos": 312, "And": { - "FramePos": 324, + "FramePos": 316, "Type": "", "Extend": { "Number": { - "NumPos": 324, - "NumEnd": 325, + "NumPos": 316, + "NumEnd": 317, "Literal": "0", "Base": 10 }, - "UnboundedEnd": 335, + "UnboundedEnd": 327, "Direction": "PRECEDING" } } @@ -220,8 +220,8 @@ "Alias": { "Name": "latest_2", "QuoteType": 1, - "NamePos": 340, - "NameEnd": 348 + "NamePos": 332, + "NameEnd": 340 } }, { @@ -230,23 +230,23 @@ "Name": { "Name": "min", "QuoteType": 1, - "NamePos": 355, - "NameEnd": 358 + "NamePos": 346, + "NameEnd": 349 }, "Params": { - "LeftParenPos": 358, - "RightParenPos": 367, + "LeftParenPos": 349, + "RightParenPos": 358, "Items": { - "ListPos": 359, - "ListEnd": 367, + "ListPos": 350, + "ListEnd": 358, "HasDistinct": false, "Items": [ { "Expr": { "Name": "latest_1", "QuoteType": 1, - "NamePos": 359, - "NameEnd": 367 + "NamePos": 350, + "NameEnd": 358 }, "Alias": null } @@ -255,63 +255,63 @@ "ColumnArgList": null } }, - "OverPos": 369, + "OverPos": 360, "OverExpr": { "Name": "w", "QuoteType": 1, - "NamePos": 374, - "NameEnd": 375 + "NamePos": 365, + "NameEnd": 366 } }, "Modifiers": [], "Alias": { "Name": "latest_1", "QuoteType": 1, - "NamePos": 379, - "NameEnd": 387 + "NamePos": 370, + "NameEnd": 378 } } ], "From": { - "FromPos": 389, + "FromPos": 379, "Expr": { "Table": { - "TablePos": 394, - "TableEnd": 396, + "TablePos": 384, + "TableEnd": 386, "Alias": null, "Expr": { "Database": null, "Table": { "Name": "t0", "QuoteType": 1, - "NamePos": 394, - "NameEnd": 396 + "NamePos": 384, + "NameEnd": 386 } }, "HasFinal": false }, - "StatementEnd": 396, + "StatementEnd": 386, "SampleRatio": null, "HasFinal": false } }, "ArrayJoin": null, "Window": { - "LeftParenPos": 410, - "RightParenPos": 520, + "LeftParenPos": 399, + "RightParenPos": 508, "PartitionBy": { - "PartitionPos": 410, + "PartitionPos": 399, "Expr": { - "ListPos": 424, - "ListEnd": 442, + "ListPos": 413, + "ListEnd": 431, "HasDistinct": false, "Items": [ { "Expr": { "Name": "aggregation_target", "QuoteType": 1, - "NamePos": 424, - "NameEnd": 442 + "NamePos": 413, + "NameEnd": 431 }, "Alias": null } @@ -319,16 +319,16 @@ } }, "OrderBy": { - "OrderPos": 448, - "ListEnd": 466, + "OrderPos": 436, + "ListEnd": 454, "Items": [ { - "OrderPos": 448, + "OrderPos": 436, "Expr": { "Name": "timestamp", "QuoteType": 1, - "NamePos": 457, - "NameEnd": 466 + "NamePos": 445, + "NameEnd": 454 }, "Alias": null, "Direction": "DESC" @@ -336,42 +336,42 @@ ] }, "Frame": { - "FramePos": 472, + "FramePos": 460, "Type": "ROWS", "Extend": { "Expr": null, "Between": { - "FramePos": 485, + "FramePos": 473, "Type": "", "Extend": { - "UnboundedPos": 485, + "UnboundedPos": 473, "UnboundedEnd": 0, "Direction": "PRECEDING" } }, - "AndPos": 505, + "AndPos": 493, "And": { - "FramePos": 509, + "FramePos": 497, "Type": "", "Extend": { "Number": { - "NumPos": 509, - "NumEnd": 510, + "NumPos": 497, + "NumEnd": 498, "Literal": "0", "Base": 10 }, - "UnboundedEnd": 520, + "UnboundedEnd": 508, "Direction": "PRECEDING" } } } }, - "WindowPos": 398, + "WindowPos": 387, "Name": { "Name": "w", "QuoteType": 1, - "NamePos": 405, - "NameEnd": 406 + "NamePos": 394, + "NameEnd": 395 }, "AsPos": 0 },