Passing command arguments without Option

pgcentralfoundation · Sep 9, 2024 · 4eb4aa6 · 4eb4aa6
1 parent 56446f5
commit 4eb4aa6
Show file tree

Hide file tree

Showing 14 changed files with 139 additions and 153 deletions.
diff --git a/pgrx-tests/src/tests/array_tests.rs b/pgrx-tests/src/tests/array_tests.rs
@@ -300,7 +300,7 @@ mod tests {
                 .select(
                     "SELECT serde_serialize_array_i32($1)",
                     None,
-                    Some(&[(PgBuiltInOids::INT4ARRAYOID.oid(), owned_vec.as_slice().into_datum())]),
+                    &[(PgBuiltInOids::INT4ARRAYOID.oid(), owned_vec.as_slice().into_datum())],
                 )?
                 .first()
                 .get_one::<Json>()

diff --git a/pgrx-tests/src/tests/bgworker_tests.rs b/pgrx-tests/src/tests/bgworker_tests.rs
@@ -30,7 +30,7 @@ pub extern "C" fn bgworker(arg: pg_sys::Datum) {
                     .update(
                         "INSERT INTO tests.bgworker_test VALUES ($1);",
                         None,
-                        Some(&[(PgOid::BuiltIn(PgBuiltInOids::INT4OID), arg.into_datum())]),
+                        &[(PgOid::BuiltIn(PgBuiltInOids::INT4OID), arg.into_datum())],
                     )
                     .map(|_| ())
             })
@@ -77,7 +77,7 @@ pub extern "C" fn bgworker_return_value(arg: pg_sys::Datum) {
             c.update(
                 "INSERT INTO tests.bgworker_test_return VALUES ($1)",
                 None,
-                Some(&[(PgOid::BuiltIn(PgBuiltInOids::INT4OID), val.into_datum())]),
+                &[(PgOid::BuiltIn(PgBuiltInOids::INT4OID), val.into_datum())],
             )
             .map(|_| ())
         })

diff --git a/pgrx-tests/src/tests/heap_tuple.rs b/pgrx-tests/src/tests/heap_tuple.rs
@@ -881,7 +881,7 @@ mod tests {
     fn test_tuple_desc_clone() -> Result<(), spi::Error> {
         let result = Spi::connect(|client| {
             let query = "select * from generate_lots_of_dogs()";
-            client.select(query, None, None).map(|table| table.len())
+            client.select(query, None, &[][..]).map(|table| table.len())
         })?;
         assert_eq!(result, 10_000);
         Ok(())

diff --git a/pgrx-tests/src/tests/pg_cast_tests.rs b/pgrx-tests/src/tests/pg_cast_tests.rs
@@ -48,8 +48,12 @@ mod tests {
     #[pg_test]
     fn test_pg_cast_assignment_type_cast() {
         let _ = Spi::connect(|mut client| {
-            client.update("CREATE TABLE test_table(value int4);", None, None)?;
-            client.update("INSERT INTO test_table VALUES('{\"a\": 1}'::json->'a');", None, None)?;
+            client.update("CREATE TABLE test_table(value int4);", None, &[][..])?;
+            client.update(
+                "INSERT INTO test_table VALUES('{\"a\": 1}'::json->'a');",
+                None,
+                &[][..],
+            )?;
 
             Ok::<_, spi::Error>(())
         });