Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase #320

Closed
wants to merge 19 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
change function signatures
  • Loading branch information
rebasedming committed Jul 29, 2024
commit c2e640524d1b1e5f970e4c32890bcc7fb1ebc48b
2 changes: 1 addition & 1 deletion supabase-wrappers/src/instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ pub(super) unsafe fn create_fdw_instance<E: Into<ErrorReport>, W: ForeignDataWra
false => HashMap::new(),
};

let wrapper = W::new(&fserver_opts, &user_mapping_opts);
let wrapper = W::new(fserver_opts, user_mapping_opts);
wrapper.report_unwrap()
}
6 changes: 3 additions & 3 deletions supabase-wrappers/src/interface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,8 @@ pub trait ForeignDataWrapper<E: Into<ErrorReport>> {
/// info or API url in an variable, but don't do heavy works like database
/// connection or API call.
fn new(
server_options: &HashMap<String, String>,
user_mapping_options: &HashMap<String, String>,
server_options: HashMap<String, String>,
user_mapping_options: HashMap<String, String>,
) -> Result<Self, E>
where
Self: Sized;
Expand Down Expand Up @@ -553,7 +553,7 @@ pub trait ForeignDataWrapper<E: Into<ErrorReport>> {
columns: &[Column],
sorts: &[Sort],
limit: &Option<Limit>,
options: &HashMap<String, String>,
options: HashMap<String, String>,
) -> Result<(), E>;

/// Called when fetch one row from the foreign source
Expand Down
2 changes: 1 addition & 1 deletion supabase-wrappers/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pub fn check_options_contain(opt_list: &[Option<String>], tgt: &str) -> Result<(
}

// convert options definition to hashmap
pub(super) unsafe fn options_to_hashmap(
pub unsafe fn options_to_hashmap(
options: *mut pg_sys::List,
) -> Result<HashMap<String, String>, OptionsError> {
let mut ret = HashMap::new();
Expand Down
2 changes: 1 addition & 1 deletion supabase-wrappers/src/scan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ impl<E: Into<ErrorReport>, W: ForeignDataWrapper<E>> FdwState<E, W> {
&self.tgts,
&self.sorts,
&self.limit,
&self.opts,
self.opts.clone(),
)
}

Expand Down