From 576aa1a2e97941a09096b0ed65feab3398a19236 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 19 Jan 2020 07:51:37 +0100 Subject: v2.1.6 --- 33.patch | 139 -------------- PHPINFO | 4 +- REFLECTION | 545 ++++++++++++++++++++++++++++--------------------------- php-pecl-pq.spec | 17 +- 4 files changed, 285 insertions(+), 420 deletions(-) delete mode 100644 33.patch diff --git a/33.patch b/33.patch deleted file mode 100644 index 28a7491..0000000 --- a/33.patch +++ /dev/null @@ -1,139 +0,0 @@ -From b71a5226c19caba947c99500385023fd043f6999 Mon Sep 17 00:00:00 2001 -From: Michael Wallner -Date: Tue, 18 Jun 2019 12:02:30 +0200 -Subject: [PATCH] fix issue #19: Failed test with PgSQL < 9.3 - ---- - src/php_pqres.c | 102 ++++++++++++++++++++++++++++-------------------- - 1 file changed, 60 insertions(+), 42 deletions(-) - -diff --git a/src/php_pqres.c b/src/php_pqres.c -index 849f8bf..3427b38 100644 ---- a/src/php_pqres.c -+++ b/src/php_pqres.c -@@ -491,65 +491,83 @@ static void php_pqres_object_read_error_message(zval *object, void *o, zval *ret - } - } - --static void php_pqres_object_read_diag(zval *object, void *o, zval *return_value) --{ -- php_pqres_object_t *obj = o; -- int i; -- struct { -- char code; -- const char *const name; -- } diag[] = { --#ifdef PG_DIAG_SEVERITY -- {PG_DIAG_SEVERITY, "severity"}, -+#ifndef PG_DIAG_SEVERITY -+# define PG_DIAG_SEVERITY 'S' - #endif --#ifdef PG_DIAG_SQLSTATE -- {PG_DIAG_SQLSTATE, "sqlstate"}, -+#ifndef PG_DIAG_SQLSTATE -+# define PG_DIAG_SQLSTATE 'C' - #endif --#ifdef PG_DIAG_MESSAGE_PRIMARY -- {PG_DIAG_MESSAGE_PRIMARY, "message_primary"}, -+#ifndef PG_DIAG_MESSAGE_PRIMARY -+# define PG_DIAG_MESSAGE_PRIMARY 'M' - #endif --#ifdef PG_DIAG_MESSAGE_DETAIL -- {PG_DIAG_MESSAGE_DETAIL, "message_detail"}, -+#ifndef PG_DIAG_MESSAGE_DETAIL -+# define PG_DIAG_MESSAGE_DETAIL 'D' - #endif --#ifdef PG_DIAG_MESSAGE_HINT -- {PG_DIAG_MESSAGE_HINT, "message_hint"}, -+#ifndef PG_DIAG_MESSAGE_HINT -+# define PG_DIAG_MESSAGE_HINT 'H' - #endif --#ifdef PG_DIAG_STATEMENT_POSITION -- {PG_DIAG_STATEMENT_POSITION,"statement_position"}, -+#ifndef PG_DIAG_STATEMENT_POSITION -+# define PG_DIAG_STATEMENT_POSITION 'P' - #endif --#ifdef PG_DIAG_INTERNAL_POSITION -- {PG_DIAG_INTERNAL_POSITION, "internal_position"}, -+#ifndef PG_DIAG_INTERNAL_POSITION -+# define PG_DIAG_INTERNAL_POSITION 'p' - #endif --#ifdef PG_DIAG_INTERNAL_QUERY -- {PG_DIAG_INTERNAL_QUERY, "internal_query"}, -+#ifndef PG_DIAG_INTERNAL_QUERY -+# define PG_DIAG_INTERNAL_QUERY 'q' - #endif --#ifdef PG_DIAG_CONTEXT -- {PG_DIAG_CONTEXT, "context"}, -+#ifndef PG_DIAG_CONTEXT -+# define PG_DIAG_CONTEXT 'W' - #endif --#ifdef PG_DIAG_SCHEMA_NAME -- {PG_DIAG_SCHEMA_NAME, "schema_name"}, -+#ifndef PG_DIAG_SCHEMA_NAME -+# define PG_DIAG_SCHEMA_NAME 's' - #endif --#ifdef PG_DIAG_TABLE_NAME -- {PG_DIAG_TABLE_NAME, "table_name"}, -+#ifndef PG_DIAG_TABLE_NAME -+# define PG_DIAG_TABLE_NAME 't' - #endif --#ifdef PG_DIAG_COLUMN_NAME -- {PG_DIAG_COLUMN_NAME, "column_name"}, -+#ifndef PG_DIAG_COLUMN_NAME -+# define PG_DIAG_COLUMN_NAME 'c' - #endif --#ifdef PG_DIAG_DATATYPE_NAME -- {PG_DIAG_DATATYPE_NAME, "datatype_name"}, -+#ifndef PG_DIAG_DATATYPE_NAME -+# define PG_DIAG_DATATYPE_NAME 'd' - #endif --#ifdef PG_DIAG_CONSTRAINT_NAME -- {PG_DIAG_CONSTRAINT_NAME, "constraint_name"}, -+#ifndef PG_DIAG_CONSTRAINT_NAME -+# define PG_DIAG_CONSTRAINT_NAME 'n' - #endif --#ifdef PG_DIAG_SOURCE_FILE -- {PG_DIAG_SOURCE_FILE, "source_file"}, -+#ifndef PG_DIAG_SOURCE_FILE -+# define PG_DIAG_SOURCE_FILE 'F' - #endif --#ifdef PG_DIAG_SOURCE_LINE -- {PG_DIAG_SOURCE_LINE, "source_line"}, -+#ifndef PG_DIAG_SOURCE_LINE -+# define PG_DIAG_SOURCE_LINE 'L' - #endif --#ifdef PG_DIAG_SOURCE_FUNCTION -- {PG_DIAG_SOURCE_FUNCTION, "source_function"}, -+#ifndef PG_DIAG_SOURCE_FUNCTION -+# define PG_DIAG_SOURCE_FUNCTION 'R' - #endif -+ -+static void php_pqres_object_read_diag(zval *object, void *o, zval *return_value) -+{ -+ php_pqres_object_t *obj = o; -+ int i; -+ struct { -+ char code; -+ const char *const name; -+ } diag[] = { -+ {PG_DIAG_SEVERITY, "severity"}, -+ {PG_DIAG_SQLSTATE, "sqlstate"}, -+ {PG_DIAG_MESSAGE_PRIMARY, "message_primary"}, -+ {PG_DIAG_MESSAGE_DETAIL, "message_detail"}, -+ {PG_DIAG_MESSAGE_HINT, "message_hint"}, -+ {PG_DIAG_STATEMENT_POSITION,"statement_position"}, -+ {PG_DIAG_INTERNAL_POSITION, "internal_position"}, -+ {PG_DIAG_INTERNAL_QUERY, "internal_query"}, -+ {PG_DIAG_CONTEXT, "context"}, -+ {PG_DIAG_SCHEMA_NAME, "schema_name"}, -+ {PG_DIAG_TABLE_NAME, "table_name"}, -+ {PG_DIAG_COLUMN_NAME, "column_name"}, -+ {PG_DIAG_DATATYPE_NAME, "datatype_name"}, -+ {PG_DIAG_CONSTRAINT_NAME, "constraint_name"}, -+ {PG_DIAG_SOURCE_FILE, "source_file"}, -+ {PG_DIAG_SOURCE_LINE, "source_line"}, -+ {PG_DIAG_SOURCE_FUNCTION, "source_function"}, - }; - - array_init_size(return_value, 32); diff --git a/PHPINFO b/PHPINFO index 1fcbe86..fbfb867 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,7 +2,7 @@ pq PQ Support => enabled -Extension Version => 2.1.5 +Extension Version => 2.1.6 Used Library => Compiled => Linked -libpq => 10.6 => 10.0.6 +libpq => 11.6 => 11.0.6 diff --git a/REFLECTION b/REFLECTION index 40686f7..efe0458 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #194 pq version 2.1.5 ] { +Extension [ extension #108 pq version 2.1.6 ] { - Dependencies { Dependency [ raphf (Required) ] @@ -67,8 +67,8 @@ Extension [ extension #194 pq version 2.1.5 ] { - Static properties [0] { } - - Static methods [3] { - Method [ static public method createFromFormat ] { + - Static methods [4] { + Method [ static public method createFromFormat ] { - Parameters [3] { Parameter #0 [ $format ] @@ -78,6 +78,17 @@ Extension [ extension #194 pq version 2.1.5 ] { } Method [ static public method __set_state ] { + + - Parameters [1] { + Parameter #0 [ array $array ] + } + } + + Method [ static public method createFromImmutable ] { + + - Parameters [1] { + Parameter #0 [ $DateTimeImmutable ] + } } Method [ static public method getLastErrors ] { @@ -216,15 +227,15 @@ Extension [ extension #194 pq version 2.1.5 ] { Interface [ interface pq\Exception extends Throwable ] { - Constants [9] { - Constant [ public integer INVALID_ARGUMENT ] { 0 } - Constant [ public integer RUNTIME ] { 1 } - Constant [ public integer CONNECTION_FAILED ] { 2 } - Constant [ public integer IO ] { 3 } - Constant [ public integer ESCAPE ] { 4 } - Constant [ public integer BAD_METHODCALL ] { 5 } - Constant [ public integer UNINITIALIZED ] { 6 } - Constant [ public integer DOMAIN ] { 7 } - Constant [ public integer SQL ] { 8 } + Constant [ public int INVALID_ARGUMENT ] { 0 } + Constant [ public int RUNTIME ] { 1 } + Constant [ public int CONNECTION_FAILED ] { 2 } + Constant [ public int IO ] { 3 } + Constant [ public int ESCAPE ] { 4 } + Constant [ public int BAD_METHODCALL ] { 5 } + Constant [ public int UNINITIALIZED ] { 6 } + Constant [ public int DOMAIN ] { 7 } + Constant [ public int SQL ] { 8 } } - Static properties [0] { @@ -266,15 +277,15 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\Exception\InvalidArgumentException extends InvalidArgumentException implements Throwable, pq\Exception ] { - Constants [9] { - Constant [ public integer INVALID_ARGUMENT ] { 0 } - Constant [ public integer RUNTIME ] { 1 } - Constant [ public integer CONNECTION_FAILED ] { 2 } - Constant [ public integer IO ] { 3 } - Constant [ public integer ESCAPE ] { 4 } - Constant [ public integer BAD_METHODCALL ] { 5 } - Constant [ public integer UNINITIALIZED ] { 6 } - Constant [ public integer DOMAIN ] { 7 } - Constant [ public integer SQL ] { 8 } + Constant [ public int INVALID_ARGUMENT ] { 0 } + Constant [ public int RUNTIME ] { 1 } + Constant [ public int CONNECTION_FAILED ] { 2 } + Constant [ public int IO ] { 3 } + Constant [ public int ESCAPE ] { 4 } + Constant [ public int BAD_METHODCALL ] { 5 } + Constant [ public int UNINITIALIZED ] { 6 } + Constant [ public int DOMAIN ] { 7 } + Constant [ public int SQL ] { 8 } } - Static properties [0] { @@ -332,15 +343,15 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\Exception\RuntimeException extends RuntimeException implements Throwable, pq\Exception ] { - Constants [9] { - Constant [ public integer INVALID_ARGUMENT ] { 0 } - Constant [ public integer RUNTIME ] { 1 } - Constant [ public integer CONNECTION_FAILED ] { 2 } - Constant [ public integer IO ] { 3 } - Constant [ public integer ESCAPE ] { 4 } - Constant [ public integer BAD_METHODCALL ] { 5 } - Constant [ public integer UNINITIALIZED ] { 6 } - Constant [ public integer DOMAIN ] { 7 } - Constant [ public integer SQL ] { 8 } + Constant [ public int INVALID_ARGUMENT ] { 0 } + Constant [ public int RUNTIME ] { 1 } + Constant [ public int CONNECTION_FAILED ] { 2 } + Constant [ public int IO ] { 3 } + Constant [ public int ESCAPE ] { 4 } + Constant [ public int BAD_METHODCALL ] { 5 } + Constant [ public int UNINITIALIZED ] { 6 } + Constant [ public int DOMAIN ] { 7 } + Constant [ public int SQL ] { 8 } } - Static properties [0] { @@ -398,15 +409,15 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\Exception\BadMethodCallException extends BadMethodCallException implements Throwable, pq\Exception ] { - Constants [9] { - Constant [ public integer INVALID_ARGUMENT ] { 0 } - Constant [ public integer RUNTIME ] { 1 } - Constant [ public integer CONNECTION_FAILED ] { 2 } - Constant [ public integer IO ] { 3 } - Constant [ public integer ESCAPE ] { 4 } - Constant [ public integer BAD_METHODCALL ] { 5 } - Constant [ public integer UNINITIALIZED ] { 6 } - Constant [ public integer DOMAIN ] { 7 } - Constant [ public integer SQL ] { 8 } + Constant [ public int INVALID_ARGUMENT ] { 0 } + Constant [ public int RUNTIME ] { 1 } + Constant [ public int CONNECTION_FAILED ] { 2 } + Constant [ public int IO ] { 3 } + Constant [ public int ESCAPE ] { 4 } + Constant [ public int BAD_METHODCALL ] { 5 } + Constant [ public int UNINITIALIZED ] { 6 } + Constant [ public int DOMAIN ] { 7 } + Constant [ public int SQL ] { 8 } } - Static properties [0] { @@ -464,15 +475,15 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\Exception\DomainException extends DomainException implements Throwable, pq\Exception ] { - Constants [9] { - Constant [ public integer INVALID_ARGUMENT ] { 0 } - Constant [ public integer RUNTIME ] { 1 } - Constant [ public integer CONNECTION_FAILED ] { 2 } - Constant [ public integer IO ] { 3 } - Constant [ public integer ESCAPE ] { 4 } - Constant [ public integer BAD_METHODCALL ] { 5 } - Constant [ public integer UNINITIALIZED ] { 6 } - Constant [ public integer DOMAIN ] { 7 } - Constant [ public integer SQL ] { 8 } + Constant [ public int INVALID_ARGUMENT ] { 0 } + Constant [ public int RUNTIME ] { 1 } + Constant [ public int CONNECTION_FAILED ] { 2 } + Constant [ public int IO ] { 3 } + Constant [ public int ESCAPE ] { 4 } + Constant [ public int BAD_METHODCALL ] { 5 } + Constant [ public int UNINITIALIZED ] { 6 } + Constant [ public int DOMAIN ] { 7 } + Constant [ public int SQL ] { 8 } } - Static properties [0] { @@ -531,28 +542,28 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\Connection ] { - Constants [22] { - Constant [ public integer OK ] { 0 } - Constant [ public integer BAD ] { 1 } - Constant [ public integer STARTED ] { 2 } - Constant [ public integer MADE ] { 3 } - Constant [ public integer AWAITING_RESPONSE ] { 4 } - Constant [ public integer AUTH_OK ] { 5 } - Constant [ public integer SSL_STARTUP ] { 7 } - Constant [ public integer SETENV ] { 6 } - Constant [ public integer TRANS_IDLE ] { 0 } - Constant [ public integer TRANS_ACTIVE ] { 1 } - Constant [ public integer TRANS_INTRANS ] { 2 } - Constant [ public integer TRANS_INERROR ] { 3 } - Constant [ public integer TRANS_UNKNOWN ] { 4 } - Constant [ public integer POLLING_FAILED ] { 0 } - Constant [ public integer POLLING_READING ] { 1 } - Constant [ public integer POLLING_WRITING ] { 2 } - Constant [ public integer POLLING_OK ] { 3 } + Constant [ public int OK ] { 0 } + Constant [ public int BAD ] { 1 } + Constant [ public int STARTED ] { 2 } + Constant [ public int MADE ] { 3 } + Constant [ public int AWAITING_RESPONSE ] { 4 } + Constant [ public int AUTH_OK ] { 5 } + Constant [ public int SSL_STARTUP ] { 7 } + Constant [ public int SETENV ] { 6 } + Constant [ public int TRANS_IDLE ] { 0 } + Constant [ public int TRANS_ACTIVE ] { 1 } + Constant [ public int TRANS_INTRANS ] { 2 } + Constant [ public int TRANS_INERROR ] { 3 } + Constant [ public int TRANS_UNKNOWN ] { 4 } + Constant [ public int POLLING_FAILED ] { 0 } + Constant [ public int POLLING_READING ] { 1 } + Constant [ public int POLLING_WRITING ] { 2 } + Constant [ public int POLLING_OK ] { 3 } Constant [ public string EVENT_NOTICE ] { notice } Constant [ public string EVENT_RESULT ] { result } Constant [ public string EVENT_RESET ] { reset } - Constant [ public integer ASYNC ] { 1 } - Constant [ public integer PERSISTENT ] { 2 } + Constant [ public int ASYNC ] { 1 } + Constant [ public int PERSISTENT ] { 2 } } - Static properties [0] { @@ -859,174 +870,168 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\Types ] { - - Constants [167] { - Constant [ public integer BOOL ] { 16 } - Constant [ public integer BYTEA ] { 17 } - Constant [ public integer CHAR ] { 18 } - Constant [ public integer NAME ] { 19 } - Constant [ public integer INT8 ] { 20 } - Constant [ public integer INT2 ] { 21 } - Constant [ public integer INT2VECTOR ] { 22 } - Constant [ public integer INT4 ] { 23 } - Constant [ public integer REGPROC ] { 24 } - Constant [ public integer TEXT ] { 25 } - Constant [ public integer OID ] { 26 } - Constant [ public integer TID ] { 27 } - Constant [ public integer XID ] { 28 } - Constant [ public integer CID ] { 29 } - Constant [ public integer OIDVECTOR ] { 30 } - Constant [ public integer PG_TYPE ] { 71 } - Constant [ public integer PG_ATTRIBUTE ] { 75 } - Constant [ public integer PG_PROC ] { 81 } - Constant [ public integer PG_CLASS ] { 83 } - Constant [ public integer JSON ] { 114 } - Constant [ public integer XML ] { 142 } - Constant [ public integer XMLARRAY ] { 143 } - Constant [ public integer JSONARRAY ] { 199 } - Constant [ public integer PG_NODE_TREE ] { 194 } - Constant [ public integer PG_NDISTINCT ] { 3361 } - Constant [ public integer PG_DEPENDENCIES ] { 3402 } - Constant [ public integer PG_DDL_COMMAND ] { 32 } - Constant [ public integer SMGR ] { 210 } - Constant [ public integer POINT ] { 600 } - Constant [ public integer LSEG ] { 601 } - Constant [ public integer PATH ] { 602 } - Constant [ public integer BOX ] { 603 } - Constant [ public integer POLYGON ] { 604 } - Constant [ public integer LINE ] { 628 } - Constant [ public integer LINEARRAY ] { 629 } - Constant [ public integer FLOAT4 ] { 700 } - Constant [ public integer FLOAT8 ] { 701 } - Constant [ public integer ABSTIME ] { 702 } - Constant [ public integer RELTIME ] { 703 } - Constant [ public integer TINTERVAL ] { 704 } - Constant [ public integer UNKNOWN ] { 705 } - Constant [ public integer CIRCLE ] { 718 } - Constant [ public integer CIRCLEARRAY ] { 719 } - Constant [ public integer MONEY ] { 790 } - Constant [ public integer MONEYARRAY ] { 791 } - Constant [ public integer MACADDR ] { 829 } - Constant [ public integer INET ] { 869 } - Constant [ public integer CIDR ] { 650 } - Constant [ public integer MACADDR8 ] { 774 } - Constant [ public integer BOOLARRAY ] { 1000 } - Constant [ public integer BYTEAARRAY ] { 1001 } - Constant [ public integer CHARARRAY ] { 1002 } - Constant [ public integer NAMEARRAY ] { 1003 } - Constant [ public integer INT2ARRAY ] { 1005 } - Constant [ public integer INT2VECTORARRAY ] { 1006 } - Constant [ public integer INT4ARRAY ] { 1007 } - Constant [ public integer REGPROCARRAY ] { 1008 } - Constant [ public integer TEXTARRAY ] { 1009 } - Constant [ public integer OIDARRAY ] { 1028 } - Constant [ public integer TIDARRAY ] { 1010 } - Constant [ public integer XIDARRAY ] { 1011 } - Constant [ public integer CIDARRAY ] { 1012 } - Constant [ public integer OIDVECTORARRAY ] { 1013 } - Constant [ public integer BPCHARARRAY ] { 1014 } - Constant [ public integer VARCHARARRAY ] { 1015 } - Constant [ public integer INT8ARRAY ] { 1016 } - Constant [ public integer POINTARRAY ] { 1017 } - Constant [ public integer LSEGARRAY ] { 1018 } - Constant [ public integer PATHARRAY ] { 1019 } - Constant [ public integer BOXARRAY ] { 1020 } - Constant [ public integer FLOAT4ARRAY ] { 1021 } - Constant [ public integer FLOAT8ARRAY ] { 1022 } - Constant [ public integer ABSTIMEARRAY ] { 1023 } - Constant [ public integer RELTIMEARRAY ] { 1024 } - Constant [ public integer TINTERVALARRAY ] { 1025 } - Constant [ public integer POLYGONARRAY ] { 1027 } - Constant [ public integer ACLITEM ] { 1033 } - Constant [ public integer ACLITEMARRAY ] { 1034 } - Constant [ public integer MACADDRARRAY ] { 1040 } - Constant [ public integer MACADDR8ARRAY ] { 775 } - Constant [ public integer INETARRAY ] { 1041 } - Constant [ public integer CIDRARRAY ] { 651 } - Constant [ public integer CSTRINGARRAY ] { 1263 } - Constant [ public integer BPCHAR ] { 1042 } - Constant [ public integer VARCHAR ] { 1043 } - Constant [ public integer DATE ] { 1082 } - Constant [ public integer TIME ] { 1083 } - Constant [ public integer TIMESTAMP ] { 1114 } - Constant [ public integer TIMESTAMPARRAY ] { 1115 } - Constant [ public integer DATEARRAY ] { 1182 } - Constant [ public integer TIMEARRAY ] { 1183 } - Constant [ public integer TIMESTAMPTZ ] { 1184 } - Constant [ public integer TIMESTAMPTZARRAY ] { 1185 } - Constant [ public integer INTERVAL ] { 1186 } - Constant [ public integer INTERVALARRAY ] { 1187 } - Constant [ public integer NUMERICARRAY ] { 1231 } - Constant [ public integer TIMETZ ] { 1266 } - Constant [ public integer TIMETZARRAY ] { 1270 } - Constant [ public integer BIT ] { 1560 } - Constant [ public integer BITARRAY ] { 1561 } - Constant [ public integer VARBIT ] { 1562 } - Constant [ public integer VARBITARRAY ] { 1563 } - Constant [ public integer NUMERIC ] { 1700 } - Constant [ public integer REFCURSOR ] { 1790 } - Constant [ public integer REFCURSORARRAY ] { 2201 } - Constant [ public integer REGPROCEDURE ] { 2202 } - Constant [ public integer REGOPER ] { 2203 } - Constant [ public integer REGOPERATOR ] { 2204 } - Constant [ public integer REGCLASS ] { 2205 } - Constant [ public integer REGTYPE ] { 2206 } - Constant [ public integer REGROLE ] { 4096 } - Constant [ public integer REGNAMESPACE ] { 4089 } - Constant [ public integer REGPROCEDUREARRAY ] { 2207 } - Constant [ public integer REGOPERARRAY ] { 2208 } - Constant [ public integer REGOPERATORARRAY ] { 2209 } - Constant [ public integer REGCLASSARRAY ] { 2210 } - Constant [ public integer REGTYPEARRAY ] { 2211 } - Constant [ public integer REGROLEARRAY ] { 4097 } - Constant [ public integer REGNAMESPACEARRAY ] { 4090 } - Constant [ public integer UUID ] { 2950 } - Constant [ public integer UUIDARRAY ] { 2951 } - Constant [ public integer PG_LSN ] { 3220 } - Constant [ public integer PG_LSNARRAY ] { 3221 } - Constant [ public integer TSVECTOR ] { 3614 } - Constant [ public integer GTSVECTOR ] { 3642 } - Constant [ public integer TSQUERY ] { 3615 } - Constant [ public integer REGCONFIG ] { 3734 } - Constant [ public integer REGDICTIONARY ] { 3769 } - Constant [ public integer TSVECTORARRAY ] { 3643 } - Constant [ public integer GTSVECTORARRAY ] { 3644 } - Constant [ public integer TSQUERYARRAY ] { 3645 } - Constant [ public integer REGCONFIGARRAY ] { 3735 } - Constant [ public integer REGDICTIONARYARRAY ] { 3770 } - Constant [ public integer JSONB ] { 3802 } - Constant [ public integer JSONBARRAY ] { 3807 } - Constant [ public integer TXID_SNAPSHOT ] { 2970 } - Constant [ public integer TXID_SNAPSHOTARRAY ] { 2949 } - Constant [ public integer INT4RANGE ] { 3904 } - Constant [ public integer INT4RANGEARRAY ] { 3905 } - Constant [ public integer NUMRANGE ] { 3906 } - Constant [ public integer NUMRANGEARRAY ] { 3907 } - Constant [ public integer TSRANGE ] { 3908 } - Constant [ public integer TSRANGEARRAY ] { 3909 } - Constant [ public integer TSTZRANGE ] { 3910 } - Constant [ public integer TSTZRANGEARRAY ] { 3911 } - Constant [ public integer DATERANGE ] { 3912 } - Constant [ public integer DATERANGEARRAY ] { 3913 } - Constant [ public integer INT8RANGE ] { 3926 } - Constant [ public integer INT8RANGEARRAY ] { 3927 } - Constant [ public integer RECORD ] { 2249 } - Constant [ public integer RECORDARRAY ] { 2287 } - Constant [ public integer CSTRING ] { 2275 } - Constant [ public integer ANY ] { 2276 } - Constant [ public integer ANYARRAY ] { 2277 } - Constant [ public integer VOID ] { 2278 } - Constant [ public integer TRIGGER ] { 2279 } - Constant [ public integer EVENT_TRIGGER ] { 3838 } - Constant [ public integer LANGUAGE_HANDLER ] { 2280 } - Constant [ public integer INTERNAL ] { 2281 } - Constant [ public integer OPAQUE ] { 2282 } - Constant [ public integer ANYELEMENT ] { 2283 } - Constant [ public integer ANYNONARRAY ] { 2776 } - Constant [ public integer ANYENUM ] { 3500 } - Constant [ public integer FDW_HANDLER ] { 3115 } - Constant [ public integer INDEX_AM_HANDLER ] { 325 } - Constant [ public integer TSM_HANDLER ] { 3310 } - Constant [ public integer ANYRANGE ] { 3831 } + - Constants [161] { + Constant [ public int BOOL ] { 16 } + Constant [ public int BYTEA ] { 17 } + Constant [ public int CHAR ] { 18 } + Constant [ public int NAME ] { 19 } + Constant [ public int INT8 ] { 20 } + Constant [ public int INT2 ] { 21 } + Constant [ public int INT2VECTOR ] { 22 } + Constant [ public int INT4 ] { 23 } + Constant [ public int REGPROC ] { 24 } + Constant [ public int TEXT ] { 25 } + Constant [ public int OID ] { 26 } + Constant [ public int TID ] { 27 } + Constant [ public int XID ] { 28 } + Constant [ public int CID ] { 29 } + Constant [ public int OIDVECTOR ] { 30 } + Constant [ public int PG_DDL_COMMAND ] { 32 } + Constant [ public int PG_TYPE ] { 71 } + Constant [ public int PG_ATTRIBUTE ] { 75 } + Constant [ public int PG_PROC ] { 81 } + Constant [ public int PG_CLASS ] { 83 } + Constant [ public int JSON ] { 114 } + Constant [ public int XML ] { 142 } + Constant [ public int XMLARRAY ] { 143 } + Constant [ public int PG_NODE_TREE ] { 194 } + Constant [ public int JSONARRAY ] { 199 } + Constant [ public int SMGR ] { 210 } + Constant [ public int INDEX_AM_HANDLER ] { 325 } + Constant [ public int POINT ] { 600 } + Constant [ public int LSEG ] { 601 } + Constant [ public int PATH ] { 602 } + Constant [ public int BOX ] { 603 } + Constant [ public int POLYGON ] { 604 } + Constant [ public int LINE ] { 628 } + Constant [ public int LINEARRAY ] { 629 } + Constant [ public int CIDR ] { 650 } + Constant [ public int CIDRARRAY ] { 651 } + Constant [ public int FLOAT4 ] { 700 } + Constant [ public int FLOAT8 ] { 701 } + Constant [ public int UNKNOWN ] { 705 } + Constant [ public int CIRCLE ] { 718 } + Constant [ public int CIRCLEARRAY ] { 719 } + Constant [ public int MACADDR8 ] { 774 } + Constant [ public int MACADDR8ARRAY ] { 775 } + Constant [ public int MONEY ] { 790 } + Constant [ public int MONEYARRAY ] { 791 } + Constant [ public int MACADDR ] { 829 } + Constant [ public int INET ] { 869 } + Constant [ public int BOOLARRAY ] { 1000 } + Constant [ public int BYTEAARRAY ] { 1001 } + Constant [ public int CHARARRAY ] { 1002 } + Constant [ public int NAMEARRAY ] { 1003 } + Constant [ public int INT2ARRAY ] { 1005 } + Constant [ public int INT2VECTORARRAY ] { 1006 } + Constant [ public int INT4ARRAY ] { 1007 } + Constant [ public int REGPROCARRAY ] { 1008 } + Constant [ public int TEXTARRAY ] { 1009 } + Constant [ public int TIDARRAY ] { 1010 } + Constant [ public int XIDARRAY ] { 1011 } + Constant [ public int CIDARRAY ] { 1012 } + Constant [ public int OIDVECTORARRAY ] { 1013 } + Constant [ public int BPCHARARRAY ] { 1014 } + Constant [ public int VARCHARARRAY ] { 1015 } + Constant [ public int INT8ARRAY ] { 1016 } + Constant [ public int POINTARRAY ] { 1017 } + Constant [ public int LSEGARRAY ] { 1018 } + Constant [ public int PATHARRAY ] { 1019 } + Constant [ public int BOXARRAY ] { 1020 } + Constant [ public int FLOAT4ARRAY ] { 1021 } + Constant [ public int FLOAT8ARRAY ] { 1022 } + Constant [ public int POLYGONARRAY ] { 1027 } + Constant [ public int OIDARRAY ] { 1028 } + Constant [ public int ACLITEM ] { 1033 } + Constant [ public int ACLITEMARRAY ] { 1034 } + Constant [ public int MACADDRARRAY ] { 1040 } + Constant [ public int INETARRAY ] { 1041 } + Constant [ public int BPCHAR ] { 1042 } + Constant [ public int VARCHAR ] { 1043 } + Constant [ public int DATE ] { 1082 } + Constant [ public int TIME ] { 1083 } + Constant [ public int TIMESTAMP ] { 1114 } + Constant [ public int TIMESTAMPARRAY ] { 1115 } + Constant [ public int DATEARRAY ] { 1182 } + Constant [ public int TIMEARRAY ] { 1183 } + Constant [ public int TIMESTAMPTZ ] { 1184 } + Constant [ public int TIMESTAMPTZARRAY ] { 1185 } + Constant [ public int INTERVAL ] { 1186 } + Constant [ public int INTERVALARRAY ] { 1187 } + Constant [ public int NUMERICARRAY ] { 1231 } + Constant [ public int CSTRINGARRAY ] { 1263 } + Constant [ public int TIMETZ ] { 1266 } + Constant [ public int TIMETZARRAY ] { 1270 } + Constant [ public int BIT ] { 1560 } + Constant [ public int BITARRAY ] { 1561 } + Constant [ public int VARBIT ] { 1562 } + Constant [ public int VARBITARRAY ] { 1563 } + Constant [ public int NUMERIC ] { 1700 } + Constant [ public int REFCURSOR ] { 1790 } + Constant [ public int REFCURSORARRAY ] { 2201 } + Constant [ public int REGPROCEDURE ] { 2202 } + Constant [ public int REGOPER ] { 2203 } + Constant [ public int REGOPERATOR ] { 2204 } + Constant [ public int REGCLASS ] { 2205 } + Constant [ public int REGTYPE ] { 2206 } + Constant [ public int REGPROCEDUREARRAY ] { 2207 } + Constant [ public int REGOPERARRAY ] { 2208 } + Constant [ public int REGOPERATORARRAY ] { 2209 } + Constant [ public int REGCLASSARRAY ] { 2210 } + Constant [ public int REGTYPEARRAY ] { 2211 } + Constant [ public int RECORD ] { 2249 } + Constant [ public int CSTRING ] { 2275 } + Constant [ public int ANY ] { 2276 } + Constant [ public int ANYARRAY ] { 2277 } + Constant [ public int VOID ] { 2278 } + Constant [ public int TRIGGER ] { 2279 } + Constant [ public int LANGUAGE_HANDLER ] { 2280 } + Constant [ public int INTERNAL ] { 2281 } + Constant [ public int OPAQUE ] { 2282 } + Constant [ public int ANYELEMENT ] { 2283 } + Constant [ public int _RECORD ] { 2287 } + Constant [ public int ANYNONARRAY ] { 2776 } + Constant [ public int TXID_SNAPSHOTARRAY ] { 2949 } + Constant [ public int UUID ] { 2950 } + Constant [ public int UUIDARRAY ] { 2951 } + Constant [ public int TXID_SNAPSHOT ] { 2970 } + Constant [ public int FDW_HANDLER ] { 3115 } + Constant [ public int PG_LSN ] { 3220 } + Constant [ public int PG_LSNARRAY ] { 3221 } + Constant [ public int TSM_HANDLER ] { 3310 } + Constant [ public int PG_NDISTINCT ] { 3361 } + Constant [ public int PG_DEPENDENCIES ] { 3402 } + Constant [ public int ANYENUM ] { 3500 } + Constant [ public int TSVECTOR ] { 3614 } + Constant [ public int TSQUERY ] { 3615 } + Constant [ public int GTSVECTOR ] { 3642 } + Constant [ public int TSVECTORARRAY ] { 3643 } + Constant [ public int GTSVECTORARRAY ] { 3644 } + Constant [ public int TSQUERYARRAY ] { 3645 } + Constant [ public int REGCONFIG ] { 3734 } + Constant [ public int REGCONFIGARRAY ] { 3735 } + Constant [ public int REGDICTIONARY ] { 3769 } + Constant [ public int REGDICTIONARYARRAY ] { 3770 } + Constant [ public int JSONB ] { 3802 } + Constant [ public int JSONBARRAY ] { 3807 } + Constant [ public int ANYRANGE ] { 3831 } + Constant [ public int EVENT_TRIGGER ] { 3838 } + Constant [ public int INT4RANGE ] { 3904 } + Constant [ public int INT4RANGEARRAY ] { 3905 } + Constant [ public int NUMRANGE ] { 3906 } + Constant [ public int NUMRANGEARRAY ] { 3907 } + Constant [ public int TSRANGE ] { 3908 } + Constant [ public int TSRANGEARRAY ] { 3909 } + Constant [ public int TSTZRANGE ] { 3910 } + Constant [ public int TSTZRANGEARRAY ] { 3911 } + Constant [ public int DATERANGE ] { 3912 } + Constant [ public int DATERANGEARRAY ] { 3913 } + Constant [ public int INT8RANGE ] { 3926 } + Constant [ public int INT8RANGEARRAY ] { 3927 } + Constant [ public int REGNAMESPACE ] { 4089 } + Constant [ public int REGNAMESPACEARRAY ] { 4090 } + Constant [ public int REGROLE ] { 4096 } + Constant [ public int REGROLEARRAY ] { 4097 } } - Static properties [0] { @@ -1060,27 +1065,27 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\Result implements Traversable, Countable ] { - Constants [21] { - Constant [ public integer EMPTY_QUERY ] { 0 } - Constant [ public integer COMMAND_OK ] { 1 } - Constant [ public integer TUPLES_OK ] { 2 } - Constant [ public integer COPY_OUT ] { 3 } - Constant [ public integer COPY_IN ] { 4 } - Constant [ public integer BAD_RESPONSE ] { 5 } - Constant [ public integer NONFATAL_ERROR ] { 6 } - Constant [ public integer FATAL_ERROR ] { 7 } - Constant [ public integer COPY_BOTH ] { 8 } - Constant [ public integer SINGLE_TUPLE ] { 9 } - Constant [ public integer FETCH_ARRAY ] { 0 } - Constant [ public integer FETCH_ASSOC ] { 1 } - Constant [ public integer FETCH_OBJECT ] { 2 } - Constant [ public integer CONV_BOOL ] { 1 } - Constant [ public integer CONV_INT ] { 2 } - Constant [ public integer CONV_FLOAT ] { 4 } - Constant [ public integer CONV_SCALAR ] { 15 } - Constant [ public integer CONV_ARRAY ] { 16 } - Constant [ public integer CONV_DATETIME ] { 32 } - Constant [ public integer CONV_JSON ] { 256 } - Constant [ public integer CONV_ALL ] { 65535 } + Constant [ public int EMPTY_QUERY ] { 0 } + Constant [ public int COMMAND_OK ] { 1 } + Constant [ public int TUPLES_OK ] { 2 } + Constant [ public int COPY_OUT ] { 3 } + Constant [ public int COPY_IN ] { 4 } + Constant [ public int BAD_RESPONSE ] { 5 } + Constant [ public int NONFATAL_ERROR ] { 6 } + Constant [ public int FATAL_ERROR ] { 7 } + Constant [ public int COPY_BOTH ] { 8 } + Constant [ public int SINGLE_TUPLE ] { 9 } + Constant [ public int FETCH_ARRAY ] { 0 } + Constant [ public int FETCH_ASSOC ] { 1 } + Constant [ public int FETCH_OBJECT ] { 2 } + Constant [ public int CONV_BOOL ] { 1 } + Constant [ public int CONV_INT ] { 2 } + Constant [ public int CONV_FLOAT ] { 4 } + Constant [ public int CONV_SCALAR ] { 15 } + Constant [ public int CONV_ARRAY ] { 16 } + Constant [ public int CONV_DATETIME ] { 32 } + Constant [ public int CONV_JSON ] { 256 } + Constant [ public int CONV_ALL ] { 65535 } } - Static properties [0] { @@ -1263,9 +1268,9 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\Transaction ] { - Constants [3] { - Constant [ public integer READ_COMMITTED ] { 0 } - Constant [ public integer REPEATABLE_READ ] { 1 } - Constant [ public integer SERIALIZABLE ] { 2 } + Constant [ public int READ_COMMITTED ] { 0 } + Constant [ public int REPEATABLE_READ ] { 1 } + Constant [ public int SERIALIZABLE ] { 2 } } - Static properties [0] { @@ -1398,11 +1403,11 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\Cursor ] { - Constants [5] { - Constant [ public integer BINARY ] { 1 } - Constant [ public integer INSENSITIVE ] { 2 } - Constant [ public integer WITH_HOLD ] { 4 } - Constant [ public integer SCROLL ] { 16 } - Constant [ public integer NO_SCROLL ] { 32 } + Constant [ public int BINARY ] { 1 } + Constant [ public int INSENSITIVE ] { 2 } + Constant [ public int WITH_HOLD ] { 4 } + Constant [ public int SCROLL ] { 16 } + Constant [ public int NO_SCROLL ] { 32 } } - Static properties [0] { @@ -1489,8 +1494,8 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\COPY ] { - Constants [2] { - Constant [ public integer FROM_STDIN ] { 0 } - Constant [ public integer TO_STDOUT ] { 1 } + Constant [ public int FROM_STDIN ] { 0 } + Constant [ public int TO_STDOUT ] { 1 } } - Static properties [0] { @@ -1543,10 +1548,10 @@ Extension [ extension #194 pq version 2.1.5 ] { Class [ class pq\LOB ] { - Constants [4] { - Constant [ public integer INVALID_OID ] { 0 } - Constant [ public integer R ] { 262144 } - Constant [ public integer W ] { 131072 } - Constant [ public integer RW ] { 393216 } + Constant [ public int INVALID_OID ] { 0 } + Constant [ public int R ] { 262144 } + Constant [ public int W ] { 131072 } + Constant [ public int RW ] { 393216 } } - Static properties [0] { diff --git a/php-pecl-pq.spec b/php-pecl-pq.spec index fb5140e..8f2dd81 100644 --- a/php-pecl-pq.spec +++ b/php-pecl-pq.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-pq # -# Copyright (c) 2014-2019 Remi Collet +# Copyright (c) 2014-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -30,18 +30,16 @@ Summary: PostgreSQL client library (libpq) binding Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 2.1.5 +Version: 2.1.6 %if 0%{?gh_date:1} Release: 0.10.%{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: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif License: BSD -URL: http://pecl.php.net/package/%{pecl_name} - -Patch0: https://patch-diff.githubusercontent.com/raw/m6w6/ext-pq/pull/33.patch +URL: https://pecl.php.net/package/%{pecl_name} %if 0%{?fedora} >= 29 && 0%{?rhel} >= 8 BuildRequires: libpq-devel > 9 @@ -129,8 +127,6 @@ sed -e '/role="test"/d' \ -i package.xml cd NTS -%patch0 -p1 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_PQ_VERSION/{s/.* "//;s/".*$//;p}' php_pq.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -300,6 +296,9 @@ exit $RET %changelog +* Sun Jan 19 2020 Remi Collet - 2.1.6-1 +- update to 2.1.6 + * Tue Sep 03 2019 Remi Collet - 2.1.5-4 - rebuild for 7.4.0RC1 -- cgit