PostgreSQL: Support CREATE FOREIGN DATA WRAPPER by fmguerreiro · Pull Request #2317 · apache/datafusion-sqlparser-rs

fmguerreiro · 2026-04-18T09:09:13Z

Parses CREATE FOREIGN DATA WRAPPER name [HANDLER fn | NO HANDLER] [VALIDATOR fn | NO VALIDATOR] [OPTIONS (...)] (docs).

Split out of this PR at @LucaCappelletti94's request. CREATE FOREIGN TABLE is now #2515.

HANDLER and VALIDATOR are accepted in either order, because the PostgreSQL grammar takes them as an unordered list even though the doc synopsis shows one order.

ALTER FOREIGN DATA WRAPPER and CREATE USER MAPPING are out of scope.

Ported from the pgmold-sqlparser fork.

LucaCappelletti94 · 2026-09-15T19:35:54Z

I suggest to split the PR into two, once for each statement

fmguerreiro · 2026-09-16T06:12:40Z

split. CREATE FOREIGN TABLE is now #2515.

codecov-commenter · 2026-09-23T21:42:06Z

Codecov Report

❌ Patch coverage is 90.27778% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 81.32%. Comparing base (3330dc9) to head (b6a5877).

Files with missing lines	Patch %	Lines
src/parser/mod.rs	89.18%	0 Missing and 4 partials ⚠️
src/ast/ddl.rs	90.90%	0 Missing and 3 partials ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2317      +/-   ##
==========================================
+ Coverage   81.31%   81.32%   +0.01%     
==========================================
  Files          42       42              
  Lines       33977    34040      +63     
  Branches    33977    34040      +63     
==========================================
+ Hits        27628    27684      +56     
  Misses       2785     2785              
- Partials     3564     3571       +7

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

LucaCappelletti94 · 2026-09-24T07:21:17Z

+    #[test]
+    fn test_create_foreign_data_wrapper_span_includes_option_keys() {
+        let dialect = &crate::dialect::PostgreSqlDialect {};
+        let sql = "CREATE FOREIGN DATA WRAPPER myfdw HANDLER myhandler OPTIONS (debug 'true')";
+        let mut test = SpanTest::new(dialect, sql);
+
+        // Ends at the option key, not the statement: a quoted option value is an
+        // Ident with an empty span, so it contributes nothing to the union.
+        let stmt = test.0.parse_statement().unwrap();
+        assert_eq!(
+            test.get_source(stmt.span()),
+            "myfdw HANDLER myhandler OPTIONS (debug"
+        );
+    }


You should drop this test. It asserts the truncated span ... OPTIONS (debug, which comes from parse_identifier returning Span::empty() for single-quoted strings (src/parser/mod.rs:13877). The test turns that defect into a contract, so a later fix of the value span would break it.

Suggested change

#[test]

fn test_create_foreign_data_wrapper_span_includes_option_keys() {

let dialect = &crate::dialect::PostgreSqlDialect {};

let sql = "CREATE FOREIGN DATA WRAPPER myfdw HANDLER myhandler OPTIONS (debug 'true')";

let mut test = SpanTest::new(dialect, sql);

// Ends at the option key, not the statement: a quoted option value is an

// Ident with an empty span, so it contributes nothing to the union.

let stmt = test.0.parse_statement().unwrap();

assert_eq!(

test.get_source(stmt.span()),

"myfdw HANDLER myhandler OPTIONS (debug"

);

}

dropped in 59608c6.

LucaCappelletti94 · 2026-09-24T07:22:23Z

+    // Pinning the message keeps this from passing on the old positional parser,
+    // which also errored here but on the trailing tokens instead.


Differential comment with previous code.

Suggested change

// Pinning the message keeps this from passing on the old positional parser,

// which also errored here but on the trailing tokens instead.

removed in 59608c6.

LucaCappelletti94 · 2026-09-24T07:24:25Z

+        }])
+    );
+
+    // A single hardcoded Display label would render this as `NO HANDLER NO HANDLER`.


Do not include comments describing the PR change, comments are for describing the code.

Suggested change

// A single hardcoded Display label would render this as `NO HANDLER NO HANDLER`.

removed in 59608c6.

LucaCappelletti94

Do please also add some seed entries for the fuzzer corpus, so it can better search bugs that are relevant to this syntax.

Share one has_modifier check between the FOREIGN TABLE and FOREIGN DATA WRAPPER arms so temporary/or-alter/global no longer parse and render as a bare CREATE FOREIGN DATA WRAPPER. Add fuzz seeds.

LucaCappelletti94

Most likely "A repeated clause errors." should be dropped from the description once the parser keeps repeats, given the pg_query reference.

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>

# Conflicts: # tests/sqlparser_postgres.rs

