squawk-cli 2.14.0__tar.gz → 2.16.0__tar.gz

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/Cargo.lock

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

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/Cargo.toml

@@ -3,8 +3,8 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-edition = "2021"
-rust-version = "1.81.0"
+edition = "2024"
+rust-version = "1.88.0"
 authors = ["Squawk Team & Contributors"]
 license = "Apache-2.0 OR MIT"
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/PKG-INFO

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

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk/Cargo.toml

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

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk/src/debug.rs

@@ -6,8 +6,8 @@ use serde_json::json;
 use squawk_syntax::{ast::AstNode, syntax_error::SyntaxError};
 
 use crate::{
-    file::{sql_from_path, sql_from_stdin},
     DebugOption,
+    file::{sql_from_path, sql_from_stdin},
 };
 
 pub(crate) fn debug<W: io::Write>(
@@ -26,9 +26,9 @@ pub(crate) fn debug<W: io::Write>(
                     if verbose {
                         let content = &sql[start as usize..(start + token.len) as usize];
                         start += token.len;
-                        writeln!(f, "{:?} @ {:?}", content, token.kind)?;
+                        writeln!(f, "{content:?} @ {:?}", token.kind)?;
                     } else {
-                        writeln!(f, "{:?}", token)?;
+                        writeln!(f, "{token:?}")?;
                     }
                 }
             }
@@ -54,7 +54,7 @@ pub(crate) fn debug<W: io::Write>(
                             snap += &format!("@{:?}:{:?} {:?}", range.start(), range.end(), text);
                         }
                     }
