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.

Sign up for GitHub

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

Fix issue #1032 #1033

Merged
merged 8 commits into from
Feb 16, 2023
Merged

Fix issue #1032 #1033

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c869d19
Fix issue #1032
eeeebbbbrrrr Feb 3, 2023
b0975dc
On pg15, detect if we're being compiled against something with a diff…
eeeebbbbrrrr Feb 3, 2023
166d6bd
typeo
eeeebbbbrrrr Feb 3, 2023
a6cbc9c
Update README.md
eeeebbbbrrrr Feb 3, 2023
4d8aaac
oops
eeeebbbbrrrr Feb 3, 2023
c4a2464
Merge remote-tracking branch 'origin/issue-1032' into issue-1032
eeeebbbbrrrr Feb 3, 2023
78ab459
oops
eeeebbbbrrrr Feb 3, 2023
50ab855
@thomcc has taught me how to const
eeeebbbbrrrr Feb 3, 2023
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
5 changes: 3 additions & 2 deletions pgx/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,9 @@ macro_rules! pg_magic_func {
namedatalen: pgx::pg_sys::NAMEDATALEN as i32,
float8byval: cfg!(target_pointer_width = "64") as i32,
abi_extra: {
// array::from_fn isn't const yet, boohoo, so const-copy a bstr
let magic = b"PostgreSQL";
// we'll use what the bindings tell us, but if it ain't "PostgreSQL" then pgx'
// assumptions can't necessarily be assumed correct
let magic = pgx::pg_sys::FMGR_ABI_EXTRA;
let mut abi = [0 as ::pgx::ffi::c_char; 32];
let mut i = 0;
while i < magic.len() {
Expand Down