Skip to content
This repository was archived by the owner on Jan 25, 2024. It is now read-only.

Merge postgresql-libpq upstream as of 2022-12-29 #2

Merged
merged 15 commits into from
Dec 30, 2022
Merged

Conversation

robx
Copy link
Collaborator

@robx robx commented Dec 29, 2022

Merge branch 'master' into merge-upstream, resolving conflicts regarding the zero-copy parameter passing by including the patch from branch 'unsafe-rebase'.

This essentially just brings our branch of postgresql-libpq uptodate with upstream, which has a few minor changes since we forked. If haskellari#31 were to be merged upstream, we could drop the fork entirely; this here PR is meant to pave the way for that.

Validated through PostgREST CI at PostgREST/postgrest#2599.

phadej and others added 15 commits October 9, 2022 18:24
Add simple CI for windows and macos
There were two identical copies each of the parameter mangling
code.
exec, query: factor out common parameter handling helpers
Also calculate length already in a helper accum
Use withArrayLen to avoid traversing many times
Use toCInt and fromCInt instead of
fromIntegral . toEnum / fromEnum
Move enums into separate .hsc file
Less hsc2hs: Convert main module into ordinary Haskell file
Merge branch 'master' into merge-upstream, resolving conflicts
regarding the zero-copy parameter passing by including the patch
from branch 'unsafe-rebase'.
@robx robx changed the title Merge postgreql-libpq upstream as of 2022-12-29 Merge postgresql-libpq upstream as of 2022-12-29 Dec 29, 2022
@robx robx requested a review from steve-chavez December 29, 2022 13:41
@robx robx merged commit 890a0a1 into master Dec 30, 2022
robx added a commit to PostgREST/postgrest that referenced this pull request Dec 30, 2022
laurenceisla pushed a commit to laurenceisla/postgrest that referenced this pull request Apr 11, 2023
laurenceisla pushed a commit to PostgREST/postgrest that referenced this pull request Apr 12, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants