From 7eb26e9d7fc9a4c25fcf15ef78cd63b789b45c6a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Jul 2017 15:36:28 +0200 Subject: v8.0.2 --- .gitignore | 7 + REFLECTION | 632 ++++++++++++++++++++++++++++++++++++-------- php-pecl-mysql-xdevapi.spec | 50 ++-- 3 files changed, 548 insertions(+), 141 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/REFLECTION b/REFLECTION index 36e6ae9..ca1b1c5 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { +Extension [ extension #72 mysql_xdevapi version 8.0.2 ] { - Dependencies { Dependency [ standard (Required) ] @@ -34,25 +34,23 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { - Functions { Function [ function mysql_xdevapi\getSession ] { - - Parameters [1] { - Parameter #0 [ string $uri_string ] + - Parameters [0] { } } - Function [ function mysql_xdevapi\getNodeSession ] { + Function [ function mysql_xdevapi\expression ] { - Parameters [1] { - Parameter #0 [ string $uri_string ] + Parameter #0 [ string $expression ] } } - Function [ function mysql_xdevapi\expression ] { + Function [ function mysql_xdevapi\sessions ] { - - Parameters [1] { - Parameter #0 [ string $expression ] + - Parameters [0] { } } } - - Classes [41] { + - Classes [46] { Interface [ interface mysql_xdevapi\DatabaseObject ] { - Constants [0] { @@ -461,7 +459,7 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { Class [ final class mysql_xdevapi\Driver ] { - Constants [1] { - Constant [ public string version ] { 1.0.1 } + Constant [ public string version ] { 8.0.2 } } - Static properties [0] { @@ -493,7 +491,7 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { - Properties [0] { } - - Methods [17] { + - Methods [15] { Method [ private method __construct ] { } @@ -546,22 +544,6 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { } } - Method [ public method dropCollection ] { - - - Parameters [2] { - Parameter #0 [ string $schema_name ] - Parameter #1 [ string $collection_name ] - } - } - - Method [ public method dropTable ] { - - - Parameters [2] { - Parameter #0 [ string $schema_name ] - Parameter #1 [ string $table_name ] - } - } - Method [ public method startTransaction ] { - Parameters [0] { @@ -615,7 +597,7 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { - Properties [0] { } - - Methods [17] { + - Methods [15] { Method [ private method __construct ] { } @@ -668,22 +650,6 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { } } - Method [ public method dropCollection ] { - - - Parameters [2] { - Parameter #0 [ string $schema_name ] - Parameter #1 [ string $collection_name ] - } - } - - Method [ public method dropTable ] { - - - Parameters [2] { - Parameter #0 [ string $schema_name ] - Parameter #1 [ string $table_name ] - } - } - Method [ public method startTransaction ] { - Parameters [0] { @@ -737,7 +703,7 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { - Properties [0] { } - - Methods [19] { + - Methods [17] { Method [ private method __construct ] { } @@ -800,22 +766,6 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { } } - Method [ public method dropCollection ] { - - - Parameters [2] { - Parameter #0 [ string $schema_name ] - Parameter #1 [ string $collection_name ] - } - } - - Method [ public method dropTable ] { - - - Parameters [2] { - Parameter #0 [ string $schema_name ] - Parameter #1 [ string $table_name ] - } - } - Method [ public method startTransaction ] { - Parameters [0] { @@ -870,7 +820,7 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { Property [ public $name ] } - - Methods [14] { + - Methods [16] { Method [ private method __construct ] { } @@ -892,16 +842,18 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { } } - Method [ public method drop ] { + Method [ public method createCollection ] { - - Parameters [0] { + - Parameters [1] { + Parameter #0 [ string $name ] } } - Method [ public method createCollection ] { + Method [ public method dropCollection ] { - - Parameters [1] { - Parameter #0 [ string $name ] + - Parameters [2] { + Parameter #0 [ string $schema_name ] + Parameter #1 [ string $collection_name ] } } @@ -918,6 +870,22 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { } } + Method [ public method createTable ] { + + - Parameters [2] { + Parameter #0 [ string $table_name ] + Parameter #1 [ integer $replace_existing ] + } + } + + Method [ public method dropTable ] { + + - Parameters [2] { + Parameter #0 [ string $schema_name ] + Parameter #1 [ string $table_name ] + } + } + Method [ public method getTable ] { - Parameters [1] { @@ -941,7 +909,7 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { - Parameters [2] { Parameter #0 [ string $view_name ] - Parameter #1 [ integer $replace_existing ] + Parameter #1 [ integer $replace_existing ] } } @@ -1116,32 +1084,6 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { } } - Class [ class mysql_xdevapi\NodeCollectionDropIndex implements mysql_xdevapi\Executable ] { - - - Constants [0] { - } - - - Static properties [0] { - } - - - Static methods [0] { - } - - - Properties [0] { - } - - - Methods [2] { - Method [ private method __construct ] { - } - - Method [ public method execute ] { - - - Parameters [0] { - } - } - } - } - Class [ class mysql_xdevapi\NodeCollectionFind implements mysql_xdevapi\Executable, mysql_xdevapi\CrudOperationBindable, mysql_xdevapi\CrudOperationLimitable, mysql_xdevapi\CrudOperationSkippable, mysql_xdevapi\CrudOperationSortable ] { - Constants [0] { @@ -1371,7 +1313,7 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { } } - Class [ class mysql_xdevapi\ViewCreate implements mysql_xdevapi\Executable ] { + Class [ class mysql_xdevapi\TableCreate implements mysql_xdevapi\Executable ] { - Constants [0] { } @@ -1385,49 +1327,93 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { - Properties [0] { } - - Methods [8] { + - Methods [15] { Method [ private method __construct ] { } - Method [ public method definer ] { + Method [ public method addColumn ] { - Parameters [1] { - Parameter #0 [ string $definer ] + Parameter #0 [ object $column ] } } - Method [ public method algorithm ] { + Method [ public method addPrimaryKey ] { - Parameters [1] { - Parameter #0 [ string $algorithm ] + Parameter #0 [ $primary_key ] } } - Method [ public method security ] { + Method [ public method addIndex ] { + + - Parameters [2] { + Parameter #0 [ string $name ] + Parameter #1 [ $columns ] + } + } + + Method [ public method addUniqueIndex ] { + + - Parameters [2] { + Parameter #0 [ string $name ] + Parameter #1 [ $columns ] + } + } + + Method [ public method addForeignKey ] { + + - Parameters [2] { + Parameter #0 [ string $table_name ] + Parameter #1 [ object $fields ] + } + } + + Method [ public method setInitialAutoIncrement ] { - Parameters [1] { - Parameter #0 [ string $security ] + Parameter #0 [ integer $init_auto_increment ] } } - Method [ public method withCheckOption ] { + Method [ public method setDefaultCharset ] { - Parameters [1] { - Parameter #0 [ string $check_option ] + Parameter #0 [ string $default_charset ] } } - Method [ public method columns ] { + Method [ public method setDefaultCollation ] { - Parameters [1] { - Parameter #0 [ $columns ] + Parameter #0 [ string $default_collation ] } } - Method [ public method definedAs ] { + Method [ public method setComment ] { - Parameters [1] { - Parameter #0 [ object $defined_as ] + Parameter #0 [ string $comment ] + } + } + + Method [ public method temporary ] { + + - Parameters [0] { + } + } + + Method [ public method as ] { + + - Parameters [1] { + Parameter #0 [ string $defined_as ] + } + } + + Method [ public method like ] { + + - Parameters [1] { + Parameter #0 [ string $template_table_name ] } } @@ -1436,10 +1422,282 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { - Parameters [0] { } } + + Method [ public method getSqlQuery ] { + + - Parameters [0] { + } + } } } - Class [ class mysql_xdevapi\ViewAlter implements mysql_xdevapi\Executable ] { + Class [ class mysql_xdevapi\ColumnDefBase ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Methods [5] { + Method [ protected method __construct ] { + } + + Method [ public method notNull ] { + + - Parameters [0] { + } + } + + Method [ public method uniqueIndex ] { + + - Parameters [0] { + } + } + + Method [ public method primaryKey ] { + + - Parameters [0] { + } + } + + Method [ public method comment ] { + + - Parameters [1] { + Parameter #0 [ string $comment ] + } + } + } + } + + Class [ class mysql_xdevapi\ColumnDef extends mysql_xdevapi\ColumnDefBase ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Methods [15] { + Method [ public method __construct ] { + + - Parameters [3] { + Parameter #0 [ string $name ] + Parameter #1 [ string $type ] + Parameter #2 [ integer $length ] + } + } + + Method [ public method setDefault ] { + + - Parameters [1] { + Parameter #0 [ $default_value_expr ] + } + } + + Method [ public method defaultCurrentTimestamp ] { + + - Parameters [0] { + } + } + + Method [ public method autoIncrement ] { + + - Parameters [0] { + } + } + + Method [ public method foreignKey ] { + + - Parameters [2] { + Parameter #0 [ string $table_name ] + Parameter #1 [ $fields ] + } + } + + Method [ public method unsigned ] { + + - Parameters [0] { + } + } + + Method [ public method decimals ] { + + - Parameters [1] { + Parameter #0 [ integer $decimals_size ] + } + } + + Method [ public method charset ] { + + - Parameters [1] { + Parameter #0 [ string $charset ] + } + } + + Method [ public method collation ] { + + - Parameters [1] { + Parameter #0 [ string $collation ] + } + } + + Method [ public method binary ] { + + - Parameters [0] { + } + } + + Method [ public method values ] { + + - Parameters [1] { + Parameter #0 [ $values ] + } + } + + Method [ public method notNull ] { + + - Parameters [0] { + } + } + + Method [ public method uniqueIndex ] { + + - Parameters [0] { + } + } + + Method [ public method primaryKey ] { + + - Parameters [0] { + } + } + + Method [ public method comment ] { + + - Parameters [1] { + Parameter #0 [ string $comment ] + } + } + } + } + + Class [ class mysql_xdevapi\GeneratedColumnDef extends mysql_xdevapi\ColumnDefBase ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Methods [6] { + Method [ public method __construct ] { + } + + Method [ public method stored ] { + + - Parameters [0] { + } + } + + Method [ public method notNull ] { + + - Parameters [0] { + } + } + + Method [ public method uniqueIndex ] { + + - Parameters [0] { + } + } + + Method [ public method primaryKey ] { + + - Parameters [0] { + } + } + + Method [ public method comment ] { + + - Parameters [1] { + Parameter #0 [ string $comment ] + } + } + } + } + + Class [ class mysql_xdevapi\ForeignKeyDef ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Methods [5] { + Method [ public method __construct ] { + + - Parameters [0] { + } + } + + Method [ public method fields ] { + + - Parameters [1] { + Parameter #0 [ $fields ] + } + } + + Method [ public method refersTo ] { + + - Parameters [2] { + Parameter #0 [ string $refers_to_table ] + Parameter #1 [ $refers_to_columns ] + } + } + + Method [ public method onDelete ] { + + - Parameters [1] { + Parameter #0 [ string $on_delete_mode ] + } + } + + Method [ public method onUpdate ] { + + - Parameters [1] { + Parameter #0 [ string $on_update_mode ] + } + } + } + } + + Class [ class mysql_xdevapi\ViewCreate implements mysql_xdevapi\Executable ] { - Constants [0] { } @@ -1507,7 +1765,7 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { } } - Class [ class mysql_xdevapi\ViewDrop implements mysql_xdevapi\Executable ] { + Class [ class mysql_xdevapi\ViewAlter implements mysql_xdevapi\Executable ] { - Constants [0] { } @@ -1521,14 +1779,49 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { - Properties [0] { } - - Methods [3] { + - Methods [8] { Method [ private method __construct ] { } - Method [ public method ifExists ] { + Method [ public method definer ] { + + - Parameters [1] { + Parameter #0 [ string $definer ] + } + } + + Method [ public method algorithm ] { - Parameters [1] { - Parameter #0 [ boolean $if_exists ] + Parameter #0 [ string $algorithm ] + } + } + + Method [ public method security ] { + + - Parameters [1] { + Parameter #0 [ string $security ] + } + } + + Method [ public method withCheckOption ] { + + - Parameters [1] { + Parameter #0 [ string $check_option ] + } + } + + Method [ public method columns ] { + + - Parameters [1] { + Parameter #0 [ $columns ] + } + } + + Method [ public method definedAs ] { + + - Parameters [1] { + Parameter #0 [ object $defined_as ] } } @@ -2317,6 +2610,119 @@ Extension [ extension #61 mysql_xdevapi version 1.0.1 ] { } } } + + Class [ class mysql_xdevapi\SessionConfigManager ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Methods [5] { + Method [ private method __construct ] { + + - Parameters [0] { + } + } + + Method [ public method save ] { + + - Parameters [1] { + Parameter #0 [ $input ] + } + } + + Method [ public method get ] { + + - Parameters [1] { + Parameter #0 [ string $name ] + } + } + + Method [ public method list ] { + + - Parameters [0] { + } + } + + Method [ public method delete ] { + + - Parameters [1] { + Parameter #0 [ string $name ] + } + } + } + } + + Class [ class mysql_xdevapi\SessionConfig ] { + + - Constants [0] { + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Methods [7] { + Method [ private method __construct ] { + + - Parameters [0] { + } + } + + Method [ public method getName ] { + + - Parameters [0] { + } + } + + Method [ public method getUri ] { + + - Parameters [0] { + } + } + + Method [ public method setUri ] { + + - Parameters [0] { + } + } + + Method [ public method setAppData ] { + + - Parameters [2] { + Parameter #0 [ string $name ] + Parameter #1 [ string $value ] + } + } + + Method [ public method getAppData ] { + + - Parameters [1] { + Parameter #0 [ string $name ] + } + } + + Method [ public method deleteAppData ] { + + - Parameters [1] { + Parameter #0 [ string $name ] + } + } + } + } } } diff --git a/php-pecl-mysql-xdevapi.spec b/php-pecl-mysql-xdevapi.spec index 1b9a35b..6d49474 100644 --- a/php-pecl-mysql-xdevapi.spec +++ b/php-pecl-mysql-xdevapi.spec @@ -13,13 +13,14 @@ %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name mysql_xdevapi +# https://bugzilla.redhat.com/show_bug.cgi?id=1470164 %global with_tests 0%{?_with_tests:1} # After 20-json, 20-mysqlnd %global ini_name 40-%{pecl_name}.ini Summary: MySQL database access functions Name: %{?sub_prefix}php-pecl-mysql-xdevapi -Version: 1.0.1 +Version: 8.0.2 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP @@ -56,10 +57,17 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} +# Removed +Obsoletes: %{name}-devel < 8.0.2 + %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff Obsoletes: php71u-pecl-%{pecl_name} <= %{version} Obsoletes: php71w-pecl-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -95,21 +103,14 @@ data. Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. -%package devel -Summary: %{name} developer files (header) -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{?scl_prefix}php-devel%{?_isa} - -%description devel -These are the files needed to compile programs using %{name}. - - %prep %setup -qc mv %{pecl_name}-%{version} NTS -%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} +# Don't install/register tests +sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -i package.xml cd NTS %patch0 -p1 -b .old @@ -181,10 +182,7 @@ make -C ZTS install INSTALL_ROOT=%{buildroot} install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif -# Test & Documentation -for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i -done +# Documentation for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') do [ -f NTS/$i ] && install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -224,8 +222,9 @@ MYSQLX_PID_FILE=$PWD/mysql.pid rm -rf data mkdir data -%{_bindir}/mysql_install_db \ - --datadir=$PWD/data +%{_libexecdir}/mysqld \ + --datadir=$PWD/data \ + --initialize %{_libexecdir}/mysqld \ --socket=$MYSQLX_TEST_SOCKET \ @@ -298,18 +297,13 @@ fi %endif -%files devel -%doc %{pecl_testdir}/%{pecl_name} -%{php_incldir}/ext/%{pecl_name} - -%if %{with_zts} -%{php_ztsincldir}/ext/%{pecl_name} -%endif - - %changelog +* Wed Jul 12 2017 Remi Collet - 8.0.2-1 +- Update to 8.0.2 (alpha) +- drop devel sub-package + * Tue Mar 14 2017 Remi Collet - 1.0.1-1 -- Update to 1.0.1 +- Update to 1.0.1 (alpha) * Thu Dec 8 2016 Remi Collet - 1.0.0-1 - initial package, version 1.0.0 (alpha) -- cgit