Changed query methods to accept slices

pgrx-examples/bgworker/src/lib.rs

@@ -69,7 +69,7 @@ pub extern "C" fn background_worker_main(arg: pg_sys::Datum) {
                 let tuple_table = client.select(
                     "SELECT 'Hi', id, ''||a FROM (SELECT id, 42 from generate_series(1,10) id) a ",
                     None,
-                    None,
+                    &[][..],
                 )?;
                 for tuple in tuple_table {
                     let a = tuple.get_datum_by_ordinal(1)?.value::<String>()?;

pgrx-examples/custom_sql/src/lib.rs

@@ -89,7 +89,7 @@ mod tests {
         let buf = Spi::connect(|client| {
             Ok::<_, spi::Error>(
                 client
-                    .select("SELECT * FROM extension_sql", None, None)?
+                    .select("SELECT * FROM extension_sql", None, &[][..])?
                     .flat_map(|tup| {
                         tup.get_datum_by_ordinal(1)
                             .ok()

pgrx-examples/schemas/src/lib.rs

@@ -103,10 +103,10 @@ mod tests {
     fn test_my_some_schema_type() -> Result<(), spi::Error> {
         Spi::connect(|mut c| {
             // "MySomeSchemaType" is in 'some_schema', so it needs to be discoverable
-            c.update("SET search_path TO some_schema,public", None, None)?;
+            c.update("SET search_path TO some_schema,public", None, &[][..])?;
             assert_eq!(
                 String::from("test"),
-                c.select("SELECT '\"test\"'::MySomeSchemaType", None, None)?
+                c.select("SELECT '\"test\"'::MySomeSchemaType", None, &[][..])?
                     .first()
                     .get_one::<MySomeSchemaType>()
                     .expect("get_one::<MySomeSchemaType>() failed")

pgrx-examples/spi/src/lib.rs

@@ -48,7 +48,7 @@ fn spi_return_query() -> Result<
 
     Spi::connect(|client| {
         client
-            .select(query, None, None)?
+            .select(query, None, &[][..])?
             .map(|row| Ok((row["oid"].value()?, row[2].value()?)))
             .collect::<Result<Vec<_>, _>>()
     })
@@ -64,7 +64,7 @@ fn spi_query_random_id() -> Result<Option<i64>, pgrx::spi::Error> {
 fn spi_query_title(title: &str) -> Result<Option<i64>, pgrx::spi::Error> {
     Spi::get_one_with_args(
         "SELECT id FROM spi.spi_example WHERE title = $1;",
-        vec![(PgBuiltInOids::TEXTOID.oid(), title.into_datum())],
+        &[(PgBuiltInOids::TEXTOID.oid(), title.into_datum())],
     )
 }
 
@@ -75,7 +75,7 @@ fn spi_query_by_id(id: i64) -> Result<Option<String>, spi::Error> {
             .select(
                 "SELECT id, title FROM spi.spi_example WHERE id = $1",
                 None,
-                Some(vec![(PgBuiltInOids::INT8OID.oid(), id.into_datum())]),
+                &[(PgBuiltInOids::INT8OID.oid(), id.into_datum())],
             )?
             .first();
 
@@ -90,7 +90,7 @@ fn spi_query_by_id(id: i64) -> Result<Option<String>, spi::Error> {
 fn spi_insert_title(title: &str) -> Result<Option<i64>, spi::Error> {
     Spi::get_one_with_args(
         "INSERT INTO spi.spi_example(title) VALUES ($1) RETURNING id",
-        vec![(PgBuiltInOids::TEXTOID.oid(), title.into_datum())],
+        &[(PgBuiltInOids::TEXTOID.oid(), title.into_datum())],
     )
 }
 
@@ -100,7 +100,7 @@ fn spi_insert_title2(
 ) -> TableIterator<(name!(id, Option<i64>), name!(title, Option<String>))> {
     let tuple = Spi::get_two_with_args(
         "INSERT INTO spi.spi_example(title) VALUES ($1) RETURNING id, title",
-        vec![(PgBuiltInOids::TEXTOID.oid(), title.into_datum())],
+        &[(PgBuiltInOids::TEXTOID.oid(), title.into_datum())],
     )
     .unwrap();
 
@@ -110,7 +110,8 @@ fn spi_insert_title2(
 #[pg_extern]
 fn issue1209_fixed() -> Result<Option<String>, Box<dyn std::error::Error>> {
     let res = Spi::connect(|c| {
-        let mut cursor = c.open_cursor("SELECT 'hello' FROM generate_series(1, 10000)", None);
+        let mut cursor =
+            c.try_open_cursor("SELECT 'hello' FROM generate_series(1, 10000)", &[][..])?;
         let table = cursor.fetch(10000)?;
         table.into_iter().map(|row| row.get::<&str>(1)).collect::<Result<Vec<_>, _>>()
     })?;

pgrx-examples/spi_srf/src/lib.rs

@@ -55,7 +55,7 @@ fn calculate_human_years() -> Result<
 
     Spi::connect(|client| {
         let mut results = Vec::new();
-        let tup_table = client.select(query, None, None)?;
+        let tup_table = client.select(query, None, &[][..])?;
 
         for row in tup_table {
             let dog_name = row["dog_name"].value::<String>();
@@ -92,7 +92,7 @@ fn filter_by_breed(
     let args = vec![(PgBuiltInOids::TEXTOID.oid(), breed.into_datum())];
 
     Spi::connect(|client| {
-        let tup_table = client.select(query, None, Some(args))?;
+        let tup_table = client.select(query, None, &args)?;
 
         let filtered = tup_table
             .map(|row| {

pgrx-tests/src/tests/aggregate_tests.rs

@@ -263,7 +263,7 @@ mod tests {
     fn aggregate_first_json() -> Result<(), pgrx::spi::Error> {
         let retval = Spi::get_one_with_args::<pgrx::Json>(
             "SELECT FirstJson(value) FROM UNNEST(ARRAY [$1, $2]) as value;",
-            vec![
+            &[
                 (
                     PgBuiltInOids::JSONOID.oid(),
                     pgrx::Json(serde_json::json!({ "foo": "one" })).into_datum(),
@@ -285,7 +285,7 @@ mod tests {
     fn aggregate_first_jsonb() -> Result<(), pgrx::spi::Error> {
         let retval = Spi::get_one_with_args::<pgrx::JsonB>(
             "SELECT FirstJsonB(value) FROM UNNEST(ARRAY [$1, $2]) as value;",
-            vec![
+            &[
                 (
                     PgBuiltInOids::JSONBOID.oid(),
                     pgrx::JsonB(serde_json::json!({ "foo": "one" })).into_datum(),

pgrx-tests/src/tests/anyelement_tests.rs

@@ -17,7 +17,7 @@ mod tests {
     fn test_anyelement_arg() -> Result<(), pgrx::spi::Error> {
         let element = Spi::get_one_with_args::<AnyElement>(
             "SELECT anyelement_arg($1);",
-            vec![(PgBuiltInOids::ANYELEMENTOID.oid(), 123.into_datum())],
+            &[(PgBuiltInOids::ANYELEMENTOID.oid(), 123.into_datum())],
         )?
         .map(|e| e.datum());
 

pgrx-tests/src/tests/anynumeric_tests.rs

@@ -17,7 +17,7 @@ mod tests {
     fn test_anynumeric_arg() -> Result<(), pgrx::spi::Error> {
         let numeric = Spi::get_one_with_args::<AnyNumeric>(
             "SELECT anynumeric_arg($1);",
-            vec![(PgBuiltInOids::INT4OID.oid(), 123.into_datum())],
+            &[(PgBuiltInOids::INT4OID.oid(), 123.into_datum())],
         )?
         .map(|n| n.normalize().to_string());
 

pgrx-tests/src/tests/array_tests.rs

@@ -300,10 +300,7 @@ mod tests {
                 .select(
                     "SELECT serde_serialize_array_i32($1)",
                     None,
-                    Some(vec![(
-                        PgBuiltInOids::INT4ARRAYOID.oid(),
-                        owned_vec.as_slice().into_datum(),
-                    )]),
+                    &[(PgBuiltInOids::INT4ARRAYOID.oid(), owned_vec.as_slice().into_datum())],
                 )?
                 .first()
                 .get_one::<Json>()

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(vec![(PgOid::BuiltIn(PgBuiltInOids::INT4OID), arg.into_datum())]),
+                        &[(PgOid::BuiltIn(PgBuiltInOids::INT4OID), arg.into_datum())],
                     )
                     .map(|_| ())
             })
@@ -63,7 +63,7 @@ pub extern "C" fn bgworker_return_value(arg: pg_sys::Datum) {
             Spi::run("CREATE TABLE tests.bgworker_test_return (v INTEGER);")?;
             Spi::get_one_with_args::<i32>(
                 "SELECT $1",
-                vec![(PgOid::BuiltIn(PgBuiltInOids::INT4OID), arg.into_datum())],
+                &[(PgOid::BuiltIn(PgBuiltInOids::INT4OID), arg.into_datum())],
             )
         })
         .expect("bgworker transaction failed")
@@ -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(vec![(PgOid::BuiltIn(PgBuiltInOids::INT4OID), val.into_datum())]),
+                &[(PgOid::BuiltIn(PgBuiltInOids::INT4OID), val.into_datum())],
             )
             .map(|_| ())
         })

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(())

pgrx-tests/src/tests/json_tests.rs

@@ -79,7 +79,7 @@ mod tests {
     fn test_json_arg() -> Result<(), pgrx::spi::Error> {
         let json = Spi::get_one_with_args::<Json>(
             "SELECT json_arg($1);",
-            vec![(
+            &[(
                 PgBuiltInOids::JSONOID.oid(),
                 Json(serde_json::json!({ "foo": "bar" })).into_datum(),
             )],
@@ -95,7 +95,7 @@ mod tests {
     fn test_jsonb_arg() -> Result<(), pgrx::spi::Error> {
         let json = Spi::get_one_with_args::<JsonB>(
             "SELECT jsonb_arg($1);",
-            vec![(
+            &[(
                 PgBuiltInOids::JSONBOID.oid(),
                 JsonB(serde_json::json!({ "foo": "bar" })).into_datum(),
             )],

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>(())
         });

pgrx-tests/src/tests/proptests.rs

@@ -32,7 +32,7 @@ pub fn [<$datetime_ty:lower _spi_roundtrip>] () {
         .run(&strat, |datetime| {
             let query = concat!("SELECT ", stringify!($nop_fn), "($1)");
             let builtin_oid = PgOid::BuiltIn(pg_sys::BuiltinOid::from_u32(<$datetime_ty as IntoDatum>::type_oid().as_u32()).unwrap());
-            let args = vec![(builtin_oid, datetime.into_datum())];
+            let args = &[(builtin_oid, datetime.into_datum())];
             let spi_ret: $datetime_ty = Spi::get_one_with_args(query, args).unwrap().unwrap();
             // 5. A condition on which the test is accepted or rejected:
             //    this is easily done via `prop_assert!` and its friends,

pgrx-tests/src/tests/roundtrip_tests.rs

@@ -79,7 +79,7 @@ mod tests {
                 let expected: $rtype = Clone::clone(&value);
                 let result: $rtype = Spi::get_one_with_args(
                     &format!("SELECT {}($1)", stringify!(tests.$fname)),
-                    vec![(PgOid::from(<$rtype>::type_oid()), value.into_datum())],
+                    &[(PgOid::from(<$rtype>::type_oid()), value.into_datum())],
                 )?
                 .unwrap();