Attachment #225058 for bug #255969




PORTNAME=	postgrest
PORTVERSION=	7.0.1
PORTREVISION=	4
CATEGORIES=	www databases haskell

MAINTAINER=	dmitry.wagin@ya.ru

BUILD_DEPENDS=	pg_config:databases/postgresql${PGSQL_DEFAULT}-client

USES=		cabal pgsql
USE_RC_SUBR=	postgrest

USE_CABAL=	HTTP-4000.3.14_1 \
		HUnit-1.6.0.0 \

		free-5.1.3 \
		generics-sop-0.5.1.0 \
		gitrev-1.3.1 \
		happy-1.19.12 \
		hashable-1.3.0.0_1 \
		hashtables-1.2.3.4 \
		haskell-src-exts-1.23.0 \

		hasql-transaction-1.0.0.1 \
		heredoc-0.2.0.0 \
		hourglass-0.2.12 \
		hsc2hs-0.68.7 \
		http-date-0.0.8 \
		http-media-0.8.0.0_3 \
		http-types-0.12.3 \

		warp-3.3.11 \
		word8-0.1.3 \
		x509-1.7.5_1 \
		zlib-0.6.2.1_1

SKIP_CABAL_PLIST=	yes
		hsc2hs-0.68.7

POSTGREST_USER?=	postgrest
POSTGREST_GROUP?=	postgrest

SUB_FILES=	default.conf
SUB_LIST=	ETCDIR=${ETCDIR} \
		POSTGREST_GROUP=${POSTGREST_GROUP} \
		POSTGREST_USER=${POSTGREST_USER}

USERS=		${POSTGREST_USER}
GROUPS=		${POSTGREST_GROUP}

PLIST_FILES=	"@sample ${ETCDIR}/default.conf.sample" \
		sbin/postgrest
		POSTGREST_USER=${POSTGREST_USER} \
		POSTGREST_GROUP=${POSTGREST_GROUP}

PLIST_SUB=	ETCDIR=${ETCDIR} \
		POSTGREST_GROUP=${POSTGREST_GROUP} \
		POSTGREST_USER=${POSTGREST_USER}

OPTIONS_DEFINE=		POOLER
OPTIONS_DEFAULT=	POOLER

POOLER_DESC=		Connection pooler support (disable usage of prepared statements)
POOLER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-hasql-1.4.2_library_Hasql_Private_IO.hs

do-install:
	@${MKDIR} ${STAGEDIR}${ETCDIR}