-                    writeln!(f, "{}", snap)?;
+                    writeln!(f, "{snap}")?;
                     let renderer = Renderer::styled();
                     render_syntax_errors(&errors, filename, sql, |message| {
                         writeln!(f, "{}", renderer.render(message))?;

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk/src/github.rs

@@ -1,11 +1,11 @@
-use crate::config::Config;
-use crate::reporter::{fmt_tty_violation, CheckReport};
 use crate::Command;
+use crate::config::Config;
+use crate::reporter::{CheckReport, fmt_tty_violation};
 use crate::{file_finding::find_paths, reporter::check_files};
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use console::strip_ansi_codes;
 use log::info;
-use squawk_github::{actions, app, comment_on_pr, GitHubApi};
+use squawk_github::{GitHubApi, actions, app, comment_on_pr};
 use squawk_linter::{Rule, Version};
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -178,11 +178,7 @@ fn get_comment_body(files: &[CheckReport], version: &str) -> String {
 }
 
 const fn get_violations_emoji(count: usize) -> &'static str {
-    if count > 0 {
-        "🚒"
-    } else {
-        "✅"
-    }
+    if count > 0 { "🚒" } else { "✅" }
 }
 
 fn get_sql_file_content(violation: &CheckReport) -> Result<String> {

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk/src/main.rs

@@ -204,10 +204,10 @@ Please open an issue at https://github.com/sbdchd/squawk/issues/new with the log
         conf.assume_in_transaction.unwrap_or_default()
     };
 
-    info!("pg version: {:?}", pg_version);
+    info!("pg version: {pg_version:?}");
     info!("excluded rules: {:?}", &excluded_rules);
     info!("excluded paths: {:?}", &excluded_paths);
-    info!("assume in a transaction: {:?}", assume_in_transaction);
+    info!("assume in a transaction: {assume_in_transaction:?}");
 
     let mut clap_app = Opt::clap();
     let stdout = io::stdout();

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk/src/reporter.rs

@@ -16,8 +16,8 @@ use std::path::PathBuf;
 use std::process::ExitCode;
 
 use crate::{
-    file::{sql_from_path, sql_from_stdin},
     Reporter,
+    file::{sql_from_path, sql_from_stdin},
 };
 
 fn check_sql(
@@ -223,11 +223,23 @@ fn print_summary<W: io::Write>(f: &mut W, summary: &Summary) -> Result<()> {
             f,
             "Found {total_violations} issue{plural} in {files_with_violations} file{files_plural} (checked {files_checked} {files_checked_plural})",
             total_violations = summary.total_violations,
-            plural = if summary.total_violations == 1 { "" } else { "s" },
+            plural = if summary.total_violations == 1 {
+                ""
+            } else {
+                "s"
+            },
             files_with_violations = summary.files_with_violations,
-            files_plural = if summary.files_with_violations == 1 { "" } else { "s" },
+            files_plural = if summary.files_with_violations == 1 {
+                ""
+            } else {
+                "s"
+            },
             files_checked = summary.files_checked,
-            files_checked_plural = if summary.files_checked == 1 { "source file" } else { "source files" }
+            files_checked_plural = if summary.files_checked == 1 {
+                "source file"
+            } else {
+                "source files"
+            }
         )?;
     }
     Ok(())
@@ -355,7 +367,7 @@ select \;
 #[cfg(test)]
 mod test_reporter {
     use super::check_sql;
-    use crate::reporter::{print_violations, Reporter};
+    use crate::reporter::{Reporter, print_violations};
     use console::strip_ansi_codes;
     use insta::{assert_debug_snapshot, assert_snapshot};
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_github/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "squawk_github"
 version = "0.0.0"
-authors = ["Steve Dignam <steve@dignam.xyz>"]
-edition = "2018"
+authors.workspace = true
+edition.workspace = true
 license.workspace = true
 description = "Postgres SQL linter Github APIs used in Squawk"
 repository = "https://github.com/sbdchd/squawk"

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_lexer/src/lib.rs

@@ -279,7 +279,7 @@ impl Cursor<'_> {
                     return LiteralKind::Int {
                         base,
                         empty_int: false,
-                    }
+                    };
                 }
             }
         } else {

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/ignore.rs

@@ -108,7 +108,7 @@ pub(crate) fn find_ignores(ctx: &mut Linter, file: &SyntaxNode) {
 #[cfg(test)]
 mod test {
 
-    use crate::{find_ignores, Linter, Rule};
+    use crate::{Linter, Rule, find_ignores};
 
     #[test]
     fn single_ignore() {

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/lib.rs

@@ -1,10 +1,10 @@
 use std::collections::HashSet;
 use std::fmt;
 
-use enum_iterator::all;
 use enum_iterator::Sequence;
-use ignore::find_ignores;
+use enum_iterator::all;
 pub use ignore::Ignore;
+use ignore::find_ignores;
 use ignore_index::IgnoreIndex;
 use lazy_static::lazy_static;
 use rowan::TextRange;
@@ -152,7 +152,7 @@ impl TryFrom<&str> for Rule {
             "ban-alter-domain-with-add-constraint" => Ok(Rule::BanAlterDomainWithAddConstraint),
             "ban-truncate-cascade" => Ok(Rule::BanTruncateCascade),
             // xtask:new-rule:str-name
-            _ => Err(format!("Unknown violation name: {}", s)),
+            _ => Err(format!("Unknown violation name: {s}")),
         }
     }
 }
@@ -211,7 +211,7 @@ impl fmt::Display for Rule {
             Rule::BanTruncateCascade => "ban-truncate-cascade",
             // xtask:new-rule:variant-to-name
         };
-        write!(f, "{}", val)
+        write!(f, "{val}")
     }
 }
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/ban_concurrent_index_creation_in_transaction.rs

@@ -1,4 +1,4 @@
-use squawk_syntax::{ast, Parse, SourceFile};
+use squawk_syntax::{Parse, SourceFile, ast};
 
 use crate::{Linter, Rule, Violation};
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/ban_truncate_cascade.rs

@@ -1,4 +1,4 @@
-use squawk_syntax::{ast, Parse, SourceFile};
+use squawk_syntax::{Parse, SourceFile, ast};
 
 use crate::{Linter, Rule, Violation};
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/constraint_missing_not_valid.rs

@@ -1,11 +1,11 @@
 use std::collections::HashSet;
 
 use squawk_syntax::{
-    ast::{self, AstNode},
     Parse, SourceFile,
+    ast::{self, AstNode},
 };
 
