From 0a7c19b96fafc83922d2b09b9222a867a450a8fe Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Jul 2017 12:59:18 +0200 Subject: v2.1.2 --- REFLECTION | 14 +++++-- php-pecl-pq.spec | 26 ++++--------- pq-upstream.patch | 107 ------------------------------------------------------ 3 files changed, 19 insertions(+), 128 deletions(-) delete mode 100644 pq-upstream.patch diff --git a/REFLECTION b/REFLECTION index b4da084..dca6e01 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #89 pq version 2.1.1 ] { +Extension [ extension #175 pq version 2.1.2 ] { - Dependencies { Dependency [ raphf (Required) ] @@ -48,7 +48,7 @@ Extension [ extension #89 pq version 2.1.1 ] { Class [ class pq\DateTime extends DateTime implements DateTimeInterface, JsonSerializable ] { - - Constants [12] { + - Constants [13] { Constant [ string ATOM ] { Y-m-d\TH:i:sP } Constant [ string COOKIE ] { l, d-M-Y H:i:s T } Constant [ string ISO8601 ] { Y-m-d\TH:i:sO } @@ -56,6 +56,7 @@ Extension [ extension #89 pq version 2.1.1 ] { Constant [ string RFC850 ] { l, d-M-y H:i:s T } Constant [ string RFC1036 ] { D, d M y H:i:s O } Constant [ string RFC1123 ] { D, d M Y H:i:s O } + Constant [ string RFC7231 ] { D, d M Y H:i:s \G\M\T } Constant [ string RFC2822 ] { D, d M Y H:i:s O } Constant [ string RFC3339 ] { Y-m-d\TH:i:sP } Constant [ string RFC3339_EXTENDED ] { Y-m-d\TH:i:s.vP } @@ -857,7 +858,7 @@ Extension [ extension #89 pq version 2.1.1 ] { Class [ class pq\Types ] { - - Constants [156] { + - Constants [163] { Constant [ integer BOOL ] { 16 } Constant [ integer BYTEA ] { 17 } Constant [ integer CHAR ] { 18 } @@ -882,6 +883,7 @@ Extension [ extension #89 pq version 2.1.1 ] { Constant [ integer XMLARRAY ] { 143 } Constant [ integer JSONARRAY ] { 199 } Constant [ integer PG_NODE_TREE ] { 194 } + Constant [ integer PG_DDL_COMMAND ] { 32 } Constant [ integer SMGR ] { 210 } Constant [ integer POINT ] { 600 } Constant [ integer LSEG ] { 601 } @@ -963,11 +965,15 @@ Extension [ extension #89 pq version 2.1.1 ] { Constant [ integer REGOPERATOR ] { 2204 } Constant [ integer REGCLASS ] { 2205 } Constant [ integer REGTYPE ] { 2206 } + Constant [ integer REGROLE ] { 4096 } + Constant [ integer REGNAMESPACE ] { 4089 } Constant [ integer REGPROCEDUREARRAY ] { 2207 } Constant [ integer REGOPERARRAY ] { 2208 } Constant [ integer REGOPERATORARRAY ] { 2209 } Constant [ integer REGCLASSARRAY ] { 2210 } Constant [ integer REGTYPEARRAY ] { 2211 } + Constant [ integer REGROLEARRAY ] { 4097 } + Constant [ integer REGNAMESPACEARRAY ] { 4090 } Constant [ integer UUID ] { 2950 } Constant [ integer UUIDARRAY ] { 2951 } Constant [ integer PG_LSN ] { 3220 } @@ -1013,6 +1019,8 @@ Extension [ extension #89 pq version 2.1.1 ] { Constant [ integer ANYNONARRAY ] { 2776 } Constant [ integer ANYENUM ] { 3500 } Constant [ integer FDW_HANDLER ] { 3115 } + Constant [ integer INDEX_AM_HANDLER ] { 325 } + Constant [ integer TSM_HANDLER ] { 3310 } Constant [ integer ANYRANGE ] { 3831 } } diff --git a/php-pecl-pq.spec b/php-pecl-pq.spec index 77886aa..93f3d9d 100644 --- a/php-pecl-pq.spec +++ b/php-pecl-pq.spec @@ -26,31 +26,22 @@ # Build using "--with tests" to enable tests %global with_tests 0%{?_with_tests:1} %endif -%if "%{php_version}" < "5.6" -# After raph, json -%global ini_name z-%{pecl_name}.ini -%else -# After 40-json, 40-raphf %global ini_name 50-%{pecl_name}.ini -%endif Summary: PostgreSQL client library (libpq) binding Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 2.1.1 +Version: 2.1.2 %if 0%{?gh_date:1} Release: 0.5.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} -Patch0: %{pecl_name}-upstream.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel > 9 BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear @@ -132,7 +123,6 @@ sed -e '/role="test"/d' \ -i package.xml cd NTS -%patch0 -p1 -b .upstream # Sanity check, really often broken extver=$(sed -n '/#define PHP_PQ_VERSION/{s/.* "//;s/".*$//;p}' php_pq.h) @@ -155,6 +145,8 @@ EOF %build +%{?dtsenable} + cd NTS %{_bindir}/phpize %configure \ @@ -173,7 +165,7 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} +%{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -289,12 +281,7 @@ exit $RET %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %doc %{pecl_docdir}/%{pecl_name} %{?_licensedir:%license NTS/LICENSE} @@ -309,6 +296,9 @@ rm -rf %{buildroot} %changelog +* Mon Jul 3 2017 Remi Collet - 2.1.2-1 +- Update to 2.1.2 (stable) + * Fri Jun 23 2017 Remi Collet - 2.1.1-5 - add upstream patch for 7.2 diff --git a/pq-upstream.patch b/pq-upstream.patch deleted file mode 100644 index e96dfc9..0000000 --- a/pq-upstream.patch +++ /dev/null @@ -1,107 +0,0 @@ -From ef9b34bc5ae76a1a961108085e5d21e8ad679b18 Mon Sep 17 00:00:00 2001 -From: Michael Wallner -Date: Tue, 15 Nov 2016 09:53:42 +0100 -Subject: [PATCH] fix issue #23 (PHP-7.1 JSON compat) - ---- - src/php_pq_params.c | 3 +++ - tests/conv001.phpt | 12 ++++++------ - 2 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/src/php_pq_params.c b/src/php_pq_params.c -index 0f7ba50..5a5156f 100644 ---- a/src/php_pq_params.c -+++ b/src/php_pq_params.c -@@ -83,6 +83,9 @@ static zend_string *object_param_to_string(php_pq_params_t *p, zval *zobj, Oid t - case PHP_PQ_OID_JSONB: - # endif - case PHP_PQ_OID_JSON: -+# if PHP_VERSION_ID >= 70100 -+ JSON_G(encode_max_depth) = PHP_JSON_PARSER_DEFAULT_DEPTH; -+# endif - php_json_encode(&str, zobj, PHP_JSON_UNESCAPED_UNICODE); - smart_str_0(&str); - return str.s; -diff --git a/tests/conv001.phpt b/tests/conv001.phpt -index 8533753..b24da0e 100644 ---- a/tests/conv001.phpt -+++ b/tests/conv001.phpt -@@ -328,7 +328,7 @@ array(1) { - ["format"]=> - string(11) "Y-m-d H:i:s" - ["date"]=> -- string(26) "%d-%d-%d %d:%d:%d.000000" -+ string(26) "%d-%d-%d %d:%d:%d.%d" - ["timezone_type"]=> - int(1) - ["timezone"]=> -@@ -339,7 +339,7 @@ array(1) { - ["format"]=> - string(13) "Y-m-d H:i:s.u" - ["date"]=> -- string(26) "%d-%d-%d %d:%d:%d.000000" -+ string(26) "%d-%d-%d %d:%d:%d.%d" - ["timezone_type"]=> - int(3) - ["timezone"]=> -@@ -350,7 +350,7 @@ array(1) { - ["format"]=> - string(14) "Y-m-d H:i:s.uO" - ["date"]=> -- string(26) "%d-%d-%d %d:%d:%d.000000" -+ string(26) "%d-%d-%d %d:%d:%d.%d" - ["timezone_type"]=> - int(1) - ["timezone"]=> -@@ -372,7 +372,7 @@ array(1) { - ["format"]=> - string(11) "Y-m-d H:i:s" - ["date"]=> -- string(26) "%d-%d-%d %d:%d:%d.000000" -+ string(26) "%d-%d-%d %d:%d:%d.%d" - ["timezone_type"]=> - int(1) - ["timezone"]=> -@@ -383,7 +383,7 @@ array(1) { - ["format"]=> - string(13) "Y-m-d H:i:s.u" - ["date"]=> -- string(26) "%d-%d-%d %d:%d:%d.000000" -+ string(26) "%d-%d-%d %d:%d:%d.%d" - ["timezone_type"]=> - int(3) - ["timezone"]=> -@@ -394,7 +394,7 @@ array(1) { - ["format"]=> - string(14) "Y-m-d H:i:s.uO" - ["date"]=> -- string(26) "%d-%d-%d %d:%d:%d.000000" -+ string(26) "%d-%d-%d %d:%d:%d.%d" - ["timezone_type"]=> - int(1) - ["timezone"]=> -From be621b64a9a5faea34741430db84cfe16b7b40b6 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 23 Jun 2017 15:24:38 +0200 -Subject: [PATCH] fix pq\DateTime::createFromFormat() proto for 7.2 - ---- - src/php_pq_misc.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/php_pq_misc.c b/src/php_pq_misc.c -index 3f824ed..08f10c3 100644 ---- a/src/php_pq_misc.c -+++ b/src/php_pq_misc.c -@@ -139,7 +139,11 @@ static PHP_METHOD(pqdt, __toString) - ZEND_BEGIN_ARG_INFO_EX(ai_pqdt_create_from_format, 0, 0, 2) - ZEND_ARG_INFO(0, format) - ZEND_ARG_INFO(0, datetime) -+#if PHP_VERSION_ID >= 70200 -+ ZEND_ARG_OBJ_INFO(0, object, DateTimeZone, 1) -+#else - ZEND_ARG_INFO(0, timezone) -+#endif - ZEND_END_ARG_INFO(); - static PHP_METHOD(pqdt, createFromFormat) - { -- cgit