squawk-cli 2.21.0__tar.gz → 2.22.0__tar.gz

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/Cargo.lock

@@ -2596,7 +2596,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "squawk"
-version = "2.21.0"
+version = "2.22.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",

squawk_cli-2.22.0/PKG-INFO

@@ -0,0 +1,14 @@
+Metadata-Version: 2.4
+Name: squawk-cli
+Version: 2.22.0
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Rust
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Summary: Linter for PostgreSQL migrations
+Requires-Python: >=3.8

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "squawk"
-version = "2.21.0"
+version = "2.22.0"
 default-run = "squawk"
 
 authors.workspace = true
@@ -9,7 +9,7 @@ license.workspace = true
 description = "Linter for Postgresql focused on database migrations."
 repository = "https://github.com/sbdchd/squawk"
 documentation = "https://github.com/sbdchd/squawk/blob/master/README.md"
-readme = "../../README.md"
+readme = "README.md"
 keywords = ["postgres", "postgresql", "linter"]
 categories = ["command-line-utilities", "development-tools"]
 

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk/src/main.rs

@@ -217,7 +217,7 @@ Please open an issue at https://github.com/sbdchd/squawk/issues/new with the log
     let mut clap_app = Opt::clap();
     let is_stdin = !atty::is(Stream::Stdin);
     let github_annotations = std::env::var("GITHUB_ACTIONS").is_ok()
