progress

src/database/executors/mock.rs

@@ -44,7 +44,7 @@ impl MockExecutor {
 
 #[cfg(test)]
 impl DatabaseExecutor for MockExecutor {
-  fn query(&self, sql: &str, _args: Option<&[Value]>) -> Result<Value, String> {
+  fn query(&self, sql: &str, _args: Option<Vec<Value>>) -> Result<Value, String> {
     println!("JSPG_SQL: {}", sql);
     MOCK_STATE.with(|state| {
       let mut s = state.borrow_mut();
@@ -65,7 +65,7 @@ impl DatabaseExecutor for MockExecutor {
     })
   }
 
-  fn execute(&self, sql: &str, _args: Option<&[Value]>) -> Result<(), String> {
+  fn execute(&self, sql: &str, _args: Option<Vec<Value>>) -> Result<(), String> {
     println!("JSPG_SQL: {}", sql);
     MOCK_STATE.with(|state| {
       let mut s = state.borrow_mut();

src/database/executors/mod.rs

@@ -9,10 +9,10 @@ use serde_json::Value;
 /// without a live Postgres SPI connection.
 pub trait DatabaseExecutor: Send + Sync {
   /// Executes a query expecting a single JSONB return, representing rows.
-  fn query(&self, sql: &str, args: Option<&[Value]>) -> Result<Value, String>;
+  fn query(&self, sql: &str, args: Option<Vec<Value>>) -> Result<Value, String>;
 
   /// Executes an operation (INSERT, UPDATE, DELETE, or pg_notify) that does not return rows.
-  fn execute(&self, sql: &str, args: Option<&[Value]>) -> Result<(), String>;
+  fn execute(&self, sql: &str, args: Option<Vec<Value>>) -> Result<(), String>;
 
   /// Returns the current authenticated user's ID
   fn auth_user_id(&self) -> Result<String, String>;

src/database/executors/pgrx.rs

@@ -67,15 +67,11 @@ impl SpiExecutor {
 }
 
 impl DatabaseExecutor for SpiExecutor {
-  fn query(&self, sql: &str, args: Option<&[Value]>) -> Result<Value, String> {
-    let mut json_args = Vec::new();
+  fn query(&self, sql: &str, args: Option<Vec<Value>>) -> Result<Value, String> {
     let mut args_with_oid: Vec<pgrx::datum::DatumWithOid> = Vec::new();
     if let Some(params) = args {
       for val in params {
-        json_args.push(pgrx::JsonB(val.clone()));
-      }
-      for j_val in json_args.into_iter() {
-        args_with_oid.push(pgrx::datum::DatumWithOid::from(j_val));
+        args_with_oid.push(pgrx::datum::DatumWithOid::from(pgrx::JsonB(val)));
       }
     }
 
@@ -98,15 +94,11 @@ impl DatabaseExecutor for SpiExecutor {
     })
   }
 
-  fn execute(&self, sql: &str, args: Option<&[Value]>) -> Result<(), String> {
-    let mut json_args = Vec::new();
+  fn execute(&self, sql: &str, args: Option<Vec<Value>>) -> Result<(), String> {
     let mut args_with_oid: Vec<pgrx::datum::DatumWithOid> = Vec::new();
     if let Some(params) = args {
       for val in params {
-        json_args.push(pgrx::JsonB(val.clone()));
-      }
-      for j_val in json_args.into_iter() {
-        args_with_oid.push(pgrx::datum::DatumWithOid::from(j_val));
+        args_with_oid.push(pgrx::datum::DatumWithOid::from(pgrx::JsonB(val)));
       }
     }