--- hasql-1.4.2/library/Hasql/Private/IO.hs.orig	2020-03-21 17:55:07 UTC
+++ hasql-1.4.2/library/Hasql/Private/IO.hs
@@ -157,9 +157,7 @@ sendParametricStatement ::
   IO (Either CommandError ())
 sendParametricStatement connection integerDatetimes registry template encoder prepared params =
   {-# SCC "sendParametricStatement" #-} 
-  if prepared
-    then sendPreparedParametricStatement connection registry integerDatetimes template encoder params
-    else sendUnpreparedParametricStatement connection integerDatetimes template encoder params
+  sendUnpreparedParametricStatement connection integerDatetimes template encoder params
 
 {-# INLINE sendNonparametricStatement #-}
 sendNonparametricStatement :: LibPQ.Connection -> ByteString -> IO (Either CommandError ())

Lines 2-7 Link Here

(-)b/www/hs-postgrest/files/postgrest.in (+1 lines)
2		2
3	# PROVIDE: postgrest	3	# PROVIDE: postgrest
4	# REQUIRE: LOGIN	4	# REQUIRE: LOGIN
		5	# BEFORE: nginx
5	# KEYWORD: shutdown	6	# KEYWORD: shutdown
6	#	7	#
7	# Add postgrest_enable="YES" to /etc/rc.conf to enable PostgREST:	8	# Add postgrest_enable="YES" to /etc/rc.conf to enable PostgREST:

Removed Link Here

(-)a/www/hs-postgrest/pkg-plist (-2 lines)
1	sbin/postgrest
2	@sample %%ETCDIR%%/default.conf.sample

Return to bug 255969

Lines 1-6 Link Here

(-)b/www/hs-postgrest/Makefile (-13 / +20 lines)
1	PORTNAME= postgrest	1	PORTNAME= postgrest
2	PORTVERSION= 7.0.1	2	PORTVERSION= 7.0.1
3	PORTREVISION= 3	3	PORTREVISION= 4
4	CATEGORIES= www databases haskell	4	CATEGORIES= www databases haskell
5		5
6	MAINTAINER= dmitry.wagin@ya.ru	6	MAINTAINER= dmitry.wagin@ya.ru
Lines 14-19 ONLY_FOR_ARCHS= amd64 i386 Link Here
14	BUILD_DEPENDS= pg_config:databases/postgresql${PGSQL_DEFAULT}-client	14	BUILD_DEPENDS= pg_config:databases/postgresql${PGSQL_DEFAULT}-client
15		15
16	USES= cabal pgsql	16	USES= cabal pgsql
		17	USE_RC_SUBR= postgrest
17		18
18	USE_CABAL= HTTP-4000.3.14_1 \	19	USE_CABAL= HTTP-4000.3.14_1 \
19	HUnit-1.6.0.0 \	20	HUnit-1.6.0.0 \
Lines 82-87 USE_CABAL= HTTP-4000.3.14_1 \ Link Here
82	free-5.1.3 \	83	free-5.1.3 \
83	generics-sop-0.5.1.0 \	84	generics-sop-0.5.1.0 \
84	gitrev-1.3.1 \	85	gitrev-1.3.1 \
		86	happy-1.19.12 \
85	hashable-1.3.0.0_1 \	87	hashable-1.3.0.0_1 \
86	hashtables-1.2.3.4 \	88	hashtables-1.2.3.4 \
87	haskell-src-exts-1.23.0 \	89	haskell-src-exts-1.23.0 \
Lines 91-96 USE_CABAL= HTTP-4000.3.14_1 \ Link Here
91	hasql-transaction-1.0.0.1 \	93	hasql-transaction-1.0.0.1 \
92	heredoc-0.2.0.0 \	94	heredoc-0.2.0.0 \
93	hourglass-0.2.12 \	95	hourglass-0.2.12 \
		96	hsc2hs-0.68.7 \
94	http-date-0.0.8 \	97	http-date-0.0.8 \
95	http-media-0.8.0.0_3 \	98	http-media-0.8.0.0_3 \
96	http-types-0.12.3 \	99	http-types-0.12.3 \
Lines 191-219 USE_CABAL= HTTP-4000.3.14_1 \ Link Here
191	warp-3.3.11 \	194	warp-3.3.11 \
192	word8-0.1.3 \	195	word8-0.1.3 \
193	x509-1.7.5_1 \	196	x509-1.7.5_1 \
194	zlib-0.6.2.1_1 \	197	zlib-0.6.2.1_1
195	\	198
196	happy-1.19.12 \	199	SKIP_CABAL_PLIST= yes
197	hsc2hs-0.68.7
198		200
199	POSTGREST_USER?= postgrest	201	POSTGREST_USER?= postgrest
200	POSTGREST_GROUP?= postgrest	202	POSTGREST_GROUP?= postgrest
201		203
		204	SUB_FILES= default.conf
		205	SUB_LIST= ETCDIR=${ETCDIR} \
		206	POSTGREST_GROUP=${POSTGREST_GROUP} \
		207	POSTGREST_USER=${POSTGREST_USER}
		208
202	USERS= ${POSTGREST_USER}	209	USERS= ${POSTGREST_USER}
203	GROUPS= ${POSTGREST_GROUP}	210	GROUPS= ${POSTGREST_GROUP}
204		211
205	SUB_FILES= default.conf	212	PLIST_FILES= "@sample ${ETCDIR}/default.conf.sample" \
206	SUB_LIST= ETCDIR=${ETCDIR} \	213	sbin/postgrest
207	POSTGREST_USER=${POSTGREST_USER} \
208	POSTGREST_GROUP=${POSTGREST_GROUP}
209		214
210	PLIST_SUB= ETCDIR=${ETCDIR} \	215	PLIST_SUB= ETCDIR=${ETCDIR} \
211	POSTGREST_USER=${POSTGREST_USER} \	216	POSTGREST_GROUP=${POSTGREST_GROUP} \
212	POSTGREST_GROUP=${POSTGREST_GROUP}	217	POSTGREST_USER=${POSTGREST_USER}
213		218
214	USE_RC_SUBR= postgrest	219	OPTIONS_DEFINE= POOLER
		220	OPTIONS_DEFAULT= POOLER
215		221
216	SKIP_CABAL_PLIST= yes	222	POOLER_DESC= Connection pooler support (disable usage of prepared statements)
		223	POOLER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-hasql-1.4.2_library_Hasql_Private_IO.hs
217		224
218	do-install:	225	do-install:
219	@${MKDIR} ${STAGEDIR}${ETCDIR}	226	@${MKDIR} ${STAGEDIR}${ETCDIR}

Added Link Here

(-)b/www/hs-postgrest/files/extra-patch-hasql-1.4.2_library_Hasql_Private_IO.hs (+13 lines)
1	--- hasql-1.4.2/library/Hasql/Private/IO.hs.orig 2020-03-21 17:55:07 UTC
2	+++ hasql-1.4.2/library/Hasql/Private/IO.hs
3	@@ -157,9 +157,7 @@ sendParametricStatement ::
4	IO (Either CommandError ())
5	sendParametricStatement connection integerDatetimes registry template encoder prepared params =
6	{-# SCC "sendParametricStatement" #-}
7	- if prepared
8	- then sendPreparedParametricStatement connection registry integerDatetimes template encoder params
9	- else sendUnpreparedParametricStatement connection integerDatetimes template encoder params
10	+ sendUnpreparedParametricStatement connection integerDatetimes template encoder params
11
12	{-# INLINE sendNonparametricStatement #-}
13	sendNonparametricStatement :: LibPQ.Connection -> ByteString -> IO (Either CommandError ())