Skip to content

Commit 11075db

Browse files
committed
release 2.1.3
* Fix gh-issue #27: crash in pq\Connection::escapeBytea() + Update static pq\Types with PostgreSQL-10 types
1 parent 0e22011 commit 11075db

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

package.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<email>[email protected]</email>
4242
<active>yes</active>
4343
</developer>
44-
<date>2017-07-03</date>
44+
<date>2018-01-10</date>
4545
<version>
46-
<release>2.1.2</release>
46+
<release>2.1.3</release>
4747
<api>2.1.0</api>
4848
</version>
4949
<stability>
@@ -52,9 +52,8 @@
5252
</stability>
5353
<license uri="http://copyfree.org/content/standard/licenses/2bsd/license.txt">BSD-2-Clause</license>
5454
<notes><![CDATA[
55-
* Fix gh-issue #32: JSON compatibility with PHP-7.1
56-
* Fix pq\DateTime::createFromFormat() prototype with PHP-7.2
57-
+ Update static pq\Types with PostgreSQL-9.6 types
55+
* Fix gh-issue #27: crash in pq\Connection::escapeBytea()
56+
+ Update static pq\Types with PostgreSQL-10 types
5857
]]></notes>
5958
<contents>
6059
<dir name="/">

php_pq.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef PHP_PQ_H
1515
#define PHP_PQ_H
1616

17-
#define PHP_PQ_VERSION "2.1.2"
17+
#define PHP_PQ_VERSION "2.1.3"
1818

1919
#ifdef PHP_WIN32
2020
# define PHP_PQ_API __declspec(dllexport)

php_pq_type.h

+22
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ PHP_PQ_TYPE("JSONARRAY", 199)
9797
# define PHP_PQ_OID_PG_NODE_TREE 194
9898
#endif
9999
PHP_PQ_TYPE("PG_NODE_TREE", 194)
100+
#ifndef PHP_PQ_OID_PG_NDISTINCT
101+
# define PHP_PQ_OID_PG_NDISTINCT 3361
102+
#endif
103+
PHP_PQ_TYPE("PG_NDISTINCT", 3361)
104+
#ifndef PHP_PQ_OID_PG_DEPENDENCIES
105+
# define PHP_PQ_OID_PG_DEPENDENCIES 3402
106+
#endif
107+
PHP_PQ_TYPE("PG_DEPENDENCIES", 3402)
100108
#ifndef PHP_PQ_OID_PG_DDL_COMMAND
101109
# define PHP_PQ_OID_PG_DDL_COMMAND 32
102110
#endif
@@ -185,6 +193,10 @@ PHP_PQ_TYPE("INET", 869)
185193
# define PHP_PQ_OID_CIDR 650
186194
#endif
187195
PHP_PQ_TYPE("CIDR", 650)
196+
#ifndef PHP_PQ_OID_MACADDR8
197+
# define PHP_PQ_OID_MACADDR8 774
198+
#endif
199+
PHP_PQ_TYPE("MACADDR8", 774)
188200
#ifndef PHP_PQ_OID_BOOLARRAY
189201
# define PHP_PQ_OID_BOOLARRAY 1000
190202
#endif
@@ -305,6 +317,10 @@ PHP_PQ_TYPE("ACLITEMARRAY", 1034)
305317
# define PHP_PQ_OID_MACADDRARRAY 1040
306318
#endif
307319
PHP_PQ_TYPE("MACADDRARRAY", 1040)
320+
#ifndef PHP_PQ_OID_MACADDR8ARRAY
321+
# define PHP_PQ_OID_MACADDR8ARRAY 775
322+
#endif
323+
PHP_PQ_TYPE("MACADDR8ARRAY", 775)
308324
#ifndef PHP_PQ_OID_INETARRAY
309325
# define PHP_PQ_OID_INETARRAY 1041
310326
#endif
@@ -661,6 +677,7 @@ PHP_PQ_TYPE("ANYRANGE", 3831)
661677
|| ((oid) == 629) \
662678
|| ((oid) == 651) \
663679
|| ((oid) == 719) \
680+
|| ((oid) == 775) \
664681
|| ((oid) == 791) \
665682
|| ((oid) == 1000) \
666683
|| ((oid) == 1001) \
@@ -735,6 +752,7 @@ PHP_PQ_TYPE("ANYRANGE", 3831)
735752
(oid) == 629 ? 628 : \
736753
(oid) == 651 ? 650 : \
737754
(oid) == 719 ? 718 : \
755+
(oid) == 775 ? 774 : \
738756
(oid) == 791 ? 790 : \
739757
(oid) == 1000 ? 16 : \
740758
(oid) == 1001 ? 17 : \
@@ -848,6 +866,8 @@ PHP_PQ_TYPE("ANYRANGE", 3831)
848866
(oid) == 705 ? '\054' : \
849867
(oid) == 718 ? '\054' : \
850868
(oid) == 719 ? '\054' : \
869+
(oid) == 774 ? '\054' : \
870+
(oid) == 775 ? '\054' : \
851871
(oid) == 790 ? '\054' : \
852872
(oid) == 791 ? '\054' : \
853873
(oid) == 829 ? '\054' : \
@@ -936,6 +956,8 @@ PHP_PQ_TYPE("ANYRANGE", 3831)
936956
(oid) == 3220 ? '\054' : \
937957
(oid) == 3221 ? '\054' : \
938958
(oid) == 3310 ? '\054' : \
959+
(oid) == 3361 ? '\054' : \
960+
(oid) == 3402 ? '\054' : \
939961
(oid) == 3500 ? '\054' : \
940962
(oid) == 3614 ? '\054' : \
941963
(oid) == 3615 ? '\054' : \

0 commit comments

Comments
 (0)