Skip to content

Commit 55cf3a8

Browse files
Update pg_query_go dependency to fix compilation on MacOS 15.4 (#799)
`pgroll` doesn't build on MacOS 15.4 due to a known issue with MacOS 15.4 and the C libraries it ships with: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=6da2ba1d8a031984eb016fed6741bb2ac945f19d The issue is fixed in upstream `libpg_query`: pganalyze/libpg_query#277 This PR updates the `pg_query_go` dependency in `pgroll` to a version of our fork of `pg_query_go` that includes the fix.
1 parent 8db5ad7 commit 55cf3a8

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/stretchr/testify v1.10.0
1616
github.com/testcontainers/testcontainers-go v0.36.0
1717
github.com/testcontainers/testcontainers-go/modules/postgres v0.36.0
18-
github.com/xataio/pg_query_go/v6 v6.0.0-20250226155420-277802e03678
18+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425105130-ed1845ee2d75
1919
golang.org/x/tools v0.32.0
2020
sigs.k8s.io/yaml v1.4.0
2121
)
@@ -63,6 +63,7 @@ require (
6363
github.com/opencontainers/go-digest v1.0.0 // indirect
6464
github.com/opencontainers/image-spec v1.1.1 // indirect
6565
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
66+
github.com/pganalyze/pg_query_go/v6 v6.1.0 // indirect
6667
github.com/pkg/errors v0.9.1 // indirect
6768
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6869
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect

go.sum

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw
148148
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
149149
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
150150
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
151+
github.com/pganalyze/pg_query_go/v6 v6.1.0 h1:jG5ZLhcVgL1FAw4C/0VNQaVmX1SUJx71wBGdtTtBvls=
152+
github.com/pganalyze/pg_query_go/v6 v6.1.0/go.mod h1:nvTHIuoud6e1SfrUaFwHqT0i4b5Nr+1rPWVds3B5+50=
151153
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
152154
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
153155
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -213,6 +215,24 @@ github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYg
213215
github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
214216
github.com/xataio/pg_query_go/v6 v6.0.0-20250226155420-277802e03678 h1:jNslWEyKOXeYi7wZfkcSfsR/slEemAU5rVKBvkNnSsg=
215217
github.com/xataio/pg_query_go/v6 v6.0.0-20250226155420-277802e03678/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
218+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425075255-595a0199d60b h1:8LK+3X4fh0BKtDAckeI6vva9pR9J/HrWP8QKqeMtExc=
219+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425075255-595a0199d60b/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
220+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425080357-64284d17eabb h1:xsG6NiT0oG3UwPrVSrnYWPUlCFCatuQ8q0NOMuYd374=
221+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425080357-64284d17eabb/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
222+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425080555-3a455ed2a913 h1:EM6cWs0AOZv0ZExJZctkmaZl0JeWCsQlUBWx1lbk3hk=
223+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425080555-3a455ed2a913/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
224+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425082655-cf8d6c6cc065 h1:Ylz2ZgN6cbxNcGltsxV5YdwF/lu9iRAw7xfjXywarPQ=
225+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425082655-cf8d6c6cc065/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
226+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425102459-8d3b0c98676d h1:0IVOIWj+oNFXaOr2CAUzNxiPAEEdZ4dYxQESRu1F/OM=
227+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425102459-8d3b0c98676d/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
228+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425102805-11caf3f3695d h1:yICu1XGodFeXD5goINHXdByBogllcl/D54zoDjYY9Ho=
229+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425102805-11caf3f3695d/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
230+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425103003-9629266376d8 h1:iPdv22cyM1Sh+xDWKOhNk7bvpfwuym58stmbpR43EnU=
231+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425103003-9629266376d8/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
232+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425103150-aac614686700 h1:vdNOs2kF5zZBk1HLWKjbtS9v86iLv5rm5F1A2JCJP0Y=
233+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425103150-aac614686700/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
234+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425105130-ed1845ee2d75 h1:KSyU4gD9tTZPKsGYNiYCt8dCk2iRtMe+vmmoHll+CEU=
235+
github.com/xataio/pg_query_go/v6 v6.0.0-20250425105130-ed1845ee2d75/go.mod h1:GK6bpfAhPtZb7wG/IccqvnH+cz3cmvvRTkC+MosESGo=
216236
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
217237
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
218238
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=

0 commit comments

Comments
 (0)