prepare v0.9.7

eeeebbbbrrrr · web-flow · commit f048ce9acac1 · 2023-06-29T10:40:16.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-pgrx/Cargo.toml b/cargo-pgrx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-pgrx"
-version = "0.9.6"
+version = "0.9.7"
 authors = ["ZomboDB, LLC <zombodb@gmail.com>"]
 license = "MIT"
 description = "Cargo subcommand for 'pgrx' to make Postgres extension development easy"
@@ -17,17 +17,17 @@ edition = "2021"
 atty = "0.2.14"
 cargo_metadata = "0.15.4"
 cargo_toml = "0.15.3"
-clap = { version = "4.3.5", features = [ "env", "suggestions", "cargo", "derive", "wrap_help" ] }
+clap = { version = "4.3.9", features = [ "env", "suggestions", "cargo", "derive", "wrap_help" ] }
 clap-cargo = { version = "0.10.0", features = [ "cargo_metadata" ] }
 semver = "1.0.17"
 owo-colors = { version = "3.5.0", features = [ "supports-colors" ] }
 env_proxy = "0.4.1"
-num_cpus = "1.15.0"
-pgrx-pg-config = { path = "../pgrx-pg-config", version = "=0.9.6" }
-pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph", version = "=0.9.6" }
-prettyplease = "0.2.8"
-proc-macro2 = { version = "1.0.60", features = [ "span-locations" ] }
-quote = "1.0.28"
+num_cpus = "1.16.0"
+pgrx-pg-config = { path = "../pgrx-pg-config", version = "=0.9.7" }
+pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph", version = "=0.9.7" }
+prettyplease = "0.2.9"
+proc-macro2 = { version = "1.0.63", features = [ "span-locations" ] }
+quote = "1.0.29"
 rayon = "1.7.0"
 regex = "1.8.4"
 ureq = "2.7.1"
diff --git a/cargo-pgrx/src/templates/cargo_toml b/cargo-pgrx/src/templates/cargo_toml
@@ -16,10 +16,10 @@ pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
 pg_test = []
 
 [dependencies]
-pgrx = "=0.9.6"
+pgrx = "=0.9.7"
 
 [dev-dependencies]
-pgrx-tests = "=0.9.6"
+pgrx-tests = "=0.9.7"
 
 [profile.dev]
 panic = "unwind"
diff --git a/nix/templates/default/Cargo.toml b/nix/templates/default/Cargo.toml
@@ -16,10 +16,10 @@ pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
 pg_test = []
 
 [dependencies]
-pgrx = "=0.9.6"
+pgrx = "=0.9.7"
 
 [dev-dependencies]
-pgrx-tests = "=0.9.6"
+pgrx-tests = "=0.9.7"
 tempfile = "3.2.0"
 once_cell = "1.7.2"
 
diff --git a/pgrx-macros/Cargo.toml b/pgrx-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pgrx-macros"
-version = "0.9.6"
+version = "0.9.7"
 authors = ["ZomboDB, LLC <zombodb@gmail.com>"]
 license = "MIT"
 description = "Proc Macros for 'pgrx'"
@@ -21,9 +21,9 @@ rustc-args = ["--cfg", "docsrs"]
 no-schema-generation = ["pgrx-sql-entity-graph/no-schema-generation"]
 
 [dependencies]
-pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph", version = "=0.9.6" }
-proc-macro2 = "1.0.60"
-quote = "1.0.28"
+pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph", version = "=0.9.7" }
+proc-macro2 = "1.0.63"
+quote = "1.0.29"
 syn = { version = "1.0.109", features = [ "extra-traits", "full", "fold", "parsing" ] }
 
 [dev-dependencies]
diff --git a/pgrx-pg-config/Cargo.toml b/pgrx-pg-config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pgrx-pg-config"
-version = "0.9.6"
+version = "0.9.7"
 authors = ["ZomboDB, LLC <zombodb@gmail.com>"]
 license = "MIT"
 description = "A Postgres pg_config wrapper for 'pgrx'"
@@ -20,6 +20,6 @@ owo-colors = "3.5.0"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_derive = "1.0"
 serde_json = "1.0"
-toml = "0.7.4"
+toml = "0.7.5"
 url = "2.4.0"
 cargo_toml = "0.15.3"
diff --git a/pgrx-pg-sys/Cargo.toml b/pgrx-pg-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pgrx-pg-sys"
-version = "0.9.6"
+version = "0.9.7"
 authors = ["ZomboDB, LLC <zombodb@gmail.com>"]
 license = "MIT"
 description = "Generated Rust bindings for Postgres internals, for use with 'pgrx'"
