From 8e6ba978f203a48e32700f06e79c5c85f2a851e7 Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Thu, 22 May 2025 20:11:53 -0400 Subject: [PATCH] parser: clean & set transaction historical syntax Various renames to prepare for the codegen'd stuff. AST node names need to match their SyntaxKind names. Also added a test case and fixed parsing historical syntax for set transaction that I found when looking through the pg gram.y --- crates/squawk_parser/src/grammar.rs | 99 ++++----- crates/squawk_parser/src/lib.rs | 8 +- crates/squawk_parser/src/syntax_kind.rs | 16 +- .../tests/data/ok/set_transaction.sql | 5 +- .../snapshots/tests__alter_aggregate_ok.snap | 1 - .../snapshots/tests__alter_collation_ok.snap | 1 - .../snapshots/tests__alter_conversion_ok.snap | 1 - .../snapshots/tests__alter_database_ok.snap | 1 - .../tests__alter_default_privileges_ok.snap | 1 - .../snapshots/tests__alter_domain_ok.snap | 1 - .../tests__alter_event_trigger_ok.snap | 1 - .../snapshots/tests__alter_extension_ok.snap | 1 - ...tests__alter_foreign_data_wrapper_err.snap | 1 - .../tests__alter_foreign_data_wrapper_ok.snap | 1 - .../tests__alter_foreign_table_ok.snap | 1 - .../snapshots/tests__alter_function_ok.snap | 1 - .../snapshots/tests__alter_group_ok.snap | 1 - .../snapshots/tests__alter_index_ok.snap | 1 - .../snapshots/tests__alter_language_ok.snap | 1 - .../tests__alter_large_object_ok.snap | 1 - .../tests__alter_materialized_view_ok.snap | 1 - .../tests__alter_operator_class_ok.snap | 1 - .../tests__alter_operator_family_ok.snap | 1 - .../snapshots/tests__alter_operator_ok.snap | 1 - .../snapshots/tests__alter_policy_ok.snap | 1 - .../snapshots/tests__alter_procedure_ok.snap | 1 - .../tests__alter_publication_ok.snap | 1 - .../tests/snapshots/tests__alter_role_ok.snap | 1 - .../snapshots/tests__alter_routine_ok.snap | 1 - .../tests/snapshots/tests__alter_rule_ok.snap | 1 - .../snapshots/tests__alter_schema_ok.snap | 1 - .../snapshots/tests__alter_sequence_err.snap | 1 - .../snapshots/tests__alter_sequence_ok.snap | 1 - .../snapshots/tests__alter_server_err.snap | 1 - .../snapshots/tests__alter_server_ok.snap | 1 - .../snapshots/tests__alter_statistics_ok.snap | 1 - .../tests__alter_subscription_ok.snap | 1 - .../snapshots/tests__alter_system_ok.snap | 1 - .../snapshots/tests__alter_table_err.snap | 3 +- .../snapshots/tests__alter_table_ok.snap | 1 - .../snapshots/tests__alter_table_pg17_ok.snap | 1 - .../snapshots/tests__alter_tablespace_ok.snap | 1 - ...s__alter_text_search_configuration_ok.snap | 1 - ...ests__alter_text_search_dictionary_ok.snap | 1 - .../tests__alter_text_search_parser_ok.snap | 1 - .../tests__alter_text_search_template_ok.snap | 1 - .../snapshots/tests__alter_trigger_ok.snap | 1 - .../tests/snapshots/tests__alter_type_ok.snap | 1 - .../tests__alter_user_mapping_ok.snap | 1 - .../tests/snapshots/tests__alter_user_ok.snap | 1 - .../tests/snapshots/tests__alter_view_ok.snap | 1 - .../tests/snapshots/tests__analyze_ok.snap | 1 - .../tests/snapshots/tests__call_ok.snap | 1 - .../tests/snapshots/tests__checkpoint_ok.snap | 1 - .../tests/snapshots/tests__close_ok.snap | 1 - .../tests/snapshots/tests__cluster_ok.snap | 1 - .../tests/snapshots/tests__comment_ok.snap | 1 - .../tests/snapshots/tests__copy_ok.snap | 1 - .../tests__create_access_method_ok.snap | 1 - .../snapshots/tests__create_aggregate_ok.snap | 1 - .../snapshots/tests__create_cast_ok.snap | 1 - .../snapshots/tests__create_collation_ok.snap | 1 - .../tests__create_conversion_ok.snap | 1 - .../snapshots/tests__create_database_ok.snap | 1 - .../snapshots/tests__create_domain_ok.snap | 1 - .../tests__create_event_trigger_ok.snap | 1 - .../tests/snapshots/tests__create_ext_ok.snap | 1 - ...tests__create_foreign_data_wrapper_ok.snap | 1 - .../tests__create_foreign_table_ok.snap | 1 - .../snapshots/tests__create_function_err.snap | 1 - .../snapshots/tests__create_function_ok.snap | 7 +- .../snapshots/tests__create_group_ok.snap | 1 - .../snapshots/tests__create_index_ok.snap | 41 ++-- .../snapshots/tests__create_language_ok.snap | 1 - .../tests__create_materialized_view_ok.snap | 1 - .../tests__create_operator_class_ok.snap | 1 - .../tests__create_operator_family_ok.snap | 1 - .../snapshots/tests__create_operator_ok.snap | 1 - .../snapshots/tests__create_policy_ok.snap | 1 - .../snapshots/tests__create_procedure_ok.snap | 1 - .../tests__create_publication_ok.snap | 1 - .../snapshots/tests__create_role_ok.snap | 1 - .../snapshots/tests__create_rule_ok.snap | 1 - .../snapshots/tests__create_sequence_ok.snap | 1 - .../snapshots/tests__create_server_ok.snap | 1 - .../tests__create_statistics_ok.snap | 1 - .../tests__create_subscription_ok.snap | 1 - .../snapshots/tests__create_table_as_ok.snap | 1 - .../snapshots/tests__create_table_err.snap | 1 - .../snapshots/tests__create_table_ok.snap | 7 +- .../tests__create_table_pg17_ok.snap | 1 - .../tests__create_tablespace_ok.snap | 1 - .../tests__create_text_search_config_ok.snap | 1 - .../tests__create_text_search_dict_ok.snap | 1 - .../tests__create_text_search_parser_ok.snap | 1 - ...tests__create_text_search_template_ok.snap | 1 - .../snapshots/tests__create_transform_ok.snap | 1 - .../snapshots/tests__create_trigger_ok.snap | 1 - .../snapshots/tests__create_type_ok.snap | 1 - .../snapshots/tests__create_user_ok.snap | 1 - .../tests__create_view_extra_parens_ok.snap | 1 - .../snapshots/tests__create_view_ok.snap | 1 - .../tests/snapshots/tests__deallocate_ok.snap | 1 - .../tests/snapshots/tests__declare_ok.snap | 1 - .../tests/snapshots/tests__delete_ok.snap | 1 - .../tests/snapshots/tests__discard_ok.snap | 1 - .../tests/snapshots/tests__do_ok.snap | 1 - .../tests__drop_access_method_ok.snap | 1 - .../snapshots/tests__drop_aggregate_ok.snap | 9 +- .../tests/snapshots/tests__drop_cast_ok.snap | 1 - .../snapshots/tests__drop_collation_ok.snap | 1 - .../snapshots/tests__drop_conversion_ok.snap | 1 - .../snapshots/tests__drop_database_ok.snap | 1 - .../snapshots/tests__drop_domain_ok.snap | 1 - .../tests__drop_event_trigger_ok.snap | 1 - .../snapshots/tests__drop_extension_ok.snap | 1 - .../tests__drop_foreign_data_ok.snap | 1 - .../tests__drop_foreign_table_ok.snap | 1 - .../snapshots/tests__drop_function_ok.snap | 1 - .../tests/snapshots/tests__drop_group_ok.snap | 1 - .../tests/snapshots/tests__drop_index_ok.snap | 1 - .../snapshots/tests__drop_language_ok.snap | 1 - .../tests__drop_materialized_view_ok.snap | 1 - .../tests__drop_operator_class_ok.snap | 1 - .../tests__drop_operator_family_ok.snap | 1 - .../snapshots/tests__drop_operator_ok.snap | 1 - .../tests/snapshots/tests__drop_owned_ok.snap | 1 - .../snapshots/tests__drop_policy_ok.snap | 1 - .../snapshots/tests__drop_procedure_ok.snap | 1 - .../snapshots/tests__drop_publication_ok.snap | 1 - .../tests/snapshots/tests__drop_role_ok.snap | 1 - .../snapshots/tests__drop_routine_ok.snap | 1 - .../tests/snapshots/tests__drop_rule_ok.snap | 1 - .../snapshots/tests__drop_sequence_ok.snap | 1 - .../snapshots/tests__drop_server_ok.snap | 1 - .../snapshots/tests__drop_statistics_ok.snap | 1 - .../tests__drop_subscription_ok.snap | 1 - .../tests/snapshots/tests__drop_table_ok.snap | 1 - .../snapshots/tests__drop_tablespace_ok.snap | 1 - .../tests__drop_text_search_config_ok.snap | 1 - .../tests__drop_text_search_dict_ok.snap | 1 - .../tests__drop_text_search_parser_ok.snap | 1 - .../tests__drop_text_search_template_ok.snap | 1 - .../snapshots/tests__drop_transform_ok.snap | 1 - .../snapshots/tests__drop_trigger_ok.snap | 1 - .../tests/snapshots/tests__drop_type_ok.snap | 1 - .../tests__drop_user_mapping_ok.snap | 1 - .../tests/snapshots/tests__drop_user_ok.snap | 1 - .../tests/snapshots/tests__drop_view_ok.snap | 1 - .../tests/snapshots/tests__execute_ok.snap | 1 - .../tests/snapshots/tests__explain_ok.snap | 4 +- .../tests/snapshots/tests__fetch_ok.snap | 1 - .../tests/snapshots/tests__grant_ok.snap | 1 - .../tests__import_foreign_schema_ok.snap | 1 - .../tests/snapshots/tests__insert_err.snap | 1 - .../tests/snapshots/tests__insert_ok.snap | 1 - .../tests/snapshots/tests__load_ok.snap | 1 - .../tests/snapshots/tests__lock_ok.snap | 1 - .../tests/snapshots/tests__merge_ok.snap | 1 - .../tests/snapshots/tests__merge_pg17_ok.snap | 1 - .../tests/snapshots/tests__misc_ok.snap | 66 +++--- .../tests/snapshots/tests__move_ok.snap | 1 - .../tests/snapshots/tests__precedence_ok.snap | 1 - .../tests/snapshots/tests__reassign_ok.snap | 1 - .../tests/snapshots/tests__refresh_ok.snap | 1 - .../tests/snapshots/tests__reindex_ok.snap | 1 - .../tests/snapshots/tests__reset_ok.snap | 1 - .../tests/snapshots/tests__revoke_ok.snap | 1 - .../tests/snapshots/tests__schemas_ok.snap | 1 - .../snapshots/tests__security_label_ok.snap | 1 - .../snapshots/tests__select_casts_ok.snap | 195 +++++++++--------- ...ests__select_compound_union_select_ok.snap | 5 +- .../snapshots/tests__select_cte_err.snap | 1 - .../tests/snapshots/tests__select_cte_ok.snap | 1 - .../tests/snapshots/tests__select_err.snap | 1 - .../snapshots/tests__select_funcs_ok.snap | 5 +- .../tests__select_funcs_pg17_ok.snap | 3 +- .../snapshots/tests__select_into_ok.snap | 1 - .../snapshots/tests__select_operators_ok.snap | 78 +++---- .../snapshots/tests__set_constraints_ok.snap | 1 - .../tests/snapshots/tests__set_role_ok.snap | 1 - .../snapshots/tests__set_session_auth_ok.snap | 1 - .../snapshots/tests__set_transaction_ok.snap | 26 ++- .../snapshots/tests__transaction_ok.snap | 37 ++-- .../tests/snapshots/tests__truncate_ok.snap | 1 - .../tests/snapshots/tests__update_ok.snap | 5 +- .../tests/snapshots/tests__vacuum_ok.snap | 1 - .../tests/snapshots/tests__values_err.snap | 1 - .../tests/snapshots/tests__values_ok.snap | 3 +- crates/squawk_parser/tests/utils.rs | 61 ------ crates/squawk_syntax/src/ast/nodes.rs | 30 +-- ...st__alter_aggregate_params_validation.snap | 4 +- ..._syntax__test__array_exprs_validation.snap | 4 +- ...t__create_aggregate_params_validation.snap | 4 +- ...ax__test__custom_operators_validation.snap | 4 +- ...est__drop_aggregate_params_validation.snap | 10 +- 196 files changed, 336 insertions(+), 572 deletions(-) delete mode 100644 crates/squawk_parser/tests/utils.rs diff --git a/crates/squawk_parser/src/grammar.rs b/crates/squawk_parser/src/grammar.rs index 45f3d28d..110a1739 100644 --- a/crates/squawk_parser/src/grammar.rs +++ b/crates/squawk_parser/src/grammar.rs @@ -1654,10 +1654,10 @@ fn json_key_value(p: &mut Parser<'_>, lhs: CompletedMarker) -> CompletedMarker { } fn named_arg(p: &mut Parser<'_>, lhs: CompletedMarker) -> CompletedMarker { - assert!(p.at(FAT_ARROW) || p.at(COLONEQ)); + assert!(p.at(FAT_ARROW) || p.at(COLON_EQ)); let m = lhs.precede(p); - if p.at(COLONEQ) { - p.bump(COLONEQ); + if p.at(COLON_EQ) { + p.bump(COLON_EQ); } else { p.bump(FAT_ARROW); } @@ -1668,9 +1668,9 @@ fn named_arg(p: &mut Parser<'_>, lhs: CompletedMarker) -> CompletedMarker { } fn cast_expr(p: &mut Parser<'_>, lhs: CompletedMarker) -> CompletedMarker { - assert!(p.at(COLON2)); + assert!(p.at(COLON_COLON)); let m = lhs.precede(p); - p.bump(COLON2); + p.bump(COLON_COLON); type_name(p); m.complete(p, CAST_EXPR) } @@ -2089,9 +2089,9 @@ fn current_op(p: &Parser<'_>, r: &Restrictions) -> (u8, SyntaxKind, Associativit MINUS if p.next_not_joined_op(0) => (8, MINUS, Left), // symbol // Later on we return a NAMED_ARG for this instead of BIN_EXPR // := - COLON if p.at(COLONEQ) => (5, COLONEQ, Right), // symbol + COLON if p.at(COLON_EQ) => (5, COLON_EQ, Right), // symbol // :: - COLON if p.at(COLON2) => (15, COLON2, Left), // symbol + COLON if p.at(COLON_COLON) => (15, COLON_COLON, Left), // symbol // Only used in json_object, like json_object('a' value 1) instead of json_object('a': 1) // value VALUE_KW if r.json_field_arg_allowed => (7, VALUE_KW, Right), @@ -2159,11 +2159,11 @@ fn expr_bp(p: &mut Parser<'_>, bp: u8, r: &Restrictions) -> Option { + COLON_COLON => { lhs = cast_expr(p, lhs); continue; } - FAT_ARROW | COLONEQ => { + FAT_ARROW | COLON_EQ => { lhs = named_arg(p, lhs); continue; } @@ -2740,7 +2740,7 @@ fn data_source(p: &mut Parser<'_>) { // USING data_source ON join_condition fn merge_using_clause(p: &mut Parser<'_>) { - let m1 = p.start(); + let m = p.start(); p.expect(USING_KW); data_source(p); p.expect(ON_KW); @@ -2748,7 +2748,7 @@ fn merge_using_clause(p: &mut Parser<'_>) { if expr(p).is_none() { p.error("expected an expression"); } - m1.complete(p, USING_CLAUSE); + m.complete(p, USING_CLAUSE); } // where from_item can be one of: @@ -3119,8 +3119,7 @@ fn opt_with_params(p: &mut Parser<'_>) -> Option { // [ INCLUDE ( column_name [, ... ] ) ] // [ WITH ( storage_parameter [= value] [, ... ] ) ] // [ USING INDEX TABLESPACE tablespace_name ] -#[must_use] -fn opt_index_parameters(p: &mut Parser<'_>) -> bool { +fn opt_index_parameters(p: &mut Parser<'_>) { opt_include_columns(p); opt_with_params(p); if p.at(USING_KW) { @@ -3131,7 +3130,6 @@ fn opt_index_parameters(p: &mut Parser<'_>) -> bool { name_ref(p); m.complete(p, CONSTRAINT_INDEX_TABLESPACE); } - true } // referential_action in a FOREIGN KEY/REFERENCES constraint is: @@ -3293,18 +3291,14 @@ fn opt_constraint_inner(p: &mut Parser<'_>) -> Option { p.eat(NOT_KW); p.expect(DISTINCT_KW); } - if !opt_index_parameters(p) { - p.error("expected index parameters"); - } + opt_index_parameters(p); UNIQUE_CONSTRAINT } // PRIMARY KEY index_parameters PRIMARY_KW => { p.bump(PRIMARY_KW); p.expect(KEY_KW); - if !opt_index_parameters(p) { - p.error("expected index parameters"); - } + opt_index_parameters(p); PRIMARY_KEY_CONSTRAINT } // REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] @@ -3506,9 +3500,7 @@ fn table_constraint(p: &mut Parser<'_>) -> CompletedMarker { p.eat(DISTINCT_KW); } column_list(p); - if !opt_index_parameters(p) { - p.error("expected index parameters"); - } + opt_index_parameters(p); } UNIQUE_CONSTRAINT } @@ -3523,9 +3515,7 @@ fn table_constraint(p: &mut Parser<'_>) -> CompletedMarker { // ( column_name [, ... ] ) index_parameters } else { column_list(p); - if !opt_index_parameters(p) { - p.error("expected index parameters"); - } + opt_index_parameters(p); } PRIMARY_KEY_CONSTRAINT } @@ -3553,9 +3543,7 @@ fn table_constraint(p: &mut Parser<'_>) -> CompletedMarker { } p.expect(R_PAREN); m.complete(p, CONSTRAINT_EXCLUSIONS); - if !opt_index_parameters(p) { - p.error("expected index parameters"); - } + opt_index_parameters(p); if p.at(WHERE_KW) { let m = p.start(); p.bump(WHERE_KW); @@ -3637,7 +3625,7 @@ fn opt_initally_constraint_option(p: &mut Parser<'_>) -> Option (INITIALLY_KW, DEFERRED_KW) => { p.bump(INITIALLY_KW); p.bump(DEFERRED_KW); - INITALLY_DEFERRED_CONSTRAINT_OPTION + INITIALLY_DEFERRED_CONSTRAINT_OPTION } (INITIALLY_KW, IMMEDIATE_KW) => { p.bump(INITIALLY_KW); @@ -3665,7 +3653,7 @@ fn opt_constraint_options(p: &mut Parser<'_>) { } (Some(deferrable), Some(initially)) => { if deferrable.kind() == NOT_DEFERRABLE_CONSTRAINT_OPTION - && initially.kind() == INITALLY_DEFERRED_CONSTRAINT_OPTION + && initially.kind() == INITIALLY_DEFERRED_CONSTRAINT_OPTION { p.error("constraint declared INITIALLY DEFERRED must be DEFERRABLE"); } @@ -4176,9 +4164,8 @@ fn opt_target_el(p: &mut Parser) -> Option { return None; } else if p.at(STAR) && !p.nth_at_ts(1, OPERATOR_FIRST) { p.bump(STAR); - true } else if expr(p).is_some() { - opt_as_col_label(p) || p.at(COMMA) + opt_as_col_label(p); } else { m.abandon(p); p.error(format!( @@ -4562,7 +4549,7 @@ fn commit_stmt(p: &mut Parser<'_>) -> CompletedMarker { p.expect(CHAIN_KW); } } - m.complete(p, COMMIT_STMT) + m.complete(p, COMMIT) } const TRANSACTION_MODE_FIRST: TokenSet = @@ -4635,7 +4622,7 @@ fn begin_stmt(p: &mut Parser<'_>) -> CompletedMarker { p.expect(TRANSACTION_KW); opt_transaction_mode_list(p); } - m.complete(p, BEGIN_STMT) + m.complete(p, BEGIN) } // Sconst @@ -9179,7 +9166,7 @@ fn drop_aggregate_stmt(p: &mut Parser<'_>) -> CompletedMarker { aggregate(p); } opt_cascade_or_restrict(p); - m.complete(p, DROP_AGGREGATE_STMT) + m.complete(p, DROP_AGGREGATE) } fn source_type_as_target_type(p: &mut Parser<'_>) { @@ -10554,6 +10541,18 @@ fn set_session_auth_stmt(p: &mut Parser<'_>) -> CompletedMarker { m.complete(p, SET_SESSION_AUTH_STMT) } +fn transaction_mode_list(p: &mut Parser<'_>) { + // TODO: generalize + // transaction_mode [, ...] + while !p.at(EOF) && p.at_ts(TRANSACTION_MODE_FIRST) { + if !opt_transaction_mode(p) { + p.error("expected transaction mode"); + } + // historical pg syntax doesn't require commas + p.eat(COMMA); + } +} + // SET TRANSACTION transaction_mode [, ...] // SET TRANSACTION SNAPSHOT snapshot_id // SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...] @@ -10570,32 +10569,14 @@ fn set_transaction_stmt(p: &mut Parser<'_>) -> CompletedMarker { p.expect(CHARACTERISTICS_KW); p.expect(AS_KW); p.expect(TRANSACTION_KW); - // TODO: generalize - // transaction_mode [, ...] - while !p.at(EOF) { - if !opt_transaction_mode(p) { - p.error("expected transaction mode"); - } - if !p.eat(COMMA) { - break; - } - } + transaction_mode_list(p); } else { p.expect(TRANSACTION_KW); // [ SNAPSHOT snapshot_id ] if p.eat(SNAPSHOT_KW) { string_literal(p); } else { - // TODO: generalize - // transaction_mode [, ...] - while !p.at(EOF) { - if !opt_transaction_mode(p) { - break; - } - if !p.eat(COMMA) { - break; - } - } + transaction_mode_list(p); } } m.complete(p, SET_TRANSACTION_STMT) @@ -12017,7 +11998,7 @@ fn create_index_stmt(p: &mut Parser<'_>) -> CompletedMarker { } // [ WHERE predicate ] opt_where_clause(p); - m.complete(p, CREATE_INDEX_STMT) + m.complete(p, CREATE_INDEX) } // ( @@ -12060,7 +12041,7 @@ fn opt_param_mode(p: &mut Parser<'_>) -> Option { IN_KW => { p.bump(IN_KW); if p.eat(OUT_KW) { - PARAM_INOUT + PARAM_IN_OUT } else { PARAM_IN } @@ -12071,7 +12052,7 @@ fn opt_param_mode(p: &mut Parser<'_>) -> Option { } INOUT_KW => { p.bump(INOUT_KW); - PARAM_INOUT + PARAM_IN_OUT } _ => { m.abandon(p); diff --git a/crates/squawk_parser/src/lib.rs b/crates/squawk_parser/src/lib.rs index efc78110..d97b0ad6 100644 --- a/crates/squawk_parser/src/lib.rs +++ b/crates/squawk_parser/src/lib.rs @@ -210,8 +210,8 @@ impl<'t> Parser<'t> { return false; } let n_raw_tokens = match kind { - SyntaxKind::COLON2 - | SyntaxKind::COLONEQ + SyntaxKind::COLON_COLON + | SyntaxKind::COLON_EQ | SyntaxKind::NEQ | SyntaxKind::NEQB | SyntaxKind::LTEQ @@ -508,14 +508,14 @@ impl<'t> Parser<'t> { TrivaBetween::NotAllowed, ), // := - SyntaxKind::COLONEQ => self.at_composite2( + SyntaxKind::COLON_EQ => self.at_composite2( n, SyntaxKind::COLON, SyntaxKind::EQ, TrivaBetween::NotAllowed, ), // :: - SyntaxKind::COLON2 => self.at_composite2( + SyntaxKind::COLON_COLON => self.at_composite2( n, SyntaxKind::COLON, SyntaxKind::COLON, diff --git a/crates/squawk_parser/src/syntax_kind.rs b/crates/squawk_parser/src/syntax_kind.rs index 7f9774bb..4b5aa0e4 100644 --- a/crates/squawk_parser/src/syntax_kind.rs +++ b/crates/squawk_parser/src/syntax_kind.rs @@ -56,9 +56,9 @@ pub enum SyntaxKind { /// `:` COLON, /// `::` - COLON2, + COLON_COLON, /// `:=` - COLONEQ, + COLON_EQ, /// `=` EQ, /// `=>` @@ -1212,7 +1212,7 @@ pub enum SyntaxKind { ANALYZE_STMT, CLUSTER_STMT, COMMENT_STMT, - COMMIT_STMT, + COMMIT, CREATE_EXTENSION_STMT, CREATE_ACCESS_METHOD_STMT, CREATE_AGGREGATE_STMT, @@ -1246,14 +1246,14 @@ pub enum SyntaxKind { CREATE_TEXT_SEARCH_PARSER_STMT, CREATE_TEXT_SEARCH_TEMPLATE_STMT, CREATE_TRANSFORM_STMT, - CREATE_INDEX_STMT, + CREATE_INDEX, CREATE_TYPE_STMT, CREATE_TRIGGER_STMT, CREATE_FUNCTION_STMT, PARAM, PARAM_IN, PARAM_OUT, - PARAM_INOUT, + PARAM_IN_OUT, PARAM_VARIADIC, BEGIN_FUNC_OPTION, RETURN_FUNC_OPTION, @@ -1278,7 +1278,7 @@ pub enum SyntaxKind { OR_REPLACE, DROP_INDEX_STMT, DROP_TRIGGER_STMT, - BEGIN_STMT, + BEGIN, SHOW_STMT, SET_STMT, PREPARE_TRANSACTION_STMT, @@ -1339,7 +1339,7 @@ pub enum SyntaxKind { DROP_CONVERSION_STMT, DROP_COLLATION_STMT, DROP_CAST_STMT, - DROP_AGGREGATE_STMT, + DROP_AGGREGATE, DROP_ACCESS_METHOD_STMT, DROP_USER_MAPPING_STMT, IMPORT_FOREIGN_SCHEMA, @@ -1407,7 +1407,7 @@ pub enum SyntaxKind { CONSTRAINT_EXCLUSIONS, DEFERRABLE_CONSTRAINT_OPTION, NOT_DEFERRABLE_CONSTRAINT_OPTION, - INITALLY_DEFERRED_CONSTRAINT_OPTION, + INITIALLY_DEFERRED_CONSTRAINT_OPTION, INITIALLY_IMMEDIATE_CONSTRAINT_OPTION, CONSTRAINT_OPTION_LIST, SEQUENCE_OPTION_LIST, diff --git a/crates/squawk_parser/tests/data/ok/set_transaction.sql b/crates/squawk_parser/tests/data/ok/set_transaction.sql index 4c1b3bb0..549f084f 100644 --- a/crates/squawk_parser/tests/data/ok/set_transaction.sql +++ b/crates/squawk_parser/tests/data/ok/set_transaction.sql @@ -3,5 +3,8 @@ SET TRANSACTION SNAPSHOT '00000003-0000001B-1'; SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL READ COMMITTED, read write; -SET TRANSACTION ISOLATION LEVEL SERIALIZABLE, READ WRITE, NOT DEFERRABLE +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE, READ WRITE, NOT DEFERRABLE; + +-- no commas is postgres historical according to gram.y +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE READ WRITE NOT DEFERRABLE; diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_aggregate_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_aggregate_ok.snap index ed5750e3..54cfffa3 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_aggregate_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_aggregate_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_aggregate.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- star" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_collation_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_collation_ok.snap index fdc84cf6..cac16903 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_collation_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_collation_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_collation.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- refresh" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_conversion_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_conversion_ok.snap index 64414bc8..36652cdc 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_conversion_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_conversion_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_conversion.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_database_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_database_ok.snap index 8f3a3a2d..243e9877 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_database_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_database_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_database.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_default_privileges_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_default_privileges_ok.snap index 7ec31028..6f73c3a6 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_default_privileges_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_default_privileges_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_default_privileges.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_domain_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_domain_ok.snap index 3c364b47..5c219f40 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_domain_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_domain_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_domain.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- set_default" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_event_trigger_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_event_trigger_ok.snap index 07a23852..59d4d7ac 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_event_trigger_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_event_trigger_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_event_trigger.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- disable" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_extension_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_extension_ok.snap index 3bccc061..397518c6 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_extension_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_extension_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_extension.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- update_to" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_foreign_data_wrapper_err.snap b/crates/squawk_parser/tests/snapshots/tests__alter_foreign_data_wrapper_err.snap index 862c9b4e..bca446b1 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_foreign_data_wrapper_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_foreign_data_wrapper_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/alter_foreign_data_wrapper.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- missing option" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_foreign_data_wrapper_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_foreign_data_wrapper_ok.snap index 599398c5..c05c6f48 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_foreign_data_wrapper_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_foreign_data_wrapper_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_foreign_data_wrapper.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- handler" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_foreign_table_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_foreign_table_ok.snap index c9f3f04a..8ffa0a21 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_foreign_table_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_foreign_table_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_foreign_table.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_function_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_function_ok.snap index c9d840b8..c4fe76cb 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_function_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_function_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_function.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_group_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_group_ok.snap index 69838db7..4e098b3c 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_group_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_group_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_group.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- add" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_index_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_index_ok.snap index 2e9ff1b4..f613fe8e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_index_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_index_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_index.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_language_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_language_ok.snap index b7017620..adda6dff 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_language_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_language_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_language.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_large_object_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_large_object_ok.snap index 5346bbc6..1a341e22 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_large_object_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_large_object_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_large_object.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_materialized_view_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_materialized_view_ok.snap index d4fd5a4f..e1cfc9b2 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_materialized_view_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_materialized_view_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_materialized_view.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename_view" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_operator_class_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_operator_class_ok.snap index f977ef21..34834eae 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_operator_class_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_operator_class_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_operator_class.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_operator_family_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_operator_family_ok.snap index 86d7b5b9..e8ba0d72 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_operator_family_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_operator_family_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_operator_family.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_operator_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_operator_ok.snap index 33d45257..ea7387af 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_operator_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_operator_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_operator.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- owner" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_policy_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_policy_ok.snap index 63006b8f..79a84197 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_policy_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_policy_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_policy.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_procedure_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_procedure_ok.snap index df97b925..5b9a0ee4 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_procedure_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_procedure_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_procedure.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_publication_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_publication_ok.snap index e4312f0d..fe885c6b 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_publication_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_publication_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_publication.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- add_table" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_role_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_role_ok.snap index 37cc7cca..7af92263 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_role_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_role_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_role.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- with_options" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_routine_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_routine_ok.snap index 52c1c09b..64a81f5e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_routine_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_routine_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_routine.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_rule_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_rule_ok.snap index c237b4b9..6f4e86e0 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_rule_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_rule_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_rule.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_schema_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_schema_ok.snap index d5bdd6af..d8ed6a30 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_schema_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_schema_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_schema.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_sequence_err.snap b/crates/squawk_parser/tests/snapshots/tests__alter_sequence_err.snap index c8583359..8fdc680f 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_sequence_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_sequence_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/alter_sequence.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- missing option" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_sequence_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_sequence_ok.snap index 78b19f21..ef291ae7 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_sequence_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_sequence_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_sequence.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- full" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_server_err.snap b/crates/squawk_parser/tests/snapshots/tests__alter_server_err.snap index c726703f..09190c3f 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_server_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_server_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/alter_server.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- missing option" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_server_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_server_ok.snap index ac918016..f46317a6 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_server_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_server_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_server.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_statistics_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_statistics_ok.snap index 73a09909..e6aa24b2 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_statistics_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_statistics_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_statistics.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- owner" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_subscription_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_subscription_ok.snap index 9e8bb19b..edb9beac 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_subscription_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_subscription_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_subscription.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- connection" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_system_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_system_ok.snap index bd42d40f..1c0b0b72 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_system_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_system_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_system.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- set_to" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_table_err.snap b/crates/squawk_parser/tests/snapshots/tests__alter_table_err.snap index 7a7ef002..e63b32be 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_table_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_table_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/alter_table.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- missing alter_table" @@ -45,7 +44,7 @@ SOURCE_FILE WHITESPACE " " DEFERRABLE_KW "deferrable" WHITESPACE " " - INITALLY_DEFERRED_CONSTRAINT_OPTION + INITIALLY_DEFERRED_CONSTRAINT_OPTION INITIALLY_KW "initially" WHITESPACE " " DEFERRED_KW "deferred" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_table_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_table_ok.snap index 850398bc..946b4506 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_table_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_table_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_table.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- add column" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_table_pg17_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_table_pg17_ok.snap index 721ae827..319a341a 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_table_pg17_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_table_pg17_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_table_pg17.sql -snapshot_kind: text --- SOURCE_FILE WHITESPACE "\n" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_tablespace_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_tablespace_ok.snap index f36e9a5b..e0712bed 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_tablespace_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_tablespace_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_tablespace.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_text_search_configuration_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_text_search_configuration_ok.snap index 0f054582..85347003 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_text_search_configuration_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_text_search_configuration_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_text_search_configuration.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- add_mapping" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_text_search_dictionary_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_text_search_dictionary_ok.snap index 3a8f6aad..e6c47897 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_text_search_dictionary_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_text_search_dictionary_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_text_search_dictionary.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- options" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_text_search_parser_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_text_search_parser_ok.snap index 99cd1d6b..e8122bbe 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_text_search_parser_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_text_search_parser_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_text_search_parser.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_text_search_template_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_text_search_template_ok.snap index 02fe9997..7a53818e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_text_search_template_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_text_search_template_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_text_search_template.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_trigger_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_trigger_ok.snap index bd83bdce..1ef16cc8 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_trigger_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_trigger_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_trigger.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- rename" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_type_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_type_ok.snap index 579c4679..f55eb171 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_type_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_type_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_type.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- owner" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_user_mapping_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_user_mapping_ok.snap index 6ddc2753..1512db62 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_user_mapping_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_user_mapping_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_user_mapping.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- full" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_user_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_user_ok.snap index d4275063..f49900af 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_user_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_user_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_user.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__alter_view_ok.snap b/crates/squawk_parser/tests/snapshots/tests__alter_view_ok.snap index bb8af155..a04bac0a 100644 --- a/crates/squawk_parser/tests/snapshots/tests__alter_view_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__alter_view_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/alter_view.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- column_set_default" diff --git a/crates/squawk_parser/tests/snapshots/tests__analyze_ok.snap b/crates/squawk_parser/tests/snapshots/tests__analyze_ok.snap index a23226c8..7c4ab0f7 100644 --- a/crates/squawk_parser/tests/snapshots/tests__analyze_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__analyze_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/analyze.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__call_ok.snap b/crates/squawk_parser/tests/snapshots/tests__call_ok.snap index b0ca763d..c8e8b212 100644 --- a/crates/squawk_parser/tests/snapshots/tests__call_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__call_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/call.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__checkpoint_ok.snap b/crates/squawk_parser/tests/snapshots/tests__checkpoint_ok.snap index acd30f3c..2a0225eb 100644 --- a/crates/squawk_parser/tests/snapshots/tests__checkpoint_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__checkpoint_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/checkpoint.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- checkpoint" diff --git a/crates/squawk_parser/tests/snapshots/tests__close_ok.snap b/crates/squawk_parser/tests/snapshots/tests__close_ok.snap index c93b5dc6..9ee0d5dc 100644 --- a/crates/squawk_parser/tests/snapshots/tests__close_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__close_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/close.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__cluster_ok.snap b/crates/squawk_parser/tests/snapshots/tests__cluster_ok.snap index a09b1aa2..016caf55 100644 --- a/crates/squawk_parser/tests/snapshots/tests__cluster_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__cluster_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/cluster.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__comment_ok.snap b/crates/squawk_parser/tests/snapshots/tests__comment_ok.snap index 04bb439f..11642bf0 100644 --- a/crates/squawk_parser/tests/snapshots/tests__comment_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__comment_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/comment.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- access_method" diff --git a/crates/squawk_parser/tests/snapshots/tests__copy_ok.snap b/crates/squawk_parser/tests/snapshots/tests__copy_ok.snap index 69989513..6f356c61 100644 --- a/crates/squawk_parser/tests/snapshots/tests__copy_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__copy_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/copy.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple_copy_from" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_access_method_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_access_method_ok.snap index faa7c8ec..1f5921cc 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_access_method_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_access_method_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_access_method.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_aggregate_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_aggregate_ok.snap index 419cb142..ba9f046e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_aggregate_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_aggregate_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_aggregate.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple_old_syntax" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_cast_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_cast_ok.snap index 0d1357e9..3a430cac 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_cast_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_cast_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_cast.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_collation_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_collation_ok.snap index ecee2431..f1240fa7 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_collation_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_collation_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_collation.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_conversion_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_conversion_ok.snap index 5d9fc656..8c5e12cf 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_conversion_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_conversion_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_conversion.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_database_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_database_ok.snap index ab19b588..cfc99934 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_database_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_database_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_database.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_domain_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_domain_ok.snap index e02cb0ad..8f6c1585 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_domain_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_domain_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_domain.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_event_trigger_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_event_trigger_ok.snap index 874af966..2b593b04 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_event_trigger_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_event_trigger_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_event_trigger.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_ext_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_ext_ok.snap index 37a46eb4..52df6bb6 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_ext_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_ext_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_ext.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- create_extension" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_foreign_data_wrapper_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_foreign_data_wrapper_ok.snap index bab46449..677067e6 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_foreign_data_wrapper_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_foreign_data_wrapper_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_foreign_data_wrapper.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_foreign_table_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_foreign_table_ok.snap index 304c7c0a..8b946174 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_foreign_table_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_foreign_table_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_foreign_table.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_function_err.snap b/crates/squawk_parser/tests/snapshots/tests__create_function_err.snap index 351eb2cc..4fb79697 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_function_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_function_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/create_function.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- regression partial definition" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_function_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_function_ok.snap index 674001d8..c938d9b4 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_function_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_function_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_function.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- create_func_with_in_out" @@ -1854,7 +1853,7 @@ SOURCE_FILE END_KW "end" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT END_KW "end" SEMICOLON ";" WHITESPACE "\n\n" @@ -2248,7 +2247,7 @@ SOURCE_FILE PARAM_LIST L_PAREN "(" PARAM - PARAM_INOUT + PARAM_IN_OUT IN_KW "in" WHITESPACE " " OUT_KW "out" @@ -2291,7 +2290,7 @@ SOURCE_FILE PARAM_LIST L_PAREN "(" PARAM - PARAM_INOUT + PARAM_IN_OUT INOUT_KW "inout" WHITESPACE " " PATH_TYPE diff --git a/crates/squawk_parser/tests/snapshots/tests__create_group_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_group_ok.snap index c47f69dc..0e3ccd2f 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_group_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_group_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_group.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_index_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_index_ok.snap index 25e91a6d..69a7a4a5 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_index_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_index_ok.snap @@ -1,14 +1,13 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_index.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- create_index" WHITESPACE "\n" COMMENT "-- simple" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -29,7 +28,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- more options" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " UNIQUE_KW "unique" @@ -71,7 +70,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- column options" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -102,7 +101,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -129,7 +128,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- opclass" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -186,7 +185,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- column expr" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -226,7 +225,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- trailing options" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -307,7 +306,7 @@ SOURCE_FILE INT_NUMBER "10" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -347,7 +346,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- schema" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -373,7 +372,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- doc_examples" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " UNIQUE_KW "UNIQUE" @@ -397,7 +396,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " UNIQUE_KW "UNIQUE" @@ -436,7 +435,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -476,7 +475,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -504,7 +503,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -532,7 +531,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -558,7 +557,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " UNIQUE_KW "UNIQUE" @@ -597,7 +596,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -642,7 +641,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -669,7 +668,7 @@ SOURCE_FILE IDENT "indexspace" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -705,7 +704,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_language_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_language_ok.snap index 320bef1a..8631ff0d 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_language_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_language_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_language.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_materialized_view_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_materialized_view_ok.snap index f1624682..f14a79f1 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_materialized_view_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_materialized_view_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_materialized_view.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_operator_class_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_operator_class_ok.snap index 7b865c1a..399f68d1 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_operator_class_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_operator_class_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_operator_class.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_operator_family_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_operator_family_ok.snap index 593555f2..f3c70c38 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_operator_family_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_operator_family_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_operator_family.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_operator_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_operator_ok.snap index 2dc1fa71..5a3050e1 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_operator_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_operator_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_operator.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_policy_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_policy_ok.snap index 961a30da..09bf1688 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_policy_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_policy_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_policy.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_procedure_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_procedure_ok.snap index 2497734c..eed3eb8e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_procedure_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_procedure_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_procedure.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_publication_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_publication_ok.snap index 9facedbf..4f37371a 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_publication_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_publication_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_publication.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_role_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_role_ok.snap index 723bced2..bbefaff7 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_role_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_role_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_role.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_rule_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_rule_ok.snap index 1bce7cbf..906472ee 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_rule_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_rule_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_rule.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_sequence_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_sequence_ok.snap index 0b7ef4c9..7c82dc38 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_sequence_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_sequence_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_sequence.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_server_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_server_ok.snap index e8cd19bf..eefe2095 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_server_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_server_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_server.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_statistics_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_statistics_ok.snap index 17035c95..4be07212 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_statistics_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_statistics_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_statistics.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_subscription_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_subscription_ok.snap index bc35179c..93baf780 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_subscription_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_subscription_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_subscription.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_table_as_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_table_as_ok.snap index b00c21cb..97a2e32d 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_table_as_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_table_as_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_table_as.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- execute" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_table_err.snap b/crates/squawk_parser/tests/snapshots/tests__create_table_err.snap index ce9a9e0a..db4ae5e5 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_table_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_table_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/create_table.sql -snapshot_kind: text --- SOURCE_FILE CREATE_TABLE diff --git a/crates/squawk_parser/tests/snapshots/tests__create_table_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_table_ok.snap index 3336b5ce..aae429f5 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_table_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_table_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_table.sql -snapshot_kind: text --- SOURCE_FILE CREATE_TABLE @@ -1444,7 +1443,7 @@ SOURCE_FILE NULL_KW "null" WHITESPACE " " CONSTRAINT_OPTION_LIST - INITALLY_DEFERRED_CONSTRAINT_OPTION + INITIALLY_DEFERRED_CONSTRAINT_OPTION INITIALLY_KW "initially" WHITESPACE " " DEFERRED_KW "deferred" @@ -1821,7 +1820,7 @@ SOURCE_FILE DEFERRABLE_CONSTRAINT_OPTION DEFERRABLE_KW "deferrable" WHITESPACE " " - INITALLY_DEFERRED_CONSTRAINT_OPTION + INITIALLY_DEFERRED_CONSTRAINT_OPTION INITIALLY_KW "initially" WHITESPACE " " DEFERRED_KW "deferred" @@ -2555,7 +2554,7 @@ SOURCE_FILE DEFERRABLE_CONSTRAINT_OPTION DEFERRABLE_KW "deferrable" WHITESPACE " " - INITALLY_DEFERRED_CONSTRAINT_OPTION + INITIALLY_DEFERRED_CONSTRAINT_OPTION INITIALLY_KW "initially" WHITESPACE " " DEFERRED_KW "deferred" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_table_pg17_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_table_pg17_ok.snap index 60052d80..b63ee692 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_table_pg17_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_table_pg17_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_table_pg17.sql -snapshot_kind: text --- SOURCE_FILE CREATE_TABLE diff --git a/crates/squawk_parser/tests/snapshots/tests__create_tablespace_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_tablespace_ok.snap index e5dd7c22..abc0b0f6 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_tablespace_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_tablespace_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_tablespace.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_text_search_config_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_text_search_config_ok.snap index ac73e982..0ece51f8 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_text_search_config_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_text_search_config_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_text_search_config.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_text_search_dict_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_text_search_dict_ok.snap index 5afdb82c..fda4e8e0 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_text_search_dict_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_text_search_dict_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_text_search_dict.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_text_search_parser_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_text_search_parser_ok.snap index b27e3b59..a009de02 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_text_search_parser_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_text_search_parser_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_text_search_parser.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_text_search_template_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_text_search_template_ok.snap index d6cf58c1..77796e79 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_text_search_template_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_text_search_template_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_text_search_template.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_transform_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_transform_ok.snap index 627bcc85..807e8b01 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_transform_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_transform_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_transform.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_trigger_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_trigger_ok.snap index b8e3dab3..11478487 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_trigger_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_trigger_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_trigger.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- create_trigger" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_type_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_type_ok.snap index cc275e28..adff562d 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_type_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_type_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_type.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- create_type_as" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_user_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_user_ok.snap index b952945e..4f830fac 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_user_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_user_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_user.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__create_view_extra_parens_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_view_extra_parens_ok.snap index d5bfd1e3..5da48f65 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_view_extra_parens_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_view_extra_parens_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_view_extra_parens.sql -snapshot_kind: text --- SOURCE_FILE CREATE_VIEW_STMT diff --git a/crates/squawk_parser/tests/snapshots/tests__create_view_ok.snap b/crates/squawk_parser/tests/snapshots/tests__create_view_ok.snap index 0d9dc5ae..03491c01 100644 --- a/crates/squawk_parser/tests/snapshots/tests__create_view_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__create_view_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/create_view.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__deallocate_ok.snap b/crates/squawk_parser/tests/snapshots/tests__deallocate_ok.snap index 651cca95..d6f158f5 100644 --- a/crates/squawk_parser/tests/snapshots/tests__deallocate_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__deallocate_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/deallocate.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__declare_ok.snap b/crates/squawk_parser/tests/snapshots/tests__declare_ok.snap index ec0c4806..54ee7f48 100644 --- a/crates/squawk_parser/tests/snapshots/tests__declare_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__declare_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/declare.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__delete_ok.snap b/crates/squawk_parser/tests/snapshots/tests__delete_ok.snap index ddc52faa..da25a31c 100644 --- a/crates/squawk_parser/tests/snapshots/tests__delete_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__delete_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/delete.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- delete" diff --git a/crates/squawk_parser/tests/snapshots/tests__discard_ok.snap b/crates/squawk_parser/tests/snapshots/tests__discard_ok.snap index bda3482b..35bfb86b 100644 --- a/crates/squawk_parser/tests/snapshots/tests__discard_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__discard_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/discard.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__do_ok.snap b/crates/squawk_parser/tests/snapshots/tests__do_ok.snap index bbc6721c..f8fd9737 100644 --- a/crates/squawk_parser/tests/snapshots/tests__do_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__do_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/do.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_access_method_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_access_method_ok.snap index 750d74f4..87d8d1ce 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_access_method_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_access_method_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_access_method.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_aggregate_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_aggregate_ok.snap index a8b56bc3..2ca74ff4 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_aggregate_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_aggregate_ok.snap @@ -1,12 +1,11 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_aggregate.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" WHITESPACE "\n" - DROP_AGGREGATE_STMT + DROP_AGGREGATE DROP_KW "drop" WHITESPACE " " AGGREGATE_KW "aggregate" @@ -24,7 +23,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- full" WHITESPACE "\n" - DROP_AGGREGATE_STMT + DROP_AGGREGATE DROP_KW "drop" WHITESPACE " " AGGREGATE_KW "aggregate" @@ -121,7 +120,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- aggregate" WHITESPACE "\n" - DROP_AGGREGATE_STMT + DROP_AGGREGATE DROP_KW "drop" WHITESPACE " " AGGREGATE_KW "aggregate" @@ -190,7 +189,7 @@ SOURCE_FILE RESTRICT_KW "restrict" SEMICOLON ";" WHITESPACE "\n\n" - DROP_AGGREGATE_STMT + DROP_AGGREGATE DROP_KW "drop" WHITESPACE " " AGGREGATE_KW "aggregate" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_cast_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_cast_ok.snap index 92174b0b..253c56d2 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_cast_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_cast_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_cast.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_collation_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_collation_ok.snap index c9ee4393..dbe15250 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_collation_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_collation_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_collation.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_conversion_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_conversion_ok.snap index 60c360ff..82b61ce1 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_conversion_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_conversion_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_conversion.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_database_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_database_ok.snap index fe762dc1..aeef47d5 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_database_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_database_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_database.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- drop_database" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_domain_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_domain_ok.snap index 1e81ccbf..37848725 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_domain_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_domain_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_domain.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_event_trigger_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_event_trigger_ok.snap index 8d06962b..ea52e8f5 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_event_trigger_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_event_trigger_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_event_trigger.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_extension_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_extension_ok.snap index 83c034eb..7e541a4f 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_extension_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_extension_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_extension.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_foreign_data_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_foreign_data_ok.snap index 55b6ff02..b9065e53 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_foreign_data_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_foreign_data_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_foreign_data.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_foreign_table_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_foreign_table_ok.snap index c3de156e..d37faa63 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_foreign_table_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_foreign_table_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_foreign_table.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_function_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_function_ok.snap index fd5d2a9d..3465785d 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_function_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_function_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_function.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_group_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_group_ok.snap index 3c61ca6d..e857bca2 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_group_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_group_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_group.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_index_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_index_ok.snap index bdca5e86..cd241f88 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_index_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_index_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_index.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- drop_index" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_language_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_language_ok.snap index dd0eaa78..b8555d01 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_language_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_language_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_language.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_materialized_view_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_materialized_view_ok.snap index 59820c70..1af2aa25 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_materialized_view_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_materialized_view_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_materialized_view.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_operator_class_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_operator_class_ok.snap index 32f45ff2..cab7c52b 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_operator_class_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_operator_class_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_operator_class.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_operator_family_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_operator_family_ok.snap index 29534152..ed208588 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_operator_family_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_operator_family_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_operator_family.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_operator_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_operator_ok.snap index 640d23c3..2af0e3c8 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_operator_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_operator_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_operator.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_owned_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_owned_ok.snap index 3e0f4d2c..d55c19ed 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_owned_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_owned_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_owned.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_policy_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_policy_ok.snap index 6a0a3aa2..da74ed3f 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_policy_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_policy_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_policy.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_procedure_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_procedure_ok.snap index 6414db11..85b70f3b 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_procedure_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_procedure_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_procedure.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_publication_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_publication_ok.snap index ffdff650..954f9cfc 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_publication_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_publication_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_publication.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_role_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_role_ok.snap index 5bb55805..e96f0d7d 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_role_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_role_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_role.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_routine_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_routine_ok.snap index fdfb38bc..ba3540bc 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_routine_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_routine_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_routine.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_rule_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_rule_ok.snap index 19513a5f..2289207b 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_rule_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_rule_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_rule.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_sequence_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_sequence_ok.snap index 8abda7db..3e704e4e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_sequence_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_sequence_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_sequence.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_server_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_server_ok.snap index 3be10781..4bd833f3 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_server_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_server_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_server.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_statistics_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_statistics_ok.snap index 81347193..56ba955a 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_statistics_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_statistics_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_statistics.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_subscription_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_subscription_ok.snap index a08f5b75..8edb96a4 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_subscription_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_subscription_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_subscription.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_table_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_table_ok.snap index a7bcd3c9..017916c5 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_table_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_table_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_table.sql -snapshot_kind: text --- SOURCE_FILE DROP_TABLE diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_tablespace_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_tablespace_ok.snap index ec801159..83b79018 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_tablespace_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_tablespace_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_tablespace.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_text_search_config_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_text_search_config_ok.snap index 3b82e390..34281a30 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_text_search_config_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_text_search_config_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_text_search_config.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_text_search_dict_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_text_search_dict_ok.snap index 36e9b15c..685e6160 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_text_search_dict_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_text_search_dict_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_text_search_dict.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_text_search_parser_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_text_search_parser_ok.snap index f3426f46..535979ee 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_text_search_parser_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_text_search_parser_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_text_search_parser.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_text_search_template_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_text_search_template_ok.snap index c835436d..7f0c992d 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_text_search_template_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_text_search_template_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_text_search_template.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_transform_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_transform_ok.snap index 95060b88..1619f237 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_transform_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_transform_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_transform.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_trigger_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_trigger_ok.snap index 1fa5231f..01be5c41 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_trigger_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_trigger_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_trigger.sql -snapshot_kind: text --- SOURCE_FILE DROP_TRIGGER_STMT diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_type_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_type_ok.snap index abfb84cb..2ff384ba 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_type_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_type_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_type.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- drop_type" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_user_mapping_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_user_mapping_ok.snap index f983d718..50454d9d 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_user_mapping_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_user_mapping_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_user_mapping.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_user_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_user_ok.snap index 72ff6626..5388b335 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_user_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_user_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_user.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__drop_view_ok.snap b/crates/squawk_parser/tests/snapshots/tests__drop_view_ok.snap index 0997d629..113d9046 100644 --- a/crates/squawk_parser/tests/snapshots/tests__drop_view_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__drop_view_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/drop_view.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__execute_ok.snap b/crates/squawk_parser/tests/snapshots/tests__execute_ok.snap index 2a25efb8..9a17f752 100644 --- a/crates/squawk_parser/tests/snapshots/tests__execute_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__execute_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/execute.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- execute" diff --git a/crates/squawk_parser/tests/snapshots/tests__explain_ok.snap b/crates/squawk_parser/tests/snapshots/tests__explain_ok.snap index 96d5e642..555816e7 100644 --- a/crates/squawk_parser/tests/snapshots/tests__explain_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__explain_ok.snap @@ -521,7 +521,7 @@ SOURCE_FILE CAST_EXPR LITERAL POSITIONAL_PARAM "$1" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -539,7 +539,7 @@ SOURCE_FILE CAST_EXPR LITERAL POSITIONAL_PARAM "$2" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT diff --git a/crates/squawk_parser/tests/snapshots/tests__fetch_ok.snap b/crates/squawk_parser/tests/snapshots/tests__fetch_ok.snap index dbfc4e24..d38cefdc 100644 --- a/crates/squawk_parser/tests/snapshots/tests__fetch_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__fetch_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/fetch.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__grant_ok.snap b/crates/squawk_parser/tests/snapshots/tests__grant_ok.snap index 5af2e7d7..d26060ec 100644 --- a/crates/squawk_parser/tests/snapshots/tests__grant_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__grant_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/grant.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__import_foreign_schema_ok.snap b/crates/squawk_parser/tests/snapshots/tests__import_foreign_schema_ok.snap index f3f5298c..943648e9 100644 --- a/crates/squawk_parser/tests/snapshots/tests__import_foreign_schema_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__import_foreign_schema_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/import_foreign_schema.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__insert_err.snap b/crates/squawk_parser/tests/snapshots/tests__insert_err.snap index 4bb13152..279abdb9 100644 --- a/crates/squawk_parser/tests/snapshots/tests__insert_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__insert_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/insert.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- missing comma in column list" diff --git a/crates/squawk_parser/tests/snapshots/tests__insert_ok.snap b/crates/squawk_parser/tests/snapshots/tests__insert_ok.snap index 8dd064b8..da90907e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__insert_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__insert_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/insert.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- insert" diff --git a/crates/squawk_parser/tests/snapshots/tests__load_ok.snap b/crates/squawk_parser/tests/snapshots/tests__load_ok.snap index b6ab05d4..8d23f006 100644 --- a/crates/squawk_parser/tests/snapshots/tests__load_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__load_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/load.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__lock_ok.snap b/crates/squawk_parser/tests/snapshots/tests__lock_ok.snap index 3b8bd999..5c24a512 100644 --- a/crates/squawk_parser/tests/snapshots/tests__lock_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__lock_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/lock.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__merge_ok.snap b/crates/squawk_parser/tests/snapshots/tests__merge_ok.snap index abff57b6..42bcac09 100644 --- a/crates/squawk_parser/tests/snapshots/tests__merge_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__merge_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/merge.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__merge_pg17_ok.snap b/crates/squawk_parser/tests/snapshots/tests__merge_pg17_ok.snap index 1bbeaffb..dd5be79a 100644 --- a/crates/squawk_parser/tests/snapshots/tests__merge_pg17_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__merge_pg17_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/merge_pg17.sql -snapshot_kind: text --- SOURCE_FILE WHITESPACE "\n" diff --git a/crates/squawk_parser/tests/snapshots/tests__misc_ok.snap b/crates/squawk_parser/tests/snapshots/tests__misc_ok.snap index b9977a4f..0fb73606 100644 --- a/crates/squawk_parser/tests/snapshots/tests__misc_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__misc_ok.snap @@ -100,7 +100,7 @@ SOURCE_FILE CAST_EXPR LITERAL POSITIONAL_PARAM "$1" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -114,7 +114,7 @@ SOURCE_FILE CAST_EXPR LITERAL POSITIONAL_PARAM "$2" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -128,7 +128,7 @@ SOURCE_FILE CAST_EXPR LITERAL POSITIONAL_PARAM "$3" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -655,7 +655,7 @@ SOURCE_FILE CAST_EXPR LITERAL POSITIONAL_PARAM "$2" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -763,7 +763,7 @@ SOURCE_FILE L_PAREN "(" WHITESPACE " " PARAM - PARAM_INOUT + PARAM_IN_OUT INOUT_KW "INOUT" WHITESPACE " " NAME @@ -980,7 +980,7 @@ SOURCE_FILE NAME_REF IDENT "interaction_ts" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1036,7 +1036,7 @@ SOURCE_FILE NAME_REF IDENT "interaction_ts" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1212,7 +1212,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-12-25'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1282,7 +1282,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-12-25'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1376,7 +1376,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - BEGIN_STMT + BEGIN BEGIN_KW "BEGIN" SEMICOLON ";" WHITESPACE "\n\n" @@ -1638,7 +1638,7 @@ SOURCE_FILE IDENT "clean_default_temp" SEMICOLON ";" WHITESPACE "\n\n" - COMMIT_STMT + COMMIT COMMIT_KW "COMMIT" SEMICOLON ";" WHITESPACE "\n\n" @@ -2023,7 +2023,7 @@ SOURCE_FILE NAME_REF IDENT "plot" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -2081,7 +2081,7 @@ SOURCE_FILE LITERAL STRING "'What is the Star Trek episode where Deanna and her mother are kidnapped?'" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -2288,7 +2288,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "/* enable fast range scans on the sequence column */" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -2473,7 +2473,7 @@ SOURCE_FILE ARG_LIST L_PAREN "(" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -2553,7 +2553,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -2664,7 +2664,7 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "/* enable fast range scans on the event_time column */" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "create" WHITESPACE " " INDEX_KW "index" @@ -2846,7 +2846,7 @@ SOURCE_FILE NAME_REF IDENT "source_table_name" WHITESPACE " " - COLONEQ ":=" + COLON_EQ ":=" WHITESPACE " " LITERAL STRING "'events'" @@ -2858,7 +2858,7 @@ SOURCE_FILE NAME_REF IDENT "batched" WHITESPACE " " - COLONEQ ":=" + COLON_EQ ":=" WHITESPACE " " LITERAL FALSE_KW "false" @@ -2870,7 +2870,7 @@ SOURCE_FILE NAME_REF IDENT "start_time" WHITESPACE " " - COLONEQ ":=" + COLON_EQ ":=" WHITESPACE " " LITERAL STRING "'2024-01-01'" @@ -3350,7 +3350,7 @@ SOURCE_FILE LITERAL STRING "'eventTypeGroups'" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3384,7 +3384,7 @@ SOURCE_FILE LITERAL STRING "'eventTypes'" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3513,7 +3513,7 @@ SOURCE_FILE LITERAL STRING "'bookings'" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3557,7 +3557,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\n \"start\": \"2025-01-01T23:30:00.000Z\",\n \"eventTypeId\": 1398027,\n \"attendee\": {\n \"name\": \"Elon Musk\",\n \"email\": \"elon.musk@x.com\",\n \"timeZone\": \"America/New_York\"\n }\n }'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3655,7 +3655,7 @@ SOURCE_FILE INT_NUMBER "1" SEMICOLON ";" WHITESPACE "\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " UNIQUE_KW "UNIQUE" @@ -5454,7 +5454,7 @@ SOURCE_FILE DESC_KW "DESC" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -5488,7 +5488,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -5544,13 +5544,13 @@ SOURCE_FILE CAST_EXPR NAME_REF IDENT "ctid" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT NAME_REF TEXT_KW "text" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -5562,13 +5562,13 @@ SOURCE_FILE CAST_EXPR NAME_REF TIMESTAMP_KW "timestamp" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT NAME_REF TEXT_KW "text" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -5739,7 +5739,7 @@ SOURCE_FILE DESC_KW "DESC" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " INDEX_KW "INDEX" @@ -5774,7 +5774,7 @@ SOURCE_FILE IDENT "recent_product_sales" SEMICOLON ";" WHITESPACE "\n\n" - CREATE_INDEX_STMT + CREATE_INDEX CREATE_KW "CREATE" WHITESPACE " " UNIQUE_KW "UNIQUE" diff --git a/crates/squawk_parser/tests/snapshots/tests__move_ok.snap b/crates/squawk_parser/tests/snapshots/tests__move_ok.snap index 76442c08..aa8f7ab9 100644 --- a/crates/squawk_parser/tests/snapshots/tests__move_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__move_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/move.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__precedence_ok.snap b/crates/squawk_parser/tests/snapshots/tests__precedence_ok.snap index 28733235..31b2b747 100644 --- a/crates/squawk_parser/tests/snapshots/tests__precedence_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__precedence_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/precedence.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- see: https://github.com/postgres/postgres/blob/028b4b21df26fee67b3ce75c6f14fcfd3c7cf2ee/src/backend/parser/gram.y#L12699" diff --git a/crates/squawk_parser/tests/snapshots/tests__reassign_ok.snap b/crates/squawk_parser/tests/snapshots/tests__reassign_ok.snap index 5af7bd2f..5b22e352 100644 --- a/crates/squawk_parser/tests/snapshots/tests__reassign_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__reassign_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/reassign.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__refresh_ok.snap b/crates/squawk_parser/tests/snapshots/tests__refresh_ok.snap index 95ecf098..fe47a9bc 100644 --- a/crates/squawk_parser/tests/snapshots/tests__refresh_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__refresh_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/refresh.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__reindex_ok.snap b/crates/squawk_parser/tests/snapshots/tests__reindex_ok.snap index 95002ccd..7991382a 100644 --- a/crates/squawk_parser/tests/snapshots/tests__reindex_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__reindex_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/reindex.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__reset_ok.snap b/crates/squawk_parser/tests/snapshots/tests__reset_ok.snap index 1f546d5e..5ff0f247 100644 --- a/crates/squawk_parser/tests/snapshots/tests__reset_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__reset_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/reset.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__revoke_ok.snap b/crates/squawk_parser/tests/snapshots/tests__revoke_ok.snap index 81d101c1..b53e881b 100644 --- a/crates/squawk_parser/tests/snapshots/tests__revoke_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__revoke_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/revoke.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__schemas_ok.snap b/crates/squawk_parser/tests/snapshots/tests__schemas_ok.snap index e78fb13f..dad01d5b 100644 --- a/crates/squawk_parser/tests/snapshots/tests__schemas_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__schemas_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/schemas.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- create_schema" diff --git a/crates/squawk_parser/tests/snapshots/tests__security_label_ok.snap b/crates/squawk_parser/tests/snapshots/tests__security_label_ok.snap index f9ed330a..e8035e03 100644 --- a/crates/squawk_parser/tests/snapshots/tests__security_label_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__security_label_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/security_label.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- table" diff --git a/crates/squawk_parser/tests/snapshots/tests__select_casts_ok.snap b/crates/squawk_parser/tests/snapshots/tests__select_casts_ok.snap index 895709bc..e65c22a8 100644 --- a/crates/squawk_parser/tests/snapshots/tests__select_casts_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__select_casts_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/select_casts.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- type_casts" @@ -29,7 +28,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'1234'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -84,7 +83,7 @@ SOURCE_FILE CAST_EXPR LITERAL INT_NUMBER "44" - COLON2 "::" + COLON_COLON "::" BIT_TYPE BIT_KW "bit" L_PAREN "(" @@ -132,7 +131,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'1110'" - COLON2 "::" + COLON_COLON "::" BIT_TYPE BIT_KW "bit" L_PAREN "(" @@ -141,7 +140,7 @@ SOURCE_FILE LITERAL INT_NUMBER "4" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -158,7 +157,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{1,2,3}'" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -178,7 +177,7 @@ SOURCE_FILE CAST_EXPR NAME_REF IDENT "foo" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -195,7 +194,7 @@ SOURCE_FILE CAST_EXPR NAME_REF IDENT "foo" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -218,7 +217,7 @@ SOURCE_FILE LITERAL STRING "'{}'" WHITESPACE " " - COLON2 "::" + COLON_COLON "::" WHITESPACE " " ARRAY_TYPE PATH_TYPE @@ -229,7 +228,7 @@ SOURCE_FILE L_BRACK "[" R_BRACK "]" WHITESPACE " " - COLON2 "::" + COLON_COLON "::" WHITESPACE " " ARRAY_TYPE PATH_TYPE @@ -240,7 +239,7 @@ SOURCE_FILE L_BRACK "[" R_BRACK "]" WHITESPACE " " - COLON2 "::" + COLON_COLON "::" WHITESPACE " " ARRAY_TYPE PATH_TYPE @@ -265,7 +264,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{}'" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -274,7 +273,7 @@ SOURCE_FILE INT_KW "int" L_BRACK "[" R_BRACK "]" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -283,7 +282,7 @@ SOURCE_FILE IDENT "int8" L_BRACK "[" R_BRACK "]" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -309,7 +308,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'1001'" - COLON2 "::" + COLON_COLON "::" BIT_TYPE BIT_KW "bit" WHITESPACE " " @@ -325,7 +324,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'1001'" - COLON2 "::" + COLON_COLON "::" BIT_TYPE BIT_KW "bit" WHITESPACE " " @@ -349,7 +348,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE CHARACTER_KW "character" SEMICOLON ";" @@ -363,7 +362,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE CHARACTER_KW "character" WHITESPACE " " @@ -379,7 +378,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE CHAR_KW "char" SEMICOLON ";" @@ -393,7 +392,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE CHAR_KW "char" WHITESPACE " " @@ -409,7 +408,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE VARCHAR_KW "varchar" SEMICOLON ";" @@ -423,7 +422,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE NATIONAL_KW "national" WHITESPACE " " @@ -439,7 +438,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE NATIONAL_KW "national" WHITESPACE " " @@ -457,7 +456,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE NATIONAL_KW "national" WHITESPACE " " @@ -473,7 +472,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE NATIONAL_KW "national" WHITESPACE " " @@ -491,7 +490,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE NCHAR_KW "nchar" SEMICOLON ";" @@ -505,7 +504,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE NCHAR_KW "nchar" WHITESPACE " " @@ -521,7 +520,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE CHAR_TYPE NCHAR_KW "nchar" @@ -542,7 +541,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIMESTAMP_KW "timestamp" @@ -561,7 +560,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIMESTAMP_KW "timestamp" @@ -587,7 +586,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIMESTAMP_KW "timestamp" @@ -613,7 +612,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIMESTAMP_KW "timestamp" @@ -628,7 +627,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIMESTAMP_KW "timestamp" @@ -650,7 +649,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIMESTAMP_KW "timestamp" @@ -672,7 +671,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIME_KW "time" @@ -691,7 +690,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIME_KW "time" @@ -717,7 +716,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIME_KW "time" @@ -743,7 +742,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIME_KW "time" @@ -758,7 +757,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIME_KW "time" @@ -780,7 +779,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2024-01-01 12:34:56.123456'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIME_KW "time" @@ -991,7 +990,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" SEMICOLON ";" @@ -1005,7 +1004,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1021,7 +1020,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1037,7 +1036,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1053,7 +1052,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1069,7 +1068,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1085,7 +1084,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1101,7 +1100,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1121,7 +1120,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1141,7 +1140,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1161,7 +1160,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1181,7 +1180,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1201,7 +1200,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1225,7 +1224,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1245,7 +1244,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1265,7 +1264,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1289,7 +1288,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1309,7 +1308,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" WHITESPACE " " @@ -1333,7 +1332,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'10 days'" - COLON2 "::" + COLON_COLON "::" INTERVAL_TYPE INTERVAL_KW "interval" L_PAREN "(" @@ -1355,7 +1354,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1375,7 +1374,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'\"foo\"'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1389,7 +1388,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'\"foo\"'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1408,7 +1407,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH @@ -1430,7 +1429,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH @@ -1463,7 +1462,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE VARCHAR_KW "varchar" SEMICOLON ";" @@ -1477,7 +1476,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'abc'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE VARCHAR_KW "varchar" L_PAREN "(" @@ -1497,7 +1496,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE CHAR_TYPE VARCHAR_KW "varchar" @@ -1520,7 +1519,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE CHAR_TYPE VARCHAR_KW "varchar" @@ -1539,7 +1538,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -1565,7 +1564,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH @@ -1593,7 +1592,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -1625,7 +1624,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -1663,7 +1662,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1680,7 +1679,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1697,7 +1696,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1714,7 +1713,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1731,7 +1730,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1748,7 +1747,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1771,7 +1770,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" DOUBLE_TYPE DOUBLE_KW "double" WHITESPACE " " @@ -1787,7 +1786,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1804,7 +1803,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1837,7 +1836,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1854,7 +1853,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1887,7 +1886,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1904,7 +1903,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1932,7 +1931,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -1949,7 +1948,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -2294,7 +2293,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "''" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE CHAR_KW "char" L_PAREN "(" @@ -2321,7 +2320,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'a '" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE CHAR_KW "CHAR" L_PAREN "(" @@ -2341,7 +2340,7 @@ SOURCE_FILE CAST_EXPR LITERAL ESC_STRING "E'a\\n'" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE CHAR_KW "CHAR" L_PAREN "(" @@ -2509,7 +2508,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{1}'" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -2549,7 +2548,7 @@ SOURCE_FILE ARRAY_KW "array" L_BRACK "[" R_BRACK "]" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -2571,7 +2570,7 @@ SOURCE_FILE CAST_EXPR LITERAL INT_NUMBER "44" - COLON2 "::" + COLON_COLON "::" BIT_TYPE BIT_KW "bit" L_PAREN "(" @@ -2593,7 +2592,7 @@ SOURCE_FILE CAST_EXPR LITERAL INT_NUMBER "44" - COLON2 "::" + COLON_COLON "::" BIT_TYPE BIT_KW "bit" L_PAREN "(" @@ -2645,7 +2644,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'1110'" - COLON2 "::" + COLON_COLON "::" BIT_TYPE BIT_KW "bit" L_PAREN "(" @@ -2654,7 +2653,7 @@ SOURCE_FILE LITERAL INT_NUMBER "4" R_PAREN ")" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -2673,7 +2672,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'1'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH @@ -2695,7 +2694,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{1}'" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH diff --git a/crates/squawk_parser/tests/snapshots/tests__select_compound_union_select_ok.snap b/crates/squawk_parser/tests/snapshots/tests__select_compound_union_select_ok.snap index 4390f772..fc8585ea 100644 --- a/crates/squawk_parser/tests/snapshots/tests__select_compound_union_select_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__select_compound_union_select_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/select_compound_union_select.sql -snapshot_kind: text --- SOURCE_FILE SELECT @@ -46,7 +45,7 @@ SOURCE_FILE CAST_EXPR NAME_REF LANGUAGE_KW "language" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE CHAR_KW "char" L_PAREN "(" @@ -174,7 +173,7 @@ SOURCE_FILE CAST_EXPR NAME_REF LANGUAGE_KW "language" - COLON2 "::" + COLON_COLON "::" CHAR_TYPE CHAR_KW "char" L_PAREN "(" diff --git a/crates/squawk_parser/tests/snapshots/tests__select_cte_err.snap b/crates/squawk_parser/tests/snapshots/tests__select_cte_err.snap index 34debfc9..c74d3c72 100644 --- a/crates/squawk_parser/tests/snapshots/tests__select_cte_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__select_cte_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/select_cte.sql -snapshot_kind: text --- SOURCE_FILE SELECT diff --git a/crates/squawk_parser/tests/snapshots/tests__select_cte_ok.snap b/crates/squawk_parser/tests/snapshots/tests__select_cte_ok.snap index 4303d276..bed33416 100644 --- a/crates/squawk_parser/tests/snapshots/tests__select_cte_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__select_cte_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/select_cte.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- with_merge" diff --git a/crates/squawk_parser/tests/snapshots/tests__select_err.snap b/crates/squawk_parser/tests/snapshots/tests__select_err.snap index 1ebb745f..f6cfb99b 100644 --- a/crates/squawk_parser/tests/snapshots/tests__select_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__select_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/select.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "--- via https://duckdb.org/docs/stable/sql/dialect/friendly_sql.html#trailing-commas" diff --git a/crates/squawk_parser/tests/snapshots/tests__select_funcs_ok.snap b/crates/squawk_parser/tests/snapshots/tests__select_funcs_ok.snap index 07193ec2..47dd19de 100644 --- a/crates/squawk_parser/tests/snapshots/tests__select_funcs_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__select_funcs_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/select_funcs.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- normalize" @@ -2676,7 +2675,7 @@ SOURCE_FILE NAME_REF IDENT "a" WHITESPACE " " - COLONEQ ":=" + COLON_EQ ":=" WHITESPACE " " LITERAL TRUE_KW "true" @@ -3574,7 +3573,7 @@ SOURCE_FILE ARRAY_KW "array" L_BRACK "[" R_BRACK "]" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH diff --git a/crates/squawk_parser/tests/snapshots/tests__select_funcs_pg17_ok.snap b/crates/squawk_parser/tests/snapshots/tests__select_funcs_pg17_ok.snap index 463c5a0f..f0370f0e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__select_funcs_pg17_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__select_funcs_pg17_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/select_funcs_pg17.sql -snapshot_kind: text --- SOURCE_FILE WHITESPACE "\n" @@ -395,7 +394,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"favorites\":\n {\"movies\":\n [{\"name\": \"One\", \"director\": \"John Doe\"},\n {\"name\": \"Two\", \"director\": \"Don Joe\"}],\n \"books\":\n [{\"name\": \"Mystery\", \"authors\": [{\"name\": \"Brown Dan\"}]},\n {\"name\": \"Wonder\", \"authors\": [{\"name\": \"Jun Murakami\"}, {\"name\":\"Craig Doe\"}]}]\n}}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT diff --git a/crates/squawk_parser/tests/snapshots/tests__select_into_ok.snap b/crates/squawk_parser/tests/snapshots/tests__select_into_ok.snap index 56e4412f..9a163676 100644 --- a/crates/squawk_parser/tests/snapshots/tests__select_into_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__select_into_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/select_into.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__select_operators_ok.snap b/crates/squawk_parser/tests/snapshots/tests__select_operators_ok.snap index 3db10c14..9268d717 100644 --- a/crates/squawk_parser/tests/snapshots/tests__select_operators_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__select_operators_ok.snap @@ -1141,7 +1141,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'cat'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -2910,7 +2910,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[{\"a\":\"foo\"},{\"b\":\"bar\"},{\"c\":\"baz\"}]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -2935,7 +2935,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\": {\"b\":\"foo\"}}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -2962,7 +2962,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[1,2,3]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -2988,7 +2988,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\":1,\"b\":2}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3016,7 +3016,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\": {\"b\": [\"foo\",\"bar\"]}}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3043,7 +3043,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\": {\"b\": [\"foo\",\"bar\"]}}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3071,7 +3071,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'\"foo\"'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3085,7 +3085,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'\"foo\"'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3103,7 +3103,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"b\":2}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3117,7 +3117,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\":1, \"b\":2}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3137,7 +3137,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\":1, \"b\":2}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3161,7 +3161,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[\"a\", \"b\", \"c\"]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3187,7 +3187,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\":1, \"b\":2, \"c\":3}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3222,7 +3222,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[\"a\", \"b\", \"c\"]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3257,7 +3257,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[\"a\", \"b\"]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3271,7 +3271,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[\"a\", \"d\"]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3289,7 +3289,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\": \"b\"}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3303,7 +3303,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"c\": \"d\"}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3321,7 +3321,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[1, 2]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3335,7 +3335,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'3'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3353,7 +3353,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\": \"b\"}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3367,7 +3367,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'42'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3385,7 +3385,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[1, 2]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3404,7 +3404,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[3, 4]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3425,7 +3425,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\": \"b\", \"c\": \"d\"}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3448,7 +3448,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[\"a\", \"b\", \"c\", \"b\"]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3471,7 +3471,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\": \"b\", \"c\": \"d\"}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3483,7 +3483,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{a,c}'" - COLON2 "::" + COLON_COLON "::" ARRAY_TYPE PATH_TYPE PATH @@ -3504,7 +3504,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[\"a\", \"b\"]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3529,7 +3529,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[\"a\", {\"b\":1}]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3556,7 +3556,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"items\": [1, 2, 3]}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3583,7 +3583,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\":[1,2,3,4,5]}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3642,7 +3642,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[1, \"2\", null]'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3667,7 +3667,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\": 1}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -3694,7 +3694,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'{\"a\": {\"b\": {\"c\": 1}}}'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -4084,7 +4084,7 @@ SOURCE_FILE DOT "." NAME_REF IDENT "b" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -4338,7 +4338,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'[2011-01-01,2011-03-01)'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT @@ -4352,7 +4352,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'2011-01-10'" - COLON2 "::" + COLON_COLON "::" TIME_TYPE NAME_REF TIMESTAMP_KW "timestamp" diff --git a/crates/squawk_parser/tests/snapshots/tests__set_constraints_ok.snap b/crates/squawk_parser/tests/snapshots/tests__set_constraints_ok.snap index b97343dd..998324f2 100644 --- a/crates/squawk_parser/tests/snapshots/tests__set_constraints_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__set_constraints_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/set_constraints.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__set_role_ok.snap b/crates/squawk_parser/tests/snapshots/tests__set_role_ok.snap index 55c5a465..471081ca 100644 --- a/crates/squawk_parser/tests/snapshots/tests__set_role_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__set_role_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/set_role.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__set_session_auth_ok.snap b/crates/squawk_parser/tests/snapshots/tests__set_session_auth_ok.snap index cc36a00b..b3264737 100644 --- a/crates/squawk_parser/tests/snapshots/tests__set_session_auth_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__set_session_auth_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/set_session_auth.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- docs" diff --git a/crates/squawk_parser/tests/snapshots/tests__set_transaction_ok.snap b/crates/squawk_parser/tests/snapshots/tests__set_transaction_ok.snap index e3436702..9db04b01 100644 --- a/crates/squawk_parser/tests/snapshots/tests__set_transaction_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__set_transaction_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/set_transaction.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- docs" @@ -62,4 +61,27 @@ SOURCE_FILE NOT_KW "NOT" WHITESPACE " " DEFERRABLE_KW "DEFERRABLE" - WHITESPACE "\n\n" + SEMICOLON ";" + WHITESPACE "\n\n\n" + COMMENT "-- no commas is postgres historical according to gram.y" + WHITESPACE "\n" + SET_TRANSACTION_STMT + SET_KW "SET" + WHITESPACE " " + TRANSACTION_KW "TRANSACTION" + WHITESPACE " " + ISOLATION_KW "ISOLATION" + WHITESPACE " " + LEVEL_KW "LEVEL" + WHITESPACE " " + SERIALIZABLE_KW "SERIALIZABLE" + WHITESPACE " " + READ_KW "READ" + WHITESPACE " " + WRITE_KW "WRITE" + WHITESPACE " " + NOT_KW "NOT" + WHITESPACE " " + DEFERRABLE_KW "DEFERRABLE" + SEMICOLON ";" + WHITESPACE "\n" diff --git a/crates/squawk_parser/tests/snapshots/tests__transaction_ok.snap b/crates/squawk_parser/tests/snapshots/tests__transaction_ok.snap index 8dcc02b5..f4e626f6 100644 --- a/crates/squawk_parser/tests/snapshots/tests__transaction_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__transaction_ok.snap @@ -1,30 +1,29 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/transaction.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- begin_commit_abort_rollback" WHITESPACE "\n" COMMENT "-- https://www.postgresql.org/docs/17/sql-commit.html" WHITESPACE "\n" - COMMIT_STMT + COMMIT COMMIT_KW "commit" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT COMMIT_KW "commit" WHITESPACE " " WORK_KW "work" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT COMMIT_KW "commit" WHITESPACE " " TRANSACTION_KW "transaction" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT COMMIT_KW "commit" WHITESPACE " " AND_KW "and" @@ -32,7 +31,7 @@ SOURCE_FILE CHAIN_KW "chain" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT COMMIT_KW "commit" WHITESPACE " " AND_KW "and" @@ -42,7 +41,7 @@ SOURCE_FILE CHAIN_KW "chain" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT COMMIT_KW "commit" WHITESPACE " " PREPARED_KW "prepared" @@ -53,23 +52,23 @@ SOURCE_FILE WHITESPACE "\n\n" COMMENT "-- https://www.postgresql.org/docs/17/sql-begin.html" WHITESPACE "\n" - BEGIN_STMT + BEGIN BEGIN_KW "begin" SEMICOLON ";" WHITESPACE "\n" - BEGIN_STMT + BEGIN BEGIN_KW "begin" WHITESPACE " " TRANSACTION_KW "transaction" SEMICOLON ";" WHITESPACE "\n" - BEGIN_STMT + BEGIN BEGIN_KW "begin" WHITESPACE " " WORK_KW "work" SEMICOLON ";" WHITESPACE "\n" - BEGIN_STMT + BEGIN BEGIN_KW "begin" WHITESPACE " \n " ISOLATION_KW "isolation" @@ -95,7 +94,7 @@ SOURCE_FILE DEFERRABLE_KW "deferrable" SEMICOLON ";" WHITESPACE "\n\n" - BEGIN_STMT + BEGIN BEGIN_KW "begin" WHITESPACE "\n " ISOLATION_KW "isolation" @@ -150,7 +149,7 @@ SOURCE_FILE DEFERRABLE_KW "deferrable" SEMICOLON ";" WHITESPACE "\n\n" - BEGIN_STMT + BEGIN START_KW "start" WHITESPACE " " TRANSACTION_KW "transaction" @@ -178,7 +177,7 @@ SOURCE_FILE DEFERRABLE_KW "deferrable" SEMICOLON ";" WHITESPACE "\n\n" - BEGIN_STMT + BEGIN START_KW "start" WHITESPACE " " TRANSACTION_KW "transaction" @@ -335,23 +334,23 @@ SOURCE_FILE IDENT "foo" SEMICOLON ";" WHITESPACE "\n\n" - COMMIT_STMT + COMMIT END_KW "end" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT END_KW "end" WHITESPACE " " WORK_KW "work" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT END_KW "end" WHITESPACE " " TRANSACTION_KW "transaction" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT END_KW "end" WHITESPACE " " AND_KW "and" @@ -359,7 +358,7 @@ SOURCE_FILE CHAIN_KW "chain" SEMICOLON ";" WHITESPACE "\n" - COMMIT_STMT + COMMIT END_KW "end" WHITESPACE " " AND_KW "and" diff --git a/crates/squawk_parser/tests/snapshots/tests__truncate_ok.snap b/crates/squawk_parser/tests/snapshots/tests__truncate_ok.snap index 4c4730c0..c5ed75e2 100644 --- a/crates/squawk_parser/tests/snapshots/tests__truncate_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__truncate_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/truncate.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_grammar" diff --git a/crates/squawk_parser/tests/snapshots/tests__update_ok.snap b/crates/squawk_parser/tests/snapshots/tests__update_ok.snap index 6ed560dd..7a78f5e0 100644 --- a/crates/squawk_parser/tests/snapshots/tests__update_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__update_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/update.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- update" @@ -969,7 +968,7 @@ SOURCE_FILE R_PAREN ")" SEMICOLON ";" WHITESPACE "\n\n" - BEGIN_STMT + BEGIN BEGIN_KW "BEGIN" SEMICOLON ";" WHITESPACE "\n" @@ -1056,7 +1055,7 @@ SOURCE_FILE WHITESPACE "\n" COMMENT "-- continue with other operations, and eventually" WHITESPACE "\n" - COMMIT_STMT + COMMIT COMMIT_KW "COMMIT" SEMICOLON ";" WHITESPACE "\n\n" diff --git a/crates/squawk_parser/tests/snapshots/tests__vacuum_ok.snap b/crates/squawk_parser/tests/snapshots/tests__vacuum_ok.snap index 62d02e2b..d15d563e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__vacuum_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__vacuum_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/vacuum.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- simple" diff --git a/crates/squawk_parser/tests/snapshots/tests__values_err.snap b/crates/squawk_parser/tests/snapshots/tests__values_err.snap index 23c7be95..bf96e74a 100644 --- a/crates/squawk_parser/tests/snapshots/tests__values_err.snap +++ b/crates/squawk_parser/tests/snapshots/tests__values_err.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/err/values.sql -snapshot_kind: text --- SOURCE_FILE WHITESPACE "\n" diff --git a/crates/squawk_parser/tests/snapshots/tests__values_ok.snap b/crates/squawk_parser/tests/snapshots/tests__values_ok.snap index f9cb73dd..3742723e 100644 --- a/crates/squawk_parser/tests/snapshots/tests__values_ok.snap +++ b/crates/squawk_parser/tests/snapshots/tests__values_ok.snap @@ -1,7 +1,6 @@ --- source: crates/squawk_parser/tests/tests.rs input_file: crates/squawk_parser/tests/data/ok/values.sql -snapshot_kind: text --- SOURCE_FILE COMMENT "-- pg_docs" @@ -441,7 +440,7 @@ SOURCE_FILE CAST_EXPR LITERAL STRING "'192.168.0.1'" - COLON2 "::" + COLON_COLON "::" PATH_TYPE PATH PATH_SEGMENT diff --git a/crates/squawk_parser/tests/utils.rs b/crates/squawk_parser/tests/utils.rs deleted file mode 100644 index e7481f2d..00000000 --- a/crates/squawk_parser/tests/utils.rs +++ /dev/null @@ -1,61 +0,0 @@ -use std::fmt::Write; - -use squawk_parser::{parse, LexedStr}; - -pub fn parse_text(text: &str) -> (String, bool) { - let lexed = LexedStr::new(text); - let input = lexed.to_input(); - let output = parse(&input); - - let mut buf = String::new(); - let mut errors = Vec::new(); - let mut indent = String::new(); - let mut depth = 0; - let mut len = 0; - lexed.intersperse_trivia(&output, &mut |step| match step { - squawk_parser::StrStep::Token { kind, text } => { - assert!(depth > 0); - len += text.len(); - writeln!(buf, "{indent}{kind:?} {text:?}").unwrap(); - } - squawk_parser::StrStep::Enter { kind } => { - assert!(depth > 0 || len == 0); - depth += 1; - writeln!(buf, "{indent}{kind:?}").unwrap(); - indent.push_str(" "); - } - squawk_parser::StrStep::Exit => { - assert!(depth > 0); - depth -= 1; - indent.pop(); - indent.pop(); - } - squawk_parser::StrStep::Error { msg, pos } => { - assert!(depth > 0); - let err = "ERROR"; - errors.push(format!("{err}@{pos}: {msg}\n")); - } - }); - assert_eq!( - len, - text.len(), - "didn't parse all text.\nParsed:\n{}\n\nAll:\n{}\n", - &text[..len], - text - ); - - for (token, msg) in lexed.errors() { - let pos = lexed.text_start(token); - let err = "ERROR"; - errors.push(format!("{err}@{pos}: {msg}\n")); - } - - let has_errors = !errors.is_empty(); - if has_errors { - buf.push_str("---\n"); - for e in errors { - buf.push_str(&e); - } - } - (buf, has_errors) -} diff --git a/crates/squawk_syntax/src/ast/nodes.rs b/crates/squawk_syntax/src/ast/nodes.rs index ddc28eb0..9f2af80e 100644 --- a/crates/squawk_syntax/src/ast/nodes.rs +++ b/crates/squawk_syntax/src/ast/nodes.rs @@ -2724,7 +2724,7 @@ pub struct Begin { impl AstNode for Begin { #[inline] fn can_cast(kind: SyntaxKind) -> bool { - kind == SyntaxKind::BEGIN_STMT + kind == SyntaxKind::BEGIN } #[inline] fn cast(syntax: SyntaxNode) -> Option { @@ -2748,7 +2748,7 @@ pub struct Commit { impl AstNode for Commit { #[inline] fn can_cast(kind: SyntaxKind) -> bool { - kind == SyntaxKind::COMMIT_STMT + kind == SyntaxKind::COMMIT } #[inline] fn cast(syntax: SyntaxNode) -> Option { @@ -2839,7 +2839,7 @@ impl CreateIndex { impl AstNode for CreateIndex { #[inline] fn can_cast(kind: SyntaxKind) -> bool { - kind == SyntaxKind::CREATE_INDEX_STMT + kind == SyntaxKind::CREATE_INDEX } #[inline] fn cast(syntax: SyntaxNode) -> Option { @@ -3038,7 +3038,7 @@ impl DropAggregate { impl AstNode for DropAggregate { #[inline] fn can_cast(kind: SyntaxKind) -> bool { - kind == SyntaxKind::DROP_AGGREGATE_STMT + kind == SyntaxKind::DROP_AGGREGATE } #[inline] fn cast(syntax: SyntaxNode) -> Option { @@ -3206,13 +3206,13 @@ impl AstNode for Stmt { | SyntaxKind::ALTER_TABLE | SyntaxKind::DROP_DATABASE_STMT | SyntaxKind::CREATE_TABLE - | SyntaxKind::BEGIN_STMT - | SyntaxKind::COMMIT_STMT - | SyntaxKind::CREATE_INDEX_STMT + | SyntaxKind::BEGIN + | SyntaxKind::COMMIT + | SyntaxKind::CREATE_INDEX | SyntaxKind::DROP_TABLE | SyntaxKind::DROP_INDEX_STMT | SyntaxKind::DROP_TYPE_STMT - | SyntaxKind::DROP_AGGREGATE_STMT + | SyntaxKind::DROP_AGGREGATE | SyntaxKind::CREATE_DOMAIN_STMT | SyntaxKind::ALTER_DOMAIN_STMT | SyntaxKind::ALTER_AGGREGATE_STMT @@ -3229,9 +3229,9 @@ impl AstNode for Stmt { SyntaxKind::ALTER_TABLE => Stmt::AlterTable(AlterTable { syntax }), SyntaxKind::DROP_DATABASE_STMT => Stmt::DropDatabase(DropDatabase { syntax }), SyntaxKind::CREATE_TABLE => Stmt::CreateTable(CreateTable { syntax }), - SyntaxKind::BEGIN_STMT => Stmt::Begin(Begin { syntax }), - SyntaxKind::COMMIT_STMT => Stmt::Commit(Commit { syntax }), - SyntaxKind::CREATE_INDEX_STMT => Stmt::CreateIndex(CreateIndex { syntax }), + SyntaxKind::BEGIN => Stmt::Begin(Begin { syntax }), + SyntaxKind::COMMIT => Stmt::Commit(Commit { syntax }), + SyntaxKind::CREATE_INDEX => Stmt::CreateIndex(CreateIndex { syntax }), SyntaxKind::DROP_TABLE => Stmt::DropTable(DropTable { syntax }), SyntaxKind::DROP_INDEX_STMT => Stmt::DropIndex(DropIndex { syntax }), SyntaxKind::DROP_TYPE_STMT => Stmt::DropType(DropType { syntax }), @@ -3239,7 +3239,7 @@ impl AstNode for Stmt { SyntaxKind::ALTER_DOMAIN_STMT => Stmt::AlterDomain(AlterDomain { syntax }), SyntaxKind::ALTER_AGGREGATE_STMT => Stmt::AlterAggregate(AlterAggregate { syntax }), SyntaxKind::CREATE_AGGREGATE_STMT => Stmt::CreateAggregate(CreateAggregate { syntax }), - SyntaxKind::DROP_AGGREGATE_STMT => Stmt::DropAggregate(DropAggregate { syntax }), + SyntaxKind::DROP_AGGREGATE => Stmt::DropAggregate(DropAggregate { syntax }), SyntaxKind::ROLLBACK_STMT => Stmt::Rollback(Rollback { syntax }), SyntaxKind::TRUNCATE_STMT => Stmt::Truncate(Truncate { syntax }), _ => return None, @@ -4453,7 +4453,7 @@ pub struct ParamInOut { impl AstNode for ParamInOut { #[inline] fn can_cast(kind: SyntaxKind) -> bool { - kind == SyntaxKind::PARAM_INOUT + kind == SyntaxKind::PARAM_IN_OUT } #[inline] fn cast(syntax: SyntaxNode) -> Option { @@ -4508,7 +4508,7 @@ impl AstNode for ParamMode { kind, SyntaxKind::PARAM_IN | SyntaxKind::PARAM_OUT - | SyntaxKind::PARAM_INOUT + | SyntaxKind::PARAM_IN_OUT | SyntaxKind::VARIADIC_KW ) } @@ -4518,7 +4518,7 @@ impl AstNode for ParamMode { let res = match syntax.kind() { SyntaxKind::PARAM_IN => ParamMode::ParamIn(ParamIn { syntax }), SyntaxKind::PARAM_OUT => ParamMode::ParamOut(ParamOut { syntax }), - SyntaxKind::PARAM_INOUT => ParamMode::ParamInOut(ParamInOut { syntax }), + SyntaxKind::PARAM_IN_OUT => ParamMode::ParamInOut(ParamInOut { syntax }), SyntaxKind::PARAM_VARIADIC => ParamMode::ParamVariadic(ParamVariadic { syntax }), _ => return None, }; diff --git a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__alter_aggregate_params_validation.snap b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__alter_aggregate_params_validation.snap index 0c4831be..db550b1e 100644 --- a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__alter_aggregate_params_validation.snap +++ b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__alter_aggregate_params_validation.snap @@ -1,6 +1,6 @@ --- -source: crates/syntax/src/test.rs -input_file: crates/syntax/test_data/validation/alter_aggregate_params.sql +source: crates/squawk_syntax/src/test.rs +input_file: crates/squawk_syntax/test_data/validation/alter_aggregate_params.sql --- SOURCE_FILE@0..101 COMMENT@0..38 "-- can't have out par ..." diff --git a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__array_exprs_validation.snap b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__array_exprs_validation.snap index dcd5f199..c7d582d8 100644 --- a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__array_exprs_validation.snap +++ b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__array_exprs_validation.snap @@ -1,6 +1,6 @@ --- -source: crates/syntax/src/test.rs -input_file: crates/syntax/test_data/validation/array_exprs.sql +source: crates/squawk_syntax/src/test.rs +input_file: crates/squawk_syntax/test_data/validation/array_exprs.sql --- SOURCE_FILE@0..42 SELECT@0..22 diff --git a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__create_aggregate_params_validation.snap b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__create_aggregate_params_validation.snap index 2d26710f..7f985561 100644 --- a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__create_aggregate_params_validation.snap +++ b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__create_aggregate_params_validation.snap @@ -1,6 +1,6 @@ --- -source: crates/syntax/src/test.rs -input_file: crates/syntax/test_data/validation/create_aggregate_params.sql +source: crates/squawk_syntax/src/test.rs +input_file: crates/squawk_syntax/test_data/validation/create_aggregate_params.sql --- SOURCE_FILE@0..91 COMMENT@0..38 "-- can't have out par ..." diff --git a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__custom_operators_validation.snap b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__custom_operators_validation.snap index 77003b51..e22d02da 100644 --- a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__custom_operators_validation.snap +++ b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__custom_operators_validation.snap @@ -1,6 +1,6 @@ --- -source: crates/syntax/src/test.rs -input_file: crates/syntax/test_data/validation/custom_operators.sql +source: crates/squawk_syntax/src/test.rs +input_file: crates/squawk_syntax/test_data/validation/custom_operators.sql --- SOURCE_FILE@0..108 COMMENT@0..30 "-- disallowed prefix ..." diff --git a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__drop_aggregate_params_validation.snap b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__drop_aggregate_params_validation.snap index e138f26a..8f1787b5 100644 --- a/crates/squawk_syntax/src/snapshots/squawk_syntax__test__drop_aggregate_params_validation.snap +++ b/crates/squawk_syntax/src/snapshots/squawk_syntax__test__drop_aggregate_params_validation.snap @@ -1,12 +1,12 @@ --- -source: crates/syntax/src/test.rs -input_file: crates/syntax/test_data/validation/drop_aggregate_params.sql +source: crates/squawk_syntax/src/test.rs +input_file: crates/squawk_syntax/test_data/validation/drop_aggregate_params.sql --- SOURCE_FILE@0..389 WHITESPACE@0..1 "\n" COMMENT@1..8 "-- full" WHITESPACE@8..9 "\n" - DROP_AGGREGATE_STMT@9..167 + DROP_AGGREGATE@9..167 DROP_KW@9..13 "drop" WHITESPACE@13..14 " " AGGREGATE_KW@14..23 "aggregate" @@ -106,7 +106,7 @@ SOURCE_FILE@0..389 WHITESPACE@168..170 "\n\n" COMMENT@170..182 "-- aggregate" WHITESPACE@182..183 "\n" - DROP_AGGREGATE_STMT@183..299 + DROP_AGGREGATE@183..299 DROP_KW@183..187 "drop" WHITESPACE@187..188 " " AGGREGATE_KW@188..197 "aggregate" @@ -178,7 +178,7 @@ SOURCE_FILE@0..389 RESTRICT_KW@291..299 "restrict" SEMICOLON@299..300 ";" WHITESPACE@300..302 "\n\n" - DROP_AGGREGATE_STMT@302..386 + DROP_AGGREGATE@302..386 DROP_KW@302..306 "drop" WHITESPACE@306..307 " " AGGREGATE_KW@307..316 "aggregate"