summaryrefslogtreecommitdiff
path: root/ext/sqlite3
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2010-06-20 15:30:49 +0000
committerPierre Joye <pajoye@php.net>2010-06-20 15:30:49 +0000
commitbd8d42729f5ab8f8ee23bb6d78cbeccf38c78159 (patch)
tree1cd8fd156943de103a269e0f13d9d8737cc281a6 /ext/sqlite3
parentf7f74b4c0eec65e2232d0d7f3f59e87936d07341 (diff)
downloadphp-git-bd8d42729f5ab8f8ee23bb6d78cbeccf38c78159.tar.gz
- #51295, SQLite3::busyTimeout not existing
Diffstat (limited to 'ext/sqlite3')
-rw-r--r--ext/sqlite3/sqlite3.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 6cbb754f3c..949900cb8e 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -298,6 +298,33 @@ PHP_METHOD(sqlite3, lastErrorMsg)
}
/* }}} */
+/* {{{ proto bool SQLite3::busyTimeout(int msecs)
+ Sets a busy handler that will sleep until database is not locked or timeout is reached. Passing a value less than or equal to zero turns off all busy handlers. */
+PHP_METHOD(sqlite3, busyTimeout)
+{
+ php_sqlite3_db_object *db_obj;
+ zval *object = getThis();
+ long ms;
+ int return_code;
+ db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
+
+ SQLITE3_CHECK_INITIALIZED(db_obj, db_obj->initialised, SQLite3)
+
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &ms)) {
+ return;
+ }
+
+ return_code = sqlite3_busy_timeout(db_obj->db, ms);
+ if (return_code != SQLITE_OK) {
+ php_sqlite3_error(db_obj, "Unable to set busy timeout: %d, %s", return_code, sqlite3_errmsg(db_obj->db));
+ RETURN_FALSE;
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
+
+
#ifndef SQLITE_OMIT_LOAD_EXTENSION
/* {{{ proto bool SQLite3::loadExtension(String Shared Library)
Attempts to load an SQLite extension library. */
@@ -1652,6 +1679,10 @@ ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_open, 0)
ZEND_ARG_INFO(0, encryption_key)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_busytimeout, 0)
+ ZEND_ARG_INFO(0, ms)
+ZEND_END_ARG_INFO()
+
#ifndef SQLITE_OMIT_LOAD_EXTENSION
ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_loadextension, 0)
ZEND_ARG_INFO(0, shared_library)
@@ -1736,6 +1767,7 @@ static zend_function_entry php_sqlite3_class_methods[] = {
PHP_ME(sqlite3, lastInsertRowID, arginfo_sqlite3_void, ZEND_ACC_PUBLIC)
PHP_ME(sqlite3, lastErrorCode, arginfo_sqlite3_void, ZEND_ACC_PUBLIC)
PHP_ME(sqlite3, lastErrorMsg, arginfo_sqlite3_void, ZEND_ACC_PUBLIC)
+ PHP_ME(sqlite3, busyTimeout, arginfo_sqlite3_busytimeout, ZEND_ACC_PUBLIC)
#ifndef SQLITE_OMIT_LOAD_EXTENSION
PHP_ME(sqlite3, loadExtension, arginfo_sqlite3_loadextension, ZEND_ACC_PUBLIC)
#endif