From 11075db860470f36eafe93257972e5f7db9632fa Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 10 Jan 2018 13:44:49 +0100
Subject: [PATCH] release 2.1.3

* Fix gh-issue #27: crash in pq\Connection::escapeBytea()
+ Update static pq\Types with PostgreSQL-10 types
---
 package.xml   |  9 ++++-----
 php_pq.h      |  2 +-
 php_pq_type.h | 22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/package.xml b/package.xml
index 08a0c08..8ecec88 100644
--- a/package.xml
+++ b/package.xml
@@ -41,9 +41,9 @@
   <email>remi@php.net</email>
   <active>yes</active>
  </developer>
- <date>2017-07-03</date>
+ <date>2018-01-10</date>
  <version>
-  <release>2.1.2</release>
+  <release>2.1.3</release>
   <api>2.1.0</api>
  </version>
  <stability>
@@ -52,9 +52,8 @@
  </stability>
  <license uri="http://copyfree.org/content/standard/licenses/2bsd/license.txt">BSD-2-Clause</license>
  <notes><![CDATA[
-* Fix gh-issue #32: JSON compatibility with PHP-7.1
-* Fix pq\DateTime::createFromFormat() prototype with PHP-7.2
-+ Update static pq\Types with PostgreSQL-9.6 types
+* Fix gh-issue #27: crash in pq\Connection::escapeBytea()
++ Update static pq\Types with PostgreSQL-10 types
 ]]></notes>
  <contents>
   <dir name="/">
diff --git a/php_pq.h b/php_pq.h
index 1da26a0..5d93dd5 100644
--- a/php_pq.h
+++ b/php_pq.h
@@ -14,7 +14,7 @@
 #ifndef PHP_PQ_H
 #define PHP_PQ_H
 
-#define PHP_PQ_VERSION "2.1.2"
+#define PHP_PQ_VERSION "2.1.3"
 
 #ifdef PHP_WIN32
 #	define PHP_PQ_API __declspec(dllexport)
diff --git a/php_pq_type.h b/php_pq_type.h
index 9f00b90..5545028 100644
--- a/php_pq_type.h
+++ b/php_pq_type.h
@@ -97,6 +97,14 @@ PHP_PQ_TYPE("JSONARRAY", 199)
 # define PHP_PQ_OID_PG_NODE_TREE 194
 #endif
 PHP_PQ_TYPE("PG_NODE_TREE", 194)
+#ifndef PHP_PQ_OID_PG_NDISTINCT
+# define PHP_PQ_OID_PG_NDISTINCT 3361
+#endif
+PHP_PQ_TYPE("PG_NDISTINCT", 3361)
+#ifndef PHP_PQ_OID_PG_DEPENDENCIES
+# define PHP_PQ_OID_PG_DEPENDENCIES 3402
+#endif
+PHP_PQ_TYPE("PG_DEPENDENCIES", 3402)
 #ifndef PHP_PQ_OID_PG_DDL_COMMAND
 # define PHP_PQ_OID_PG_DDL_COMMAND 32
 #endif
@@ -185,6 +193,10 @@ PHP_PQ_TYPE("INET", 869)
 # define PHP_PQ_OID_CIDR 650
 #endif
 PHP_PQ_TYPE("CIDR", 650)
+#ifndef PHP_PQ_OID_MACADDR8
+# define PHP_PQ_OID_MACADDR8 774
+#endif
+PHP_PQ_TYPE("MACADDR8", 774)
 #ifndef PHP_PQ_OID_BOOLARRAY
 # define PHP_PQ_OID_BOOLARRAY 1000
 #endif
@@ -305,6 +317,10 @@ PHP_PQ_TYPE("ACLITEMARRAY", 1034)
 # define PHP_PQ_OID_MACADDRARRAY 1040
 #endif
 PHP_PQ_TYPE("MACADDRARRAY", 1040)
+#ifndef PHP_PQ_OID_MACADDR8ARRAY
+# define PHP_PQ_OID_MACADDR8ARRAY 775
+#endif
+PHP_PQ_TYPE("MACADDR8ARRAY", 775)
 #ifndef PHP_PQ_OID_INETARRAY
 # define PHP_PQ_OID_INETARRAY 1041
 #endif
@@ -661,6 +677,7 @@ PHP_PQ_TYPE("ANYRANGE", 3831)
 	||	((oid) == 629) \
 	||	((oid) == 651) \
 	||	((oid) == 719) \
+	||	((oid) == 775) \
 	||	((oid) == 791) \
 	||	((oid) == 1000) \
 	||	((oid) == 1001) \
@@ -735,6 +752,7 @@ PHP_PQ_TYPE("ANYRANGE", 3831)
 	(oid) == 629 ? 628 : \
 	(oid) == 651 ? 650 : \
 	(oid) == 719 ? 718 : \
+	(oid) == 775 ? 774 : \
 	(oid) == 791 ? 790 : \
 	(oid) == 1000 ? 16 : \
 	(oid) == 1001 ? 17 : \
@@ -848,6 +866,8 @@ PHP_PQ_TYPE("ANYRANGE", 3831)
 	(oid) == 705 ? '\054' : \
 	(oid) == 718 ? '\054' : \
 	(oid) == 719 ? '\054' : \
+	(oid) == 774 ? '\054' : \
+	(oid) == 775 ? '\054' : \
 	(oid) == 790 ? '\054' : \
 	(oid) == 791 ? '\054' : \
 	(oid) == 829 ? '\054' : \
@@ -936,6 +956,8 @@ PHP_PQ_TYPE("ANYRANGE", 3831)
 	(oid) == 3220 ? '\054' : \
 	(oid) == 3221 ? '\054' : \
 	(oid) == 3310 ? '\054' : \
+	(oid) == 3361 ? '\054' : \
+	(oid) == 3402 ? '\054' : \
 	(oid) == 3500 ? '\054' : \
 	(oid) == 3614 ? '\054' : \
 	(oid) == 3615 ? '\054' : \
-- 
2.30.2