squawk-cli 2.2.0__tar.gz → 2.4.0__tar.gz

{squawk_cli-2.2.0 → squawk_cli-2.4.0}/Cargo.lock

@@ -2543,7 +2543,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "squawk"
-version = "2.2.0"
+version = "2.4.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",

{squawk_cli-2.2.0 → squawk_cli-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squawk-cli
-Version: 2.2.0
+Version: 2.4.0
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
@@ -310,7 +310,7 @@ cargo xtask new-rule 'prefer big serial'
 2. Run `s/update-version`
 
    ```bash
-   # update version in cli/Cargo.toml, package.json, flake.nix to 4.5.3
+   # update version in squawk/Cargo.toml, package.json, flake.nix to 4.5.3
    s/update-version 4.5.3
    ```
 

{squawk_cli-2.2.0 → squawk_cli-2.4.0}/crates/squawk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "squawk"
-version = "2.2.0"
+version = "2.4.0"
 default-run = "squawk"
 
 authors.workspace = true

{squawk_cli-2.2.0 → squawk_cli-2.4.0}/crates/squawk/README.md

@@ -291,7 +291,7 @@ cargo xtask new-rule 'prefer big serial'
 2. Run `s/update-version`
 
    ```bash
-   # update version in cli/Cargo.toml, package.json, flake.nix to 4.5.3
+   # update version in squawk/Cargo.toml, package.json, flake.nix to 4.5.3
    s/update-version 4.5.3
    ```
 

{squawk_cli-2.2.0 → squawk_cli-2.4.0}/crates/squawk_parser/src/grammar.rs

@@ -2709,10 +2709,8 @@ fn data_source(p: &mut Parser<'_>) {
     p.eat(LATERAL_KW);
     match p.current() {
         L_PAREN => {
-            p.bump(L_PAREN);
-            // we're at the start of a nested select statement
-            select_stmt(p, None);
-            p.expect(R_PAREN);
+            // TODO: this should be `paren_select` instead of a general `tuple_expr`, since only a select statement is allowed inside
+            tuple_expr(p);
             opt_alias(p);
         }
         JSON_TABLE_KW => {
@@ -6560,7 +6558,7 @@ fn alter_default_privileges_stmt(p: &mut Parser<'_>) -> CompletedMarker {
             p.bump(GRANT_KW);
             privileges(p);
             p.expect(ON_KW);
-            privilege_target(p);
+            privilege_target_type(p);
             p.expect(TO_KW);
             role(p);
             while !p.at(EOF) && p.eat(COMMA) {
@@ -6579,7 +6577,7 @@ fn alter_default_privileges_stmt(p: &mut Parser<'_>) -> CompletedMarker {
             }
             privileges(p);
             p.expect(ON_KW);
-            privilege_target(p);
+            privilege_target_type(p);
             p.expect(FROM_KW);
             role(p);
             while !p.at(EOF) && p.eat(COMMA) {
@@ -6594,7 +6592,7 @@ fn alter_default_privileges_stmt(p: &mut Parser<'_>) -> CompletedMarker {
     m.complete(p, ALTER_DEFAULT_PRIVILEGES_STMT)
 }
 
-fn privilege_target(p: &mut Parser<'_>) {
+fn privilege_target_type(p: &mut Parser<'_>) {
     match p.current() {
         TABLES_KW | FUNCTIONS_KW | ROUTINES_KW | SEQUENCES_KW | TYPES_KW | SCHEMAS_KW => {
             p.bump_any();
@@ -10052,90 +10050,7 @@ fn grant_stmt(p: &mut Parser<'_>) -> CompletedMarker {
     //       | ALL { FUNCTIONS | PROCEDURES | ROUTINES } IN SCHEMA schema_name [, ...] }
     // ON PARAMETER configuration_parameter [, ...]
     if p.eat(ON_KW) {
-        if p.eat(ALL_KW) {
-            match p.current() {
-                TABLES_KW | SEQUENCES_KW | FUNCTIONS_KW | PROCEDURES_KW | ROUTINES_KW => {
-                    p.bump_any();
-                    p.expect(IN_KW);
-                    p.expect(SCHEMA_KW);
-                    // schema_name [, ...]
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                _ => p.error("expected TABLE"),
-            }
-        } else {
-            match p.current() {
-                PARAMETER_KW => {
-                    p.bump(PARAMETER_KW);
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                FUNCTION_KW | PROCEDURE_KW | ROUTINE_KW => {
-                    p.bump_any();
-                    // function_name [ ( [ [ argmode ] [ arg_name ] arg_type [, ...] ] ) ] [, ...]
-                    path_name_ref(p);
-                    opt_param_list(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        // function_name [ ( [ [ argmode ] [ arg_name ] arg_type [, ...] ] ) ] [, ...]
-                        path_name_ref(p);
-                        opt_param_list(p);
-                    }
-                }
-                // TYPE type_name [, ...]
-                TYPE_KW => {
-                    p.bump(TYPE_KW);
-                    type_name(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        type_name(p);
-                    }
-                }
-                TABLE_KW | SEQUENCE_KW | DATABASE_KW | TABLESPACE_KW | SCHEMA_KW | LANGUAGE_KW
-                | DOMAIN_KW => {
-                    p.bump_any();
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                FOREIGN_KW => {
-                    p.bump(FOREIGN_KW);
-                    if p.eat(DATA_KW) {
-                        p.expect(WRAPPER_KW);
-                    } else {
-                        p.expect(SERVER_KW);
-                    }
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                LARGE_KW => {
-                    p.bump(LARGE_KW);
-                    p.expect(OBJECT_KW);
-                    if opt_numeric_literal(p).is_none() {
-                        p.error("expected large_object_oid")
-                    }
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        if opt_numeric_literal(p).is_none() {
-                            p.error("expected large_object_oid")
-                        }
-                    }
-                }
-                // table_name [, ...]
-                _ if p.at_ts(COL_LABEL_FIRST) => {
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                _ => (),
-            }
-        }
+        privilege_target(p);
     }
     // TO role_specification [, ...]
     p.expect(TO_KW);
@@ -10165,6 +10080,101 @@ fn grant_stmt(p: &mut Parser<'_>) -> CompletedMarker {
     m.complete(p, GRANT_STMT)
 }
 
+fn privilege_target(p: &mut Parser<'_>) {
+    if p.eat(ALL_KW) {
+        match p.current() {
+            TABLES_KW | SEQUENCES_KW | FUNCTIONS_KW | PROCEDURES_KW | ROUTINES_KW => {
+                p.bump_any();
+                p.expect(IN_KW);
+                p.expect(SCHEMA_KW);
+                // schema_name [, ...]
+                name_ref(p);
+                while !p.at(EOF) && p.eat(COMMA) {
+                    name_ref(p);
+                }
+            }
+            _ => p.error("expected TABLE"),
+        }
+    } else {
+        match p.current() {
+            PARAMETER_KW => {
+                p.bump(PARAMETER_KW);
+                path_name_ref(p);
+                while !p.at(EOF) && p.eat(COMMA) {
+                    path_name_ref(p);
+                }
+            }
+            FUNCTION_KW | PROCEDURE_KW | ROUTINE_KW => {
+                p.bump_any();
+                // function_name [ ( [ [ argmode ] [ arg_name ] arg_type [, ...] ] ) ] [, ...]
+                path_name_ref(p);
+                opt_param_list(p);
+                while !p.at(EOF) && p.eat(COMMA) {
+                    // function_name [ ( [ [ argmode ] [ arg_name ] arg_type [, ...] ] ) ] [, ...]
+                    path_name_ref(p);
+                    opt_param_list(p);
+                }
+            }
+            // TYPE type_name [, ...]
+            TYPE_KW => {
+                p.bump(TYPE_KW);
+                type_name(p);
+                while !p.at(EOF) && p.eat(COMMA) {
+                    type_name(p);
+                }
+            }
+            // no schema allowed for the name
+            DATABASE_KW | TABLESPACE_KW | SCHEMA_KW | LANGUAGE_KW => {
+                p.bump_any();
+                name_ref(p);
+                while !p.at(EOF) && p.eat(COMMA) {
+                    name_ref(p);
+                }
+            }
+            // these allow schema
+            TABLE_KW | SEQUENCE_KW | DOMAIN_KW => {
+                p.bump_any();
+                path_name_ref(p);
+                while !p.at(EOF) && p.eat(COMMA) {
+                    path_name_ref(p);
+                }
+            }
+            FOREIGN_KW => {
+                p.bump(FOREIGN_KW);
+                if p.eat(DATA_KW) {
+                    p.expect(WRAPPER_KW);
+                } else {
+                    p.expect(SERVER_KW);
+                }
+                name_ref(p);
+                while !p.at(EOF) && p.eat(COMMA) {
+                    name_ref(p);
+                }
+            }
+            LARGE_KW => {
+                p.bump(LARGE_KW);
+                p.expect(OBJECT_KW);
+                if opt_numeric_literal(p).is_none() {
+                    p.error("expected large_object_oid")
+                }
+                while !p.at(EOF) && p.eat(COMMA) {
+                    if opt_numeric_literal(p).is_none() {
+                        p.error("expected large_object_oid")
+                    }
+                }
+            }
+            // table_name [, ...]
+            _ if p.at_ts(COL_LABEL_FIRST) => {
+                path_name_ref(p);
+                while !p.at(EOF) && p.eat(COMMA) {
+                    path_name_ref(p);
+                }
+            }
+            _ => (),
+        }
+    }
+}
+
 // [ GRANTED BY role_specification ]
 fn opt_granted_by(p: &mut Parser<'_>) {
     if p.eat(GRANTED_KW) {
@@ -10214,88 +10224,7 @@ fn revoke_stmt(p: &mut Parser<'_>) -> CompletedMarker {
     //       | ALL { FUNCTIONS | PROCEDURES | ROUTINES } IN SCHEMA schema_name [, ...] }
     // ON PARAMETER configuration_parameter [, ...]
     if p.eat(ON_KW) {
-        if p.eat(ALL_KW) {
-            match p.current() {
-                TABLES_KW | SEQUENCES_KW | FUNCTIONS_KW | PROCEDURES_KW | ROUTINES_KW => {
-                    p.bump_any();
-                    p.expect(IN_KW);
-                    p.expect(SCHEMA_KW);
-                    // schema_name [, ...]
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                _ => p.error("expected TABLE"),
-            }
-        } else {
-            match p.current() {
-                PARAMETER_KW => {
-                    p.bump(PARAMETER_KW);
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                FUNCTION_KW | PROCEDURE_KW | ROUTINE_KW => {
-                    p.bump_any();
-                    path_name_ref(p);
-                    opt_param_list(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        path_name_ref(p);
-                        opt_param_list(p);
-                    }
-                }
-                // TYPE type_name [, ...]
-                TYPE_KW => {
-                    p.bump(TYPE_KW);
-                    type_name(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        type_name(p);
-                    }
-                }
-                TABLE_KW | SEQUENCE_KW | DATABASE_KW | TABLESPACE_KW | SCHEMA_KW | LANGUAGE_KW
-                | DOMAIN_KW => {
-                    p.bump_any();
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                FOREIGN_KW => {
-                    p.bump(FOREIGN_KW);
-                    if p.eat(DATA_KW) {
-                        p.expect(WRAPPER_KW);
-                    } else {
-                        p.expect(SERVER_KW);
-                    }
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                LARGE_KW => {
-                    p.bump(LARGE_KW);
-                    p.expect(OBJECT_KW);
-                    if opt_numeric_literal(p).is_none() {
-                        p.error("expected large_object_oid")
-                    }
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        if opt_numeric_literal(p).is_none() {
-                            p.error("expected large_object_oid")
-                        }
-                    }
-                }
-                // table_name [, ...]
-                _ if p.at_ts(COL_LABEL_FIRST) => {
-                    name_ref(p);
-                    while !p.at(EOF) && p.eat(COMMA) {
-                        name_ref(p);
-                    }
-                }
-                _ => (),
-            }
-        }
+        privilege_target(p);
     }
     // FROM role_specification [, ...]
     p.expect(FROM_KW);

squawk_cli-2.4.0/crates/squawk_parser/src/snapshots/squawk_parser__test__create_view_extra_parens_ok.snap

@@ -0,0 +1,73 @@
+---
+source: crates/squawk_parser/src/test.rs
+input_file: crates/squawk_parser/test_data/ok/create_view_extra_parens.sql
+---
+SOURCE_FILE
+  CREATE_VIEW_STMT
+    CREATE_KW "create"
+    WHITESPACE " "
+    VIEW_KW "view"
+    WHITESPACE " "
+    PATH
+      PATH_SEGMENT
+        NAME
+          IDENT "foo"
+    WHITESPACE " "
+    AS_KW "as"
+    WHITESPACE " \n  "
+    SELECT
+      SELECT_CLAUSE
+        SELECT_KW "select"
+        WHITESPACE " "
+        TARGET_LIST
+          TARGET
+            FIELD_EXPR
+              NAME_REF
+                IDENT "b"
+              DOT "."
+              NAME_REF
+                IDENT "y"
+      WHITESPACE " "
+      FROM_CLAUSE
+        FROM_KW "from"
+        WHITESPACE " "
+        PAREN_EXPR
+          L_PAREN "("
+          PAREN_EXPR
+            L_PAREN "("
+            WHITESPACE " "
+            SELECT
+              SELECT_CLAUSE
+                SELECT_KW "select"
+                WHITESPACE " "
+                TARGET_LIST
+                  TARGET
+                    NAME_REF
+                      IDENT "y"
+              WHITESPACE " "
+              FROM_CLAUSE
+                FROM_KW "from"
+                WHITESPACE " "
+                NAME_REF
+                  IDENT "bar"
+            WHITESPACE " "
+            R_PAREN ")"
+          R_PAREN ")"
+        WHITESPACE " "
+        ALIAS
+          AS_KW "as"
+          WHITESPACE " "
+          NAME
+            IDENT "b"
+      WHITESPACE "\n  "
+      ORDER_BY_CLAUSE
+        ORDER_KW "order"
+        WHITESPACE " "
+        BY_KW "by"
+        WHITESPACE " "
+        NAME_REF
+          IDENT "y"
+        WHITESPACE " "
+        DESC_KW "desc"
+  SEMICOLON ";"
+  WHITESPACE "\n"

{squawk_cli-2.2.0 → squawk_cli-2.4.0}/crates/squawk_parser/src/snapshots/squawk_parser__test__delete_ok.snap

@@ -254,46 +254,47 @@ SOURCE_FILE
           IDENT "u"
       COMMA ","
       WHITESPACE "\n  "
-      L_PAREN "("
-      SELECT
-        SELECT_CLAUSE
-          SELECT_KW "select"
-          WHITESPACE " "
-          TARGET_LIST
-            TARGET
-              NAME_REF
-                IDENT "user_id"
-            COMMA ","
+      PAREN_EXPR
+        L_PAREN "("
+        SELECT
+          SELECT_CLAUSE
+            SELECT_KW "select"
             WHITESPACE " "
-            TARGET
-              CALL_EXPR
+            TARGET_LIST
+              TARGET
                 NAME_REF
-                  IDENT "max"
-                ARG_LIST
-                  L_PAREN "("
-                  NAME_REF
-                    IDENT "login_time"
-                  R_PAREN ")"
+                  IDENT "user_id"
+              COMMA ","
               WHITESPACE " "
-              AS_KW "as"
-              WHITESPACE " "
-              NAME
-                IDENT "last_login"
-        WHITESPACE "\n  "
-        FROM_CLAUSE
-          FROM_KW "from"
-          WHITESPACE " "
-          NAME_REF
-            IDENT "login_history"
-        WHITESPACE "\n  "
-        GROUP_BY_CLAUSE
-          GROUP_KW "group"
-          WHITESPACE " "
-          BY_KW "by"
-          WHITESPACE " "
-          NAME_REF
-            IDENT "user_id"
-      R_PAREN ")"
+              TARGET
+                CALL_EXPR
+                  NAME_REF
+                    IDENT "max"
+                  ARG_LIST
+                    L_PAREN "("
+                    NAME_REF
+                      IDENT "login_time"
+                    R_PAREN ")"
+                WHITESPACE " "
+                AS_KW "as"
+                WHITESPACE " "
+                NAME
+                  IDENT "last_login"
+          WHITESPACE "\n  "
+          FROM_CLAUSE
+            FROM_KW "from"
+            WHITESPACE " "
+            NAME_REF
+              IDENT "login_history"
+          WHITESPACE "\n  "
+          GROUP_BY_CLAUSE
+            GROUP_KW "group"
+            WHITESPACE " "
+            BY_KW "by"
+            WHITESPACE " "
+            NAME_REF
+              IDENT "user_id"
+        R_PAREN ")"
       WHITESPACE " "
       ALIAS
         NAME