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

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

@@ -2385,7 +2385,7 @@ dependencies = [
 
 [[package]]
 name = "squawk"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -2399,6 +2399,7 @@ dependencies = [
  "log",
  "lsp-server",
  "lsp-types",
+ "rayon",
  "serde",
  "serde_json",
  "simplelog",
@@ -2415,7 +2416,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-fmt"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "anyhow",
  "camino",
@@ -2431,7 +2432,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-github"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "jsonwebtoken",
  "log",
@@ -2442,7 +2443,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-ide"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "etcetera",
@@ -2464,14 +2465,14 @@ dependencies = [
 
 [[package]]
 name = "squawk-lexer"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "insta",
 ]
 
 [[package]]
 name = "squawk-linter"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "enum-iterator",
@@ -2486,7 +2487,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-parser"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2499,7 +2500,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-server"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -2525,7 +2526,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-syntax"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "annotate-snippets",
  "camino",
@@ -2539,7 +2540,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-thread"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
@@ -2551,7 +2552,7 @@ dependencies = [
 
 [[package]]
 name = "squawk-wasm"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3427,7 +3428,7 @@ checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547"
 
 [[package]]
 name = "xtask"
-version = "2.49.0"
+version = "2.50.0"
 dependencies = [
  "anyhow",
  "camino",

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

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "2.49.0"
+version = "2.50.0"
 edition = "2024"
 rust-version = "1.94"
 authors = ["Squawk Team & Contributors"]
@@ -71,20 +71,21 @@ url = "2.5.4"
 crossbeam-channel = "0.5.15"
 crossbeam-utils = "0.8.21"
 jod-thread = "0.1.2"
+rayon = "1"
 libc = "0.2.171"
 tracing = "0.1.40"
 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.49.0" }
-squawk-ide = { path = "./crates/squawk_ide", version = "2.49.0" }
-squawk-lexer = { path = "./crates/squawk_lexer", version = "2.49.0" }
-squawk-parser = { path = "./crates/squawk_parser", version = "2.49.0" }
-squawk-syntax = { path = "./crates/squawk_syntax", version = "2.49.0" }
-squawk-linter = { path = "./crates/squawk_linter", version = "2.49.0" }
-squawk-server = { path = "./crates/squawk_server", version = "2.49.0" }
-squawk-thread = { path = "./crates/squawk_thread", version = "2.49.0" }
+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" }
 
 [workspace.lints.clippy]
 collapsible_else_if = "allow"

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

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

{squawk_cli-2.49.0 → squawk_cli-2.50.0}/crates/squawk/Cargo.toml

@@ -34,6 +34,7 @@ squawk-server.workspace = true
 squawk-thread.workspace = true
 toml.workspace = true
 glob.workspace = true
+rayon.workspace = true
 anyhow.workspace = true
 annotate-snippets.workspace = true
 line-index.workspace = true

{squawk_cli-2.49.0 → squawk_cli-2.50.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.49.0
+    rev: 2.50.0
     hooks:
       - id: squawk
         files: path/to/postgres/migrations/written/in/sql

{squawk_cli-2.49.0 → squawk_cli-2.50.0}/crates/squawk/src/github.rs

@@ -205,7 +205,7 @@ fn get_summary_comment_body(
 
         let summary = format!(
             r"
-<h3><code>{filename}</code></h3>
+<h3><code>{path}</code></h3>
 
 📄 **{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<String> {
     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<String> {
 
     Ok(format!(
         r"
-<h3><code>{filename}</code></h3>
+<h3><code>{path}</code></h3>
 
 ```sql
 {sql}
@@ -353,7 +353,7 @@ fn get_sql_file_content(violation: &CheckReport) -> Result<String> {
 ---
     ",
         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(),

{squawk_cli-2.49.0 → squawk_cli-2.50.0}/crates/squawk/src/reporter.rs

@@ -4,6 +4,7 @@ use console::style;
 use line_index::LineIndex;
 use line_index::TextRange;
 use log::info;
+use rayon::prelude::*;
 use serde::Serialize;
 use squawk_linter::{Fix, Linter, Rule, Version};
 use squawk_syntax::SourceFile;
@@ -60,7 +61,7 @@ fn check_sql(
             })
             .collect();
         return CheckReport {
-            filename: path.into(),
+            path: path.into(),
             sql: sql.into(),
             violations,
         };
@@ -91,7 +92,7 @@ fn check_sql(
         .collect();
 
     CheckReport {
-        filename: path.into(),
+        path: path.into(),
         sql: sql.into(),
         violations,
     }
@@ -151,44 +152,45 @@ pub(crate) struct LintArgs {
 }
 
 pub fn lint_files(args: &LintArgs) -> Result<Vec<CheckReport>> {
-    let mut violations = vec![];
     match &args.input {
         Input::Stdin(stdin) => {
             info!("reading content from stdin");
             let sql = sql_from_stdin()?;
-            // ignore stdin if it's empty.
             if sql.trim().is_empty() {
                 info!("ignoring empty stdin");
-            } else {
-                let path = stdin.path.clone().unwrap_or_else(|| "stdin".into());
-                let content = check_sql(
-                    &sql,
-                    &path,
-                    &args.included_rules,
-                    &args.excluded_rules,
-                    args.pg_version,
-                    args.assume_in_transaction,
-                );
-                violations.push(content);
+                return Ok(vec![]);
             }
+            let path = stdin.path.clone().unwrap_or_else(|| "stdin".into());
+            let content = check_sql(
+                &sql,
+                &path,
+                &args.included_rules,
+                &args.excluded_rules,
+                args.pg_version,
+                args.assume_in_transaction,
+            );
+            Ok(vec![content])
         }
         Input::Paths(path_bufs) => {
-            for path in path_bufs {
-                info!("checking file path: {}", path.display());
-                let sql = sql_from_path(path)?;
-                let content = check_sql(
-                    &sql,
-                    path.to_str().unwrap(),
-                    &args.included_rules,
-                    &args.excluded_rules,
-                    args.pg_version,
-                    args.assume_in_transaction,
-                );
-                violations.push(content);
-            }
+            let mut reports: Vec<CheckReport> = path_bufs
+                .par_iter()
+                .map(|path| {
+                    info!("checking file path: {}", path.display());
+                    let sql = sql_from_path(path)?;
+                    Ok(check_sql(
+                        &sql,
+                        path.to_str().unwrap(),
+                        &args.included_rules,
+                        &args.excluded_rules,
+                        args.pg_version,
+                        args.assume_in_transaction,
+                    ))
+                })
+                .collect::<Result<Vec<_>>>()?;
+            reports.sort_by(|a, b| a.path.cmp(&b.path));
+            Ok(reports)
         }
     }
-    Ok(violations)
 }
 
 pub fn lint_and_report<W: io::Write>(f: &mut W, args: LintArgs) -> Result<ExitCode> {
@@ -337,7 +339,7 @@ pub fn fmt_tty<W: io::Write>(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)?;
@@ -460,7 +462,7 @@ fn fmt_gitlab<W: io::Write>(f: &mut W, reports: Vec<CheckReport>) -> Result<()>
 
 #[derive(Debug)]
 pub struct CheckReport {
-    pub filename: String,
+    pub path: String,
     pub sql: String,
     pub violations: Vec<ReportViolation>,
 }

{squawk_cli-2.49.0 → squawk_cli-2.50.0}/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 {

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

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

@@ -230,6 +230,37 @@ pub(crate) fn parent_source(node: &SyntaxNode) -> Option<ParentSouce> {
     None
 }
 
+pub(crate) enum CreateTableArg {
+    Column(ast::Column),
+    Inherits(ast::Path),
+    LikeClause(ast::LikeClause),
+    TableConstraint(#[expect(unused)] ast::TableConstraint),
+}
+
+pub(crate) fn create_table_args(
+    create_table: &impl ast::HasCreateTable,
+) -> impl Iterator<Item = CreateTableArg> {
+    let inherits_iter = create_table
+        .inherits()
+        .into_iter()
+        .flat_map(|inherits| inherits.paths())
+        .map(CreateTableArg::Inherits);
+
+    let args_iter = create_table
+        .table_arg_list()
+        .into_iter()
+        .flat_map(|arg_list| arg_list.args())
+        .map(|arg| match arg {
+            ast::TableArg::Column(column) => CreateTableArg::Column(column),
+            ast::TableArg::LikeClause(like_clause) => CreateTableArg::LikeClause(like_clause),
+            ast::TableArg::TableConstraint(constraint) => {
+                CreateTableArg::TableConstraint(constraint)
+            }
+        });
+
+    inherits_iter.chain(args_iter)
+}
+
 struct UnwrapParenExpr {
     current: Option<ast::Expr>,
 }

{squawk_cli-2.49.0 → squawk_cli-2.50.0}/crates/squawk_ide/src/code_actions/add_explicit_alias.rs

@@ -1,10 +1,9 @@
 use rowan::TextSize;
 use salsa::Database as Db;
 use squawk_syntax::ast::{self, AstNode};
+use squawk_syntax::quote::quote_column_alias;
 
-use crate::{
-    column_name::ColumnName, db::File, offsets::token_from_offset, quote::quote_column_alias,
-};
+use crate::{column_name::ColumnName, db::File, offsets::token_from_offset};
 
 use super::{ActionKind, CodeAction};
 

{squawk_cli-2.49.0 → squawk_cli-2.50.0}/crates/squawk_ide/src/code_actions/test_utils.rs

@@ -4,7 +4,7 @@ use squawk_linter::Edit;
 use squawk_syntax::ast;
 
 use crate::db::{Database, File};
-use crate::test_utils::fixture;
+use crate::test_utils::Fixture;
 
 use super::{ActionKind, CodeAction};
 
@@ -12,13 +12,13 @@ pub(super) fn apply_code_action(
     f: impl Fn(&dyn Db, File, &mut Vec<CodeAction>, TextSize) -> Option<()>,
     sql: &str,
 ) -> String {
-    let (mut offset, sql) = fixture(sql);
+    let fixture = Fixture::new(sql);
+    let offset = fixture.marker().offset_before();
+    let sql = fixture.sql();
     let db = Database::default();
-    let file = File::new(&db, sql.clone().into());
+    let file = File::new(&db, sql.into());
     let parse_result = crate::db::parse(&db, file);
 
-    offset = offset.checked_sub(1.into()).unwrap_or_default();
-
     let mut actions = vec![];
     f(&db, file, &mut actions, offset);
 
@@ -38,7 +38,7 @@ pub(super) fn apply_code_action(
         }
     }
 
-    let mut result = sql.clone();
+    let mut result = sql.to_string();
 
     let mut edits = action.edits.clone();
     edits.sort_by_key(|e| e.text_range.start());
@@ -93,9 +93,11 @@ fn code_action_not_applicable_(
     sql: &str,
     allow_errors: bool,
 ) -> bool {
-    let (offset, sql) = fixture(sql);
+    let fixture = Fixture::new(sql);
+    let offset = fixture.marker().offset();
+    let sql = fixture.sql();
     let db = Database::default();
-    let file = File::new(&db, sql.clone().into());
+    let file = File::new(&db, sql.into());
     let parse_result = crate::db::parse(&db, file);
     if !allow_errors {
         assert_eq!(parse_result.errors(), vec![]);

{squawk_cli-2.49.0 → squawk_cli-2.50.0}/crates/squawk_ide/src/code_actions/unquote_identifier.rs

@@ -2,7 +2,9 @@ use rowan::TextSize;
 use salsa::Database as Db;
 use squawk_syntax::ast::{self, AstNode};
 
-use crate::{db::File, offsets::token_from_offset, quote::unquote_ident};
+use squawk_syntax::quote::unquote_ident;
+
+use crate::{db::File, offsets::token_from_offset};
 
 use super::{ActionKind, CodeAction};
 

{squawk_cli-2.49.0 → squawk_cli-2.50.0}/crates/squawk_ide/src/collect.rs

@@ -37,48 +37,37 @@ fn columns_from_create_table_impl(
         return;
     }
 
-    if let Some(inherits) = create_table.inherits() {
-        for path in inherits.paths() {
-            if let Some((schema, table_name)) = name::schema_and_name_path(&path) {
-                let position = path.syntax().text_range().start();
-                if let Some(ResolvedTableName::Table(parent_table)) =
-                    resolve_table_name(db, file, &table_name, &schema, position)
-                {
-                    columns_from_create_table_impl(db, file, &parent_table, columns, depth + 1);
+    for arg in ast_nav::create_table_args(create_table) {
+        match arg {
+            ast_nav::CreateTableArg::Inherits(path) => {
+                if let Some((schema, table_name)) = name::schema_and_name_path(&path) {
+                    let position = path.syntax().text_range().start();
+                    if let Some(ResolvedTableName::Table(parent_table)) =
+                        resolve_table_name(db, file, &table_name, &schema, position)
+                    {
+                        columns_from_create_table_impl(db, file, &parent_table, columns, depth + 1);
+                    }
                 }
             }
-        }
-    }
-
-    if let Some(arg_list) = create_table.table_arg_list() {
-        for arg in arg_list.args() {
-            match &arg {
-                ast::TableArg::Column(column) => {
-                    if let Some(name) = column.name() {
-                        let col_name = Name::from_node(&name);
-                        columns.push((col_name, Some(SyntaxNodePtr::new(name.syntax()))));
-                    }
+            ast_nav::CreateTableArg::Column(column) => {
+                if let Some(name) = column.name() {
+                    let col_name = Name::from_node(&name);
+                    columns.push((col_name, Some(SyntaxNodePtr::new(name.syntax()))));
                 }
-                ast::TableArg::LikeClause(like_clause) => {
-                    if let Some(path) = like_clause.path()
-                        && let Some((schema, table_name)) = name::schema_and_name_path(&path)
+            }
+            ast_nav::CreateTableArg::LikeClause(like_clause) => {
+                if let Some(path) = like_clause.path()
+                    && let Some((schema, table_name)) = name::schema_and_name_path(&path)
+                {
+                    let position = path.syntax().text_range().start();
+                    if let Some(ResolvedTableName::Table(source_table)) =
+                        resolve_table_name(db, file, &table_name, &schema, position)
                     {
-                        let position = path.syntax().text_range().start();
-                        if let Some(ResolvedTableName::Table(source_table)) =
-                            resolve_table_name(db, file, &table_name, &schema, position)
-                        {
-                            columns_from_create_table_impl(
-                                db,
-                                file,
-                                &source_table,
-                                columns,
-                                depth + 1,
-                            );
-                        }
+                        columns_from_create_table_impl(db, file, &source_table, columns, depth + 1);
                     }
                 }
-                ast::TableArg::TableConstraint(_) => (),
             }
+            ast_nav::CreateTableArg::TableConstraint(_) => (),
         }
     }
 }
@@ -105,45 +94,37 @@ fn table_columns_impl(
 
     let mut columns = vec![];
 
-    if let Some(inherits) = create_table.inherits() {
-        for path in inherits.paths() {
-            if let Some((schema, table_name)) = name::schema_and_name_path(&path) {
-                let position = path.syntax().text_range().start();
-                if let Some(ResolvedTableName::Table(parent_table)) =
-                    resolve_table_name(db, file, &table_name, &schema, position)
-                {
-                    let inherited_columns = table_columns_impl(db, file, &parent_table, depth + 1);
-                    columns.extend(inherited_columns);
+    for arg in ast_nav::create_table_args(create_table) {
+        match arg {
+            ast_nav::CreateTableArg::Inherits(path) => {
+                if let Some((schema, table_name)) = name::schema_and_name_path(&path) {
+                    let position = path.syntax().text_range().start();
+                    if let Some(ResolvedTableName::Table(parent_table)) =
+                        resolve_table_name(db, file, &table_name, &schema, position)
+                    {
+                        columns.extend(table_columns_impl(db, file, &parent_table, depth + 1));
+                    }
                 }
             }
-        }
-    }
-
-    if let Some(arg_list) = create_table.table_arg_list() {
-        for arg in arg_list.args() {
-            match &arg {
-                ast::TableArg::Column(column) => {
-                    if let Some(name) = column.name() {
-                        let ty = column.ty().and_then(|ty| infer_type_from_ty(&ty));
-                        columns.push((Name::from_node(&name), ty));
-                    }
+            ast_nav::CreateTableArg::Column(column) => {
+                if let Some(name) = column.name() {
+                    let ty = column.ty().and_then(|ty| infer_type_from_ty(&ty));
+                    columns.push((Name::from_node(&name), ty));
                 }
-                ast::TableArg::LikeClause(like_clause) => {
-                    if let Some(path) = like_clause.path()
-                        && let Some((schema, table_name)) = name::schema_and_name_path(&path)
+            }
+            ast_nav::CreateTableArg::LikeClause(like_clause) => {
+                if let Some(path) = like_clause.path()
+                    && let Some((schema, table_name)) = name::schema_and_name_path(&path)
+                {
+                    let position = path.syntax().text_range().start();
+                    if let Some(ResolvedTableName::Table(source_table)) =
+                        resolve_table_name(db, file, &table_name, &schema, position)
                     {
-                        let position = path.syntax().text_range().start();
-                        if let Some(ResolvedTableName::Table(source_table)) =
-                            resolve_table_name(db, file, &table_name, &schema, position)
-                        {
-                            let like_columns =
-                                table_columns_impl(db, file, &source_table, depth + 1);
-                            columns.extend(like_columns);
-                        }
+                        columns.extend(table_columns_impl(db, file, &source_table, depth + 1));
                     }
                 }
-                ast::TableArg::TableConstraint(_) => (),
             }
+            ast_nav::CreateTableArg::TableConstraint(_) => (),
         }
     }