Skip to content

Commit

Permalink
release 2.1.3
Browse files Browse the repository at this point in the history
* Fix gh-issue #27: crash in pq\Connection::escapeBytea()
+ Update static pq\Types with PostgreSQL-10 types
  • Loading branch information
m6w6 committed Jan 10, 2018
1 parent 0e22011 commit 11075db
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 6 deletions.
9 changes: 4 additions & 5 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
<email>[email protected]</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>
Expand All @@ -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="/">
Expand Down
2 changes: 1 addition & 1 deletion php_pq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
22 changes: 22 additions & 0 deletions php_pq_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -661,6 +677,7 @@ PHP_PQ_TYPE("ANYRANGE", 3831)
|| ((oid) == 629) \
|| ((oid) == 651) \
|| ((oid) == 719) \
|| ((oid) == 775) \
|| ((oid) == 791) \
|| ((oid) == 1000) \
|| ((oid) == 1001) \
Expand Down Expand Up @@ -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 : \
Expand Down Expand Up @@ -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' : \
Expand Down Expand Up @@ -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' : \
Expand Down

0 comments on commit 11075db

Please sign in to comment.