Skip to content

Commit dc21de3

Browse files
authored
fix(deps): pin SQLClean e6ad5fa2 and SQLQuack 0.8.0 (#1429)
SQLQuack 0.8.0 records exact select-item ranges in its strict parsers: an aliased Snowflake item now has a span, and a DuckDB column's span covers its qualifier. The expression-range cases that were strict xfails for that gap now pass, so the xfail and its reason are removed. SQLClean moves to e6ad5fa2, which links the same SQLQuack release; its formatter output is unchanged.
1 parent 3bdd3c3 commit dc21de3

3 files changed

Lines changed: 45 additions & 50 deletions

File tree

‎Cargo.lock‎

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -176,22 +176,22 @@ sqlbuild-scopes = { path = "crates/sqlbuild-scopes" }
176176
sqlbuild-sqltext = { path = "crates/sqlbuild-sqltext" }
177177
sqlbuild-state = { path = "crates/sqlbuild-state" }
178178
# SQL lint Rules, quality Rules and the formatter.
179-
sqlclean = { git = "https://github.com/sqlstack-io/sqlclean.git", rev = "6e18af661ce3a6bcc385a38954c86696d722f400" }
179+
sqlclean = { git = "https://github.com/sqlstack-io/sqlclean.git", rev = "e6ad5fa2694960f1913d2a8e125194c530cc8365" }
180180
# SQL change fingerprints over SQLQuack's tokenizers.
181-
sqlquack-fingerprint = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a", features = ["bigquery", "databricks", "duckdb", "postgres", "snowflake", "sqlite", "sqlserver"] }
181+
sqlquack-fingerprint = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53", features = ["bigquery", "databricks", "duckdb", "postgres", "snowflake", "sqlite", "sqlserver"] }
182182
# Scopes, name resolution, types and lineage for the native analysis route.
183-
sqlquack-semantics = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a", features = ["bigquery", "clickhouse", "databricks", "duckdb", "postgres", "snowflake", "sqlite", "sqlserver"] }
183+
sqlquack-semantics = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53", features = ["bigquery", "clickhouse", "databricks", "duckdb", "postgres", "snowflake", "sqlite", "sqlserver"] }
184184
# SQLQuack's Snowflake-family parser and tokenizer, reached as SQLQuack exposes them.
185-
sqlquack-parse = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a" }
185+
sqlquack-parse = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53" }
186186
# SQLQuack's syntax tree and lossless tokens.
187-
sqlquack-syntax = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a" }
188-
sqlquack-syntax-bigquery = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a" }
189-
sqlquack-syntax-clickhouse = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a" }
190-
sqlquack-syntax-databricks = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a" }
191-
sqlquack-syntax-duckdb = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a" }
192-
sqlquack-syntax-postgres = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a" }
193-
sqlquack-syntax-sqlite = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a" }
194-
sqlquack-syntax-sqlserver = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "8d28aa4c4b6c3d8c5345ddef3d620fa24e26741a" }
187+
sqlquack-syntax = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53" }
188+
sqlquack-syntax-bigquery = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53" }
189+
sqlquack-syntax-clickhouse = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53" }
190+
sqlquack-syntax-databricks = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53" }
191+
sqlquack-syntax-duckdb = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53" }
192+
sqlquack-syntax-postgres = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53" }
193+
sqlquack-syntax-sqlite = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53" }
194+
sqlquack-syntax-sqlserver = { git = "https://github.com/sqlstack-io/sqlquack.git", rev = "17088bd7e864837f4bb9e41da247dd05183e4a53" }
195195
stacker = "0.1"
196196
syn = { version = "2", features = ["full", "visit", "extra-traits"] }
197197
subtle = "2"

‎tests/integration/src/sqlbuild/compiler/compiled_project/test_orchestration_snapshot.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@
6161
)
6262

6363
_DUCKSHOP: Path = Path("benchmarks/duckshop/project")
64-
_STRICT_SPANS: str = (
65-
"SQLQuack's strict parsers do not yet record projection-item spans: Snowflake gives aliased "
66-
"items none, and DuckDB's column span leaves out the qualifier"
67-
)
6864
_PRICE_MODELS: dict[str, str] = {
6965
"models/stg_prices.sql": (
7066
'MODEL (description "Staged prices");\n'
@@ -494,7 +490,6 @@ def test_given_rewritten_model_sql_when_publishing_then_expression_ranges_slice_
494490
assert published_texts(test_case, tmp_path) == test_case.expected_texts, test_case.description
495491

496492

497-
@pytest.mark.xfail(strict=True, raises=AssertionError, reason=_STRICT_SPANS)
498493
@pytest.mark.parametrize(
499494
"test_case",
500495
[

0 commit comments

Comments
 (0)