archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

sqlite3: Split off column name cache generation

Browse source 
Also no need to reset the cache unconditionally in fetchAll().
This commit is contained in:
Niels Dossche 2025-06-24 19:41:14 +02:00
parent e7678cdaa4
commit 6d15475815
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ext/sqlite3/sqlite3.c
View file

@ -1987,6 +1987,16 @@ PHP_METHOD(SQLite3Result, columnType)
}
/* }}} */
static void sqlite3result_fill_column_names_cache(php_sqlite3_result *result_obj, int nb_cols)
{
result_obj->column_names = safe_emalloc(nb_cols, sizeof(zend_string*), 0);
for (int i = 0; i < nb_cols; i++) {
const char *column = sqlite3_column_name(result_obj->stmt_obj->stmt, i);
result_obj->column_names[i] = zend_string_init(column, strlen(column), 0);
}
}
/* {{{ Fetch a result row as both an associative or numerically indexed array or both. */
PHP_METHOD(SQLite3Result, fetchArray)
{
@ -2019,12 +2029,7 @@ PHP_METHOD(SQLite3Result, fetchArray)
/* Cache column names to speed up repeated fetchArray calls. */
if (mode & PHP_SQLITE3_ASSOC && !result_obj->column_names) {
result_obj->column_names = emalloc(n_cols * sizeof(zend_string*));
for (int i = 0; i < n_cols; i++) {
const char *column = sqlite3_column_name(result_obj->stmt_obj->stmt, i);
result_obj->column_names[i] = zend_string_init(column, strlen(column), 0);
}
sqlite3result_fill_column_names_cache(result_obj, n_cols);
}
array_init(return_value);
@ -2056,7 +2061,7 @@ static void sqlite3result_clear_column_names_cache(php_sqlite3_result *result) {
PHP_METHOD(SQLite3Result, fetchAll)
{
int i, nb_cols;
int nb_cols;
bool done = false;
php_sqlite3_result *result_obj;
zval *object = ZEND_THIS;
@ -2071,14 +2076,8 @@ PHP_METHOD(SQLite3Result, fetchAll)
SQLITE3_CHECK_INITIALIZED(result_obj->db_obj, result_obj->stmt_obj->initialised, SQLite3Result)
nb_cols = sqlite3_column_count(result_obj->stmt_obj->stmt);
if (mode & PHP_SQLITE3_ASSOC) {
sqlite3result_clear_column_names_cache(result_obj);
result_obj->column_names = emalloc(nb_cols * sizeof(zend_string*));
for (i = 0; i < nb_cols; i++) {
const char *column = sqlite3_column_name(result_obj->stmt_obj->stmt, i);
result_obj->column_names[i] = zend_string_init(column, strlen(column), 0);
}
if (mode & PHP_SQLITE3_ASSOC && !result_obj->column_names) {
sqlite3result_fill_column_names_cache(result_obj, nb_cols);
}
result_obj->column_count = nb_cols;
array_init(return_value);