diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 49 | ||||
| -rw-r--r-- | e05a2b595d32d2b9a210a6f6afbed490f2d23148.patch | 35 | ||||
| -rw-r--r-- | fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch | 27 | ||||
| -rw-r--r-- | php-pecl-seasclick.spec | 82 |
5 files changed, 61 insertions, 134 deletions
@@ -2,5 +2,5 @@ SeasClick SeasClick support => enabled -Version => 0.1.0 +Version => 0.1.1 Author => SeasX Group[email: ahhhh.wang@gmail.com] @@ -1,12 +1,7 @@ -Extension [ <persistent> extension #15 SeasClick version 0.1.0 ] { - - - Functions { - Function [ <internal:SeasClick> function SeasClick_version ] { - } - } +Extension [ <persistent> extension #122 SeasClick version 0.1.1 ] { - Classes [1] { - Class [ <internal:SeasClick> class SeasClick ] { + Class [ <internal:SeasClick> final class SeasClick ] { - Constants [0] { } @@ -18,15 +13,15 @@ Extension [ <persistent> extension #15 SeasClick version 0.1.0 ] { } - Properties [6] { - Property [ <default> protected $host ] - Property [ <default> protected $port ] - Property [ <default> protected $database ] - Property [ <default> protected $user ] - Property [ <default> protected $passwd ] - Property [ <default> protected $compression ] + Property [ protected $host = '127.0.0.1' ] + Property [ protected $port = 9000 ] + Property [ protected $database = 'default' ] + Property [ protected $user = NULL ] + Property [ protected $passwd = NULL ] + Property [ protected $compression = false ] } - - Methods [5] { + - Methods [8] { Method [ <internal:SeasClick, ctor> public method __construct ] { - Parameters [1] { @@ -34,7 +29,10 @@ Extension [ <persistent> extension #15 SeasClick version 0.1.0 ] { } } - Method [ <internal:SeasClick, dtor> public method __destruct ] { + Method [ <internal:SeasClick> public method __destruct ] { + + - Parameters [0] { + } } Method [ <internal:SeasClick> public method select ] { @@ -54,6 +52,27 @@ Extension [ <persistent> extension #15 SeasClick version 0.1.0 ] { } } + Method [ <internal:SeasClick> public method writeStart ] { + + - Parameters [2] { + Parameter #0 [ <required> $table ] + Parameter #1 [ <required> $columns ] + } + } + + Method [ <internal:SeasClick> public method write ] { + + - Parameters [1] { + Parameter #0 [ <required> $values ] + } + } + + Method [ <internal:SeasClick> public method writeEnd ] { + + - Parameters [0] { + } + } + Method [ <internal:SeasClick> public method execute ] { - Parameters [2] { diff --git a/e05a2b595d32d2b9a210a6f6afbed490f2d23148.patch b/e05a2b595d32d2b9a210a6f6afbed490f2d23148.patch deleted file mode 100644 index 5bac0f3..0000000 --- a/e05a2b595d32d2b9a210a6f6afbed490f2d23148.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e05a2b595d32d2b9a210a6f6afbed490f2d23148 Mon Sep 17 00:00:00 2001 -From: Roger <whj199649@gmail.com> -Date: Tue, 14 Apr 2020 21:19:06 +0800 -Subject: [PATCH] Fixed #5 Broken build with GCC 10 - -error: 'runtime_error' is not a member of 'std' ---- - lib/clickhouse-cpp/clickhouse/columns/nullable.cpp | 1 + - lib/clickhouse-cpp/clickhouse/columns/uuid.cpp | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/lib/clickhouse-cpp/clickhouse/columns/nullable.cpp b/lib/clickhouse-cpp/clickhouse/columns/nullable.cpp -index 5f058d4..f6e1792 100644 ---- a/lib/clickhouse-cpp/clickhouse/columns/nullable.cpp -+++ b/lib/clickhouse-cpp/clickhouse/columns/nullable.cpp -@@ -1,5 +1,6 @@ - #include "nullable.h" - -+#include <stdexcept> - #include <assert.h> - - namespace clickhouse { -diff --git a/lib/clickhouse-cpp/clickhouse/columns/uuid.cpp b/lib/clickhouse-cpp/clickhouse/columns/uuid.cpp -index b47592a..9ac538a 100644 ---- a/lib/clickhouse-cpp/clickhouse/columns/uuid.cpp -+++ b/lib/clickhouse-cpp/clickhouse/columns/uuid.cpp -@@ -1,6 +1,8 @@ - #include "uuid.h" - #include "utils.h" - -+#include <stdexcept> -+ - namespace clickhouse { - - ColumnUUID::ColumnUUID() diff --git a/fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch b/fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch deleted file mode 100644 index 43631ad..0000000 --- a/fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16 Mon Sep 17 00:00:00 2001 -From: Panda <itwujunze@163.com> -Date: Tue, 28 May 2019 16:22:15 +0800 -Subject: [PATCH] PHP 7.4 support - -PHP 7.4 support -fix: https://github.com/SeasX/SeasClick/issues/1 ---- - php7_wrapper.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/php7_wrapper.h b/php7_wrapper.h -index e856b15..2306ff8 100644 ---- a/php7_wrapper.h -+++ b/php7_wrapper.h -@@ -15,6 +15,11 @@ - | Author: SeasX Group <ahhhh.wang@gmail.com> | - +----------------------------------------------------------------------+ - */ -+// PHP7.4 + -+#if !defined(ZEND_ACC_IMPLICIT_PUBLIC) -+# define ZEND_ACC_IMPLICIT_PUBLIC ZEND_ACC_PUBLIC -+#endif -+ - // PHP7+ - #if PHP_MAJOR_VERSION < 7 - diff --git a/php-pecl-seasclick.spec b/php-pecl-seasclick.spec index d9ca34e..58293bf 100644 --- a/php-pecl-seasclick.spec +++ b/php-pecl-seasclick.spec @@ -1,24 +1,24 @@ # remirepo spec file for php-pecl-seasclick # -# Copyright (c) 2019-2020 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2019-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %if 0%{?scl:1} -%global sub_prefix %{scl_prefix} %scl_package php-pecl-seasclick %else %global _root_libdir %{_libdir} %endif +# tests require a server +%bcond_with tests + %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global proj_name SeasClick %global pecl_name %{proj_name} %global lowername seasclick -# tests require a server -%global with_tests 0%{?_with_tests:1} %if "%{php_version}" < "5.6" %global ini_name %{pecl_name}.ini %else @@ -26,23 +26,18 @@ %endif Summary: An Yandex ClickHouse client driven extension for PHP -Name: %{?sub_prefix}php-pecl-%{lowername} -Version: 0.1.0 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -License: ASL 2.0 +Name: %{?scl_prefix}php-pecl-%{lowername} +Version: 0.1.1 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +License: Apache-2.0 URL: https://pecl.php.net/package/%{proj_name} Source0: https://pecl.php.net/get/%{proj_name}-%{version}.tgz -Patch0: https://github.com/SeasX/SeasClick/commit/fe089abf1a34a1ae5575bd7cc8b9bfa9a6605e16.patch -Patch1: https://github.com/SeasX/SeasClick/commit/e05a2b595d32d2b9a210a6f6afbed490f2d23148.patch - -%if 0%{?rhel} == 6 -BuildRequires: devtoolset-6-toolchain -%else +BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?dtsprefix}gcc-c++ -%endif -BuildRequires: %{?scl_prefix}php-devel +# see https://github.com/SeasX/SeasClick/issues/16 +BuildRequires: %{?scl_prefix}php-devel >= 7.0 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -54,36 +49,6 @@ Provides: %{?scl_prefix}php-%{lowername} = %{version} Provides: %{?scl_prefix}php-%{lowername}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{proj_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{proj_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif - -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -%if "%{php_version}" > "7.1" -Obsoletes: php71u-pecl-%{pecl_name} <= %{version} -Obsoletes: php71w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.2" -Obsoletes: php72u-pecl-%{pecl_name} <= %{version} -Obsoletes: php72w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.3" -Obsoletes: php73-pecl-%{pecl_name} <= %{version} -Obsoletes: php73w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php74w-pecl-%{pecl_name} <= %{version} -%endif -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif %description @@ -103,9 +68,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .up0 -%patch1 -p1 -b .up1 - : Sanity check, really often broken extver=$(sed -n '/#define PHP_SEASCLICK_VERSION /{s/.* "//;s/".*$//;p}' php_SeasClick.h) if test "x${extver}" != "x%{version}"; then @@ -127,9 +89,6 @@ EOF %build -%if 0%{?rhel} == 6 -source /opt/rh/devtoolset-6/enable -%endif %{?dtsenable} cd NTS @@ -150,9 +109,6 @@ make %{?_smp_mflags} %install -%if 0%{?rhel} == 6 -source /opt/rh/devtoolset-6/enable -%endif %{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -183,6 +139,15 @@ cd NTS --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --modules | grep -i %{pecl_name} +%if %{with tests} +: Upstream test suite for NTS extension +TEST_PHP_EXECUTABLE=%{__php} \ +TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \ +NO_INTERACTION=1 \ +REPORT_EXIT_STATUS=1 \ +%{__php} -n run-tests.php --show-diff +%endif + %if %{with_zts} cd ../ZTS : Minimal load test for ZTS extension @@ -193,6 +158,7 @@ cd ../ZTS %endif + %if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear @@ -228,6 +194,10 @@ fi %changelog +* Mon Feb 27 2023 Remi Collet <remi@remirepo.net> - 0.1.1-1 +- update to 0.1.1 +- open https://github.com/SeasX/SeasClick/issues/16 PHP 5.x broken build + * Wed Aug 19 2020 Remi Collet <remi@remirepo.net> - 0.1.0-4 - add upstream patch for GCC 10 |