Skip to content

Commit f3ec0ba

Browse files
committed
Build wrapper 0.3.0 using pgrx 0.11.3
Avoid compilation errors related to bindgen on aarch64-linux
1 parent 72c5276 commit f3ec0ba

File tree

4 files changed

+5490
-121
lines changed

4 files changed

+5490
-121
lines changed

nix/ext/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"15"
66
],
77
"hash": "sha256-ogpF8NJ7kW3Ut8jaKMDiKYIXnI38nfRq2mMK4rqFAIA=",
8-
"pgrx": "0.11.2",
8+
"pgrx": "0.11.3",
99
"rust": "1.76.0"
1010
},
1111
"0.4.1": {
Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
From 6a14bd4cf44ebfa86404aa3e0b3f12dcac3f160c Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= <[email protected]>
3+
Date: Thu, 12 Jun 2025 17:26:02 +0200
4+
Subject: [PATCH] bump pgrx to 0.11.3
5+
6+
Backport https://github.com/supabase/wrappers/pull/254
7+
---
8+
Cargo.lock | 36 +++++++++++++++---------------------
9+
supabase-wrappers/Cargo.toml | 4 ++--
10+
wrappers/Cargo.toml | 4 ++--
11+
3 files changed, 19 insertions(+), 25 deletions(-)
12+
13+
diff --git a/Cargo.lock b/Cargo.lock
14+
index 7c6b6b2..a3ba635 100644
15+
--- a/Cargo.lock
16+
+++ b/Cargo.lock
17+
@@ -759,16 +759,16 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
18+
19+
[[package]]
20+
name = "bindgen"
21+
-version = "0.68.1"
22+
+version = "0.69.4"
23+
source = "registry+https://github.com/rust-lang/crates.io-index"
24+
-checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078"
25+
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
26+
dependencies = [
27+
"bitflags 2.4.0",
28+
"cexpr",
29+
"clang-sys",
30+
+ "itertools",
31+
"lazy_static",
32+
"lazycell",
33+
- "peeking_take_while",
34+
"proc-macro2",
35+
"quote",
36+
"regex",
37+
@@ -2815,12 +2815,6 @@ dependencies = [
38+
"libc",
39+
]
40+
41+
-[[package]]
42+
-name = "peeking_take_while"
43+
-version = "0.1.2"
44+
-source = "registry+https://github.com/rust-lang/crates.io-index"
45+
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
46+
-
47+
[[package]]
48+
name = "percent-encoding"
49+
version = "2.3.0"
50+
@@ -2849,9 +2843,9 @@ dependencies = [
51+
52+
[[package]]
53+
name = "pgrx"
54+
-version = "0.11.2"
55+
+version = "0.11.3"
56+
source = "registry+https://github.com/rust-lang/crates.io-index"
57+
-checksum = "cb44171122605250e719ca2ae49afb357bdb2fce4b3c876fcf2225165237328a"
58+
+checksum = "2102faa5ef4a7bf096fefcf67692b293583efd18f9236340ad3169807dfc2b73"
59+
dependencies = [
60+
"atomic-traits",
61+
"bitflags 2.4.0",
62+
@@ -2874,9 +2868,9 @@ dependencies = [
63+
64+
[[package]]
65+
name = "pgrx-macros"
66+
-version = "0.11.2"
67+
+version = "0.11.3"
68+
source = "registry+https://github.com/rust-lang/crates.io-index"
69+
-checksum = "a18ac8628b7de2f29a93d0abdbdcaee95a0e0ef4b59fd4de99cc117e166e843b"
70+
+checksum = "c26810d09910ec987a6708d48d243efb5f879331e01c6fec0893714d0eb12bae"
71+
dependencies = [
72+
"pgrx-sql-entity-graph",
73+
"proc-macro2",
74+
@@ -2886,9 +2880,9 @@ dependencies = [
75+
76+
[[package]]
77+
name = "pgrx-pg-config"
78+
-version = "0.11.2"
79+
+version = "0.11.3"
80+
source = "registry+https://github.com/rust-lang/crates.io-index"
81+
-checksum = "acd45ac6eb1142c5690df63c4e0bdfb74f27c9f93a7af84f064dc2c0a2c2d6f7"
82+
+checksum = "0b0099ba4b635dfe1e34afc8bca8be43e9577c5d726aaf1dc7dd23a78f6c8a60"
83+
dependencies = [
84+
"cargo_toml",
85+
"dirs",
86+
@@ -2904,9 +2898,9 @@ dependencies = [
87+
88+
[[package]]
89+
name = "pgrx-pg-sys"
90+
-version = "0.11.2"
91+
+version = "0.11.3"
92+
source = "registry+https://github.com/rust-lang/crates.io-index"
93+
-checksum = "81c6207939582934fc26fceb651cb5338e363c06ddc6b2d50ca71867f7c70ffe"
94+
+checksum = "3f40315259c41fede51eb23b791b48d0a112b0f47d0dcb6862b798d1fa1db6ea"
95+
dependencies = [
96+
"bindgen",
97+
"clang-sys",
98+
@@ -2928,9 +2922,9 @@ dependencies = [
99+
100+
[[package]]
101+
name = "pgrx-sql-entity-graph"
102+
-version = "0.11.2"
103+
+version = "0.11.3"
104+
source = "registry+https://github.com/rust-lang/crates.io-index"
105+
-checksum = "a50083de83b1fac2484e8f2c2a7da5fed0193904e2578fa6c4ce02262c455c2b"
106+
+checksum = "7d47a4e991c8c66162c5d6b0fc2bd382e43a58fc893ce05a6a15ddcb1bf7eee4"
107+
dependencies = [
108+
"convert_case",
109+
"eyre",
110+
@@ -2943,9 +2937,9 @@ dependencies = [
111+
112+
[[package]]
113+
name = "pgrx-tests"
114+
-version = "0.11.2"
115+
+version = "0.11.3"
116+
source = "registry+https://github.com/rust-lang/crates.io-index"
117+
-checksum = "6ba0115cd80d9e3ca1d5d2a8ab8b7320d6ed614a53d025b86152696a8b3caa75"
118+
+checksum = "ab3abc01e2bb930b072bd660d04c8eaa69a29d4727d5b2a641f946c603c1605e"
119+
dependencies = [
120+
"clap-cargo",
121+
"eyre",
122+
diff --git a/supabase-wrappers/Cargo.toml b/supabase-wrappers/Cargo.toml
123+
index a825fea..be66f25 100644
124+
--- a/supabase-wrappers/Cargo.toml
125+
+++ b/supabase-wrappers/Cargo.toml
126+
@@ -19,14 +19,14 @@ pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
127+
pg_test = []
128+
129+
[dependencies]
130+
-pgrx = { version = "=0.11.2", default-features = false }
131+
+pgrx = { version = "=0.11.3", default-features = false }
132+
thiserror = "1.0.48"
133+
tokio = { version = "1.35", features = ["rt", "net"] }
134+
uuid = { version = "1.2.2" }
135+
supabase-wrappers-macros = { version = "0.1", path = "../supabase-wrappers-macros" }
136+
137+
[dev-dependencies]
138+
-pgrx-tests = "=0.11.2"
139+
+pgrx-tests = "=0.11.3"
140+
141+
[package.metadata.docs.rs]
142+
features = ["pg15", "cshim"]
143+
diff --git a/wrappers/Cargo.toml b/wrappers/Cargo.toml
144+
index a6dd573..6f63519 100644
145+
--- a/wrappers/Cargo.toml
146+
+++ b/wrappers/Cargo.toml
147+
@@ -134,7 +134,7 @@ all_fdws = [
148+
]
149+
150+
[dependencies]
151+
-pgrx = { version = "=0.11.2" }
152+
+pgrx = { version = "=0.11.3" }
153+
#supabase-wrappers = "0.1"
154+
supabase-wrappers = { path = "../supabase-wrappers", default-features = false }
155+
156+
@@ -204,4 +204,4 @@ redis = { version = "0.24.0", features = ["streams"], optional = true }
157+
thiserror = { version = "1.0.48", optional = true }
158+
159+
[dev-dependencies]
160+
-pgrx-tests = "=0.11.2"
161+
+pgrx-tests = "=0.11.3"
162+
--
163+
2.49.0
164+

0 commit comments

Comments
 (0)