-use crate::{text::trim_quotes, Linter, Rule, Violation};
+use crate::{Linter, Rule, Violation, text::trim_quotes};
 
 pub fn tables_created_in_transaction(
     assume_in_transaction: bool,

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/disallow_unique_constraint.rs

@@ -1,9 +1,9 @@
 use squawk_syntax::{
-    ast::{self, AstNode},
     Parse, SourceFile,
+    ast::{self, AstNode},
 };
 
-use crate::{text::trim_quotes, Linter, Rule, Violation};
+use crate::{Linter, Rule, Violation, text::trim_quotes};
 
 use super::constraint_missing_not_valid::tables_created_in_transaction;
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/prefer_bigint_over_int.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use squawk_syntax::ast::AstNode;
-use squawk_syntax::{ast, Parse, SourceFile};
+use squawk_syntax::{Parse, SourceFile, ast};
 
 use crate::{Linter, Rule, Violation};
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/prefer_bigint_over_smallint.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
 use squawk_syntax::ast::AstNode;
-use squawk_syntax::{ast, Parse, SourceFile};
+use squawk_syntax::{Parse, SourceFile, ast};
 
 use crate::{Linter, Rule, Violation};
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/prefer_robust_stmts.rs

@@ -1,11 +1,11 @@
 use std::collections::HashMap;
 
 use squawk_syntax::{
-    ast::{self, AstNode},
     Parse, SourceFile,
+    ast::{self, AstNode},
 };
 
-use crate::{text::trim_quotes, Linter, Rule, Violation};
+use crate::{Linter, Rule, Violation, text::trim_quotes};
 
 #[derive(PartialEq)]
 enum Constraint {

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/prefer_text_field.rs

@@ -1,11 +1,11 @@
 use std::collections::HashSet;
 
 use squawk_syntax::{
-    ast::{self, AstNode},
     Parse, SourceFile,
+    ast::{self, AstNode},
 };
 
-use crate::{text::trim_quotes, Linter, Rule, Violation};
+use crate::{Linter, Rule, Violation, text::trim_quotes};
 
 use crate::visitors::check_not_allowed_types;
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/prefer_timestamptz.rs

@@ -1,10 +1,10 @@
 use squawk_syntax::{
-    ast::{self, AstNode},
     Parse, SourceFile,
+    ast::{self, AstNode},
 };
 
-use crate::{text::trim_quotes, visitors::check_not_allowed_types};
 use crate::{Linter, Rule, Violation};
+use crate::{text::trim_quotes, visitors::check_not_allowed_types};
 
 pub fn is_not_allowed_timestamp(ty: &ast::Type) -> bool {
     match ty {
@@ -32,10 +32,10 @@ pub fn is_not_allowed_timestamp(ty: &ast::Type) -> bool {
         ast::Type::BitType(_) => false,
         ast::Type::DoubleType(_) => false,
         ast::Type::TimeType(time_type) => {
-            if let Some(ty_name) = time_type.name_ref() {
-                if ty_name.text() == "timestamp" && time_type.with_timezone().is_none() {
-                    return true;
-                }
+            if time_type.timestamp_token().is_some()
+                && !matches!(time_type.timezone(), Some(ast::Timezone::WithTimezone(_)))
+            {
+                return true;
             }
             false
         }

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/rules/require_concurrent_index_creation.rs

@@ -1,9 +1,9 @@
 use squawk_syntax::{
-    ast::{self, AstNode},
     Parse, SourceFile,
+    ast::{self, AstNode},
 };
 
-use crate::{text::trim_quotes, Linter, Rule, Violation};
+use crate::{Linter, Rule, Violation, text::trim_quotes};
 
 use super::constraint_missing_not_valid::tables_created_in_transaction;
 

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/version.rs

@@ -1,7 +1,7 @@
 use std::num::ParseIntError;
 use std::str::FromStr;
 
-use serde::{de::Error, Deserialize, Deserializer};
+use serde::{Deserialize, Deserializer, de::Error};
 
 #[derive(Debug, PartialEq, PartialOrd, Clone, Copy)]
 pub struct Version {

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_linter/src/visitors.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use squawk_syntax::ast;
 
-use crate::{text::trim_quotes, Linter};
+use crate::{Linter, text::trim_quotes};
 
 pub(crate) fn is_not_valid_int_type(ty: &ast::Type, invalid_type_names: &HashSet<&str>) -> bool {
     match ty {
@@ -42,8 +42,8 @@ pub(crate) fn check_not_allowed_types(
     for stmt in file.stmts() {
         match stmt {
             ast::Stmt::CreateTable(create_table) => {
-                if let Some(table_args) = create_table.table_args() {
-                    for arg in table_args.args() {
+                if let Some(table_arg_list) = create_table.table_arg_list() {
+                    for arg in table_arg_list.args() {
                         if let ast::TableArg::Column(column) = arg {
                             check_ty(ctx, column.ty());
                         }

{squawk_cli-2.14.0 → squawk_cli-2.16.0}/crates/squawk_parser/src/generated/syntax_kind.rs

@@ -600,6 +600,8 @@ pub enum SyntaxKind {
     ARRAY_TYPE,
     AS_FUNC_OPTION,
     ATTACH_PARTITION,
+    ATTRIBUTE_LIST,
+    ATTRIBUTE_OPTION,
     AT_TIME_ZONE,
     BEGIN,
     BEGIN_FUNC_OPTION,
@@ -625,12 +627,12 @@ pub enum SyntaxKind {
     COMMENT_ON,
     COMMIT,
     COMPOUND_SELECT,
+    COMPRESSION_METHOD,
     CONSTRAINT,
     CONSTRAINT_EXCLUSIONS,
     CONSTRAINT_INCLUDE_CLAUSE,
     CONSTRAINT_INDEX_METHOD,
     CONSTRAINT_INDEX_TABLESPACE,
-    CONSTRAINT_STORAGE_PARAMS,
     CONSTRAINT_WHERE_CLAUSE,
     COPY,
     COST_FUNC_OPTION,
@@ -683,6 +685,7 @@ pub enum SyntaxKind {
     DEFERRABLE,
     DEFERRABLE_CONSTRAINT_OPTION,
     DELETE,
+    DELETE_ROWS,
     DETACH_PARTITION,
     DISABLE_RLS,
     DISABLE_RULE,
@@ -691,6 +694,7 @@ pub enum SyntaxKind {
     DISTINCT_CLAUSE,
     DO,
     DOUBLE_TYPE,
+    DROP,
     DROP_ACCESS_METHOD,
     DROP_AGGREGATE,
     DROP_CAST,
@@ -759,6 +763,7 @@ pub enum SyntaxKind {
     FILTER_CLAUSE,
     FORCE_RLS,
     FOREIGN_KEY_CONSTRAINT,
+    FRAME_CLAUSE,
     FROM_CLAUSE,
     FROM_ITEM,
     FUNC_OPTION,
@@ -778,6 +783,7 @@ pub enum SyntaxKind {
     INDEX_EXPR,
     INDEX_PARAMS,
     INHERIT,
+    INHERITS,
     INITIALLY_DEFERRED_CONSTRAINT_OPTION,
     INITIALLY_IMMEDIATE_CONSTRAINT_OPTION,
     INSERT,
@@ -806,6 +812,7 @@ pub enum SyntaxKind {
     JOIN_LEFT,
     JOIN_RIGHT,
     JOIN_TYPE,
+    JOIN_USING_CLAUSE,
     JSON_BEHAVIOR_CLAUSE,
     JSON_FORMAT_CLAUSE,
     JSON_KEYS_UNIQUE_CLAUSE,
@@ -832,6 +839,7 @@ pub enum SyntaxKind {
     MATCH_PARTIAL,
     MATCH_SIMPLE,
     MATCH_TYPE,
+    MATERIALIZED,
     MERGE,
     MOVE,
     NAME,
@@ -839,6 +847,7 @@ pub enum SyntaxKind {
     NAME_REF,
     NEQ,
     NEQB,
+    NON_STANDARD_PARAM,
     NOTIFY,
     NOT_DEFERRABLE,
     NOT_DEFERRABLE_CONSTRAINT_OPTION,
@@ -846,6 +855,7 @@ pub enum SyntaxKind {
     NOT_ILIKE,
     NOT_IN,
     NOT_LIKE,
+    NOT_MATERIALIZED,
     NOT_NULL_CONSTRAINT,
     NOT_OF,
     NOT_SIMILAR_TO,
@@ -853,10 +863,16 @@ pub enum SyntaxKind {
     NO_ACTION,
     NO_FORCE_RLS,
     NO_INHERIT,
+    NULLS_DISTINCT,
+    NULLS_FIRST,
+    NULLS_LAST,
+    NULLS_NOT_DISTINCT,
     NULL_CONSTRAINT,
     OFFSET_CLAUSE,
     OF_TYPE,
     ON_CLAUSE,
+    ON_COMMIT,
+    ON_COMMIT_ACTION,
     ON_DELETE_ACTION,
     ON_UPDATE_ACTION,
     OP,
@@ -877,6 +893,14 @@ pub enum SyntaxKind {
     PARAM_VARIADIC,
     PAREN_EXPR,
     PAREN_SELECT,
+    PARTITION_BY,
+    PARTITION_DEFAULT,
+    PARTITION_FOR_VALUES_FROM,
+    PARTITION_FOR_VALUES_IN,
+    PARTITION_FOR_VALUES_WITH,
+    PARTITION_ITEM,
+    PARTITION_OF,
+    PARTITION_TYPE,
     PATH,
     PATH_SEGMENT,
     PATH_TYPE,
@@ -886,6 +910,7 @@ pub enum SyntaxKind {
     PREFIX_EXPR,
     PREPARE,
     PREPARE_TRANSACTION,
+    PRESERVE_ROWS,
     PRIMARY_KEY_CONSTRAINT,
     READ_COMMITTED,
     READ_ONLY,
@@ -955,20 +980,26 @@ pub enum SyntaxKind {
     SET_WITHOUT_OIDS,
     SHOW,
     SIMILAR_TO,
+    SORT_ASC,
+    SORT_BY,
+    SORT_DESC,
+    SORT_USING,
     SOURCE_FILE,
     STMT,
+    STORAGE,
     STRICT_FUNC_OPTION,
     SUPPORT_FUNC_OPTION,
     TABLE,
+    TABLESPACE,
     TABLE_ARG,
-    TABLE_ARGS,
+    TABLE_ARG_LIST,
     TABLE_CONSTRAINT,
     TABLE_LIST,
     TARGET,
     TARGET_LIST,
+    TIMEZONE,
     TIME_TYPE,
     TRANSACTION_MODE,
-    TRANSACTION_MODE_ISOLATION_LEVEL,
     TRANSACTION_MODE_LIST,
     TRANSFORM_FUNC_OPTION,
     TRUNCATE,
@@ -980,6 +1011,7 @@ pub enum SyntaxKind {
     UPDATE,
     USING_CLAUSE,
     USING_INDEX,
+    USING_METHOD,
     VACUUM,
     VALIDATE_CONSTRAINT,
     VALUES,
@@ -989,9 +1021,15 @@ pub enum SyntaxKind {
     WINDOW_CLAUSE,
     WINDOW_DEF,
     WINDOW_FUNC_OPTION,
+    WINDOW_SPEC,
     WITHIN_CLAUSE,
+    WITHOUT_OIDS,
     WITHOUT_TIMEZONE,
     WITH_CLAUSE,
+    WITH_DATA,
+    WITH_NO_DATA,
+    WITH_OPTIONS,
+    WITH_PARAMS,
     WITH_TABLE,
     WITH_TIMEZONE,
     XML_COLUMN_OPTION,