diff options
| author | Matteo Beccati <mbeccati@php.net> | 2015-06-12 02:07:02 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2015-06-12 02:07:02 +0200 |
| commit | 3bb1a4ffe387d0c3c18af364a8c568c71a7d7d8e (patch) | |
| tree | cb856b62b7d8700467c55d41148a0747e7b7140a /ext/pdo_pgsql/pgsql_statement.c | |
| parent | afa4c3e7c72a616d21780fd39764f7fc03d0a3df (diff) | |
| parent | b60efdce9fe7e168ba37070a4307269483a66ea4 (diff) | |
| download | php-git-3bb1a4ffe387d0c3c18af364a8c568c71a7d7d8e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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_driver.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 657c386b0c..708977c55e 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -297,8 +297,8 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data * sizeof(Oid)); } if (param->paramno >= 0) { - 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" TSRMLS_CC); return 0; } |