Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(wasm): adjust page children blocks order for Notion FDW #415

Merged
merged 1 commit into from
Feb 10, 2025
+43 −6
Merged

fix(wasm): adjust page children blocks order for Notion FDW #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 41 additions & 4 deletions docs/catalog/notion.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The Notion Wrapper is a WebAssembly(Wasm) foreign data wrapper which allows you

| Version | Wasm Package URL | Checksum |
| ------- | ----------------------------------------------------------------------------------------------- | ------------------------------------------------------------------ |
| 0.1.1 | `https://github.com/supabase/wrappers/releases/download/wasm_notion_fdw_v0.1.1/notion_fdw.wasm` | `tbd` |
| 0.1.0 | `https://github.com/supabase/wrappers/releases/download/wasm_notion_fdw_v0.1.0/notion_fdw.wasm` | `e017263d1fc3427cc1df8071d1182cdc9e2f00363344dddb8c195c5d398a2099` |

## Preparation
Expand Down Expand Up @@ -55,6 +56,42 @@ values (
returning key_id;
```

### Connecting to Notion

We need to provide Postgres with the credentials to access Notion and any additional options. We can do this using the `create server` command:

=== "With Vault"

```sql
create server notion_server
foreign data wrapper wasm_wrapper
options (
fdw_package_url 'https://github.com/supabase/wrappers/releases/download/wasm_notion_fdw_v0.1.1/notion_fdw.wasm',
fdw_package_name 'supabase:notion-fdw',
fdw_package_version '0.1.1',
fdw_package_checksum 'tbd',
api_url 'https://api.notion.com/v1', -- optional
api_key_id '<key_ID>' -- The Key ID from above.
);
```

=== "Without Vault"

```sql
create server cal_server
foreign data wrapper wasm_wrapper
options (
fdw_package_url 'https://github.com/supabase/wrappers/releases/download/wasm_notion_fdw_v0.1.1/notion_fdw.wasm',
fdw_package_name 'supabase:notion-fdw',
fdw_package_version '0.1.1',
fdw_package_checksum 'tbd',
api_url 'https://api.notion.com/v1', -- optional
api_key 'secret_xxxx...' -- Notion API key
);
```

Note the `fdw_package_*` options are required, which specify the Wasm package metadata. You can get the available package version list from [above](#available-versions).

### Create a schema

We recommend creating a schema to hold all the foreign tables:
Expand Down Expand Up @@ -91,7 +128,7 @@ Ref: [Notion API docs](https://developers.notion.com/reference/intro)

| Object | Select | Insert | Update | Delete | Truncate |
| ------ | :----: | :----: | :----: | :----: | :------: |
| Block | ✅ | ❌ | ❌ | ❌ | ❌ |
| Block | ✅ | ❌ | ❌ | ❌ | ❌ |

#### Usage

Expand Down Expand Up @@ -130,7 +167,7 @@ Ref: [Notion API docs](https://developers.notion.com/reference/intro)

| Object | Select | Insert | Update | Delete | Truncate |
| ------ | :----: | :----: | :----: | :----: | :------: |
| Page | ✅ | ❌ | ❌ | ❌ | ❌ |
| Page | ✅ | ❌ | ❌ | ❌ | ❌ |

#### Usage

Expand Down Expand Up @@ -164,7 +201,7 @@ Ref: [Notion API docs](https://developers.notion.com/reference/intro)

| Object | Select | Insert | Update | Delete | Truncate |
| -------- | :----: | :----: | :----: | :----: | :------: |
| Database | ✅ | ❌ | ❌ | ❌ | ❌ |
| Database | ✅ | ❌ | ❌ | ❌ | ❌ |

#### Usage

Expand Down Expand Up @@ -198,7 +235,7 @@ Ref: [Notion API docs](https://developers.notion.com/reference/intro)

| Object | Select | Insert | Update | Delete | Truncate |
| ------ | :----: | :----: | :----: | :----: | :------: |
| User | ✅ | ❌ | ❌ | ❌ | ❌ |
| User | ✅ | ❌ | ❌ | ❌ | ❌ |

#### Usage

Expand Down
4 changes: 2 additions & 2 deletions wasm-wrappers/fdw/notion_fdw/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ impl NotionFdw {
let children = self.make_request("block", Some(block_id), ctx)?;

for child in children.iter() {
ret.push(child.clone());

let has_children = child
.pointer("/has_children")
.and_then(|v| v.as_bool())
Expand All @@ -308,8 +310,6 @@ impl NotionFdw {
}
}

ret.extend(children);

Ok(ret)
}

Expand Down
Loading