diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2004-01-11 21:18:19 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2004-01-11 21:18:19 +0000 |
| commit | 3b7da77480e0ff048ef5f1fb8e02dc9992ff22cc (patch) | |
| tree | 971c389e1158f870a0f1b3d7ef1bd3e7104290cc /ext/pgsql | |
| parent | ac5d5c7f35561f9469d77ca3346a4d68c3272a28 (diff) | |
| download | php-git-3b7da77480e0ff048ef5f1fb8e02dc9992ff22cc.tar.gz | |
Fixed bug #26864 (pg_(update|delete) ignore PGSQL_DML_EXEC option).
Diffstat (limited to 'ext/pgsql')
| -rw-r--r-- | ext/pgsql/pgsql.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 92a51862c5..42e3cb79bf 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -4424,8 +4424,11 @@ PHP_PGSQL_API int php_pgsql_update(PGconn *pg_link, const char *table, zval *var smart_str_appendc(&querystr, ';'); smart_str_0(&querystr); - if (do_exec(&querystr, PGRES_COMMAND_OK, pg_link, opt TSRMLS_CC) == 0) + if ((opt & PGSQL_DML_EXEC) && do_exec(&querystr, PGRES_COMMAND_OK, pg_link, opt TSRMLS_CC) == 0) { ret = SUCCESS; + } else if (opt & PGSQL_DML_STRING) { + ret = SUCCESS; + } cleanup: if (var_converted) { @@ -4517,8 +4520,11 @@ PHP_PGSQL_API int php_pgsql_delete(PGconn *pg_link, const char *table, zval *ids smart_str_appendc(&querystr, ';'); smart_str_0(&querystr); - if (do_exec(&querystr, PGRES_COMMAND_OK, pg_link, opt TSRMLS_CC) == 0) + if ((opt & PGSQL_DML_EXEC) && do_exec(&querystr, PGRES_COMMAND_OK, pg_link, opt TSRMLS_CC) == 0) { ret = SUCCESS; + } else if (opt & PGSQL_DML_STRING) { + ret = SUCCESS; + } cleanup: if (!(opt & PGSQL_DML_NO_CONV)) { |