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

ref: Make jsonb type work with any valid json and add more tests to cover it #182

Merged
merged 2 commits into from
Oct 20, 2023
Merged

ref: Make jsonb type work with any valid json and add more tests to cover it #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e748d3d
ref: Make jsonb type work with any valid json and add more tests to c…
kamilogorek Oct 20, 2023
8390488
chore: bump version to 0.1.18
kamilogorek Oct 20, 2023
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
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
cp ${extension_dir}/${{ matrix.extension_name }}--${deb_version}.sql ${extension_dir}/${{ matrix.extension_name }}--0.1.14--${deb_version}.sql
cp ${extension_dir}/${{ matrix.extension_name }}--${deb_version}.sql ${extension_dir}/${{ matrix.extension_name }}--0.1.15--${deb_version}.sql
cp ${extension_dir}/${{ matrix.extension_name }}--${deb_version}.sql ${extension_dir}/${{ matrix.extension_name }}--0.1.16--${deb_version}.sql
cp ${extension_dir}/${{ matrix.extension_name }}--${deb_version}.sql ${extension_dir}/${{ matrix.extension_name }}--0.1.17--${deb_version}.sql

# Create installable package
mkdir archive
Expand Down
2 changes: 1 addition & 1 deletion wrappers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wrappers"
version = "0.1.17"
version = "0.1.18"
edition = "2021"

[lib]
Expand Down
12 changes: 10 additions & 2 deletions wrappers/dockerfiles/airtable/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,29 @@ def do_GET(self):
client.create(
test_table,
{
"bool_field": True,
"numeric_field": 1,
"string_field": "two",
"timestamp_field": "2023-07-19T06:39:15.000Z",
"strings_array_field": ["foo", "bar"],
"object_field": {"foo": "bar"},
"strings_array_field": ["foo", "bar"],
"numerics_array_field": [1, 2],
"bools_array_field": [False],
"objects_array_field": [{"foo": "bar"}, {"foo": "baz"}]
},
)
client.create(
test_table,
{
"bool_field": False,
"numeric_field": 2,
"string_field": "three",
"timestamp_field": "2023-07-20T06:39:15.000Z",
"strings_array_field": ["baz", "qux"],
"object_field": {"foo": "baz"},
"strings_array_field": ["baz", "qux"],
"numerics_array_field": [3, 4],
"bools_array_field": [True, False, True],
"objects_array_field": [{"foo": "qux"}]
},
)

Expand Down
9 changes: 2 additions & 7 deletions wrappers/src/fdw/airtable_fdw/result.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,15 +213,10 @@ impl AirtableRecord {
}
},
),
// TODO: Think about adding support for BOOLARRAYOID, NUMERICARRAYOID, TEXTARRAYOID and rest of array types.
pg_sys::JSONBOID => self.fields.0.get(&col.name).map_or_else(
|| Ok(None),
|val| {
if val.is_array() || val.is_object() {
Ok(Some(Cell::Json(pgrx::JsonB(val.clone()))))
} else {
Err(())
}
},
|val| Ok(Some(Cell::Json(pgrx::JsonB(val.clone())))),
),
_ => {
return Err(AirtableFdwError::UnsupportedColumnType(col.name.clone()));
Expand Down
136 changes: 103 additions & 33 deletions wrappers/src/fdw/airtable_fdw/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[cfg(any(test, feature = "pg_test"))]
#[pgrx::pg_schema]
mod tests {
use pgrx::{prelude::*, JsonB};
use pgrx::prelude::*;

#[pg_test]
fn airtable_smoketest() {
Expand All @@ -27,11 +27,15 @@ mod tests {
c.update(
r#"
CREATE FOREIGN TABLE airtable_table (
bool_field bool,
numeric_field numeric,
string_field text,
timestamp_field timestamp,
object_field jsonb,
strings_array_field jsonb,
object_field jsonb
numerics_array_field jsonb,
bools_array_field jsonb,
objects_array_field jsonb
)
SERVER airtable_server
OPTIONS (
Expand All @@ -46,11 +50,7 @@ mod tests {
c.update(
r#"
CREATE FOREIGN TABLE airtable_view (
numeric_field numeric,
string_field text,
timestamp_field timestamp,
strings_array_field jsonb,
object_field jsonb
string_field text
)
SERVER airtable_server
OPTIONS (
Expand All @@ -64,60 +64,130 @@ mod tests {
)
.unwrap();

#[derive(serde::Deserialize)]
struct Foo {
foo: String,
}

/*
The table data below comes from the code in wrappers/dockerfiles/airtable/server.py
*/
let results = c
.select(
"SELECT string_field FROM airtable_table WHERE numeric_field = 1",
"SELECT bool_field FROM airtable_table WHERE bool_field = False",
None,
None,
)
.unwrap()
.filter_map(|r| r.get_by_name::<&str, _>("string_field").unwrap())
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<bool, _>("bool_field")
.expect("bool_field is missing")
})
.collect::<Vec<_>>();
assert_eq!(results, vec!["two"]);
assert_eq!(results, vec![false]);

let results = c
.select(
"SELECT strings_array_field FROM airtable_table WHERE numeric_field = 1",
None,
None,
)
.unwrap()
.select("SELECT string_field FROM airtable_table", None, None)
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<JsonB, _>("strings_array_field")
.expect("strings_array_field is missing")
.and_then(|v| serde_json::from_value::<Vec<String>>(v.0.to_owned()).ok())
r.get_by_name::<&str, _>("string_field")
.expect("string_field is missing")
})
.collect::<Vec<_>>();
assert_eq!(results, vec!["two", "three"]);

assert_eq!(results, vec![vec!["foo", "bar"]]);
let results = c
.select("SELECT numeric_field FROM airtable_table", None, None)
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<pgrx::AnyNumeric, _>("numeric_field")
.expect("numeric_field is missing")
})
.collect::<Vec<_>>();
assert_eq!(
results,
vec![pgrx::AnyNumeric::from(1), pgrx::AnyNumeric::from(2)]
);

#[derive(serde::Deserialize)]
struct Foo {
foo: String,
}
let results = c
.select("SELECT timestamp_field FROM airtable_table", None, None)
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<pgrx::Timestamp, _>("timestamp_field")
.expect("timestamp_field is missing")
.map(|v| v.to_iso_string())
})
.collect::<Vec<_>>();
assert_eq!(results, vec!["2023-07-19T06:39:15", "2023-07-20T06:39:15"]);

let results = c
.select("SELECT object_field FROM airtable_table", None, None)
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<pgrx::JsonB, _>("object_field")
.expect("object_field is missing")
.and_then(|v| serde_json::from_value::<Foo>(v.0.to_owned()).ok())
.map(|v| v.foo)
})
.collect::<Vec<_>>();
assert_eq!(results, vec!["bar", "baz"]);

