update to pgx 0.4.0; update dependencies;

jefbarn · Mar 22, 2022 · 235af6b · 235af6b
1 parent 3775d3d
commit 235af6b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 49 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -1,16 +1,3 @@
-# Auto-generated by pgx. You may edit this, or delete it to have a new one created.
-
-[target.x86_64-unknown-linux-gnu]
-linker = "./.cargo/pgx-linker-script.sh"
-
-[target.aarch64-unknown-linux-gnu]
-linker = "./.cargo/pgx-linker-script.sh"
-
-[target.x86_64-apple-darwin]
-linker = "./.cargo/pgx-linker-script.sh"
-
-[target.aarch64-apple-darwin]
-linker = "./.cargo/pgx-linker-script.sh"
-
-[target.x86_64-unknown-freebsd]
-linker = "./.cargo/pgx-linker-script.sh"
+[build]
+# Postgres symbols won't be available until runtime
+rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]
diff --git a/.cargo/pgx-linker-script.sh b/.cargo/pgx-linker-script.sh
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "pgx_json_schema"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 
 [lib]
-crate-type = ["cdylib", "rlib"]
+crate-type = ["cdylib"]
 
 [features]
 default = ["pg14"]
@@ -16,15 +16,15 @@ pg14 = ["pgx/pg14"]
 pg_test = []
 
 [dependencies]
-pgx = "0.2.6"
-pgx-macros = "0.2.6"
-serde_json = "1.0.73"
-jsonschema = "0.13.3"
+pgx = "0.4.0"
+pgx-macros = "0.4.0"
+serde_json = "1.0.79"
+jsonschema = "0.15.0"
 jtd = "0.3.1"
 avro-rs = "0.13.0"
 
 [dev-dependencies]
-pgx-tests = "0.2.6"
+pgx-tests = "0.4.0"
 
 [profile.dev]
 panic = "unwind"

diff --git a/src/bin/sql-generator.rs b/src/bin/sql-generator.rs
diff --git a/src/json_schema.rs b/src/json_schema.rs
@@ -1,5 +1,5 @@
-use pgx::*;
 use jsonschema::JSONSchema;
+use pgx::*;
 
 #[pg_extern]
 fn json_schema_is_valid(schema: JsonB, instance: JsonB) -> bool {
@@ -62,6 +62,9 @@ mod tests {
         let (_value, description) = Spi::get_two::<JsonB, String>(
             "select * from json_schema_get_errors('{\"maxLength\": 5}', '\"foobar\"'::jsonb)",
         );
-        assert_eq!(description, Some("\"foobar\" is longer than 5 characters".to_string()))
+        assert_eq!(
+            description,
+            Some("\"foobar\" is longer than 5 characters".to_string())
+        )
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,13 +1,11 @@
+mod avro;
 mod json_schema;
 mod json_type_def;
-mod avro;
-
 
 use pgx::*;
 
 pg_module_magic!();
 
-
 #[cfg(test)]
 pub mod pg_test {
     pub fn setup(_options: Vec<&str>) {