@@ -29,18 +29,18 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 memoffset = "0.9.0"
-pgrx-macros = { path = "../pgrx-macros/", version = "=0.9.6" }
-pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph/", version = "=0.9.6" }
+pgrx-macros = { path = "../pgrx-macros/", version = "=0.9.7" }
+pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph/", version = "=0.9.7" }
 serde = { version = "1.0", features = [ "derive" ] } # impls on pub types
 # polyfill until #![feature(strict_provenance)] stabilizes
 sptr = "0.3"
 libc = "0.2"
 
 [build-dependencies]
 bindgen = { version = "0.66.1", default-features = false, features = ["runtime"] }
-pgrx-pg-config= { path = "../pgrx-pg-config/", version = "=0.9.6" }
-proc-macro2 = "1.0.60"
-quote = "1.0.28"
+pgrx-pg-config= { path = "../pgrx-pg-config/", version = "=0.9.7" }
+proc-macro2 = "1.0.63"
+quote = "1.0.29"
 syn = { version = "1.0.109", features = [ "extra-traits", "full", "fold", "parsing" ] }
 eyre = "0.6.8"
 shlex = "1.1.0" # shell lexing, also used by many of our deps
diff --git a/pgrx-sql-entity-graph/Cargo.toml b/pgrx-sql-entity-graph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pgrx-sql-entity-graph"
-version = "0.9.6"
+version = "0.9.7"
 authors = ["ZomboDB, LLC <zombodb@gmail.com>"]
 license = "MIT"
 description = "Sql Entity Graph for `pgrx`"
@@ -18,8 +18,8 @@ no-schema-generation = []
 convert_case = "0.6.0"
 eyre = "0.6.8"
 petgraph = "0.6.3"
-proc-macro2 = { version = "1.0.60", features = [ "span-locations" ] }
-quote = "1.0.28"
+proc-macro2 = { version = "1.0.63", features = [ "span-locations" ] }
+quote = "1.0.29"
 syn = { version = "1.0.109", features = [ "extra-traits", "full", "fold", "parsing" ] }
 unescape = "0.1.0"
 
diff --git a/pgrx-tests/Cargo.toml b/pgrx-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pgrx-tests"
-version = "0.9.6"
+version = "0.9.7"
 authors = ["ZomboDB, LLC <zombodb@gmail.com>"]
 license = "MIT"
 description = "Test framework for 'pgrx'-based Postgres extensions"
@@ -36,9 +36,9 @@ rustdoc-args = ["--cfg", "docsrs"]
 clap-cargo = "0.10.0"
 owo-colors = "3.5.0"
 once_cell = "1.18.0"
-libc = "0.2.146"
-pgrx-macros = { path = "../pgrx-macros", version = "=0.9.6" }
-pgrx-pg-config = { path = "../pgrx-pg-config", version = "=0.9.6" }
+libc = "0.2.147"
+pgrx-macros = { path = "../pgrx-macros", version = "=0.9.7" }
+pgrx-pg-config = { path = "../pgrx-pg-config", version = "=0.9.7" }
 postgres = "0.19.5"
 regex = "1.8.4"
 serde = "1.0"
@@ -53,4 +53,4 @@ eyre = "0.6.8"  # testing functions that return `eyre::Result`
 [dependencies.pgrx]
 path = "../pgrx"
 default-features = false
-version = "=0.9.6"
+version = "=0.9.7"
diff --git a/pgrx-tests/src/tests/array_tests.rs b/pgrx-tests/src/tests/array_tests.rs
@@ -482,4 +482,52 @@ mod tests {
         }
         Ok(())
     }
+
+    #[pg_test]
+    fn test_text_array_as_vec_string() -> Result<(), Box<dyn std::error::Error>> {
+        let a = Spi::get_one::<Array<String>>(
+            "SELECT ARRAY[NULL, NULL, NULL, NULL, 'the fifth element']::text[]",
+        )?
+        .expect("spi result was NULL")
+        .into_iter()
+        .collect::<Vec<_>>();
+        assert_eq!(a, vec![None, None, None, None, Some(String::from("the fifth element"))]);
+        Ok(())
+    }
+
+    #[pg_test]
+    fn test_text_array_iter() -> Result<(), Box<dyn std::error::Error>> {
+        let a = Spi::get_one::<Array<String>>(
+            "SELECT ARRAY[NULL, NULL, NULL, NULL, 'the fifth element']::text[]",
+        )?
+        .expect("spi result was NULL");
+
+        let mut iter = a.iter();
+
+        assert_eq!(iter.next(), Some(None));
+        assert_eq!(iter.next(), Some(None));
+        assert_eq!(iter.next(), Some(None));
+        assert_eq!(iter.next(), Some(None));
+        assert_eq!(iter.next(), Some(Some(String::from("the fifth element"))));
+        assert_eq!(iter.next(), None);
+
+        Ok(())
+    }
+
+    #[pg_test]
+    fn test_text_array_via_getter() -> Result<(), Box<dyn std::error::Error>> {
+        let a = Spi::get_one::<Array<String>>(
+            "SELECT ARRAY[NULL, NULL, NULL, NULL, 'the fifth element']::text[]",
+        )?
+        .expect("spi result was NULL");
+
+        assert_eq!(a.get(0), Some(None));
+        assert_eq!(a.get(1), Some(None));
+        assert_eq!(a.get(2), Some(None));
+        assert_eq!(a.get(3), Some(None));
+        assert_eq!(a.get(4), Some(Some(String::from("the fifth element"))));
+        assert_eq!(a.get(5), None);
+
+        Ok(())
+    }
 }
