squawk-cli 2.50.0__tar.gz → 2.51.0__tar.gz

{squawk_cli-2.50.0 → squawk_cli-2.51.0}/Cargo.lock

@@ -1227,6 +1227,47 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
+[[package]]
+name = "jiff"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f00b5dbd620d61dfdcb6007c9c1f6054ebd75319f163d886a9055cec1155073d"
+dependencies = [
+ "jiff-static",
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde_core",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e000de030ff8022ea1da3f466fbb0f3a809f5e51ed31f6dd931c35181ad8e6d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8"
+dependencies = [
+ "jiff-tzdb",
+]
+
 [[package]]
 name = "jod-thread"
 version = "0.1.2"
@@ -1545,15 +1586,14 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "openssl"
-version = "0.10.78"
+version = "0.10.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38c4372413cdaaf3cc79dd92d29d7d9f5ab09b51b10dded508fb90bb70b9222"
+checksum = "bf0b434746ee2832f4f0baf10137e1cabb18cbe6912c69e2e33263c45250f542"
 dependencies = [
  "bitflags 2.9.3",
  "cfg-if",
  "foreign-types",
  "libc",
- "once_cell",
  "openssl-macros",
  "openssl-sys",
 ]
@@ -1586,9 +1626,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.114"
+version = "0.9.115"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13ce1245cd07fcc4cfdb438f7507b0c7e4f3849a69fd84d52374c66d83741bb6"
+checksum = "158fe5b292746440aa6e7a7e690e55aeb72d41505e2804c23c6973ad0e9c9781"
 dependencies = [
  "cc",
  "libc",
@@ -1735,6 +1775,15 @@ version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
 
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
+dependencies = [
+ "portable-atomic",
+]
+
 [[package]]
 name = "potential_utf"
 version = "0.1.3"
@@ -2385,7 +2434,7 @@ dependencies = [
 
 [[package]]
 name = "squawk"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -2416,7 +2465,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-fmt"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "anyhow",
  "camino",
@@ -2432,7 +2481,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-github"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "jsonwebtoken",
  "log",
@@ -2443,7 +2492,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-ide"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "annotate-snippets",
  "etcetera",
@@ -2465,14 +2514,14 @@ dependencies = [
 
 [[package]]
 name = "squawk-lexer"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "insta",
 ]
 
 [[package]]
 name = "squawk-linter"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "annotate-snippets",
  "enum-iterator",
@@ -2487,7 +2536,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-parser"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2500,7 +2549,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-server"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -2526,7 +2575,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-syntax"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2540,7 +2589,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-thread"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
@@ -2552,7 +2601,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-wasm"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3428,7 +3477,7 @@ checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
 
 [[package]]
 name = "xtask"
-version = "2.50.0"
+version = "2.51.0"
 dependencies = [
  "anyhow",
  "camino",
@@ -3436,12 +3485,14 @@ dependencies = [
  "convert_case",
  "csv",
  "enum-iterator",
+ "jiff",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash 2.1.1",
  "serde",
  "serde_json",
+ "toml",
  "ungrammar",
  "xshell",
 ]

{squawk_cli-2.50.0 → squawk_cli-2.51.0}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "2.50.0"
+version = "2.51.0"
 edition = "2024"
 rust-version = "1.94"
 authors = ["Squawk Team & Contributors"]
@@ -44,6 +44,7 @@ rowan = "0.15.15"
 salsa = "0.26.0"
 smol_str = "0.3.2"
 enum-iterator = "2.1.0"
+jiff = "0.2.24"
 itertools = "0.14.0"
 line-index = "0.1.2"
 lsp-server = "0.7.8"
@@ -78,14 +79,14 @@ rustc-hash = "2.1.1"
 
 # local
 # we have to make the versions explicit otherwise `cargo publish` won't work
-squawk-github = { path = "./crates/squawk_github", version = "2.50.0" }
-squawk-ide = { path = "./crates/squawk_ide", version = "2.50.0" }
-squawk-lexer = { path = "./crates/squawk_lexer", version = "2.50.0" }
-squawk-parser = { path = "./crates/squawk_parser", version = "2.50.0" }
-squawk-syntax = { path = "./crates/squawk_syntax", version = "2.50.0" }
-squawk-linter = { path = "./crates/squawk_linter", version = "2.50.0" }
-squawk-server = { path = "./crates/squawk_server", version = "2.50.0" }
-squawk-thread = { path = "./crates/squawk_thread", version = "2.50.0" }
+squawk-github = { path = "./crates/squawk_github", version = "2.51.0" }
+squawk-ide = { path = "./crates/squawk_ide", version = "2.51.0" }
+squawk-lexer = { path = "./crates/squawk_lexer", version = "2.51.0" }
+squawk-parser = { path = "./crates/squawk_parser", version = "2.51.0" }
+squawk-syntax = { path = "./crates/squawk_syntax", version = "2.51.0" }
+squawk-linter = { path = "./crates/squawk_linter", version = "2.51.0" }
+squawk-server = { path = "./crates/squawk_server", version = "2.51.0" }
+squawk-thread = { path = "./crates/squawk_thread", version = "2.51.0" }
 
 [workspace.lints.clippy]
 collapsible_else_if = "allow"

{squawk_cli-2.50.0 → squawk_cli-2.51.0}/PKG-INFO

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

{squawk_cli-2.50.0 → squawk_cli-2.51.0}/crates/squawk/README.md

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

{squawk_cli-2.50.0 → squawk_cli-2.51.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.50.0";
+pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.51.0";
 
 #[derive(Debug, Serialize)]
 struct CommentBody {

{squawk_cli-2.50.0 → squawk_cli-2.51.0}/crates/squawk_ide/src/ast_nav.rs

@@ -38,6 +38,18 @@ pub(crate) fn find_cte_with_table(
     None
 }
 
+pub(crate) fn iter_values_columns(values: &ast::Values) -> impl Iterator<Item = (Name, ast::Expr)> {
+    values
+        .row_list()
+        .into_iter()
+        .flat_map(|rl| rl.rows().take(1))
+        .flat_map(|r| r.exprs().enumerate())
+        .map(|(idx, expr)| {
+            let name = Name::from_string(format!("column{}", idx + 1));
+            (name, expr)
+        })
+}
+
 #[derive(Debug)]
 pub(crate) enum ParentQuery {
     Select(ast::Select),

{squawk_cli-2.50.0 → squawk_cli-2.51.0}/crates/squawk_ide/src/binder.rs

@@ -50,7 +50,7 @@ impl Binder {
         name: &Name,
         kind: SymbolKind,
         position: TextSize,
-        schema: &Option<Schema>,
+        schema: Option<&Schema>,
     ) -> Option<SyntaxNodePtr> {
         let symbols = self.scope.get(name)?;
 
@@ -75,7 +75,7 @@ impl Binder {
         name: &Name,
         kind: SymbolKind,
         position: TextSize,
-        schema: &Option<Schema>,
+        schema: Option<&Schema>,
         params: Option<&[Name]>,
     ) -> Option<SyntaxNodePtr> {
         let symbols = self.scope.get(name)?;
@@ -107,7 +107,7 @@ impl Binder {
         name: &Name,
         kind: SymbolKind,
         position: TextSize,
-        schema: &Option<Schema>,
+        schema: Option<&Schema>,
         table: &Option<Name>,
     ) -> Option<SyntaxNodePtr> {
         let symbols = self.scope.get(name)?;

{squawk_cli-2.50.0 → squawk_cli-2.51.0}/crates/squawk_ide/src/classify.rs

@@ -48,6 +48,8 @@ pub(crate) enum NameRefClass {
     Schema,
     SelectColumn,
     SelectFunctionCall,
+    SelectGroupByAliasOrColumn,
+    SelectOrderByAliasOrColumn,
     SelectQualifiedColumn,
     SelectQualifiedColumnTable,
     Sequence,
@@ -114,6 +116,8 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
     let mut in_when_clause = false;
     let mut in_special_sql_fn = false;
     let mut in_conflict_target = false;
+    let mut in_group_by_clause = false;
+    let mut in_order_by_clause = false;
 
     // TODO: can we combine this if and the one that follows?
     if let Some(parent) = node.parent()
@@ -663,6 +667,12 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
         if ast::FromClause::can_cast(ancestor.kind()) {
             in_from_clause = true;
         }
+        if ast::GroupByClause::can_cast(ancestor.kind()) {
+            in_group_by_clause = true;
+        }
+        if ast::OrderByClause::can_cast(ancestor.kind()) {
+            in_order_by_clause = true;
+        }
         if ast::Select::can_cast(ancestor.kind()) {
             if in_function_name && !in_special_sql_fn {
                 return Some(NameRefClass::SelectFunctionCall);
@@ -673,7 +683,19 @@ pub(crate) fn classify_name_ref(node: &SyntaxNode) -> Option<NameRefClass> {
                 }
                 return Some(NameRefClass::FromTable);
             }
-            // Classify as SelectColumn for target list, WHERE, ORDER BY, GROUP BY, etc.
+            if in_group_by_clause
+                && let Some(parent) = node.parent()
+                && ast::GroupingExpr::can_cast(parent.kind())
+            {
+                return Some(NameRefClass::SelectGroupByAliasOrColumn);
+            }
+            if in_order_by_clause
+                && let Some(parent) = node.parent()
+                && ast::SortBy::can_cast(parent.kind())
+            {
+                return Some(NameRefClass::SelectOrderByAliasOrColumn);
+            }
+            // Classify as SelectColumn for target list, WHERE, etc.
             // (anything in SELECT except FROM clause)
             return Some(NameRefClass::SelectColumn);
         }

{squawk_cli-2.50.0 → squawk_cli-2.51.0}/crates/squawk_ide/src/code_actions/mod.rs

@@ -13,12 +13,14 @@ mod rewrite_as_dollar_quoted_string;
 mod rewrite_as_regular_string;
 mod rewrite_between_as_binary_expression;
 mod rewrite_cast_to_double_colon;
+mod rewrite_create_table_as_as_select_into;
 mod rewrite_double_colon_to_cast;
 mod rewrite_from;
 mod rewrite_leading_from;
 mod rewrite_not_equals_operator;
 mod rewrite_select_as_table;
 mod rewrite_select_as_values;
+mod rewrite_select_into_as_create_table_as;
 mod rewrite_table_as_select;
 mod rewrite_timestamp_type;
 mod rewrite_values_as_select;
@@ -36,12 +38,14 @@ use rewrite_as_dollar_quoted_string::rewrite_as_dollar_quoted_string;
 use rewrite_as_regular_string::rewrite_as_regular_string;
 use rewrite_between_as_binary_expression::rewrite_between_as_binary_expression;
 use rewrite_cast_to_double_colon::rewrite_cast_to_double_colon;
+use rewrite_create_table_as_as_select_into::rewrite_create_table_as_as_select_into;
 use rewrite_double_colon_to_cast::rewrite_double_colon_to_cast;
 use rewrite_from::rewrite_from;
 use rewrite_leading_from::rewrite_leading_from;
 use rewrite_not_equals_operator::rewrite_not_equals_operator;
 use rewrite_select_as_table::rewrite_select_as_table;
 use rewrite_select_as_values::rewrite_select_as_values;
+use rewrite_select_into_as_create_table_as::rewrite_select_into_as_create_table_as;
 use rewrite_table_as_select::rewrite_table_as_select;
 use rewrite_timestamp_type::rewrite_timestamp_type;
 use rewrite_values_as_select::rewrite_values_as_select;
@@ -72,6 +76,8 @@ pub fn code_actions(db: &dyn Db, file: File, offset: TextSize) -> Option<Vec<Cod
     rewrite_leading_from(db, file, &mut actions, offset);
     rewrite_values_as_select(db, file, &mut actions, offset);
     rewrite_select_as_values(db, file, &mut actions, offset);
+    rewrite_select_into_as_create_table_as(db, file, &mut actions, offset);
+    rewrite_create_table_as_as_select_into(db, file, &mut actions, offset);
     add_schema(db, file, &mut actions, offset);
     quote_identifier(db, file, &mut actions, offset);
     unquote_identifier(db, file, &mut actions, offset);

{squawk_cli-2.50.0 → squawk_cli-2.51.0}/crates/squawk_ide/src/code_actions/quote_identifier.rs

@@ -1,6 +1,9 @@
 use rowan::TextSize;
 use salsa::Database as Db;
-use squawk_syntax::ast::{self, AstNode};
+use squawk_syntax::{
+    ast::{self, AstNode},
+    quote::normalize_identifier,
+};
 
 use crate::{db::File, offsets::token_from_offset};
 
@@ -29,7 +32,7 @@ pub(super) fn quote_identifier(
         return None;
     }
 
-    let quoted = format!(r#""{}""#, text.to_lowercase());
+    let quoted = format!(r#""{}""#, normalize_identifier(&text));
 
     actions.push(CodeAction {
         title: "Quote identifier".to_owned(),
@@ -57,6 +60,14 @@ mod test {
         );
     }
 
+    #[test]
+    fn quote_doesnt_show_up_for_already_quoted_ident() {
+        assert!(code_action_not_applicable(
+            quote_identifier,
+            r#"create table T("X"$0 int);"#
+        ));
+    }
+
     #[test]
     fn quote_identifier_on_name() {
         assert_snapshot!(apply_code_action(

squawk_cli-2.51.0/crates/squawk_ide/src/code_actions/rewrite_create_table_as_as_select_into.rs

@@ -0,0 +1,210 @@
+use rowan::{TextRange, TextSize};
+use salsa::Database as Db;
+use squawk_linter::Edit;
+use squawk_syntax::{
+    SyntaxKind,
+    ast::{self, AstNode},
+};
+
+use crate::{db::File, offsets::token_from_offset};
+
+use super::{ActionKind, CodeAction};
+
+pub(super) fn rewrite_create_table_as_as_select_into(
+    db: &dyn Db,
+    file: File,
+    actions: &mut Vec<CodeAction>,
+    offset: TextSize,
+) -> Option<()> {
+    let token = token_from_offset(db, file, offset)?;
+    let create_table_as = token
+        .parent_ancestors()
+        .find_map(ast::CreateTableAs::cast)?;
+
+    if create_table_as.if_not_exists().is_some()
+        || create_table_as.using_method().is_some()
+        || create_table_as.on_commit().is_some()
+        || create_table_as.tablespace().is_some()
+        || create_table_as.with_data().is_some()
+        || create_table_as.with_no_data().is_some()
+        || create_table_as.with_params().is_some()
+        || create_table_as.without_oids().is_some()
+    {
+        return None;
+    }
+
+    // TODO: support more
+    let ast::SelectVariant::Select(select) = create_table_as.query()? else {
+        return None;
+    };
+
+    let delete_edit = {
+        let as_token = create_table_as.as_token()?;
+        let mut delete_end = as_token.text_range().end();
+        if let Some(next) = as_token.next_sibling_or_token()
+            && next.kind() == SyntaxKind::WHITESPACE
+        {
+            delete_end = next.text_range().end();
+        }
+        Edit::delete(TextRange::new(
+            create_table_as.syntax().text_range().start(),
+            delete_end,
+        ))
+    };
+
+    let insert_edit = {
+        let persistence_text = create_table_as
+            .persistence()
+            .map(|p| format!(" {}", p.syntax()))
+            .unwrap_or_default();
+        let into_text = format!(
+            " into{} {}",
+            persistence_text,
+            create_table_as.path()?.syntax()
+        );
+        let select_end = select.select_clause()?.syntax().text_range().end();
+        Edit::insert(into_text, select_end)
+    };
+
+    actions.push(CodeAction {
+        title: "Rewrite as `select into`".to_owned(),
+        edits: vec![delete_edit, insert_edit],
+        kind: ActionKind::RefactorRewrite,
+    });
+
+    Some(())
+}
+
+#[cfg(test)]
+mod test {
+    use insta::assert_snapshot;
+
+    use crate::code_actions::test_utils::{apply_code_action, code_action_not_applicable};
+
+    use super::rewrite_create_table_as_as_select_into;
+
+    #[test]
+    fn simple() {
+        assert_snapshot!(
+            apply_code_action(
+                rewrite_create_table_as_as_select_into,
+                "create table$0 mytable as select a, b from foo;"
+            ),
+            @"select a, b into mytable from foo;"
+        );
+    }
+
+    #[test]
+    fn with_temp() {
+        assert_snapshot!(
+            apply_code_action(
+                rewrite_create_table_as_as_select_into,
+                "create temp table$0 mytable as select a, b from foo;"
+            ),
+            @"select a, b into temp mytable from foo;"
+        );
+    }
+
+    #[test]
+    fn with_temporary() {
+        assert_snapshot!(
+            apply_code_action(
+                rewrite_create_table_as_as_select_into,
+                "create temporary table$0 mytable as select a from foo;"
+            ),
+            @"select a into temporary mytable from foo;"
+        );
+    }
+
+    #[test]
+    fn qualified_name() {
+        assert_snapshot!(
+            apply_code_action(
+                rewrite_create_table_as_as_select_into,
+                "create table$0 myschema.mytable as select a from foo;"
+            ),
+            @"select a into myschema.mytable from foo;"
+        );
+    }
+
+    #[test]
+    fn with_where() {
+        assert_snapshot!(
+            apply_code_action(
+                rewrite_create_table_as_as_select_into,
+                "create table mytable$0 as select a, b from foo where a > 1;"
+            ),
+            @"select a, b into mytable from foo where a > 1;"
+        );
+    }
+
+    #[test]
+    fn with_cte() {
+        assert_snapshot!(
+            apply_code_action(
+                rewrite_create_table_as_as_select_into,
+                "create table mytable as$0 with cte as (select 1) select a from cte;"
+            ),
+            @"with cte as (select 1) select a into mytable from cte;"
+        );
+    }
+
+    #[test]
+    fn on_create_keyword() {
+        assert_snapshot!(
+            apply_code_action(
+                rewrite_create_table_as_as_select_into,
+                "creat$0e table mytable as select a from foo;"
+            ),
+            @"select a into mytable from foo;"
+        );
+    }
+
+    #[test]
+    fn not_applicable_with_if_not_exists() {
+        assert!(code_action_not_applicable(
+            rewrite_create_table_as_as_select_into,
+            "create table if not exists$0 mytable as select a from foo;"
+        ));
+    }
+
+    #[test]
+    fn not_applicable_with_compound_select() {
+        assert!(code_action_not_applicable(
+            rewrite_create_table_as_as_select_into,
+            "create table mytable as select a from foo$0 union all select b from bar;"
+        ));
+    }
+
+    #[test]
+    fn not_applicable_with_values() {
+        assert!(code_action_not_applicable(
+            rewrite_create_table_as_as_select_into,
+            "create table mytable$0 as values (1, 2);"
+        ));
+    }
+
+    #[test]
+    fn not_applicable_with_paren_select() {
+        assert!(code_action_not_applicable(
+            rewrite_create_table_as_as_select_into,
+            "create table mytable$0 as (select 1 a);"
+        ));
+    }
+
+    #[test]
+    fn not_applicable_with_table() {
+        assert!(code_action_not_applicable(
+            rewrite_create_table_as_as_select_into,
+            "create table mytable$0 as table u;"
+        ));
+    }
+
+    #[test]
+    fn not_applicable_on_select_into() {
+        assert!(code_action_not_applicable(
+            rewrite_create_table_as_as_select_into,
+            "select a int$0o mytable from foo;"
+        ));
+    }
+}