From e5f08b591ec8f6f229493fdebefe6edce07f9080 Mon Sep 17 00:00:00 2001 From: Bo Lu Date: Wed, 19 Nov 2025 17:52:34 +1100 Subject: [PATCH] chore(s3vectors): remove bucket_name option from import foreign schema statement --- docs/catalog/s3vectors.md | 14 ++++---------- wrappers/src/fdw/s3vectors_fdw/README.md | 9 +++++---- wrappers/src/fdw/s3vectors_fdw/s3vectors_fdw.rs | 4 ++-- wrappers/src/fdw/s3vectors_fdw/tests.rs | 6 +----- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/docs/catalog/s3vectors.md b/docs/catalog/s3vectors.md index 11d2ca40..bde59429 100644 --- a/docs/catalog/s3vectors.md +++ b/docs/catalog/s3vectors.md @@ -122,11 +122,8 @@ For example, using below SQL can automatically create foreign tables in the `s3_ ```sql -- create foreign table for each index from S3 Vector bucket -import foreign schema s3_vectors - from server s3_vectors_server into s3_vectors - options ( - bucket_name 'my-vector-bucket' - ); +import foreign schema "my-vector-bucket" + from server s3_vectors_server into s3_vectors; ``` ### S3 Vector Tables @@ -371,11 +368,8 @@ Import the foreign table: ```sql -- Import all indexes from a vector bucket -import foreign schema s3_vectors - from server s3_vectors_server into s3_vectors - options ( - bucket_name 'my-vector-bucket' - ); +import foreign schema "my-vector-bucket" + from server s3_vectors_server into s3_vectors; -- or, create the foreign table manually create foreign table if not exists s3_vectors.embeddings ( diff --git a/wrappers/src/fdw/s3vectors_fdw/README.md b/wrappers/src/fdw/s3vectors_fdw/README.md index 8a0b9d04..b8a4be30 100644 --- a/wrappers/src/fdw/s3vectors_fdw/README.md +++ b/wrappers/src/fdw/s3vectors_fdw/README.md @@ -8,7 +8,8 @@ This is a foreign data wrapper for [AWS S3 Vectors](https://aws.amazon.com/s3/fe ## Changelog -| Version | Date | Notes | -| ------- | ---------- | ---------------------------------------------------- | -| 0.1.1 | 2025-11-17 | Changed 'embd' type name to 's3vec' | -| 0.1.0 | 2025-09-14 | Initial version | +| Version | Date | Notes | +| ------- | ---------- | ---------------------------------------------------------- | +| 0.1.2 | 2025-11-19 | Removed 'bucket_name' option from 'import foreign schema' | +| 0.1.1 | 2025-11-17 | Changed 'embd' type name to 's3vec' | +| 0.1.0 | 2025-09-14 | Initial version | diff --git a/wrappers/src/fdw/s3vectors_fdw/s3vectors_fdw.rs b/wrappers/src/fdw/s3vectors_fdw/s3vectors_fdw.rs index fd449fef..801636dd 100644 --- a/wrappers/src/fdw/s3vectors_fdw/s3vectors_fdw.rs +++ b/wrappers/src/fdw/s3vectors_fdw/s3vectors_fdw.rs @@ -19,7 +19,7 @@ use super::s3vec::S3Vec; use super::{S3VectorsFdwError, S3VectorsFdwResult}; #[wrappers_fdw( - version = "0.1.1", + version = "0.1.2", author = "Supabase", website = "https://github.com/supabase/wrappers/tree/main/wrappers/src/fdw/s3vectors_fdw", error_type = "S3VectorsFdwError" @@ -437,7 +437,7 @@ impl ForeignDataWrapper for S3VectorsFdw { &mut self, import_stmt: ImportForeignSchemaStmt, ) -> S3VectorsFdwResult> { - let bucket_name = require_option("bucket_name", &import_stmt.options)?; + let bucket_name = &import_stmt.remote_schema; let mut next_token: Option = None; let mut ret: Vec = Vec::new(); diff --git a/wrappers/src/fdw/s3vectors_fdw/tests.rs b/wrappers/src/fdw/s3vectors_fdw/tests.rs index fd1905b8..610069fe 100644 --- a/wrappers/src/fdw/s3vectors_fdw/tests.rs +++ b/wrappers/src/fdw/s3vectors_fdw/tests.rs @@ -28,11 +28,7 @@ mod tests { c.update(r#"CREATE SCHEMA IF NOT EXISTS s3_vectors"#, None, &[]) .unwrap(); c.update( - r#"IMPORT FOREIGN SCHEMA "s3_vectors" FROM SERVER s3_vectors_server INTO s3_vectors - OPTIONS ( - bucket_name 'my-vector-bucket' - ) - "#, + r#"IMPORT FOREIGN SCHEMA "my-vector-bucket" FROM SERVER s3_vectors_server INTO s3_vectors"#, None, &[], )