squawk-cli 2.40.1__tar.gz → 2.41.0__tar.gz

{squawk_cli-2.40.1 → squawk_cli-2.41.0}/Cargo.lock

@@ -680,6 +680,16 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "etcetera"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -2342,7 +2352,7 @@ dependencies = [
 
 [[package]]
 name = "squawk"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -2371,7 +2381,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-fmt"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "insta",
  "itertools 0.14.0",
@@ -2381,7 +2391,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-github"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "jsonwebtoken",
  "log",
@@ -2392,7 +2402,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-ide"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "annotate-snippets",
  "insta",
@@ -2410,14 +2420,14 @@ dependencies = [
 
 [[package]]
 name = "squawk-lexer"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "insta",
 ]
 
 [[package]]
 name = "squawk-linter"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "annotate-snippets",
  "enum-iterator",
@@ -2432,7 +2442,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-parser"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2446,9 +2456,10 @@ dependencies = [
 
 [[package]]
 name = "squawk-server"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "anyhow",
+ "etcetera",
  "insta",
  "line-index",
  "log",
@@ -2466,7 +2477,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-syntax"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2479,7 +2490,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-wasm"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3089,6 +3100,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -3125,6 +3142,15 @@ dependencies = [
  "windows-targets 0.53.3",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -3162,7 +3188,7 @@ version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
  "windows_i686_gnu 0.53.0",
@@ -3350,7 +3376,7 @@ checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
 
 [[package]]
 name = "xtask"
-version = "2.40.1"
+version = "2.41.0"
 dependencies = [
  "anyhow",
  "camino",

{squawk_cli-2.40.1 → squawk_cli-2.41.0}/Cargo.toml

@@ -3,9 +3,9 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "2.40.1"
+version = "2.41.0"
 edition = "2024"
-rust-version = "1.90.0"
+rust-version = "1.93"
 authors = ["Squawk Team & Contributors"]
 license = "Apache-2.0 OR MIT"
 description = "Linter for Postgres migrations & SQL"
@@ -61,16 +61,17 @@ proc-macro2 = "1.0.95"
 snapbox = { version = "0.6.0", features = ["diff", "term-svg", "cmd"] }
 smallvec = "1.13.2"
 tabled = "0.17.0"
+etcetera = "0.11.0"
 
 # local
 # we have to make the versions explicit otherwise `cargo publish` won't work
-squawk-github = { path = "./crates/squawk_github", version = "2.40.1" }
-squawk-ide = { path = "./crates/squawk_ide", version = "2.40.1" }
-squawk-lexer = { path = "./crates/squawk_lexer", version = "2.40.1" }
-squawk-parser = { path = "./crates/squawk_parser", version = "2.40.1" }
-squawk-syntax = { path = "./crates/squawk_syntax", version = "2.40.1" }
-squawk-linter = { path = "./crates/squawk_linter", version = "2.40.1" }
-squawk-server = { path = "./crates/squawk_server", version = "2.40.1" }
+squawk-github = { path = "./crates/squawk_github", version = "2.41.0" }
+squawk-ide = { path = "./crates/squawk_ide", version = "2.41.0" }
+squawk-lexer = { path = "./crates/squawk_lexer", version = "2.41.0" }
+squawk-parser = { path = "./crates/squawk_parser", version = "2.41.0" }
+squawk-syntax = { path = "./crates/squawk_syntax", version = "2.41.0" }
+squawk-linter = { path = "./crates/squawk_linter", version = "2.41.0" }
+squawk-server = { path = "./crates/squawk_server", version = "2.41.0" }
 
 [workspace.lints.clippy]
 collapsible_else_if = "allow"

{squawk_cli-2.40.1 → squawk_cli-2.41.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squawk-cli
-Version: 2.40.1
+Version: 2.41.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: MacOS

{squawk_cli-2.40.1 → squawk_cli-2.41.0}/crates/squawk/README.md

@@ -252,7 +252,7 @@ to your project's `.pre-commit-config.yaml`:
 ```yaml
 repos:
   - repo: https://github.com/sbdchd/squawk
-    rev: 2.40.1
+    rev: 2.41.0
     hooks:
       - id: squawk
         files: path/to/postgres/migrations/written/in/sql

{squawk_cli-2.40.1 → squawk_cli-2.41.0}/crates/squawk/src/reporter.rs

@@ -33,49 +33,61 @@ fn check_sql(
     linter.settings.assume_in_transaction = assume_in_transaction;
     let parse = SourceFile::parse(sql);
     let parse_errors = parse.errors();
-    let errors = linter.lint(&parse, sql);
     let line_index = LineIndex::new(sql);
 
-    let mut violations = Vec::with_capacity(parse_errors.len() + errors.len());
-
-    for e in parse_errors {
-        let range_start = e.range().start();
-        let line_col = line_index.line_col(range_start);
-        let range_end = e.range().end();
-        let line_end = line_index.line_col(range_end);
-        violations.push(ReportViolation {
-            file: path.to_string(),
-            line: line_col.line as usize,
-            line_end: line_end.line as usize,
-            column: line_col.col as usize,
-            column_end: line_end.col as usize,
-            level: ViolationLevel::Error,
-            help: None,
-            range: e.range(),
-            message: e.message().to_string(),
-            rule_name: "syntax-error".to_string(),
-            fix: None,
-        })
+    if !parse_errors.is_empty() {
+        let violations = parse_errors
+            .into_iter()
+            .map(|e| {
+                let range_start = e.range().start();
+                let line_col = line_index.line_col(range_start);
+                let range_end = e.range().end();
+                let line_end = line_index.line_col(range_end);
+                ReportViolation {
+                    file: path.to_string(),
+                    line: line_col.line as usize,
+                    line_end: line_end.line as usize,
+                    column: line_col.col as usize,
+                    column_end: line_end.col as usize,
+                    level: ViolationLevel::Error,
+                    help: None,
+                    range: e.range(),
+                    message: e.message().to_string(),
+                    rule_name: "syntax-error".to_string(),
+                    fix: None,
+                }
+            })
+            .collect();
+        return CheckReport {
+            filename: path.into(),
+            sql: sql.into(),
+            violations,
+        };
     }
-    for e in errors {
-        let range_start = e.text_range.start();
-        let line_col = line_index.line_col(range_start);
-        let range_end = e.text_range.end();
-        let line_end = line_index.line_col(range_end);
-        violations.push(ReportViolation {
-            file: path.to_string(),
-            line: line_col.line as usize,
-            line_end: line_end.line as usize,
-            column: line_col.col as usize,
-            column_end: line_end.col as usize,
-            range: e.text_range,
-            help: e.help,
-            level: ViolationLevel::Warning,
-            message: e.message,
-            rule_name: e.code.to_string(),
-            fix: e.fix,
+
+    let errors = linter.lint(&parse, sql);
+    let violations = errors
+        .into_iter()
+        .map(|e| {
+            let range_start = e.text_range.start();
+            let line_col = line_index.line_col(range_start);
+            let range_end = e.text_range.end();
+            let line_end = line_index.line_col(range_end);
+            ReportViolation {
+                file: path.to_string(),
+                line: line_col.line as usize,
+                line_end: line_end.line as usize,
+                column: line_col.col as usize,
+                column_end: line_end.col as usize,
+                range: e.text_range,
+                help: e.help,
+                level: ViolationLevel::Warning,
+                message: e.message,
+                rule_name: e.code.to_string(),
+                fix: e.fix,
+            }
         })
-    }
+        .collect();
 
     CheckReport {
         filename: path.into(),
@@ -485,6 +497,15 @@ select \;
         let val: Value = serde_json::from_slice(&buff).unwrap();
         assert_snapshot!(val);
     }
+
+    #[test]
+    fn skip_lint_on_syntax_error() {
+        let error_sql = "ALTER TABLE foo ALTER CONSTRAINT bar RENAME TO quux;";
+        let mut buff = vec![];
+        let res = check_sql(error_sql, "test.sql", &[], None, false);
+        fmt_json(&mut buff, vec![res]).unwrap();
+        assert_snapshot!(String::from_utf8_lossy(&buff), @r#"[{"file":"test.sql","line":0,"column":36,"level":"Error","message":"missing comma","help":null,"rule_name":"syntax-error","column_end":36,"line_end":0}]"#);
+    }
 }
 
 #[cfg(test)]

{squawk_cli-2.40.1 → squawk_cli-2.41.0}/crates/squawk_github/src/app.rs

@@ -11,7 +11,7 @@ use serde_json::Value;
 use std::time::Duration;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.40.1";
+pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.41.0";
 
 #[derive(Debug, Serialize)]
 struct CommentBody {

{squawk_cli-2.40.1 → squawk_cli-2.41.0}/crates/squawk_ide/src/binder.rs

@@ -281,7 +281,7 @@ fn bind_stmt(b: &mut Binder, stmt: ast::Stmt) {
         ast::Stmt::Listen(listen) => bind_listen(b, listen),
         ast::Stmt::Set(set) => bind_set(b, set),
         ast::Stmt::CreatePolicy(create_policy) => bind_create_policy(b, create_policy),
-        _ => {}
+        _ => (),
     }
 }
 

squawk_cli-2.41.0/crates/squawk_ide/src/builtins.rs

@@ -0,0 +1,14 @@
+pub const BUILTINS_SQL: &str = include_str!("builtins.sql");
+
+#[cfg(test)]
+mod test {
+    use squawk_syntax::ast;
+
+    use crate::builtins::BUILTINS_SQL;
+
+    #[test]
+    fn no_errors() {
+        let parse = ast::SourceFile::parse(BUILTINS_SQL);
+        assert_eq!(parse.errors(), vec![]);
+    }
+}

{squawk_cli-2.40.1 → squawk_cli-2.41.0}/crates/squawk_ide/src/code_actions.rs

@@ -35,6 +35,8 @@ pub fn code_actions(file: ast::SourceFile, offset: TextSize) -> Option<Vec<CodeA
     remove_else_clause(&mut actions, &file, offset);
     rewrite_table_as_select(&mut actions, &file, offset);
     rewrite_select_as_table(&mut actions, &file, offset);
+    rewrite_from(&mut actions, &file, offset);
+    rewrite_leading_from(&mut actions, &file, offset);
     rewrite_values_as_select(&mut actions, &file, offset);
     rewrite_select_as_values(&mut actions, &file, offset);
     add_schema(&mut actions, &file, offset);
@@ -162,10 +164,10 @@ fn remove_else_clause(
 
     let mut edits = vec![];
     edits.push(Edit::delete(else_clause.syntax().text_range()));
-    if let Some(token) = else_token.prev_token() {
-        if token.kind() == SyntaxKind::WHITESPACE {
-            edits.push(Edit::delete(token.text_range()));
-        }
+    if let Some(token) = else_token.prev_token()
+        && token.kind() == SyntaxKind::WHITESPACE
+    {
+        edits.push(Edit::delete(token.text_range()));
     }
 
     actions.push(CodeAction {
@@ -232,6 +234,72 @@ fn rewrite_select_as_table(
     Some(())
 }
 
+fn rewrite_from(
+    actions: &mut Vec<CodeAction>,
+    file: &ast::SourceFile,
+    offset: TextSize,
+) -> Option<()> {
+    let token = token_from_offset(file, offset)?;
+    let select = token.parent_ancestors().find_map(ast::Select::cast)?;
+
+    if select.select_clause().is_some() {
+        return None;
+    }
+
+    select.from_clause()?;
+
+    actions.push(CodeAction {
+        title: "Insert leading `select *`".to_owned(),
+        edits: vec![Edit::insert(
+            "select * ".to_owned(),
+            select.syntax().text_range().start(),
+        )],
+        kind: ActionKind::QuickFix,
+    });
+
+    Some(())
+}
+
+fn rewrite_leading_from(
+    actions: &mut Vec<CodeAction>,
+    file: &ast::SourceFile,
+    offset: TextSize,
+) -> Option<()> {
+    let token = token_from_offset(file, offset)?;
+    let select = token.parent_ancestors().find_map(ast::Select::cast)?;
+
+    let from_clause = select.from_clause()?;
+    let select_clause = select.select_clause()?;
+
+    if from_clause.syntax().text_range().start() >= select_clause.syntax().text_range().start() {
+        return None;
+    }
+
+    let select_text = select_clause.syntax().text().to_string();
+
+    let mut delete_start = select_clause.syntax().text_range().start();
+    if let Some(prev) = select_clause.syntax().prev_sibling_or_token()
+        && prev.kind() == SyntaxKind::WHITESPACE
+    {
+        delete_start = prev.text_range().start();
+    }
+    let select_with_ws = TextRange::new(delete_start, select_clause.syntax().text_range().end());
+
+    actions.push(CodeAction {
+        title: "Swap `from` and `select` clauses".to_owned(),
+        edits: vec![
+            Edit::delete(select_with_ws),
+            Edit::insert(
+                format!("{} ", select_text),
+                from_clause.syntax().text_range().start(),
+            ),
+        ],
+        kind: ActionKind::QuickFix,
+    });
+
+    Some(())
+}
+
 /// Returns true if a `select` statement can be safely rewritten as a `table` statement.
 ///
 /// We can only do this when there are no clauses besides the `select` and
@@ -748,7 +816,6 @@ mod test {
     ) -> String {
         let (mut offset, sql) = fixture(sql);
         let parse = ast::SourceFile::parse(&sql);
-        assert_eq!(parse.errors(), vec![]);
         let file: ast::SourceFile = parse.tree();
 
         offset = offset.checked_sub(1.into()).unwrap_or_default();
@@ -762,6 +829,16 @@ mod test {
         );
 
         let action = &actions[0];
+
+        match action.kind {
+            ActionKind::QuickFix => {
+                // Quickfixes can fix syntax errors so we don't assert
+            }
+            ActionKind::RefactorRewrite => {
+                assert_eq!(parse.errors(), vec![]);
+            }
+        }
+
         let mut result = sql.clone();
 
         let mut edits = action.edits.clone();
@@ -777,11 +854,19 @@ mod test {
         }
 
         let reparse = ast::SourceFile::parse(&result);
-        assert_eq!(
-            reparse.errors(),
-            vec![],
-            "Code actions shouldn't cause syntax errors"
-        );
+
+        match action.kind {
+            ActionKind::QuickFix => {
+                // Quickfixes can fix syntax errors so we don't assert
+            }
+            ActionKind::RefactorRewrite => {
+                assert_eq!(
+                    reparse.errors(),
+                    vec![],
+                    "Code actions shouldn't cause syntax errors"
+                );
+            }
+        }
 
         result
     }
@@ -804,13 +889,16 @@ mod test {
         }
     }
 
-    fn code_action_not_applicable(
+    fn code_action_not_applicable_(
         f: impl Fn(&mut Vec<CodeAction>, &ast::SourceFile, TextSize) -> Option<()>,
         sql: &str,
+        allow_errors: bool,
     ) -> bool {
         let (offset, sql) = fixture(sql);
         let parse = ast::SourceFile::parse(&sql);
-        assert_eq!(parse.errors(), vec![]);
+        if !allow_errors {
+            assert_eq!(parse.errors(), vec![]);
+        }
         let file: ast::SourceFile = parse.tree();
 
         let mut actions = vec![];
@@ -818,6 +906,20 @@ mod test {
         actions.is_empty()
     }
 
+    fn code_action_not_applicable(
+        f: impl Fn(&mut Vec<CodeAction>, &ast::SourceFile, TextSize) -> Option<()>,
+        sql: &str,
+    ) -> bool {
+        code_action_not_applicable_(f, sql, false)
+    }
+
+    fn code_action_not_applicable_with_errors(
+        f: impl Fn(&mut Vec<CodeAction>, &ast::SourceFile, TextSize) -> Option<()>,
+        sql: &str,
+    ) -> bool {
+        code_action_not_applicable_(f, sql, true)
+    }
+
     #[test]
     fn remove_else_clause_() {
         assert_snapshot!(apply_code_action(
@@ -2005,4 +2107,91 @@ select myschema.f$0();"
             "select 1 as column1, 2 as column2 exc$0ept select 3, 4;"
         ));
     }
+
+    #[test]
+    fn rewrite_from_simple() {
+        assert_snapshot!(apply_code_action(
+            rewrite_from,
+            "from$0 t;"),
+            @"select * from t;"
+        );
+    }
+
+    #[test]
+    fn rewrite_from_qualified() {
+        assert_snapshot!(apply_code_action(
+            rewrite_from,
+            "from$0 s.t;"),
+            @"select * from s.t;"
+        );
+    }
+
+    #[test]
+    fn rewrite_from_on_name() {
+        assert_snapshot!(apply_code_action(
+            rewrite_from,
+            "from t$0;"),
+            @"select * from t;"
+        );
+    }
+
+    #[test]
+    fn rewrite_from_not_applicable_with_select() {
+        assert!(code_action_not_applicable_with_errors(
+            rewrite_from,
+            "from$0 t select c;"
+        ));
+    }
+
+    #[test]
+    fn rewrite_from_not_applicable_on_normal_select() {
+        assert!(code_action_not_applicable(
+            rewrite_from,
+            "select * from$0 t;"
+        ));
+    }
+
+    #[test]
+    fn rewrite_leading_from_simple() {
+        assert_snapshot!(apply_code_action(
+            rewrite_leading_from,
+            "from$0 t select c;"),
+            @"select c from t;"
+        );
+    }
+
+    #[test]
+    fn rewrite_leading_from_multiple_cols() {
+        assert_snapshot!(apply_code_action(
+            rewrite_leading_from,
+            "from$0 t select a, b;"),
+            @"select a, b from t;"
+        );
+    }
+
+    #[test]
+    fn rewrite_leading_from_with_where() {
+        assert_snapshot!(apply_code_action(
+            rewrite_leading_from,
+            "from$0 t select c where x = 1;"),
+            @"select c from t where x = 1;"
+        );
+    }
+
+    #[test]
+    fn rewrite_leading_from_on_select() {
+        assert_snapshot!(apply_code_action(
+            rewrite_leading_from,
+            "from t sel$0ect c;"),
+            @"select c from t;"
+        );
+    }
+
+    #[test]
+    fn rewrite_leading_from_not_applicable_normal() {
+        assert!(code_action_not_applicable(
+            rewrite_leading_from,
+            "sel$0ect c from t;"
+        ));
+    }
 }

{squawk_cli-2.40.1 → squawk_cli-2.41.0}/crates/squawk_ide/src/document_symbols.rs

@@ -201,7 +201,7 @@ pub fn document_symbols(file: &ast::SourceFile) -> Vec<DocumentSymbol> {
                 }
             }
 
-            _ => {}
+            _ => (),
         }
     }