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

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squawk-cli
-Version: 2.4.0
+Version: 2.6.0
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows

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

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

{squawk_cli-2.4.0 → squawk_cli-2.6.0}/crates/squawk/src/github.rs

@@ -66,6 +66,8 @@ fn create_gh_app(
     )
 }
 
+const COMMENT_HEADER: &str = "# Squawk Report";
+
 pub fn check_and_comment_on_pr(
     cmd: Command,
     cfg: &Config,
@@ -130,6 +132,7 @@ pub fn check_and_comment_on_pr(
         &github_repo_name,
         github_pr_number,
         &comment_body,
+        COMMENT_HEADER,
     )?;
 
     let violations: usize = file_results.iter().map(|f| f.violations.len()).sum();
@@ -149,7 +152,7 @@ fn get_comment_body(files: &[CheckReport], version: &str) -> String {
 
     format!(
         r"
-# Squawk Report
+{COMMENT_HEADER}
 
 ### **{violations_emoji} {violation_count}** violations across **{file_count}** file(s)
 

{squawk_cli-2.4.0 → squawk_cli-2.6.0}/crates/squawk_github/src/lib.rs

@@ -69,16 +69,24 @@ pub fn comment_on_pr(
     repo: &str,
     issue: i64,
     body: &str,
+    existing_comment_text_includes: &str,
 ) -> Result<(), GithubError> {
     let comments = gh.list_issue_comments(owner, repo, issue)?;
 
     let bot_name = gh.app_slug();
 
     info!("checking for existing comment");
-    match comments
-        .iter()
-        .find(|x| x.user.r#type == "Bot" && x.user.login == bot_name)
-    {
+    match comments.iter().find(|x| {
+        x.user.r#type == "Bot"
+            && x.user.login == bot_name
+            // NOTE: We filter comments by their contents so we don't accidentally
+            // overwrite a comment made by some other tool. This happens often in
+            // GitHub repos that reuse the default GHA bot for all linters.
+            //
+            // This only works if `existing_comment_text_includes` is a "stable"
+            // piece of text included in all comments made by squawk!
+            && x.body.contains(existing_comment_text_includes)
+    }) {
         Some(prev_comment) => {
             info!("updating comment");
             gh.update_issue_comment(owner, repo, prev_comment.id, body)

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

@@ -4836,6 +4836,7 @@ fn stmt(p: &mut Parser, r: &StmtRestrictions) -> Option<CompletedMarker> {
                 RECURSIVE_KW | TEMP_KW | TEMPORARY_KW => Some(create_view_stmt(p)),
                 RULE_KW => Some(create_rule_stmt(p)),
                 TRANSFORM_KW => Some(create_transform_stmt(p)),
+                VIEW_KW => Some(create_view_stmt(p)),
                 _ => Some(create_function_stmt(p)),
             }
         }

{squawk_cli-2.4.0 → squawk_cli-2.6.0}/crates/squawk_parser/src/snapshots/squawk_parser__test__create_view_ok.snap

@@ -518,3 +518,38 @@ SOURCE_FILE
     OPTION_KW "option"
   SEMICOLON ";"
   WHITESPACE "\n\n"
+  COMMENT "-- regression test"
+  WHITESPACE "\n"
+  CREATE_VIEW_STMT
+    CREATE_KW "create"
+    WHITESPACE " "
+    OR_REPLACE
+      OR_KW "or"
+      WHITESPACE " "
+      REPLACE_KW "replace"
+    WHITESPACE " "
+    VIEW_KW "view"
+    WHITESPACE " "
+    PATH
+      PATH_SEGMENT
+        NAME
+          IDENT "my_view"
+    WHITESPACE " "
+    AS_KW "as"
+    WHITESPACE "\n"
+    SELECT
+      SELECT_CLAUSE
+        SELECT_KW "select"
+        WHITESPACE " "
+        TARGET_LIST
+          TARGET
+            NAME_REF
+              IDENT "x"
+      WHITESPACE " "
+      FROM_CLAUSE
+        FROM_KW "from"
+        WHITESPACE " "
+        NAME_REF
+          IDENT "foo"
+  SEMICOLON ";"
+  WHITESPACE "\n"

{squawk_cli-2.4.0 → squawk_cli-2.6.0}/crates/squawk_parser/test_data/ok/create_view.sql

@@ -43,3 +43,6 @@ create temporary view foo
 as select 1, 2, 3
 with local check option;
 
+-- regression test
+create or replace view my_view as
+select x from foo;