Skip to content

Merge upstream/main (Oct 2026) - #27

Closed
sabir-akhadov-localstack wants to merge 142 commits into
mainfrom
sync/upstream-2026-10
Closed

Merge upstream/main (Oct 2026)#27
sabir-akhadov-localstack wants to merge 142 commits into
mainfrom
sync/upstream-2026-10

Conversation

@sabir-akhadov-localstack

@sabir-akhadov-localstack sabir-akhadov-localstack commented Oct 6, 2026

Copy link
Copy Markdown
Collaborator

Merges apache/datafusion-sqlparser-rs main (141 commits, up to 14cbf755) into the fork.

Three of our upstreamed PRs (apache#2370 visitor ident hooks, apache#2388 CREATE WAREHOUSE, apache#2396 CREATE OR REPLACE SCHEMA) landed upstream in adapted form, and upstream added its own CREATE FILE FORMAT (apache#2336). Resolutions:

  • CREATE WAREHOUSE → upstream's Statement::CreateWarehouse(CreateWarehouse) with parsed options (was a struct variant that skipped all properties). ⚠️ AST change for downstream consumers.
  • CREATE FILE FORMAT → kept the fork's AST/parser (superset: format_type, LIKE, ALTER/DROP/DESC/SHOW, COMMENT anywhere). Dropped upstream's 3 AST-shape tests that assumed its shape.
  • CREATE SCHEMA → fork's TRANSIENT / WITH MANAGED ACCESS kept on top of upstream.
  • CREATE PROCEDURE → fork's signature kept, plus upstream's PROC alias.
  • Visitor → upstream's (superset, adds ORDER BY / GROUP BY hooks); removed duplicated Ident visit impls.

cargo test --all-features passes. Branches stacked on main (e.g. tag-grammar work using the old CreateWarehouse {..} shape) will need to adapt when they merge this.

finchxxia and others added 30 commits May 2, 2026 04:52
@finchxxia @iffyio
Databricks: Add support for UPDATE SET * and INSERT * in MERGE st…
a281171 
…atements (apache#2325)

Co-authored-by: Ifeanyi Ubah <ify1992@yahoo.com>
@97nitt
Snowflake: Fix COPY INTO transformation parsing for cast expressions (a…
824b5c1 
…pache#2328)
@97nitt
Snowflake: Accept COPY GRANTS after CREATE VIEW column list (apache#2327
299f54d 
)
@Mrmaxmeier
Fix panic in EscapeQuotedString and parse_flush, clean up a few unwra…
3f347e3 
…ps (apache#2330)
@iffyio
[Teradata] Add CREATE TABLE options (apache#2329)
f98c9d1
@LucaCappelletti94
Add support for PostgreSQL's ORDER BY ... USING <operator> clause (ap…
79f06bd 
…ache#2246)
@97nitt
BigQuery: Parse WITH CONNECTION on CREATE EXTERNAL TABLE (apache#2326)
7c78d13
@amaksimo @iffyio
Add ASYNC keyword support for CREATE INDEX (apache#2302)
ab8e6ad 
Co-authored-by: Ifeanyi Ubah <ify1992@yahoo.com>
@sunng87
PostgreSQL: add support for ABORT TRANSACTION (apache#2332)
05af09c
@ramnes
Snowflake: Add support for PUT (apache#2341)
05428be
@LucaCappelletti94
Make visitor feature no_std-compatible (apache#2343)
e999d3d
@LucaCappelletti94
Parser: fix exponential parse time on compound chains (apache#2344)
2705a7d
@yoavcloud
MySQL: Add support for group by with rollup (apache#2347)
182eae8
@wugeer
Hive: Support MAP<K, V> column types (apache#2346)
5d61fdd
@ramnes
Snowflake: Add support for CREATE FILE FORMAT (apache#2336)
8c3f7fc
@xitep
Expose Parser::into_comments (apache#2354)
b6af2ae
@yoavcloud
Improve accuracy of supports_string_literal_concatenation_with_newline (
0d63896 
apache#2348)
@moshap-firebolt @iffyio
Spark: enable SQL pipe operator (|>) (apache#2358)
42840f0 
Co-authored-by: Ifeanyi Ubah <ify1992@yahoo.com>
@iffyio
Support multiple targets for SELECT INTO (apache#2360)
575ee26
@revitalkr
Fix issue apache#2353: Incorrect canonicalization of NATURAL JOIN (a…
d0c081e 
…pache#2355)
@lovasoa
Microsoft sql server: Escape quotes in national string display (apach…
bd8a2c1 
…e#2365)
@LucaCappelletti94
Parser: fix exponential parse time on compound keyword chains (apache…
928783d 
…#2350)
@LucaCappelletti94
Parser: fix exponential parse time on speculative prefix parsing (apa…
20b9849 
…che#2352)
@LucaCappelletti94
Support aliased function arguments (expr AS name) (apache#2368)
0bfafea
@LucaCappelletti94
Forbid unsafe code (apache#2369)
158687b
@connyay
sqlite: Support GLOB operator (apache#2362)
b376022
@moshap-firebolt
Parser: fix exponential parse time on table-factor paren chains (apac…
fd5c163 
…he#2372)
@revitalkr
Disable supports_left_associative_joins_without_parens for MySQL an…
7bf5ff2 
…d Redshift (apache#2357)
@LucaCappelletti94
Add PostgreSQL CREATE/ALTER TEXT SEARCH DDL Parsing (apache#2250)
c3701e2
@LucaCappelletti94
Do not consume statement terminator in unparenthesized option lists (a…
8cd2997 
…pache#2376)
LucaCappelletti94 and others added 27 commits September 24, 2026 20:51
@LucaCappelletti94
Generic: Disallow quoted identifiers in colon and at-sign placeholders (
1608bf6 
apache#2539)
@jerguslejko @LucaCappelletti94
Refactor: replace dialect_of! table partition check with Dialect …
712de6e 
…trait method (apache#2526)

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>
@jordiori @LucaCappelletti94
ClickHouse: Support ALTER TABLE ... MODIFY ORDER BY (apache#2569)
88ffee6 
Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>
@alamb @LucaCappelletti94
Check in Cargo.lock (apache#2482)
393c2c3 
Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>
@EthanVieira evieira @LucaCappelletti94
Databricks: support collated data types (apache#2553)
ab23305 
Co-authored-by: evieira <ethan.vieira@tryg.dk>
Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>
@LucaCappelletti94
Enable GitHub Discussions (apache#2581)
9352883
@LucaCappelletti94
Ignore libFuzzer worker logs in fuzz/ (apache#2583)
ddb9b92
@LucaCappelletti94
Remove homepage metadata duplicating repository (apache#2582)
37109d4
@fmguerreiro @LucaCappelletti94
PostgreSQL: Support CREATE FOREIGN TABLE (apache#2515)
c23dc05 
Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>
@osipovartem @LucaCappelletti94
Snowflake: Parse structured OBJECT types (apache#2489)
37df75e 
Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>
@s5dsn-eqee
ClickHouse: Support tuple element access by index (apache#2574)
91f7ce2
@t8y2 @LucaCappelletti94
MSSQL: Support PROC as CREATE PROCEDURE abbreviation (apache#2448)
560a13c 
Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>
@LucaCappelletti94
PostgreSQL: Remove test parse_create_table_with_inherit (apache#2595)
5cad906
@dependabot
Bump bigdecimal from 0.4.10 to 0.4.11 (apache#2602)
287aaf6 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@alamb
Update SECURITY policy to conform to ASF guidelines (apache#2601)
811ef29 
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@LucaCappelletti94
Gate fuzz oracle targets behind features (apache#2585)
d405abe
@LucaCappelletti94
DuckDB: Support nested block comments (apache#2584)
c2e085d
@LucaCappelletti94
Generic: Render prefix ! operator with space before operator charac…
bfc7d38 
…ters (apache#2541)
@LucaCappelletti94
MsSql: Disallow unquoted FROM keyword as alias assignment expression (
8f4da49 
apache#2546)
@LucaCappelletti94
SQLite: Support CAST(expr AS) without a type name (apache#2558)
aa1b5d6
@LucaCappelletti94
Generic: Add spacing around dot in compound field access adjacent to …
b1d1486 
…numbers (apache#2543)
@LucaCappelletti94
SQLite: Support string literals as column names in CREATE TABLE (ap…
fc18670 
…ache#2560)
@LucaCappelletti94
SQLite: support == as assignment operator in UPDATE SET (apache#2552)
7939d4b
@LucaCappelletti94
Generic: Parse IN lists that start with a parenthesized subquery (apa…
1ba145b 
…che#2586)
@LucaCappelletti94
Add a fuzz target that flags superlinear parsing and printing (apache…
c70b5b1 
…#2580)
@LucaCappelletti94
SQLite: Support identifier characters above U+FFFF (apache#2555)
14cbf75
@sabir-akhadov-localstack @claude
Merge upstream/main into main
bcb872a 
Sync the fork with apache/datafusion-sqlparser-rs main (141 commits).

Notable conflict resolutions:
- CREATE WAREHOUSE: adopt upstream's `Statement::CreateWarehouse(CreateWarehouse)`
  (from our upstreamed apache#2388), which parses warehouse options instead of
  skipping them. Fork-only ALTER/DESC/SHOW WAREHOUSE are unchanged.
- CREATE FILE FORMAT: keep the fork's richer AST/parser (format_type,
  LIKE, ALTER/DROP/DESC/SHOW, COMMENT anywhere, VOLATILE as TEMPORARY)
  instead of upstream's apache#2336; drop upstream's duplicate AST-shape tests
  and adapt the IDENTIFIER(?) test to the fork's `TYPE = X` rendering.
- CREATE SCHEMA: keep fork's TRANSIENT / WITH MANAGED ACCESS on top of
  upstream's OR REPLACE (apache#2396).
- CREATE PROCEDURE: keep fork's (or_alter, or_replace) signature, add
  upstream's PROC alias.
- Visitor: take upstream's visitor.rs (superset, incl. ORDER BY / GROUP BY
  hooks); remove duplicated Ident Visit/VisitMut impls (apache#2370).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@sabir-akhadov-localstack

sabir-akhadov-localstack commented Oct 6, 2026

Copy link
Copy Markdown
Collaborator Author

Closing: per snowflake-rs ADR 081 the fork's main tracks apache only and nothing builds from it; snowflake-rs picks up upstream via the upgrade-sqlparser replay flow instead.

@sabir-akhadov-localstack
sabir-akhadov-localstack deleted the sync/upstream-2026-10 branch October 6, 2026 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.