Date: Saturday, January 28, 2023 @ 08:36:36
Author: felixonmars
Revision: 1389065
fix compatibility with postgresql 15
Added:
postgrest/trunk/postgresql-15.patch
Modified:
postgrest/trunk/PKGBUILD
---------------------+
PKGBUILD | 7 +++++--
postgresql-15.patch | 26 ++++++++++++++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-28 08:15:26 UTC (rev 1389064)
+++ PKGBUILD 2023-01-28 08:36:36 UTC (rev 1389065)
@@ -24,11 +24,14 @@
'haskell-pretty-simple' 'haskell-transformers-base')
checkdepends=('pifpaf' 'postgresql' 'pg-safeupdate' 'postgis' 'procps-ng'
'python-pytest'
'python-pyjwt' 'python-requests' 'python-requests-unixsocket'
'python-yaml')
-source=("https://github.com/begriffs/postgrest/archive/v$pkgver/$pkgname-$pkgver.tar.gz";)
-sha512sums=('c7a4d631b0cdd4bc79501433f21e4a4366bc496e8ae3e94fe5124defcf79cab07a937b51349972bfcb0759198af453e9239653f97eb16efad1afe251026e5f35')
+source=("https://github.com/begriffs/postgrest/archive/v$pkgver/$pkgname-$pkgver.tar.gz";
+ postgresql-15.patch)
+sha512sums=('c7a4d631b0cdd4bc79501433f21e4a4366bc496e8ae3e94fe5124defcf79cab07a937b51349972bfcb0759198af453e9239653f97eb16efad1afe251026e5f35'
+
'd78a831281441d6b2fa58b49a87c2e5aea847eb98058505d010f79dc5c65358a2c84cd12bc08b18adfa211eb80f7b872e887ba2dcb07fa95a2ba8b0b4ef9588d')
prepare() {
cd $pkgname-$pkgver
+ patch -p1 -i ../postgresql-15.patch
uusi -u aeson -u hspec -u HTTP -u jose -u lens -u lens-aeson -u
optparse-applicative -u vector $pkgname.cabal
# Hack LD_LIBRARY_PATH
Added: postgresql-15.patch
===================================================================
--- postgresql-15.patch (rev 0)
+++ postgresql-15.patch 2023-01-28 08:36:36 UTC (rev 1389065)
@@ -0,0 +1,26 @@
+From 425ab70ec748a812be0f3666c11fd87e197130a8 Mon Sep 17 00:00:00 2001
+From: Wolfgang Walther <[email protected]>
+Date: Fri, 28 Oct 2022 14:55:42 +0200
+Subject: [PATCH] fix: Make UPSERT work with PostgreSQL 15
+
+Signed-off-by: Wolfgang Walther <[email protected]>
+---
+ .github/workflows/ci.yaml | 4 ++--
+ CHANGELOG.md | 1 +
+ default.nix | 1 +
+ src/PostgREST/Query/QueryBuilder.hs | 2 +-
+ 4 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/PostgREST/Query/QueryBuilder.hs
b/src/PostgREST/Query/QueryBuilder.hs
+index 91e54ceff6..0cacbdcf6f 100644
+--- a/src/PostgREST/Query/QueryBuilder.hs
++++ b/src/PostgREST/Query/QueryBuilder.hs
+@@ -94,7 +94,7 @@ mutatePlanToQuery (Insert mainQi iCols body onConflct
putConditions returnings _
+ if null oncCols then
+ mempty
+ else
+- "ON CONFLICT(" <> BS.intercalate ", " (pgFmtIdent <$> oncCols) <> ")
" <> case oncDo of
++ " ON CONFLICT(" <> BS.intercalate ", " (pgFmtIdent <$> oncCols) <> ")
" <> case oncDo of
+ IgnoreDuplicates ->
+ "DO NOTHING"
+ MergeDuplicates ->