fmguerreiro force-pushed the upstream/foreign-table-fdw branch from 538c418 to 54177bd Compare September 16, 2026 01:35

fmguerreiro mentioned this pull request Sep 16, 2026

PostgreSQL: Support CREATE FOREIGN TABLE #2515

Merged

fmguerreiro changed the title ~~PostgreSQL: add support for CREATE FOREIGN TABLE and CREATE FOREIGN DATA WRAPPER~~ PostgreSQL: add support for CREATE FOREIGN DATA WRAPPER Sep 16, 2026

fmguerreiro changed the title ~~PostgreSQL: add support for CREATE FOREIGN DATA WRAPPER~~ PostgreSQL: Support CREATE FOREIGN DATA WRAPPER Sep 16, 2026

LucaCappelletti94 added the PostgreSQL label Sep 22, 2026

LucaCappelletti94 requested changes Sep 24, 2026

View reviewed changes

PostgreSQL: Support CREATE FOREIGN DATA WRAPPER

4d03db2

LucaCappelletti94 force-pushed the upstream/foreign-table-fdw branch from 59608c6 to 4d03db2 Compare September 26, 2026 12:18

LucaCappelletti94 added waiting on reviewer PR needs to be reviewed and removed needs rebasing The PR has collisions with main and requires rebasing labels Sep 26, 2026

LucaCappelletti94 requested changes Sep 26, 2026

View reviewed changes

Comment thread src/parser/mod.rs

Comment thread src/parser/mod.rs

Comment thread src/parser/mod.rs Outdated

Comment thread tests/sqlparser_postgres.rs Outdated

LucaCappelletti94 added waiting on contributor The review needs further refinements by its author and removed waiting on reviewer PR needs to be reviewed labels Sep 26, 2026

PostgreSQL: reject CREATE modifiers on FOREIGN DATA WRAPPER

ee0ded7

Share one has_modifier check between the FOREIGN TABLE and FOREIGN DATA WRAPPER arms so temporary/or-alter/global no longer parse and render as a bare CREATE FOREIGN DATA WRAPPER. Add fuzz seeds.

LucaCappelletti94 added waiting on reviewer PR needs to be reviewed and removed waiting on contributor The review needs further refinements by its author labels Sep 27, 2026

Merge remote-tracking branch 'upstream/main' into omp/pr2317-merge

25bd320

LucaCappelletti94 requested changes Oct 16, 2026

View reviewed changes

LucaCappelletti94 added waiting on contributor The review needs further refinements by its author needs rebasing The PR has collisions with main and requires rebasing enhancement New feature or request and removed waiting on reviewer PR needs to be reviewed labels Oct 17, 2026

fmguerreiro and others added 13 commits October 19, 2026 15:58

Update src/ast/ddl.rs

0907266

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>

Update tests/sqlparser_postgres.rs

e02c957

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>

Update tests/sqlparser_postgres.rs

b7505f9

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>

Update tests/sqlparser_postgres.rs

82fb8a4

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>

Update src/ast/ddl.rs

b73f98f

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>

Update src/ast/ddl.rs

b62f3d9

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>

Update src/ast/ddl.rs

6c33372

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>

Update src/parser/mod.rs

df5a604

Co-authored-by: Luca Cappelletti <cappelletti.luca94@gmail.com>

Merge remote-tracking branch 'origin/main' into babysit-pr2317-merge

42bb03d

# Conflicts: # tests/sqlparser_postgres.rs

test: Fix PostgreSQL raw string delimiter

f78f689

merge: update with upstream main

806dc36

# Conflicts: # tests/sqlparser_postgres.rs

merge: integrate remote branch updates

402f0e2

# Conflicts: # tests/sqlparser_postgres.rs

test: cover foreign data wrapper AST spans

b6a5877

		// Pinning the message keeps this from passing on the old positional parser,
		// which also errored here but on the trailing tokens instead.

Conversation

fmguerreiro commented Apr 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LucaCappelletti94 commented Sep 15, 2026

Uh oh!

fmguerreiro commented Sep 16, 2026

Uh oh!

codecov-commenter commented Sep 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

LucaCappelletti94 Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

fmguerreiro Sep 25, 2026

Choose a reason for hiding this comment

Uh oh!

LucaCappelletti94 Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

fmguerreiro Sep 25, 2026

Choose a reason for hiding this comment

Uh oh!

LucaCappelletti94 Sep 24, 2026

Choose a reason for hiding this comment

Uh oh!

fmguerreiro Sep 25, 2026

Choose a reason for hiding this comment

Uh oh!

LucaCappelletti94 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LucaCappelletti94 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

fmguerreiro commented Apr 18, 2026 •

edited

Loading

codecov-commenter commented Sep 23, 2026 •

edited

Loading