diff options
| author | Matteo Beccati <mbeccati@php.net> | 2015-06-12 02:08:30 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2015-06-12 02:08:30 +0200 |
| commit | 730d7b8fcad30addc80d685e046b5f05bb3d0190 (patch) | |
| tree | 8a19905b87a44b92aef09324ff28514f3b91f476 /ext/pdo_pgsql/pgsql_statement.c | |
| parent | cd5b7e968801ad2df0576cdc3273d2847590ad30 (diff) | |
| parent | 3bb1a4ffe387d0c3c18af364a8c568c71a7d7d8e (diff) | |
| download | php-git-730d7b8fcad30addc80d685e046b5f05bb3d0190.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
Fixed bug #61574 - No MSI
Conflicts:
ext/pdo_pgsql/pgsql_statement.c
Diffstat (limited to 'ext/pdo_pgsql/pgsql_statement.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_statement.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index 835c4dd97d..9c2a0e2efd 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -301,8 +301,8 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data * if (param->paramno >= 0) { zval *parameter; - if (param->paramno >= zend_hash_num_elements(stmt->bound_param_map)) { - pdo_pgsql_error_stmt(stmt, PGRES_FATAL_ERROR, "HY105"); + if (param->paramno >= zend_hash_num_elements(stmt->bound_params)) { + pdo_raise_impl_error(stmt->dbh, stmt, "HY093", "parameter was not defined"); return 0; } |