update to pgx 0.6.1; update dependencies; (fixes #3)

jefbarn · Dec 16, 2022 · db2f1dd · db2f1dd · dvv · Dec 18, 2022
1 parent 3d0e2d7
commit db2f1dd
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 17 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,30 +1,30 @@
 [package]
 name = "pgx_json_schema"
-version = "0.2.2"
+version = "0.3.0"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]
 
 [features]
 default = ["pg14"]
-pg10 = ["pgx/pg10"]
 pg11 = ["pgx/pg11"]
 pg12 = ["pgx/pg12"]
 pg13 = ["pgx/pg13"]
 pg14 = ["pgx/pg14"]
+pg15 = ["pgx/pg15"]
 pg_test = []
 
 [dependencies]
-pgx = "0.4.0"
-pgx-macros = "0.4.0"
+pgx = "0.6.1"
+pgx-macros = "0.6.1"
 serde_json = "1.0.79"
-jsonschema = {version = "0.16.0", default-features = false, features = []}
+jsonschema = {version = "0.16.1", default-features = false, features = ["draft201909", "draft202012"]}
 jtd = "0.3.1"
 avro-rs = "0.13.0"
 
 [dev-dependencies]
-pgx-tests = "0.4.0"
+pgx-tests = "0.6.1"
 
 [profile.dev]
 panic = "unwind"

diff --git a/src/avro.rs b/src/avro.rs
@@ -1,6 +1,7 @@
 use avro_rs::types::Record;
 use avro_rs::{Schema, Writer};
-use pgx::*;
+use pgx::prelude::*;
+use pgx::JsonB;
 
 #[pg_extern]
 fn avro_is_valid(schema: JsonB, instance: JsonB) -> bool {

diff --git a/src/json_schema.rs b/src/json_schema.rs
@@ -1,5 +1,6 @@
 use jsonschema::JSONSchema;
-use pgx::*;
+use pgx::prelude::*;
+use pgx::JsonB;
 
 #[pg_extern]
 fn json_schema_is_valid(schema: JsonB, instance: JsonB) -> bool {
@@ -10,8 +11,9 @@ fn json_schema_is_valid(schema: JsonB, instance: JsonB) -> bool {
 fn json_schema_get_errors(
     schema: JsonB,
     instance: JsonB,
-) -> impl std::iter::Iterator<
-    Item = (
+) -> TableIterator<
+    'static,
+    (
         name!(error_value, JsonB),
         name!(description, String),
         name!(details, String),
@@ -41,7 +43,7 @@ fn json_schema_get_errors(
         })
         .collect();
 
-    new.into_iter()
+    TableIterator::new(new.into_iter())
 }
 
 #[cfg(any(test, feature = "pg_test"))]

diff --git a/src/json_type_def.rs b/src/json_type_def.rs
@@ -1,5 +1,6 @@
 use jtd::Schema;
-use pgx::*;
+use pgx::prelude::*;
+use pgx::JsonB;
 
 #[pg_extern]
 fn jtd_is_valid(schema: JsonB, instance: JsonB) -> bool {
@@ -14,7 +15,7 @@ fn jtd_is_valid(schema: JsonB, instance: JsonB) -> bool {
 fn jtd_get_errors(
     schema: JsonB,
     instance: JsonB,
-) -> impl std::iter::Iterator<Item = (name!(instance_path, String), name!(schema_path, String))> {
+) -> TableIterator<'static, (name!(instance_path, String), name!(schema_path, String))> {
     let parsed_schema =
         Schema::from_serde_schema(serde_json::from_value(schema.0).unwrap()).unwrap();
     let result = jtd::validate(&parsed_schema, &instance.0, Default::default()).unwrap();
@@ -38,7 +39,7 @@ fn jtd_get_errors(
         })
         .collect();
 
-    new.into_iter()
+    TableIterator::new(new.into_iter())
 }
 
 #[cfg(any(test, feature = "pg_test"))]

diff --git a/src/lib.rs b/src/lib.rs
@@ -2,9 +2,7 @@ mod avro;
 mod json_schema;
 mod json_type_def;
 
-use pgx::*;
-
-pg_module_magic!();
+pgx::pg_module_magic!();
 
 #[cfg(test)]
 pub mod pg_test {