@@ -1994,7 +1994,7 @@ PHP_FUNCTION(pg_fetch_all)
1994
1994
}
1995
1995
1996
1996
if (!(result_type & PGSQL_BOTH )) {
1997
- zend_argument_value_error (4 , "must be one of PGSQL_ASSOC, PGSQL_NUM, or PGSQL_BOTH" );
1997
+ zend_argument_value_error (2 , "must be one of PGSQL_ASSOC, PGSQL_NUM, or PGSQL_BOTH" );
1998
1998
RETURN_THROWS ();
1999
1999
}
2000
2000
@@ -2345,7 +2345,7 @@ PHP_FUNCTION(pg_lo_create)
2345
2345
default :
2346
2346
php_error_docref (NULL , E_NOTICE , "Invalid OID value passed" );
2347
2347
RETURN_FALSE ;
2348
- }
2348
+ }
2349
2349
if ((pgsql_oid = lo_create (pgsql , wanted_oid )) == InvalidOid ) {
2350
2350
php_error_docref (NULL , E_WARNING , "Unable to create PostgreSQL large object" );
2351
2351
RETURN_FALSE ;
@@ -2741,9 +2741,9 @@ PHP_FUNCTION(pg_lo_import)
2741
2741
default :
2742
2742
php_error_docref (NULL , E_NOTICE , "Invalid OID value passed" );
2743
2743
RETURN_FALSE ;
2744
- }
2744
+ }
2745
2745
2746
- returned_oid = lo_import_with_oid (pgsql , file_in , wanted_oid );
2746
+ returned_oid = lo_import_with_oid (pgsql , file_in , wanted_oid );
2747
2747
2748
2748
if (returned_oid == InvalidOid ) {
2749
2749
RETURN_FALSE ;
@@ -4503,7 +4503,7 @@ static php_pgsql_data_type php_pgsql_get_data_type(const char *type_name, size_t
4503
4503
static int php_pgsql_convert_match (const char * str , size_t str_len , const char * regex , size_t regex_len , int icase )
4504
4504
{
4505
4505
pcre2_code * re ;
4506
- PCRE2_SIZE err_offset ;
4506
+ PCRE2_SIZE err_offset ;
4507
4507
int res , errnumber ;
4508
4508
uint32_t options = PCRE2_NO_AUTO_CAPTURE ;
4509
4509
size_t i ;
@@ -5263,8 +5263,8 @@ PHP_FUNCTION(pg_convert)
5263
5263
5264
5264
if (option & ~PGSQL_CONV_OPTS ) {
5265
5265
zend_argument_value_error (4 , "must be a valid bit mask of PGSQL_CONV_IGNORE_DEFAULT, "
5266
- "PGSQL_CONV_FORCE_NULL, or PGSQL_CONV_IGNORE_NOT_NULL" );
5267
- RETURN_THROWS ();
5266
+ "PGSQL_CONV_FORCE_NULL, and PGSQL_CONV_IGNORE_NOT_NULL" );
5267
+ RETURN_THROWS ();
5268
5268
}
5269
5269
5270
5270
if ((pg_link = (PGconn * )zend_fetch_resource2 (Z_RES_P (pgsql_link ), "PostgreSQL link" , le_link , le_plink )) == NULL ) {
@@ -5477,8 +5477,8 @@ PHP_FUNCTION(pg_insert)
5477
5477
5478
5478
if (option & ~(PGSQL_CONV_OPTS |PGSQL_DML_NO_CONV |PGSQL_DML_EXEC |PGSQL_DML_ASYNC |PGSQL_DML_STRING |PGSQL_DML_ESCAPE )) {
5479
5479
zend_argument_value_error (4 , "must be a valid bit mask of PGSQL_CONV_FORCE_NULL, PGSQL_DML_NO_CONV, "
5480
- "PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC or PGSQL_DML_STRING" );
5481
- RETURN_THROWS ();
5480
+ "PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC, and PGSQL_DML_STRING" );
5481
+ RETURN_THROWS ();
5482
5482
}
5483
5483
5484
5484
if ((pg_link = (PGconn * )zend_fetch_resource2 (Z_RES_P (pgsql_link ), "PostgreSQL link" , le_link , le_plink )) == NULL ) {
@@ -5694,8 +5694,8 @@ PHP_FUNCTION(pg_update)
5694
5694
5695
5695
if (option & ~(PGSQL_CONV_OPTS |PGSQL_DML_NO_CONV |PGSQL_DML_EXEC |PGSQL_DML_STRING |PGSQL_DML_ESCAPE )) {
5696
5696
zend_argument_value_error (5 , "must be a valid bit mask of PGSQL_CONV_FORCE_NULL, PGSQL_DML_NO_CONV, "
5697
- "PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC or PGSQL_DML_STRING" );
5698
- RETURN_THROWS ();
5697
+ "PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC, and PGSQL_DML_STRING" );
5698
+ RETURN_THROWS ();
5699
5699
}
5700
5700
5701
5701
if ((pg_link = (PGconn * )zend_fetch_resource2 (Z_RES_P (pgsql_link ), "PostgreSQL link" , le_link , le_plink )) == NULL ) {
@@ -5791,8 +5791,8 @@ PHP_FUNCTION(pg_delete)
5791
5791
5792
5792
if (option & ~(PGSQL_CONV_FORCE_NULL |PGSQL_DML_NO_CONV |PGSQL_DML_EXEC |PGSQL_DML_STRING |PGSQL_DML_ESCAPE )) {
5793
5793
zend_argument_value_error (4 , "must be a valid bit mask of PGSQL_CONV_FORCE_NULL, PGSQL_DML_NO_CONV, "
5794
- "PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC or PGSQL_DML_STRING" );
5795
- RETURN_THROWS ();
5794
+ "PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC, and PGSQL_DML_STRING" );
5795
+ RETURN_THROWS ();
5796
5796
}
5797
5797
5798
5798
if ((pg_link = (PGconn * )zend_fetch_resource2 (Z_RES_P (pgsql_link ), "PostgreSQL link" , le_link , le_plink )) == NULL ) {
@@ -5936,7 +5936,7 @@ PHP_FUNCTION(pg_select)
5936
5936
5937
5937
if (option & ~(PGSQL_CONV_FORCE_NULL |PGSQL_DML_NO_CONV |PGSQL_DML_EXEC |PGSQL_DML_ASYNC |PGSQL_DML_STRING |PGSQL_DML_ESCAPE )) {
5938
5938
zend_argument_value_error (4 , "must be a valid bit mask of PGSQL_CONV_FORCE_NULL, PGSQL_DML_NO_CONV, "
5939
- "PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC or PGSQL_DML_STRING" );
5939
+ "PGSQL_DML_ESCAPE, PGSQL_DML_EXEC, PGSQL_DML_ASYNC, and PGSQL_DML_STRING" );
5940
5940
RETURN_THROWS ();
5941
5941
}
5942
5942
if (!(result_type & PGSQL_BOTH )) {
0 commit comments