HDBC-postgresql 2.3.2.5 → 2.3.2.6

raw patch · 5 files changed

+85/−80 lines, 5 filesnew-uploaderPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• Database/HDBC/PostgreSQL/PTypeConv.hsc +1/−1
• HDBC-postgresql.cabal +3/−2
• pgtypes.h +0/−77
• pgtypes_internal.h +77/−0

@@ -1,5 +1,9 @@ # Changelog +### 2.3.2.6++* Fix postgresql header name collision+ #### 2.3.2.5  * Compatibility with time 1.8, GHC 8.2.

@@ -3,7 +3,7 @@ import Database.HDBC.ColTypes import Data.Word -#include "pgtypes.h"+#include "pgtypes_internal.h" #include <libpq-fe.h>  

@@ -1,11 +1,12 @@ Name: HDBC-postgresql-Version: 2.3.2.5+Version: 2.3.2.6 License: BSD3 Maintainer: Nicolas Wu <nicolas.wu@gmail.com> Author: John Goerzen Copyright: Copyright (c) 2005-2011 John Goerzen license-file: LICENSE-extra-source-files: LICENSE, hdbc-postgresql-helper.h, pgtypes.h,+extra-source-files: LICENSE, hdbc-postgresql-helper.h,+                    pgtypes_internal.h                     Makefile,                     README.txt,                     testsrc/TestTime.hs

@@ -1,77 +0,0 @@-/* File:			pgtypes.h- *- * Description:		See "pgtypes.c"- *- * Comments:		See "notice.txt" for copyright and license information.- *- */--#ifndef __PGTYPES_H__-#define __PGTYPES_H__--/* the type numbers are defined by the OID's of the types' rows */-/* in table pg_type */---#ifdef NOT_USED-#define PG_TYPE_LO				????	/* waiting for permanent type */-#endif--#define	MS_ACCESS_SERIAL		"int identity"-#define PG_TYPE_BOOL			16-#define PG_TYPE_BYTEA			17-#define PG_TYPE_CHAR			18-#define PG_TYPE_NAME			19-#define PG_TYPE_INT8			20-#define PG_TYPE_INT2			21-#define PG_TYPE_INT2VECTOR		22-#define PG_TYPE_INT4			23-#define PG_TYPE_REGPROC			24-#define PG_TYPE_TEXT			25-#define PG_TYPE_OID				26-#define PG_TYPE_TID				27-#define PG_TYPE_XID				28-#define PG_TYPE_CID				29-#define PG_TYPE_OIDVECTOR		30-#define PG_TYPE_SET				32-#define PG_TYPE_XML			142-#define PG_TYPE_XMLARRAY		143-#define PG_TYPE_CHAR2			409-#define PG_TYPE_CHAR4			410-#define PG_TYPE_CHAR8			411-#define PG_TYPE_POINT			600-#define PG_TYPE_LSEG			601-#define PG_TYPE_PATH			602-#define PG_TYPE_BOX				603-#define PG_TYPE_POLYGON			604-#define PG_TYPE_FILENAME		605-#define PG_TYPE_CIDR			650-#define PG_TYPE_FLOAT4			700-#define PG_TYPE_FLOAT8			701-#define PG_TYPE_ABSTIME			702-#define PG_TYPE_RELTIME			703-#define PG_TYPE_TINTERVAL		704-#define PG_TYPE_UNKNOWN			705-#define PG_TYPE_MONEY			790-#define PG_TYPE_OIDINT2			810-#define PG_TYPE_MACADDR			829-#define PG_TYPE_INET			869-#define PG_TYPE_OIDINT4			910-#define PG_TYPE_OIDNAME			911-#define PG_TYPE_TEXTARRAY		1009-#define PG_TYPE_BPCHARARRAY		1014-#define PG_TYPE_VARCHARARRAY		1015-#define PG_TYPE_BPCHAR			1042-#define PG_TYPE_VARCHAR			1043-#define PG_TYPE_DATE			1082-#define PG_TYPE_TIME			1083-#define PG_TYPE_TIMESTAMP_NO_TMZONE	1114		/* since 7.2 */-#define PG_TYPE_DATETIME		1184-#define PG_TYPE_TIME_WITH_TMZONE	1266		/* since 7.1 */-#define PG_TYPE_TIMESTAMP		1296	/* deprecated since 7.0 */-#define PG_TYPE_NUMERIC			1700-#define PG_TYPE_RECORD			2249-#define PG_TYPE_VOID			2278-#define INTERNAL_ASIS_TYPE		(-9999)--#endif

@@ -0,0 +1,77 @@+/* File:			pgtypes.h+ *+ * Description:		See "pgtypes.c"+ *+ * Comments:		See "notice.txt" for copyright and license information.+ *+ */++#ifndef __PGTYPES_H__+#define __PGTYPES_H__++/* the type numbers are defined by the OID's of the types' rows */+/* in table pg_type */+++#ifdef NOT_USED+#define PG_TYPE_LO				????	/* waiting for permanent type */+#endif++#define	MS_ACCESS_SERIAL		"int identity"+#define PG_TYPE_BOOL			16+#define PG_TYPE_BYTEA			17+#define PG_TYPE_CHAR			18+#define PG_TYPE_NAME			19+#define PG_TYPE_INT8			20+#define PG_TYPE_INT2			21+#define PG_TYPE_INT2VECTOR		22+#define PG_TYPE_INT4			23+#define PG_TYPE_REGPROC			24+#define PG_TYPE_TEXT			25+#define PG_TYPE_OID				26+#define PG_TYPE_TID				27+#define PG_TYPE_XID				28+#define PG_TYPE_CID				29+#define PG_TYPE_OIDVECTOR		30+#define PG_TYPE_SET				32+#define PG_TYPE_XML			142+#define PG_TYPE_XMLARRAY		143+#define PG_TYPE_CHAR2			409+#define PG_TYPE_CHAR4			410+#define PG_TYPE_CHAR8			411+#define PG_TYPE_POINT			600+#define PG_TYPE_LSEG			601+#define PG_TYPE_PATH			602+#define PG_TYPE_BOX				603+#define PG_TYPE_POLYGON			604+#define PG_TYPE_FILENAME		605+#define PG_TYPE_CIDR			650+#define PG_TYPE_FLOAT4			700+#define PG_TYPE_FLOAT8			701+#define PG_TYPE_ABSTIME			702+#define PG_TYPE_RELTIME			703+#define PG_TYPE_TINTERVAL		704+#define PG_TYPE_UNKNOWN			705+#define PG_TYPE_MONEY			790+#define PG_TYPE_OIDINT2			810+#define PG_TYPE_MACADDR			829+#define PG_TYPE_INET			869+#define PG_TYPE_OIDINT4			910+#define PG_TYPE_OIDNAME			911+#define PG_TYPE_TEXTARRAY		1009+#define PG_TYPE_BPCHARARRAY		1014+#define PG_TYPE_VARCHARARRAY		1015+#define PG_TYPE_BPCHAR			1042+#define PG_TYPE_VARCHAR			1043+#define PG_TYPE_DATE			1082+#define PG_TYPE_TIME			1083+#define PG_TYPE_TIMESTAMP_NO_TMZONE	1114		/* since 7.2 */+#define PG_TYPE_DATETIME		1184+#define PG_TYPE_TIME_WITH_TMZONE	1266		/* since 7.1 */+#define PG_TYPE_TIMESTAMP		1296	/* deprecated since 7.0 */+#define PG_TYPE_NUMERIC			1700+#define PG_TYPE_RECORD			2249+#define PG_TYPE_VOID			2278+#define INTERNAL_ASIS_TYPE		(-9999)++#endif