Skip to content

Commit b4c2670

Browse files
committed
Fix UNKNOWN default values in ext/pdo_pgsql
Closes GH-6159
1 parent d9628b9 commit b4c2670

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

ext/pdo_pgsql/pgsql_driver.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ PHP_METHOD(PDO_PGSql_Ext, pgsqlCopyFromArray)
559559
PGresult *pgsql_result;
560560
ExecStatusType status;
561561

562-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa|sss",
562+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa|sss!",
563563
&table_name, &table_name_len, &pg_rows,
564564
&pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len, &pg_fields, &pg_fields_len) == FAILURE) {
565565
RETURN_THROWS();
@@ -670,7 +670,7 @@ PHP_METHOD(PDO_PGSql_Ext, pgsqlCopyFromFile)
670670
ExecStatusType status;
671671
php_stream *stream;
672672

673-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sp|sss",
673+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sp|sss!",
674674
&table_name, &table_name_len, &filename, &filename_len,
675675
&pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len, &pg_fields, &pg_fields_len) == FAILURE) {
676676
RETURN_THROWS();
@@ -770,7 +770,7 @@ PHP_METHOD(PDO_PGSql_Ext, pgsqlCopyToFile)
770770

771771
php_stream *stream;
772772

773-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sp|sss",
773+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sp|sss!",
774774
&table_name, &table_name_len, &filename, &filename_len,
775775
&pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len, &pg_fields, &pg_fields_len) == FAILURE) {
776776
RETURN_THROWS();
@@ -862,7 +862,7 @@ PHP_METHOD(PDO_PGSql_Ext, pgsqlCopyToArray)
862862
PGresult *pgsql_result;
863863
ExecStatusType status;
864864

865-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|sss",
865+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|sss!",
866866
&table_name, &table_name_len,
867867
&pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len, &pg_fields, &pg_fields_len) == FAILURE) {
868868
RETURN_THROWS();

ext/pdo_pgsql/pgsql_driver.stub.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
// These are extension methods for PDO. This is not a real class.
66
class PDO_PGSql_Ext {
77
/** @return bool */
8-
public function pgsqlCopyFromArray(string $table_name, array $rows, string $delimiter = "\t", string $null_as = "\\\\N", string $fields = UNKNOWN) {}
8+
public function pgsqlCopyFromArray(string $table_name, array $rows, string $delimiter = "\t", string $null_as = "\\\\N", ?string $fields = null) {}
99

1010
/** @return bool */
11-
public function pgsqlCopyFromFile(string $table_name, string $filename, string $delimiter = "\t", string $null_as = "\\\\N", string $fields = UNKNOWN) {}
11+
public function pgsqlCopyFromFile(string $table_name, string $filename, string $delimiter = "\t", string $null_as = "\\\\N", ?string $fields = null) {}
1212

1313
/** @return array|false */
14-
public function pgsqlCopyToArray(string $table_name, string $delimiter = "\t", string $null_as = "\\\\N", string $fields = UNKNOWN) {}
14+
public function pgsqlCopyToArray(string $table_name, string $delimiter = "\t", string $null_as = "\\\\N", ?string $fields = null) {}
1515

1616
/** @return bool */
17-
public function pgsqlCopyToFile(string $table_name, string $filename, string $delimiter = "\t", string $null_as = "\\\\N", string $fields = UNKNOWN) {}
17+
public function pgsqlCopyToFile(string $table_name, string $filename, string $delimiter = "\t", string $null_as = "\\\\N", ?string $fields = null) {}
1818

1919
/** @return string|false */
2020
public function pgsqlLOBCreate() {}

ext/pdo_pgsql/pgsql_driver_arginfo.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 80c3e9c95db8c68ff3a2c2753aa5e9485af9fe4c */
2+
* Stub hash: 6e5758f2ff93c89f3658aa8f6cfb32a60fd85127 */
33

44
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_PGSql_Ext_pgsqlCopyFromArray, 0, 0, 2)
55
ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0)
66
ZEND_ARG_TYPE_INFO(0, rows, IS_ARRAY, 0)
77
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, delimiter, IS_STRING, 0, "\"\\t\"")
88
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, null_as, IS_STRING, 0, "\"\\\\\\\\N\"")
9-
ZEND_ARG_TYPE_INFO(0, fields, IS_STRING, 0)
9+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fields, IS_STRING, 1, "null")
1010
ZEND_END_ARG_INFO()
1111

1212
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_PGSql_Ext_pgsqlCopyFromFile, 0, 0, 2)
1313
ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0)
1414
ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
1515
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, delimiter, IS_STRING, 0, "\"\\t\"")
1616
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, null_as, IS_STRING, 0, "\"\\\\\\\\N\"")
17-
ZEND_ARG_TYPE_INFO(0, fields, IS_STRING, 0)
17+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fields, IS_STRING, 1, "null")
1818
ZEND_END_ARG_INFO()
1919

2020
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_PDO_PGSql_Ext_pgsqlCopyToArray, 0, 0, 1)
2121
ZEND_ARG_TYPE_INFO(0, table_name, IS_STRING, 0)
2222
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, delimiter, IS_STRING, 0, "\"\\t\"")
2323
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, null_as, IS_STRING, 0, "\"\\\\\\\\N\"")
24-
ZEND_ARG_TYPE_INFO(0, fields, IS_STRING, 0)
24+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, fields, IS_STRING, 1, "null")
2525
ZEND_END_ARG_INFO()
2626

2727
#define arginfo_class_PDO_PGSql_Ext_pgsqlCopyToFile arginfo_class_PDO_PGSql_Ext_pgsqlCopyFromFile

0 commit comments

Comments
 (0)