squawk-cli 1.6.0__tar.gz → 1.6.1__tar.gz

{squawk_cli-1.6.0 → squawk_cli-1.6.1}/Cargo.lock

@@ -1586,7 +1586,7 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "squawk"
-version = "1.6.0"
+version = "1.6.1"
 dependencies = [
  "atty",
  "base64 0.12.3",

{squawk_cli-1.6.0 → squawk_cli-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: squawk-cli
-Version: 1.6.0
+Version: 1.6.1
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: Microsoft :: Windows
@@ -262,22 +262,20 @@ s/new-rule 'prefer big serial'
 
 ### releasing a new version
 
-1. update the CHANGELOG.md and bump version in the cli `Cargo.toml`, ensure the
-   lock file is updated, and update `package.json` and commit the changes
+1. Update the `CHANGELOG.md`
+
+   Include a description of any fixes / additions. Make sure to include the PR numbers and credit the authors.
+
+2. Run `s/update-version`
 
    ```bash
-   # update version in Cargo.toml files and package.json to 4.5.3
+   # update version in cli/Cargo.toml, package.json, flake.nix to 4.5.3
    s/update-version 4.5.3
    ```
 
-2. create a new release on github - CI will attach the binaries automatically
-3. wait for build artifacts to be attached to release.
-4. login to `npm` and publish new version.
+3. Create a new release on GitHub
 
-   ```bash
-   npm login
-   npm publish
-   ```
+   Use the text and version from the `CHANGELOG.md`
 
 ### algolia
 

{squawk_cli-1.6.0 → squawk_cli-1.6.1}/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "squawk"
-version = "1.6.0"
+version = "1.6.1"
 authors = ["Steve Dignam <steve@dignam.xyz>"]
 edition = "2018"
 license = "GPL-3.0"

{squawk_cli-1.6.0 → squawk_cli-1.6.1}/cli/README.md

@@ -242,22 +242,20 @@ s/new-rule 'prefer big serial'
 
 ### releasing a new version
 
-1. update the CHANGELOG.md and bump version in the cli `Cargo.toml`, ensure the
-   lock file is updated, and update `package.json` and commit the changes
+1. Update the `CHANGELOG.md`
+
+   Include a description of any fixes / additions. Make sure to include the PR numbers and credit the authors.
+
+2. Run `s/update-version`
 
    ```bash
-   # update version in Cargo.toml files and package.json to 4.5.3
+   # update version in cli/Cargo.toml, package.json, flake.nix to 4.5.3
    s/update-version 4.5.3
    ```
 
-2. create a new release on github - CI will attach the binaries automatically
-3. wait for build artifacts to be attached to release.
-4. login to `npm` and publish new version.
+3. Create a new release on GitHub
 
-   ```bash
-   npm login
-   npm publish
-   ```
+   Use the text and version from the `CHANGELOG.md`
 
 ### algolia
 

{squawk_cli-1.6.0 → squawk_cli-1.6.1}/cli/src/reporter.rs

@@ -386,9 +386,19 @@ pub fn pretty_violations(
                 #[allow(clippy::cast_sign_loss)]
                 let start = start as usize;
 
-                // 1-indexed
-                // remove the leading whitespace on last line
-                let lineno = sql[..start].trim_end().lines().count() + 1;
+                let mut lineno = 0;
+
+                for (idx, char) in sql.chars().enumerate() {
+                    if char == '\n' {
+                        lineno += 1;
+                    }
+
+                    if idx == start {
+                        break;
+                    }
+                }
+
+                lineno += 1;
 
                 let content = if let Some(len) = len {
                     #[allow(clippy::cast_sign_loss)]
@@ -396,7 +406,8 @@ pub fn pretty_violations(
                 } else {
                     // Use current line
                     let tail = sql[start..].find('\n').unwrap_or(sql.len() - start);
-                    &sql[start..=start + tail]
+
+                    &sql.chars().skip(start).take(tail + 1).collect::<String>()
                 };
 
                 // TODO(sbdchd): could remove the leading whitespace and comments to
@@ -666,6 +677,7 @@ mod test_reporter {
         check_sql_with_rule,
         violations::{RuleViolation, RuleViolationKind},
     };
+    use squawk_parser::ast::Span;
 
     fn lint_sql(sql: &str) -> Vec<RuleViolation> {
         check_sql_with_rule(sql, &RuleViolationKind::AddingRequiredField, None, false).unwrap()
@@ -825,4 +837,41 @@ SELECT 1;
         }
         "#);
     }
+
+    #[test]
+    fn regression_slicing_issue_425() {
+        // Squawk was crashing with an slicing issue.
+        let sql = "ALTER TABLE test ADD COLUMN IF NOT EXISTS test INTEGER;";
+        let violation = RuleViolation::new(
+            RuleViolationKind::PreferBigInt,
+            Span {
+                start: 42,
+                len: None,
+            },
+            None,
+        );
+        pretty_violations(vec![violation], sql, "main.sql");
+    }
+    #[test]
+    fn highlight_column_for_issues() {
+        // Display only the columns with issues for large DDLs.
+        fn lint_sql(sql: &str) -> Vec<RuleViolation> {
+            check_sql_with_rule(sql, &RuleViolationKind::PreferTextField, None, false).unwrap()
+        }
+        // Squawk was crashing with an slicing issue.
+        let sql = "create table test_table (
+    col1 varchar(255),
+    col2 varchar(255),
+    col3 varchar(255)
+    --- other columns
+);";
+        let violations = lint_sql(sql);
+        let res = pretty_violations(violations, sql, "main.sql");
+        let columns = res
+            .violations
+            .iter()
+            .map(|v| v.sql.clone())
+            .collect::<String>();
+        assert_display_snapshot!(columns);
+    }
 }

squawk_cli-1.6.1/cli/src/snapshots/squawk__reporter__test_reporter__highlight_column_for_issues.snap

@@ -0,0 +1,8 @@
+---
+source: cli/src/reporter.rs
+expression: columns
+---
+col1 varchar(255),
+col2 varchar(255),
+col3 varchar(255)
+

{squawk_cli-1.6.0 → squawk_cli-1.6.1}/cli/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap

@@ -8,7 +8,7 @@ ViolationContent {
     violations: [
         ReportViolation {
             file: "main.sql",
-            line: 1,
+            line: 2,
             column: 2,
             level: Warning,
             messages: [