Skip to content

Commit

Permalink
Revert "Merge branch 'main' into CMN-1248-add-cte"
Browse files Browse the repository at this point in the history
This reverts commit 7900b4e, reversing
changes made to 64eadce.
  • Loading branch information
if-loop69420 committed Aug 21, 2024
1 parent 7900b4e commit 2cde3af
Show file tree
Hide file tree
Showing 16 changed files with 3,471 additions and 2,070 deletions.
33 changes: 1 addition & 32 deletions crates/definitions/src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::token::{Tokens, T};

pub const TOKENS: Tokens<'_> = Tokens {
trivia: &[
T!("inline_comment", "inline_comment", "inline_comment", "--.*"),
T!("comment", "comment", "comment", "--.*"),
T!("whitespace", "whitespace", "whitespace", "[ \t\n\r]+"),
],
punctuation: &[
Expand Down Expand Up @@ -70,13 +70,11 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("and"),
T!("annotations"),
T!("anyschema"),
T!("apply"),
T!("array"),
T!("as"),
T!("asc"),
T!("associate"),
T!("audit"),
T!("batch"),
T!("before"),
T!("begin"),
T!("bequeath"),
Expand All @@ -94,7 +92,6 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("byte"),
T!("call"),
T!("cascade"),
T!("case"),
T!("c", "cKw", "keyword", r"(?i)c", 2), // Manual priority to not conflict with unquoted_ident
T!("char"),
T!("character"),
Expand All @@ -106,7 +103,6 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("collation"),
T!("collect"),
T!("comment"),
T!("commit"),
T!("connect"),
T!("connect_by_root"),
T!("constant"),
Expand All @@ -116,7 +112,6 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("containers_default"),
T!("context"),
T!("create"),
T!("cross"),
T!("crossedition"),
T!("cube"),
T!("current_user"),
Expand Down Expand Up @@ -170,7 +165,6 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("foreign"),
T!("forward"),
T!("from"),
T!("full"),
T!("function"),
T!("grant"),
T!("hierarchies"),
Expand All @@ -186,7 +180,6 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("index"),
T!("indicator"),
T!("initially"),
T!("inner"),
T!("insert"),
T!("instead"),
T!("int"),
Expand All @@ -196,12 +189,10 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("invisible"),
T!("is"),
T!("java"),
T!("join"),
T!("key"),
T!("language"),
T!("large"),
T!("last"),
T!("left"),
T!("length"),
T!("library"),
T!("like", "like", "comparison_op"),
Expand All @@ -218,7 +209,6 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("month"),
T!("name"),
T!("national"),
T!("natural"),
T!("nchar"),
T!("nclob"),
T!("new"),
Expand All @@ -233,7 +223,6 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("norely"),
T!("not"),
T!("novalidate"),
T!("nowait"),
T!("null"),
T!("nulls"),
T!("number"),
Expand All @@ -249,12 +238,10 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("order"),
T!("others"),
T!("out"),
T!("outer"),
T!("package"),
T!("parallel_enable"),
T!("parameters"),
T!("parent"),
T!("partition"),
T!("pipelined"),
T!("plpgsql"),
T!("pls_integer"),
Expand Down Expand Up @@ -285,7 +272,6 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("reverse"),
T!("revoke"),
T!("rollup"),
T!("right"),
T!("row"),
T!("rowid"),
T!("rowtype"),
Expand Down Expand Up @@ -336,12 +322,9 @@ pub const TOKENS: Tokens<'_> = Tokens {
T!("varying"),
T!("view"),
T!("visible"),
T!("wait"),
T!("when"),
T!("where"),
T!("with"),
T!("work"),
T!("write"),
T!("xmlschema"),
T!("xmltype"),
T!("year"),
Expand All @@ -365,22 +348,16 @@ pub const SYNTAX_NODES: &'_ [SyntaxNode<'_>] = &[
S!("block_statement", "A node that marks an individual statement inside a block"),
S!("bulk_into_clause", "A node containing a BULK COLLECT INTO clause"),
S!("calc_meas_clause", "A node containing a calc meas clause"),
S!("case_stmt", "A node containing a CASE statement"),
S!("colon", "A colon token"),
S!("column_expr", "A single column expression, as part of an SELECT clause"),
S!("comma", "A single comma"),
S!("inline_comment", "Inline comment starting with `--`"),
S!("commit_stmt", "A node containing a full commit statement"),
S!("comment", "Inline comment starting with `--`"),
S!("comparisson_expression", "A node containing a comparisson expression"),
S!("comparison_op", "Represents an arithmetic SQL comparison operator (=, <>, <, >, <=, >=) or other types of comparison operators of SQL (ilike, like)"),
S!("concat", "A concatination operator `||`"),
S!("connect_by_root", "The CONNECT_BY_ROOT operator"),
S!("connect", "The CONNECT BY clause in selects"),
S!("constraint", "A node that marks a full constraint"),
S!("cube_meas_clause", "A node that contains a cube meas clause"),
S!("cross_join_clause", "A node that contains a full CROSS JOIN clause"),
S!("cross_outer_apply_clause", "A node that contains a full cross outer apply clause"),
S!("cursor_parameter_declaration", "A node containing a cursor parameter declaration"),
S!("cursor_parameter_declarations", "A node containing cursor parameter declarations"),
S!("cursor_stmt", "A node that marks a full cursor statement"),
Expand All @@ -391,7 +368,6 @@ pub const SYNTAX_NODES: &'_ [SyntaxNode<'_>] = &[
S!("delete_stmt", "A node that marks a full DELETE statement"),
S!("dollar_quote", "Single dollar quote `$$`"),
S!("dot", "A single dot"),
S!("else_expression", "A node containing an else expression"),
S!("error", "An error token with a cause"),
S!("exclam", "An exclamation mark `!`"),
S!("execute_immediate_stmt", "A node that contains a full EXECUTE IMMEDIATE statement"),
Expand All @@ -409,24 +385,19 @@ pub const SYNTAX_NODES: &'_ [SyntaxNode<'_>] = &[
S!("hierarchies_clause", "A node that marks a hierarchies clause"),
S!("ident", "An identifier, either quoted or unquoted"),
S!("ident_group", "An identifier group, consisting of multiple idents"),
S!("inner_join_clause", "A node that contains an INNER JOIN clause"),
S!("insert_stmt", "A node that marks a full INSERT statement"),
S!("integer", "Any integer, positive and negative"),
S!("into_clause", "A node that contains an `INTO` clause of a SELECT statement"),
S!("join_clause", "A node that contains a JOIN clause"),
S!("keyword", "A SQL keyword, e.g. `CREATE`"),
S!("logic_op", "Represents a logical SQL operator (AND, OR, NOT)"),
S!("l_paren", "Left Paren"),
S!("minus", "A minus `-`"),
S!("natural_join_clause", "A node containing an NATURAL JOIN clause"),
S!("not", "Unary logical operator NOT"),
S!("or", "Logical operator OR"),
S!("order_by_clause", "A node containing a full order by clause"),
S!("outer_join_clause", "A node containing a full OUTER JOIN clause"),
S!("package", "A node that marks a full CREATE PACKAGE BODY block"),
S!("param", "A single Param node, consisting of name & type"),
S!("param_list", "A node that consists of multiple parameters"),
S!("partition_by_clause", "A node that contains a PARTITION BY clause"),
S!("percentage", "Percentage symbol"),
S!("plus", "A plus `+`"),
S!("prior", "The PL/SQL unary prior operator"),
Expand All @@ -441,12 +412,10 @@ pub const SYNTAX_NODES: &'_ [SyntaxNode<'_>] = &[
S!("rowtype_clause", "A node containing a rowtype definition for cursors"),
S!("r_paren", "Right Paren"),
S!("search_clause", "A node containing a search clause"),
S!("searched_case_expression", "A node containing a searched case expression"),
S!("select_clause", "A node that contains the whole SELECT clause of a query"),
S!("select_stmt", "A node that marks a full SELECT statement"),
S!("semicolon", "A semi colon"),
S!("set_clause", "A node containing a SET clause in an UPDATE statement"),
S!("simple_case_expression", "A node containing a simple case expression"),
S!("slash", "Slash char `/`"),
S!("starts", "A STARTS WITH clause in a SELECT statement"),
S!("subav_clause", "A node containing a full subav clause"),
Expand Down
40 changes: 3 additions & 37 deletions crates/source_gen/src/lexer/generated.rs

Large diffs are not rendered by default.

Loading

0 comments on commit 2cde3af

Please sign in to comment.