let results = c
.select("SELECT strings_array_field FROM airtable_table", None, None)
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<pgrx::JsonB, _>("strings_array_field")
.expect("strings_array_field is missing")
.and_then(|v| serde_json::from_value::<Vec<String>>(v.0.to_owned()).ok())
})
.collect::<Vec<_>>();
assert_eq!(results, vec![vec!["foo", "bar"], vec!["baz", "qux"]]);

let results = c
.select(
"SELECT object_field FROM airtable_table WHERE numeric_field = 1",
"SELECT numerics_array_field FROM airtable_table",
None,
None,
)
.unwrap()
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<JsonB, _>("object_field")
.expect("object_field is missing")
.and_then(|v| serde_json::from_value::<Foo>(v.0.to_owned()).ok())
r.get_by_name::<pgrx::JsonB, _>("numerics_array_field")
.expect("numerics_array_field is missing")
.and_then(|v| serde_json::from_value::<Vec<u32>>(v.0.to_owned()).ok())
})
.collect::<Vec<_>>();
assert_eq!(results, vec![vec![1, 2], vec![3, 4]]);

let results = c
.select("SELECT bools_array_field FROM airtable_table", None, None)
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<pgrx::JsonB, _>("bools_array_field")
.expect("bools_array_field is missing")
.and_then(|v| serde_json::from_value::<Vec<bool>>(v.0.to_owned()).ok())
})
.collect::<Vec<_>>();
assert_eq!(results[0].foo, "bar");
assert_eq!(results, vec![vec![false], vec![true, false, true]]);

let results = c
.select("SELECT objects_array_field FROM airtable_table", None, None)
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<pgrx::JsonB, _>("objects_array_field")
.expect("objects_array_field is missing")
.and_then(|v| serde_json::from_value::<Vec<Foo>>(v.0.to_owned()).ok())
.map(|v| v.into_iter().map(|f| f.foo).collect::<Vec<_>>())
})
.collect::<Vec<_>>();
assert_eq!(results, vec![vec!["bar", "baz"], vec!["qux"]]);

let results = c
.select("SELECT string_field FROM airtable_view", None, None)
.unwrap()
.filter_map(|r| r.get_by_name::<&str, _>("string_field").unwrap())
.expect("No results for a given query")
.filter_map(|r| {
r.get_by_name::<&str, _>("string_field")
.expect("string_field is missing")
})
.collect::<Vec<_>>();
assert_eq!(results, vec!["three"]);
});
Expand Down