diff --git a/pgrx-version-updater/Cargo.toml b/pgrx-version-updater/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT"
 description = "Standalone tool to update PGRX Cargo.toml versions and dependencies in preparation for a release."
 
 [dependencies]
-clap = { version = "4.3.5", features = [ "env", "derive" ] }
+clap = { version = "4.3.9", features = [ "env", "derive" ] }
 owo-colors = "3.5.0"
-toml_edit = { version = "0.19.10" }
+toml_edit = { version = "0.19.11" }
 walkdir = "2"
diff --git a/pgrx/Cargo.toml b/pgrx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pgrx"
-version = "0.9.6"
+version = "0.9.7"
 authors = ["ZomboDB, LLC <zombodb@gmail.com>"]
 license = "MIT"
 description = "pgrx:  A Rust framework for creating Postgres extensions"
@@ -33,25 +33,25 @@ no-default-features = true
 rustc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-pgrx-macros = { path = "../pgrx-macros", version = "=0.9.6" }
-pgrx-pg-sys = { path = "../pgrx-pg-sys", version = "=0.9.6" }
-pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph", version = "=0.9.6" }
+pgrx-macros = { path = "../pgrx-macros", version = "=0.9.7" }
+pgrx-pg-sys = { path = "../pgrx-pg-sys", version = "=0.9.7" }
+pgrx-sql-entity-graph = { path = "../pgrx-sql-entity-graph", version = "=0.9.7" }
 
 # used to internally impl things
 once_cell = "1.18.0" # polyfill until std::lazy::OnceCell stabilizes
 seq-macro = "0.3" # impls loops in macros
-uuid = { version = "1.3.4", features = [ "v4" ] } # PgLwLock and shmem
+uuid = { version = "1.4.0", features = [ "v4" ] } # PgLwLock and shmem
 enum-map = "2.5.0"
 
 # error handling and logging
 thiserror = "1.0"
 
 # exposed in public API
 atomic-traits = "0.3.0" # PgAtomic and shmem init
-bitflags = "2.3.2" # BackgroundWorker
+bitflags = "2.3.3" # BackgroundWorker
 bitvec = "1.0" # processing array nullbitmaps
 heapless = "0.7.16" # shmem and PgLwLock
-libc = "0.2.146" # FFI type compat
+libc = "0.2.147" # FFI type compat
 seahash = "4.1.0" # derive(PostgresHash)
 serde = { version = "1.0", features = [ "derive" ] } # impls on pub types
 serde_cbor = "0.11.2" # derive(PostgresType)
diff --git a/pgrx/src/datum/array.rs b/pgrx/src/datum/array.rs
@@ -626,9 +626,13 @@ impl<'a, T: FromDatum> Iterator for ArrayIterator<'a, T> {
     fn next(&mut self) -> Option<Self::Item> {
         let Self { array, curr, ptr } = self;
         let Some(is_null) = array.null_slice.get(*curr) else { return None };
-        let element = unsafe { array.bring_it_back_now(*ptr, is_null) };
         *curr += 1;
-        if let Some(false) = array.null_slice.get(*curr) {
+
+        let element = unsafe { array.bring_it_back_now(*ptr, is_null) };
+        if !is_null {
+            // SAFETY: This has to not move for nulls, as they occupy 0 data bytes,
+            // and it has to move only after unpacking a non-null varlena element,
+            // as the iterator starts by pointing to the first non-null element!
             *ptr = unsafe { array.one_hop_this_time(*ptr) };
         }
         Some(element)
@@ -679,9 +683,13 @@ impl<'a, T: FromDatum> Iterator for ArrayIntoIterator<'a, T> {
     fn next(&mut self) -> Option<Self::Item> {
         let Self { array, curr, ptr } = self;
         let Some(is_null) = array.null_slice.get(*curr) else { return None };
-        let element = unsafe { array.bring_it_back_now(*ptr, is_null) };
         *curr += 1;
-        if let Some(false) = array.null_slice.get(*curr) {
+
+        let element = unsafe { array.bring_it_back_now(*ptr, is_null) };
+        if !is_null {
+            // SAFETY: This has to not move for nulls, as they occupy 0 data bytes,
+            // and it has to move only after unpacking a non-null varlena element,
+            // as the iterator starts by pointing to the first non-null element!
             *ptr = unsafe { array.one_hop_this_time(*ptr) };
         }
         Some(element)
