diff --git a/crates/squawk/src/github.rs b/crates/squawk/src/github.rs
index 59ef6711..9de00255 100644
--- a/crates/squawk/src/github.rs
+++ b/crates/squawk/src/github.rs
@@ -205,7 +205,7 @@ fn get_summary_comment_body(
let summary = format!(
r"
-
{filename}
+{path}
📄 **{line_count} lines** | {violations_emoji} **{violation_count} violations**
@@ -213,7 +213,7 @@ fn get_summary_comment_body(
---
",
- filename = file.filename,
+ path = file.path,
line_count = line_count,
violations_emoji = violations_emoji,
violation_count = violation_count,
@@ -312,7 +312,7 @@ fn get_sql_file_content(violation: &CheckReport) -> Result {
let mut buff = Vec::new();
let violation_count = violation.violations.len();
for v in &violation.violations {
- fmt_tty_violation(&mut buff, v, &violation.filename, sql)?;
+ fmt_tty_violation(&mut buff, v, &violation.path, sql)?;
}
let violations_text_raw = &String::from_utf8_lossy(&buff);
let violations_text = strip_ansi_codes(violations_text_raw);
@@ -340,7 +340,7 @@ fn get_sql_file_content(violation: &CheckReport) -> Result {
Ok(format!(
r"
-{filename}
+{path}
```sql
{sql}
@@ -353,7 +353,7 @@ fn get_sql_file_content(violation: &CheckReport) -> Result {
---
",
violations_emoji = violations_emoji,
- filename = violation.filename,
+ path = violation.path,
sql = display_sql,
truncation_notice = truncation_notice,
violation_count = violation_count,
@@ -376,7 +376,7 @@ mod test_github_comment {
#[test]
fn generating_comment_multiple_files() {
let violations = vec![CheckReport {
- filename: "alpha.sql".into(),
+ path: "alpha.sql".into(),
sql: "SELECT 1;".into(),
violations: vec![ReportViolation {
file: "alpha.sql".into(),
@@ -405,7 +405,7 @@ mod test_github_comment {
fn generating_comment_no_violations() {
let violations = vec![
CheckReport {
- filename: "alpha.sql".into(),
+ path: "alpha.sql".into(),
sql: r#"
BEGIN;
--
@@ -420,7 +420,7 @@ CREATE TABLE "core_bar" (
violations: vec![],
},
CheckReport {
- filename: "bravo.sql".into(),
+ path: "bravo.sql".into(),
sql: r#"
ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT 10;
"#
@@ -470,7 +470,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT 10;
.join("\n");
let violations = vec![CheckReport {
- filename: "large.sql".into(),
+ path: "large.sql".into(),
sql: large_sql,
violations: vec![ReportViolation {
file: "large.sql".into(),
@@ -505,7 +505,7 @@ ALTER TABLE "core_recipe" ADD COLUMN "foo" integer DEFAULT 10;
.join("\n");
let violations = vec![CheckReport {
- filename: "massive.sql".into(),
+ path: "massive.sql".into(),
sql: massive_sql,
violations: vec![ReportViolation {
file: "massive.sql".into(),
diff --git a/crates/squawk/src/reporter.rs b/crates/squawk/src/reporter.rs
index b3820ce0..61be3bcb 100644
--- a/crates/squawk/src/reporter.rs
+++ b/crates/squawk/src/reporter.rs
@@ -61,7 +61,7 @@ fn check_sql(
})
.collect();
return CheckReport {
- filename: path.into(),
+ path: path.into(),
sql: sql.into(),
violations,
};
@@ -92,7 +92,7 @@ fn check_sql(
.collect();
CheckReport {
- filename: path.into(),
+ path: path.into(),
sql: sql.into(),
violations,
}
@@ -187,7 +187,7 @@ pub fn lint_files(args: &LintArgs) -> Result> {
))
})
.collect::>>()?;
- reports.sort_by(|a, b| a.filename.cmp(&b.filename));
+ reports.sort_by(|a, b| a.path.cmp(&b.path));
Ok(reports)
}
}
@@ -339,7 +339,7 @@ pub fn fmt_tty(f: &mut W, reports: &[CheckReport]) -> Result<()> {
let summary = Summary::from(reports);
for report in reports {
for violation in &report.violations {
- fmt_tty_violation(f, violation, &report.filename, &report.sql)?;
+ fmt_tty_violation(f, violation, &report.path, &report.sql)?;
}
}
print_summary(f, &summary)?;
@@ -462,8 +462,7 @@ fn fmt_gitlab(f: &mut W, reports: Vec) -> Result<()>
#[derive(Debug)]
pub struct CheckReport {
- // TODO: rename this to path
- pub filename: String,
+ pub path: String,
pub sql: String,
pub violations: Vec,
}
diff --git a/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap
index 67809564..768fd2b3 100644
--- a/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap
+++ b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap
@@ -1,9 +1,9 @@
---
source: crates/squawk/src/reporter.rs
-expression: "check_sql(sql, filename, &[], None, false)"
+expression: "check_sql(sql, filename, &[], &[], None, false)"
---
CheckReport {
- filename: "main.sql",
+ path: "main.sql",
sql: "\n\n ALTER TABLE \"core_recipe\" ADD COLUMN \"foo\" integer NOT NULL;\nALTER TABLE \"core_foo\" ADD COLUMN \"bar\" integer NOT NULL;\nSELECT 1;\n",
violations: [
ReportViolation {