cvs: php-src /ext/sqlite3 sqlite3.c
| From: | Scott MacVicar | Date: | Mon, 19 Jan 2009 22:45:30 +0000 |
| Subject: | cvs: php-src /ext/sqlite3 sqlite3.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-55776@lists.php.net to get a copy of this message | ||
scottmac Mon Jan 19 22:45:30 2009 UTC
Modified files:
/php-src/ext/sqlite3 sqlite3.c
Log:
MFB Fixed bug #47141 - Unable to fetch error messages after the database can't be opened.
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.28 php-src/ext/sqlite3/sqlite3.c:1.29
--- php-src/ext/sqlite3/sqlite3.c:1.28 Mon Jan 5 09:32:48 2009
+++ php-src/ext/sqlite3/sqlite3.c Mon Jan 19 22:45:29 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite3.c,v 1.28 2009/01/05 09:32:48 tony2001 Exp $ */
+/* $Id: sqlite3.c,v 1.29 2009/01/19 22:45:29 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -243,7 +243,7 @@
zval *object = getThis();
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj->db, SQLite3)
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -261,7 +261,7 @@
zval *object = getThis();
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj->db, SQLite3)
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -970,7 +970,7 @@
}
if (sqlite3_clear_bindings(stmt_obj->stmt) != SQLITE_OK) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to execute statement: %s",
sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt)));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to clear statement: %s",
sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt)));
RETURN_FALSE;
}