diff options
Diffstat (limited to 'ext/pdo_sqlite')
| -rw-r--r-- | ext/pdo_sqlite/sqlite_driver.c | 34 | ||||
| -rw-r--r-- | ext/pdo_sqlite/tests/bug48773.phpt | 4 | ||||
| -rw-r--r-- | ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt | 4 |
3 files changed, 24 insertions, 18 deletions
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index 71bac8580a..fed9dbed2f 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -161,7 +161,7 @@ static int sqlite_handle_closer(pdo_dbh_t *dbh) /* {{{ */ pdo_sqlite_cleanup_callbacks(H); if (H->db) { - sqlite3_close(H->db); + sqlite3_close_v2(H->db); H->db = NULL; } if (einfo->errmsg) { @@ -193,7 +193,7 @@ static int sqlite_handle_preparer(pdo_dbh_t *dbh, const char *sql, size_t sql_le return 0; } - i = sqlite3_prepare(H->db, sql, sql_len, &S->stmt, &tail); + i = sqlite3_prepare_v2(H->db, sql, sql_len, &S->stmt, &tail); if (i == SQLITE_OK) { return 1; } @@ -520,10 +520,13 @@ static PHP_METHOD(SQLite, sqliteCreateFunction) pdo_sqlite_db_handle *H; int ret; - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sz|ll", - &func_name, &func_name_len, &callback, &argc, &flags)) { - RETURN_FALSE; - } + ZEND_PARSE_PARAMETERS_START(2, 4) + Z_PARAM_STRING(func_name, func_name_len) + Z_PARAM_ZVAL(callback) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(argc) + Z_PARAM_LONG(flags) + ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); dbh = Z_PDO_DBH_P(getThis()); PDO_CONSTRUCT_CHECK; @@ -590,10 +593,13 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate) pdo_sqlite_db_handle *H; int ret; - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "szz|l", - &func_name, &func_name_len, &step_callback, &fini_callback, &argc)) { - RETURN_FALSE; - } + ZEND_PARSE_PARAMETERS_START(3, 4) + Z_PARAM_STRING(func_name, func_name_len) + Z_PARAM_ZVAL(step_callback) + Z_PARAM_ZVAL(fini_callback) + Z_PARAM_OPTIONAL + Z_PARAM_LONG(argc) + ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); dbh = Z_PDO_DBH_P(getThis()); PDO_CONSTRUCT_CHECK; @@ -650,10 +656,10 @@ static PHP_METHOD(SQLite, sqliteCreateCollation) pdo_sqlite_db_handle *H; int ret; - if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "sz", - &collation_name, &collation_name_len, &callback)) { - RETURN_FALSE; - } + ZEND_PARSE_PARAMETERS_START(2, 2) + Z_PARAM_STRING(collation_name, collation_name_len) + Z_PARAM_ZVAL(callback) + ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); dbh = Z_PDO_DBH_P(getThis()); PDO_CONSTRUCT_CHECK; diff --git a/ext/pdo_sqlite/tests/bug48773.phpt b/ext/pdo_sqlite/tests/bug48773.phpt index b8bdea9185..c9a2f64bef 100644 --- a/ext/pdo_sqlite/tests/bug48773.phpt +++ b/ext/pdo_sqlite/tests/bug48773.phpt @@ -29,6 +29,6 @@ var_dump($stmt); ?> --EXPECTF-- object(bar)#%d (1) { - [%u|b%"queryString"]=> - %unicode|string%(8) "SELECT 1" + ["queryString"]=> + string(8) "SELECT 1" } diff --git a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt index c8cdee6f69..ea6f22c054 100644 --- a/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt +++ b/ext/pdo_sqlite/tests/pdo_fetch_func_001.phpt @@ -74,12 +74,12 @@ var_dump($st->fetchAll(PDO::FETCH_FUNC, array('bar', 'inexistent'))); ?> --EXPECTF-- object(PDOStatement)#%d (1) { - [%u|b%"queryString"]=> + ["queryString"]=> %string|unicode%(21) "SELECT * FROM testing" } data: 1, php object(PDOStatement)#%d (1) { - [%u|b%"queryString"]=> + ["queryString"]=> %string|unicode%(21) "SELECT * FROM testing" } data: 2, |