squawk-cli 2.57.0__tar.gz → 2.59.0__tar.gz

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/Cargo.lock

@@ -2435,7 +2435,7 @@ dependencies = [
 
 [[package]]
 name = "squawk"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -2466,7 +2466,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-fmt"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "anyhow",
  "camino",
@@ -2482,7 +2482,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-github"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "jsonwebtoken",
  "log",
@@ -2493,7 +2493,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-ide"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "annotate-snippets",
  "etcetera",
@@ -2515,14 +2515,14 @@ dependencies = [
 
 [[package]]
 name = "squawk-lexer"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "insta",
 ]
 
 [[package]]
 name = "squawk-linter"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "annotate-snippets",
  "enum-iterator",
@@ -2537,7 +2537,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-parser"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2550,7 +2550,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-server"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -2576,7 +2576,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-syntax"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2590,7 +2590,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-thread"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
@@ -2602,7 +2602,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-wasm"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3478,7 +3478,7 @@ checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
 
 [[package]]
 name = "xtask"
-version = "2.57.0"
+version = "2.59.0"
 dependencies = [
  "anyhow",
  "camino",

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "2.57.0"
+version = "2.59.0"
 edition = "2024"
 rust-version = "1.94"
 authors = ["Squawk Team & Contributors"]
@@ -79,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.57.0" }
-squawk-ide = { path = "./crates/squawk_ide", version = "2.57.0" }
-squawk-lexer = { path = "./crates/squawk_lexer", version = "2.57.0" }
-squawk-parser = { path = "./crates/squawk_parser", version = "2.57.0" }
-squawk-syntax = { path = "./crates/squawk_syntax", version = "2.57.0" }
-squawk-linter = { path = "./crates/squawk_linter", version = "2.57.0" }
-squawk-server = { path = "./crates/squawk_server", version = "2.57.0" }
-squawk-thread = { path = "./crates/squawk_thread", version = "2.57.0" }
+squawk-github = { path = "./crates/squawk_github", version = "2.59.0" }
+squawk-ide = { path = "./crates/squawk_ide", version = "2.59.0" }
+squawk-lexer = { path = "./crates/squawk_lexer", version = "2.59.0" }
+squawk-parser = { path = "./crates/squawk_parser", version = "2.59.0" }
+squawk-syntax = { path = "./crates/squawk_syntax", version = "2.59.0" }
+squawk-linter = { path = "./crates/squawk_linter", version = "2.59.0" }
+squawk-server = { path = "./crates/squawk_server", version = "2.59.0" }
+squawk-thread = { path = "./crates/squawk_thread", version = "2.59.0" }
 
 [workspace.lints.clippy]
 collapsible_else_if = "allow"

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/PKG-INFO

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

{squawk_cli-2.57.0 → squawk_cli-2.59.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: v2.57.0
+    rev: v2.59.0
     hooks:
       - id: squawk
         files: path/to/postgres/migrations/written/in/sql

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

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/code_actions/rewrite_create_table_as_as_select_into.rs

@@ -33,7 +33,7 @@ pub(super) fn rewrite_create_table_as_as_select_into(
     }
 
     // TODO: support more
-    let ast::SelectVariant::Select(select) = create_table_as.query()? else {
+    let ast::SelectVariant::Select(select) = create_table_as.query()?.select_variant()? else {
         return None;
     };
 

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/collect.rs

@@ -96,12 +96,16 @@ fn resolved_to_column_ptrs(
             columns_from_create_table_impl(db, file, &parent_table, &mut cols, depth);
             cols
         }
-        ResolvedTableName::TableAs(create_table_as) => {
-            select_columns_with_types(db, file, &create_table_as.query())
-                .into_iter()
-                .map(|(name, _ty)| (name, None))
-                .collect()
-        }
+        ResolvedTableName::TableAs(create_table_as) => select_columns_with_types(
+            db,
+            file,
+            &create_table_as
+                .query()
+                .and_then(|query| query.select_variant()),
+        )
+        .into_iter()
+        .map(|(name, _ty)| (name, None))
+        .collect(),
         ResolvedTableName::SelectInto(select_into) => {
             select_into_columns_with_types(db, file, &select_into)
                 .into_iter()
@@ -194,9 +198,13 @@ fn resolved_to_columns_with_types(
         ResolvedTableName::Table(parent_table) => {
             table_columns_impl(db, file, &parent_table, depth)
         }
-        ResolvedTableName::TableAs(create_table_as) => {
-            select_columns_with_types(db, file, &create_table_as.query())
-        }
+        ResolvedTableName::TableAs(create_table_as) => select_columns_with_types(
+            db,
+            file,
+            &create_table_as
+                .query()
+                .and_then(|query| query.select_variant()),
+        ),
         ResolvedTableName::SelectInto(select_into) => {
             select_into_columns_with_types(db, file, &select_into)
         }
@@ -212,7 +220,13 @@ pub(crate) fn create_table_as_columns_with_types(
     create_table_as: &ast::CreateTableAs,
 ) -> Vec<(Name, Option<Type>)> {
     for file in list_files(db, file) {
-        let columns = select_columns_with_types(db, file, &create_table_as.query());
+        let columns = select_columns_with_types(
+            db,
+            file,
+            &create_table_as
+                .query()
+                .and_then(|query| query.select_variant()),
+        );
         if !columns.is_empty() {
             return columns;
         }

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/column_name.rs

@@ -187,8 +187,8 @@ fn name_from_name_ref(
                 }
                 SyntaxKind::FLOAT_KW => {
                     let precision = arg_list.and_then(|arg| {
-                        arg.args_().find_map(|arg| {
-                            if let ast::Expr::Literal(lit) = arg.expr()? {
+                        arg.args().find_map(|arg| {
+                            if let Some(ast::Expr::Literal(lit)) = arg.expr() {
                                 lit.syntax().text().to_string().parse::<u32>().ok()
                             } else {
                                 None
@@ -485,7 +485,17 @@ fn name_from_expr(expr: ast::Expr, in_type: bool) -> Option<(ColumnName, SyntaxN
                 return name_from_expr(base, in_type);
             }
         }
-        ast::Expr::Literal(_) | ast::Expr::PrefixExpr(_) => {
+        ast::Expr::Literal(literal) => {
+            if literal
+                .syntax()
+                .first_token()
+                .is_some_and(|token| token.kind() == SyntaxKind::NATIONAL_STRING)
+            {
+                return Some((ColumnName::UnknownColumn(Some("bpchar".to_string())), node));
+            }
+            return Some((ColumnName::UnknownColumn(None), node));
+        }
+        ast::Expr::PrefixExpr(_) => {
             return Some((ColumnName::UnknownColumn(None), node));
         }
         ast::Expr::PostfixExpr(postfix_expr) => match postfix_expr.op() {
@@ -533,6 +543,8 @@ fn examples() {
     assert_snapshot!(name("1 + 2"), @"?column?");
     assert_snapshot!(name("42"), @"?column?");
     assert_snapshot!(name("'string'"), @"?column?");
+    assert_snapshot!(name("n'string'"), @"bpchar");
+    assert_snapshot!(name("N'string'"), @"bpchar");
     // prefix
     assert_snapshot!(name("-42"), @"?column?");
     assert_snapshot!(name("|/ 42"), @"?column?");

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/expand_selection.rs

@@ -40,13 +40,16 @@ const DELIMITED_LIST_KINDS: &[SyntaxKind] = &[
     SyntaxKind::ARG_LIST,
     SyntaxKind::ATTRIBUTE_LIST,
     SyntaxKind::BEGIN_FUNC_OPTION_LIST,
+    SyntaxKind::CHECKPOINT_OPTION_LIST,
     SyntaxKind::COLUMN_LIST,
     SyntaxKind::CONFLICT_INDEX_ITEM_LIST,
     SyntaxKind::CONSTRAINT_EXCLUSION_LIST,
     SyntaxKind::COPY_OPTION_LIST,
     SyntaxKind::DROP_OP_CLASS_OPTION_LIST,
+    SyntaxKind::EXPLAIN_OPTION_LIST,
     SyntaxKind::FDW_OPTION_LIST,
     SyntaxKind::FUNCTION_SIG_LIST,
+    SyntaxKind::GRANT_ROLE_OPTION_LIST,
     SyntaxKind::GROUP_BY_LIST,
     SyntaxKind::JSON_TABLE_COLUMN_LIST,
     SyntaxKind::OPERATOR_CLASS_OPTION_LIST,
@@ -56,6 +59,7 @@ const DELIMITED_LIST_KINDS: &[SyntaxKind] = &[
     SyntaxKind::PARTITION_ITEM_LIST,
     SyntaxKind::PARTITION_LIST,
     SyntaxKind::PATH_LIST,
+    SyntaxKind::REINDEX_OPTION_LIST,
     SyntaxKind::RETURNING_OPTION_LIST,
     SyntaxKind::REVOKE_COMMAND_LIST,
     SyntaxKind::ROLE_REF_LIST,

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/folding_ranges.rs

@@ -123,15 +123,18 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
         | SyntaxKind::ALTER_OPTION_LIST
         | SyntaxKind::ATTRIBUTE_LIST
         | SyntaxKind::BEGIN_FUNC_OPTION_LIST
+        | SyntaxKind::CHECKPOINT_OPTION_LIST
         | SyntaxKind::COLUMN_LIST
         | SyntaxKind::CONFLICT_INDEX_ITEM_LIST
         | SyntaxKind::CONSTRAINT_EXCLUSION_LIST
         | SyntaxKind::COPY_OPTION_LIST
         | SyntaxKind::DATABASE_OPTION_LIST
+        | SyntaxKind::EXPLAIN_OPTION_LIST
         | SyntaxKind::DROP_OP_CLASS_OPTION_LIST
         | SyntaxKind::FDW_OPTION_LIST
         | SyntaxKind::FUNCTION_SIG_LIST
         | SyntaxKind::FUNC_OPTION_LIST
+        | SyntaxKind::GRANT_ROLE_OPTION_LIST
         | SyntaxKind::GROUP_BY_LIST
         | SyntaxKind::JSON_TABLE_COLUMN_LIST
         | SyntaxKind::OPERATOR_CLASS_OPTION_LIST
@@ -140,6 +143,7 @@ fn fold_kind(kind: SyntaxKind) -> Option<FoldKind> {
         | SyntaxKind::PARTITION_ITEM_LIST
         | SyntaxKind::PARTITION_LIST
         | SyntaxKind::PATH_LIST
+        | SyntaxKind::REINDEX_OPTION_LIST
         | SyntaxKind::RETURNING_OPTION_LIST
         | SyntaxKind::REVOKE_COMMAND_LIST
         | SyntaxKind::ROLE_OPTION_LIST

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/hover.rs

@@ -156,6 +156,7 @@ fn hover_literal(literal: &ast::Literal) -> Option<Hover> {
             | LitKind::BitString(_)
             | LitKind::ByteString(_)
             | LitKind::EscString(_)
+            | LitKind::NationalString(_)
             | LitKind::UnicodeEscString(_)
             | LitKind::DollarQuotedString(_)
     ) {
@@ -170,6 +171,7 @@ fn hover_literal(literal: &ast::Literal) -> Option<Hover> {
         LitKind::ByteString(_) => format_bit_value_comment(&value, 16),
         LitKind::String(_)
         | LitKind::EscString(_)
+        | LitKind::NationalString(_)
         | LitKind::UnicodeEscString(_)
         | LitKind::DollarQuotedString(_) => match value.find('\n') {
             Some(idx) => {
@@ -5604,6 +5606,19 @@ select 'foo$0';
         ");
     }
 
+    #[test]
+    fn hover_national_string() {
+        assert_snapshot!(check_hover_info(r"
+select N'fo$0o';
+").markdown(), @"
+        ```sql
+        text
+        ```
+        ---
+        value of literal: ` foo `
+        ");
+    }
+
     #[test]
     fn hover_plain_string_escaped_quotes() {
         assert_snapshot!(check_hover_info(r"

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/infer.rs

@@ -95,6 +95,7 @@ pub(crate) fn infer_type_from_literal(literal: &ast::Literal) -> Option<Type> {
         SyntaxKind::STRING
         | SyntaxKind::DOLLAR_QUOTED_STRING
         | SyntaxKind::ESC_STRING
+        | SyntaxKind::NATIONAL_STRING
         | SyntaxKind::UNICODE_ESC_STRING => Some(Type::Text),
         SyntaxKind::BIT_STRING | SyntaxKind::BYTE_STRING => Some(Type::Bit),
         SyntaxKind::TRUE_KW | SyntaxKind::FALSE_KW => Some(Type::Boolean),

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/literals.rs

@@ -94,6 +94,10 @@ pub(crate) fn literal_string_value(literal: &ast::Literal) -> Option<String> {
                 out.push_str(inner);
                 return Some(out);
             }
+            SyntaxKind::NATIONAL_STRING => {
+                let inner = strip_prefixed_quotes(token.text(), ['n', 'N'])?;
+                decode_plain_string(inner, &mut out);
+            }
             SyntaxKind::STRING => {
                 let inner = strip_quotes(token.text())?;
                 match decoding {

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/resolve.rs

@@ -753,7 +753,7 @@ fn resolve_float_precision(name_ref: &ast::NameRef, type_name: Name) -> Name {
             .syntax()
             .ancestors()
             .find_map(ast::PathType::cast)
-            .and_then(|x| x.arg_list()?.args_().next()?.expr())
+            .and_then(|x| x.arg_list()?.args().next()?.expr())
     {
         let precision: u32 = lit.syntax().text().to_string().parse().unwrap_or(0);
         return Name::from_string(if precision <= 24 { "float4" } else { "float8" });
@@ -2246,7 +2246,7 @@ fn find_column_in_create_table_as_with_skip(
 ) -> Option<SmallVec<[Location; 1]>> {
     let file = create_table_as.file_id;
     let create_table_as = create_table_as.value;
-    let query = create_table_as.query()?;
+    let query = create_table_as.query()?.select_variant()?;
 
     if let ast::SelectVariant::Values(values) = &query {
         return resolve_values_column_after_index(file, values, column_name, skip_column_count);
@@ -2435,7 +2435,8 @@ fn count_columns_for_table_name(
                 .ancestors()
                 .find_map(ast::CreateTableAs::cast)
             {
-                let select = ast_nav::select_from_variant(create_table_as.query()?)?;
+                let select =
+                    ast_nav::select_from_variant(create_table_as.query()?.select_variant()?)?;
                 if let Some(target_list) = select.select_clause().and_then(|c| c.target_list()) {
                     return Some(target_list.targets().count());
                 }

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_ide/src/tokens.rs

@@ -10,5 +10,6 @@ pub(crate) fn is_string_or_comment(kind: SyntaxKind) -> bool {
             | SyntaxKind::BIT_STRING
             | SyntaxKind::DOLLAR_QUOTED_STRING
             | SyntaxKind::ESC_STRING
+            | SyntaxKind::NATIONAL_STRING
     )
 }

{squawk_cli-2.57.0 → squawk_cli-2.59.0}/crates/squawk_lexer/src/cursor.rs

@@ -43,6 +43,11 @@ impl<'a> Cursor<'a> {
         self.chars.as_str().is_empty()
     }
 
+    /// Returns a clone of the remaining chars, for cheap lookahead.
+    pub(crate) fn chars(&self) -> Chars<'a> {
+        self.chars.clone()
+    }
+
     /// Returns amount of already consumed symbols.
     pub(crate) fn pos_within_token(&self) -> u32 {
         (self.len_remaining - self.chars.as_str().len()) as u32
@@ -55,8 +60,7 @@ impl<'a> Cursor<'a> {
 
     /// Moves to the next character.
     pub(crate) fn bump(&mut self) -> Option<char> {
-        let c = self.chars.next()?;
-        Some(c)
+        self.chars.next()
     }
 
     /// Eats symbols while predicate returns true or until the end of file is reached.