-        && !std::env::var("SQUAWK_DISABLE_GITHUB_ANNOTATIONS").is_ok();
+        && std::env::var("SQUAWK_DISABLE_GITHUB_ANNOTATIONS").is_err();
     match opts.cmd {
         Some(Command::Server) => {
             squawk_server::run().context("language server failed")?;

squawk_cli-2.22.0/crates/squawk_linter/src/identifier.rs

@@ -0,0 +1,34 @@
+/// Postgres Identifiers are case insensitive unless they're quoted.
+///
+/// This type handles the casing rules for us to make comparisions easier.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub(crate) struct Identifier(String);
+
+impl Identifier {
+    // TODO: we need to handle more advanced identifiers like:
+    // U&"d!0061t!+000061" UESCAPE '!'
+    pub fn new(s: &str) -> Self {
+        let normalized = if s.starts_with('"') && s.ends_with('"') {
+            s[1..s.len() - 1].to_string()
+        } else {
+            s.to_lowercase()
+        };
+        Identifier(normalized)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::identifier::Identifier;
+
+    #[test]
+    fn case_folds_correctly() {
+        // https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
+        // For example, the identifiers FOO, foo, and "foo" are considered the
+        // same by PostgreSQL, but "Foo" and "FOO" are different from these
+        // three and each other.
+        assert_eq!(Identifier::new("FOO"), Identifier::new("foo"));
+        assert_eq!(Identifier::new(r#""foo""#), Identifier::new("foo"));
+        assert_eq!(Identifier::new(r#""foo""#), Identifier::new("FOO"));
+    }
+}

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk_linter/src/ignore.rs

@@ -284,7 +284,7 @@ alter table t drop column c cascade;
         let errors: Vec<_> = linter
             .lint(parse, sql)
             .into_iter()
-            .map(|x| x.code.clone())
+            .map(|x| x.code)
             .collect();
         assert!(errors.is_empty());
     }
@@ -355,7 +355,7 @@ alter table t2 drop column c2 cascade;
         let errors: Vec<_> = linter
             .lint(parse, sql)
             .into_iter()
-            .map(|x| x.code.clone())
+            .map(|x| x.code)
             .collect();
 
         assert_debug_snapshot!(errors, @r"
@@ -379,7 +379,7 @@ alter table t2 drop column c2 cascade;
         let errors: Vec<_> = linter
             .lint(parse, sql)
             .into_iter()
-            .map(|x| x.code.clone())
+            .map(|x| x.code)
             .collect();
 
         assert_debug_snapshot!(errors, @r"

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk_linter/src/lib.rs

@@ -6,8 +6,8 @@ use enum_iterator::all;
 pub use ignore::Ignore;
 use ignore::find_ignores;
 use ignore_index::IgnoreIndex;
-use lazy_static::lazy_static;
 use rowan::TextRange;
+use rowan::TextSize;
 use serde::{Deserialize, Serialize};
 
 use squawk_syntax::{Parse, SourceFile};
@@ -19,8 +19,11 @@ mod ignore_index;
 mod version;
 mod visitors;
 
+mod identifier;
 mod rules;
-mod text;
+
+#[cfg(test)]
+mod test_utils;
 use rules::adding_field_with_default;
 use rules::adding_foreign_key_constraint;
 use rules::adding_not_null_field;
@@ -222,6 +225,36 @@ pub struct Violation {
     pub message: String,
     pub text_range: TextRange,
     pub help: Option<String>,
+    pub fix: Option<Fix>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Fix {
+    pub title: String,
+    pub edits: Vec<Edit>,
+}
+
+impl Fix {
+    fn new<T: Into<String>>(title: T, edits: Vec<Edit>) -> Fix {
+        Fix {
+            title: title.into(),
+            edits,
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Edit {
+    pub text_range: TextRange,
+    pub text: Option<String>,
+}
+impl Edit {
+    fn insert<T: Into<String>>(text: T, at: TextSize) -> Self {
+        Self {
+            text_range: TextRange::new(at, at),
+            text: Some(text.into()),
+        }
+    }
 }
 
 impl Violation {
@@ -237,19 +270,22 @@ impl Violation {
             text_range,
             message,
             help: help.into(),
+            fix: None,
         }
     }
+
+    fn with_fix(mut self, fix: Option<Fix>) -> Violation {
+        self.fix = fix;
+        self
+    }
 }
 
+#[derive(Default)]
 pub struct LinterSettings {
     pub pg_version: Version,
     pub assume_in_transaction: bool,
 }
 
-lazy_static! {
-    static ref DEFAULT_PG_VERSION: Version = Version::new(15, 0, 0);
-}
-
 pub struct Linter {
     errors: Vec<Violation>,
     ignores: Vec<Ignore>,
@@ -403,10 +439,7 @@ impl Linter {
             errors: vec![],
             ignores: vec![],
             rules: rules.into(),
-            settings: LinterSettings {
-                pg_version: *DEFAULT_PG_VERSION,
-                assume_in_transaction: false,
-            },
+            settings: LinterSettings::default(),
         }
     }
 }

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk_linter/src/rules/adding_field_with_default.rs

@@ -5,6 +5,7 @@ use squawk_syntax::ast;
 use squawk_syntax::ast::AstNode;
 use squawk_syntax::{Parse, SourceFile};
 
+use crate::identifier::Identifier;
 use crate::{Linter, Rule, Violation};
 
 fn is_const_expr(expr: &ast::Expr) -> bool {
@@ -16,11 +17,12 @@ fn is_const_expr(expr: &ast::Expr) -> bool {
 }
 
 lazy_static! {
-    static ref NON_VOLATILE_FUNCS: HashSet<String> = {
+    static ref NON_VOLATILE_FUNCS: HashSet<Identifier> = {
         NON_VOLATILE_BUILT_IN_FUNCTIONS
             .split('\n')
-            .map(|x| x.trim().to_lowercase())
+            .map(|x| x.trim())
             .filter(|x| !x.is_empty())
+            .map(Identifier::new)
             .collect()
     };
 }
@@ -36,7 +38,8 @@ fn is_non_volatile(expr: &ast::Expr) -> bool {
                     return false;
                 };
 
-                let non_volatile_name = NON_VOLATILE_FUNCS.contains(name_ref.text().as_str());
+                let non_volatile_name =
+                    NON_VOLATILE_FUNCS.contains(&Identifier::new(name_ref.text().as_str()));
 
                 no_args && non_volatile_name
             } else {
@@ -98,7 +101,8 @@ pub(crate) fn adding_field_with_default(ctx: &mut Linter, parse: &Parse<SourceFi
 mod test {
     use insta::assert_debug_snapshot;
 
-    use crate::{Linter, Rule};
+    use crate::Rule;
+    use crate::test_utils::lint;
 
     #[test]
     fn docs_example_ok_post_pg_11() {
@@ -110,9 +114,7 @@ mod test {
 ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT 10;
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -127,9 +129,7 @@ ALTER TABLE "core_recipe" ALTER COLUMN "foo" SET DEFAULT 10;
 -- remove nullability
             "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -140,9 +140,7 @@ ALTER TABLE "core_recipe" ALTER COLUMN "foo" SET DEFAULT 10;
 alter table t set logged, add column c integer default uuid();
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -153,9 +151,7 @@ alter table t set logged, add column c integer default uuid();
 ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT uuid();
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -167,9 +163,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT uuid();
 ALTER TABLE "core_recipe" ADD COLUMN "foo" boolean DEFAULT random();
             "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -181,9 +175,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" boolean DEFAULT random();
 ALTER TABLE "core_recipe" ADD COLUMN "foo" boolean DEFAULT true;
             "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -195,9 +187,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" boolean DEFAULT true;
 ALTER TABLE "core_recipe" ADD COLUMN "foo" text DEFAULT 'some-str';
             "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -209,9 +199,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" text DEFAULT 'some-str';
 ALTER TABLE "core_recipe" ADD COLUMN "foo" some_enum_type DEFAULT 'my-enum-variant';
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -223,9 +211,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" some_enum_type DEFAULT 'my-enum-varia
 ALTER TABLE "core_recipe" ADD COLUMN "foo" jsonb DEFAULT '{}'::jsonb;
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -237,9 +223,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" jsonb DEFAULT '{}'::jsonb;
 ALTER TABLE "core_recipe" ADD COLUMN "foo" jsonb DEFAULT myjsonb();
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -251,9 +235,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" jsonb DEFAULT myjsonb();
 ALTER TABLE "core_recipe" ADD COLUMN "foo" timestamptz DEFAULT now(123);
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -264,9 +246,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" timestamptz DEFAULT now(123);
 ALTER TABLE "core_recipe" ADD COLUMN "foo" timestamptz DEFAULT now();
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -278,9 +258,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" timestamptz DEFAULT now();
 alter table account_metadata add column blah integer default 2 + 2;
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert_debug_snapshot!(errors);
     }
 
@@ -291,9 +269,7 @@ ALTER TABLE foo
 ADD COLUMN bar numeric GENERATED ALWAYS AS (bar + baz) STORED;
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingFieldWithDefault]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingFieldWithDefault);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk_linter/src/rules/adding_foreign_key_constraint.rs

@@ -59,7 +59,8 @@ pub(crate) fn adding_foreign_key_constraint(ctx: &mut Linter, parse: &Parse<Sour
 
 #[cfg(test)]
 mod test {
-    use crate::{Linter, Rule};
+    use crate::Rule;
+    use crate::test_utils::lint;
 
     #[test]
     fn create_table_with_foreign_key_constraint() {
@@ -77,9 +78,7 @@ mod test {
         COMMIT;
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingForeignKeyConstraint]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingForeignKeyConstraint);
         assert!(errors.is_empty());
     }
 
@@ -93,9 +92,7 @@ ALTER TABLE "email" VALIDATE CONSTRAINT "fk_user";
 COMMIT;
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingForeignKeyConstraint]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingForeignKeyConstraint);
         assert!(errors.is_empty());
     }
 
@@ -108,9 +105,7 @@ ALTER TABLE "email" ADD CONSTRAINT "fk_user" FOREIGN KEY ("user_id") REFERENCES
 COMMIT;
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingForeignKeyConstraint]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingForeignKeyConstraint);
         assert_eq!(errors.len(), 1);
         assert_eq!(errors[0].code, Rule::AddingForeignKeyConstraint);
     }
@@ -123,9 +118,7 @@ ALTER TABLE "emails" ADD COLUMN "user_id" INT REFERENCES "user" ("id");
 COMMIT;
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingForeignKeyConstraint]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingForeignKeyConstraint);
         assert_eq!(errors.len(), 1);
         assert_eq!(errors[0].code, Rule::AddingForeignKeyConstraint);
     }

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk_linter/src/rules/adding_not_null_field.rs

@@ -35,16 +35,15 @@ pub(crate) fn adding_not_null_field(ctx: &mut Linter, parse: &Parse<SourceFile>)
 mod test {
     use insta::assert_debug_snapshot;
 
-    use crate::{Linter, Rule};
+    use crate::Rule;
+    use crate::test_utils::lint;
 
     #[test]
     fn set_not_null() {
         let sql = r#"
 ALTER TABLE "core_recipe" ALTER COLUMN "foo" SET NOT NULL;
         "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingNotNullableField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingNotNullableField);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -59,9 +58,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT 10 NOT NULL;
 ALTER TABLE "core_recipe" ALTER COLUMN "foo" DROP DEFAULT;
 COMMIT;
         "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingNotNullableField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingNotNullableField);
         assert!(errors.is_empty());
     }
 
@@ -71,9 +68,7 @@ COMMIT;
 -- This won't work if the table is populated, but that error is caught by adding-required-field.
 ALTER TABLE "core_recipe" ADD COLUMN "foo" integer NOT NULL;
         "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingNotNullableField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingNotNullableField);
         assert!(errors.is_empty());
     }
 
@@ -87,9 +82,7 @@ BEGIN;
 ALTER TABLE "core_recipe" ADD COLUMN "foo" integer NOT NULL DEFAULT 10;
 COMMIT;
         "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingNotNullableField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingNotNullableField);
         assert!(errors.is_empty());
     }
 
@@ -102,9 +95,7 @@ ALTER TABLE my_table ALTER COLUMN my_column SET NOT NULL;
 UPDATE alembic_version SET version_num='b' WHERE alembic_version.version_num = 'a';
 COMMIT;
         "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingNotNullableField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingNotNullableField);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk_linter/src/rules/adding_primary_key_constraint.rs

@@ -54,16 +54,15 @@ pub(crate) fn adding_primary_key_constraint(ctx: &mut Linter, parse: &Parse<Sour
 mod test {
     use insta::assert_debug_snapshot;
 
-    use crate::{Linter, Rule};
+    use crate::Rule;
+    use crate::test_utils::lint;
 
     #[test]
     fn serial_primary_key() {
         let sql = r#"
         ALTER TABLE a ADD COLUMN b SERIAL PRIMARY KEY;
     "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingSerialPrimaryKeyField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingSerialPrimaryKeyField);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -73,9 +72,7 @@ mod test {
         let sql = r#"
 ALTER TABLE items ADD PRIMARY KEY (id);
     "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingSerialPrimaryKeyField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingSerialPrimaryKeyField);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -86,9 +83,7 @@ ALTER TABLE items ADD PRIMARY KEY (id);
 ALTER TABLE items ADD CONSTRAINT items_pk PRIMARY KEY USING INDEX items_pk;
         "#;
 
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingSerialPrimaryKeyField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingSerialPrimaryKeyField);
         assert!(errors.is_empty());
     }
 }

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk_linter/src/rules/adding_required_field.rs

@@ -58,16 +58,15 @@ fn has_not_null_and_no_default_constraint(constraints: ast::AstChildren<ast::Con
 mod test {
     use insta::assert_debug_snapshot;
 
-    use crate::{Linter, Rule};
+    use crate::Rule;
+    use crate::test_utils::lint;
 
     #[test]
     fn nullable_ok() {
         let sql = r#"
 ALTER TABLE "recipe" ADD COLUMN "public" boolean;
   "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingRequiredField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingRequiredField);
         assert!(errors.is_empty());
     }
 
@@ -76,9 +75,7 @@ ALTER TABLE "recipe" ADD COLUMN "public" boolean;
         let sql = r#"
 ALTER TABLE "recipe" ADD COLUMN "public" boolean NOT NULL DEFAULT true;
   "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingRequiredField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingRequiredField);
         assert!(errors.is_empty());
     }
 
@@ -87,9 +84,7 @@ ALTER TABLE "recipe" ADD COLUMN "public" boolean NOT NULL DEFAULT true;
         let sql = r#"
 ALTER TABLE "recipe" ADD COLUMN "public" boolean NOT NULL;
   "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingRequiredField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingRequiredField);
         assert!(!errors.is_empty());
         assert_debug_snapshot!(errors);
     }
@@ -100,9 +95,7 @@ ALTER TABLE "recipe" ADD COLUMN "public" boolean NOT NULL;
 ALTER TABLE foo
     ADD COLUMN bar numeric GENERATED ALWAYS AS (bar + baz) STORED NOT NULL;
   "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingRequiredField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingRequiredField);
         assert!(errors.is_empty());
     }
 
@@ -112,9 +105,7 @@ ALTER TABLE foo
  ALTER TABLE foo
     ADD COLUMN bar numeric GENERATED ALWAYS AS (bar + baz) STORED ;
   "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::AddingRequiredField]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::AddingRequiredField);
         assert!(errors.is_empty());
     }
 }

{squawk_cli-2.21.0 → squawk_cli-2.22.0}/crates/squawk_linter/src/rules/ban_alter_domain_with_add_constraint.rs

@@ -27,16 +27,15 @@ pub(crate) fn ban_alter_domain_with_add_constraint(ctx: &mut Linter, parse: &Par
 mod test {
     use insta::assert_debug_snapshot;
 
-    use crate::{Linter, Rule};
+    use crate::Rule;
+    use crate::test_utils::lint;
 
     #[test]
     fn err() {
         let sql = r#"
      ALTER DOMAIN domain_name ADD CONSTRAINT constraint_name CHECK (value > 0);
         "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::BanAlterDomainWithAddConstraint]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::BanAlterDomainWithAddConstraint);
         assert_ne!(errors.len(), 0);
         assert_debug_snapshot!(errors);
     }
@@ -52,9 +51,7 @@ mod test {
      ALTER DOMAIN domain_name_7 OWNER TO you;
      ALTER DOMAIN domain_name_8 SET SCHEMA foo;
         "#;
-        let file = squawk_syntax::SourceFile::parse(sql);
-        let mut linter = Linter::from([Rule::BanAlterDomainWithAddConstraint]);
-        let errors = linter.lint(file, sql);
+        let errors = lint(sql, Rule::BanAlterDomainWithAddConstraint);
         assert_eq!(errors.len(), 0);
     }
 }