Add user_mapping_options

supabase · Jan 12, 2025 · ecf3fa8 · ecf3fa8
1 parent 974c33d
commit ecf3fa8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/supabase-wrappers/src/instance.rs b/supabase-wrappers/src/instance.rs
@@ -58,28 +58,7 @@ pub(super) unsafe fn create_fdw_instance_from_table_id<
     let ftable = pg_sys::GetForeignTable(ftable_id);
     let fserver = pg_sys::GetForeignServer((*ftable).serverid);
     let fserver_opts = options_to_hashmap((*fserver).options).report_unwrap();
-    let user_id = pg_sys::GetUserId();
-
-    let user_mapping_exists = !pg_sys::SearchSysCache2(
-        pg_sys::SysCacheIdentifier_USERMAPPINGUSERSERVER as i32,
-        pg_sys::Datum::from(user_id),
-        pg_sys::Datum::from((*fserver).serverid),
-    )
-    .is_null();
-    let public_mapping_exists = !pg_sys::SearchSysCache2(
-        pg_sys::SysCacheIdentifier_USERMAPPINGUSERSERVER as i32,
-        pg_sys::Datum::from(pg_sys::InvalidOid),
-        pg_sys::Datum::from((*fserver).serverid),
-    )
-    .is_null();
-
-    let user_mapping_opts = match user_mapping_exists || public_mapping_exists {
-        true => {
-            let user_mapping = pg_sys::GetUserMapping(user_id, (*fserver).serverid);
-            options_to_hashmap((*user_mapping).options).report_unwrap()
-        }
-        false => HashMap::new(),
-    };
+    let user_mapping_opts = user_mapping_options(fserver);
 
     let wrapper = W::new(fserver_opts, user_mapping_opts);
     wrapper.report_unwrap()

diff --git a/supabase-wrappers/src/options.rs b/supabase-wrappers/src/options.rs
@@ -4,6 +4,8 @@ use std::collections::HashMap;
 use std::ffi::CStr;
 use thiserror::Error;
 
+use super::utils::ReportableError;
+
 #[derive(Error, Debug)]
 pub enum OptionsError {
     #[error("required option `{0}` is not specified")]
@@ -117,3 +119,27 @@ pub unsafe fn options_to_hashmap(
     }
     Ok(ret)
 }
+
+pub unsafe fn user_mapping_options(fserver: *mut pg_sys::ForeignServer) -> HashMap<String, String> {
+    let user_id = pg_sys::GetUserId();
+    let user_mapping_exists = !pg_sys::SearchSysCache2(
+        pg_sys::SysCacheIdentifier_USERMAPPINGUSERSERVER as i32,
+        pg_sys::Datum::from(user_id),
+        pg_sys::Datum::from((*fserver).serverid),
+    )
+    .is_null();
+    let public_mapping_exists = !pg_sys::SearchSysCache2(
+        pg_sys::SysCacheIdentifier_USERMAPPINGUSERSERVER as i32,
+        pg_sys::Datum::from(pg_sys::InvalidOid),
+        pg_sys::Datum::from((*fserver).serverid),
+    )
+    .is_null();
+
+    match user_mapping_exists || public_mapping_exists {
+        true => {
+            let user_mapping = pg_sys::GetUserMapping(user_id, (*fserver).serverid);
+            options_to_hashmap((*user_mapping).options).report_unwrap()
+        }
+        false => HashMap::new(),
+    }
+}