make opts public

supabase · Jan 12, 2025 · 91ea206 · 91ea206
1 parent 15d5437
commit 91ea206
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/supabase-wrappers/src/instance.rs b/supabase-wrappers/src/instance.rs
@@ -4,8 +4,6 @@ use std::ffi::CStr;
 use crate::prelude::*;
 use pgrx::pg_sys::panic::ErrorReport;
 use pgrx::prelude::*;
-use std::collections::HashMap;
-use std::panic::{catch_unwind, AssertUnwindSafe};
 
 pub struct ForeignServer {
     pub server_name: String,

diff --git a/supabase-wrappers/src/interface.rs b/supabase-wrappers/src/interface.rs
@@ -32,6 +32,10 @@ pub const FOREIGN_SERVER_RELATION_ID: Oid = BuiltinOid::ForeignServerRelationId.
 /// Constant can be used in [validator](ForeignDataWrapper::validator)
 pub const FOREIGN_TABLE_RELATION_ID: Oid = BuiltinOid::ForeignTableRelationId.value();
 
+pub const OPTS_DATABASE_KEY: &str = "database_oid";
+pub const OPTS_NAMESPACE_KEY: &str = "namespace_oid";
+pub const OPTS_TABLE_KEY: &str = "table_oid";
+
 /// A data cell in a data row
 #[derive(Debug)]
 pub enum Cell {

diff --git a/supabase-wrappers/src/scan.rs b/supabase-wrappers/src/scan.rs
@@ -12,7 +12,10 @@ use std::os::raw::c_int;
 use std::ptr;
 
 use crate::instance;
-use crate::interface::{Cell, Column, Limit, Qual, Row, Sort, Value};
+use crate::interface::{
+    Cell, Column, Limit, Qual, Row, Sort, Value, OPTS_DATABASE_KEY, OPTS_NAMESPACE_KEY,
+    OPTS_TABLE_KEY,
+};
 use crate::limit::*;
 use crate::memctx;
 use crate::options::options_to_hashmap;
@@ -22,10 +25,6 @@ use crate::qual::*;
 use crate::sort::*;
 use crate::utils::{self, report_error, ReportableError, SerdeList};
 
-pub const OPTS_DATABASE_KEY: &str = "database_oid";
-pub const OPTS_NAMESPACE_KEY: &str = "namespace_oid";
-pub const OPTS_TABLE_KEY: &str = "table_oid";
-
 // Fdw private state for scan
 struct FdwState<E: Into<ErrorReport>, W: ForeignDataWrapper<E>> {
     // foreign data wrapper instance
@@ -321,9 +320,9 @@ pub(super) extern "C" fn begin_foreign_scan<E: Into<ErrorReport>, W: ForeignData
 
             // pass begin_scan OID values for the table, schema, and database
             let pg_rel = PgRelation::from_pg(rel);
-            let database_oid = pg_sys::MyDatabaseId.to_string();
-            let namespace_oid = pg_rel.namespace_oid().to_string();
-            let table_oid = pg_rel.oid().to_string();
+            let database_oid = pg_sys::MyDatabaseId.as_u32().to_string();
+            let namespace_oid = pg_rel.namespace_oid().as_u32().to_string();
+            let table_oid = pg_rel.oid().as_u32().to_string();
             let extra_opts = HashMap::from([
                 (OPTS_DATABASE_KEY.into(), database_oid),
                 (OPTS_NAMESPACE_KEY.into(), namespace_oid),