mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
f133f0024e
The fix for feature request #53466 did not properly handle resetting of the corresponding statement; the problem with this is that the statement does not know about its result sets. But even if we could fix this, the `complete` handling still appears to be brittle, since the `sqlite3_column_type()`docs[1] state: | If the SQL statement does not currently point to a valid row, or if | the column index is out of range, the result is undefined. Fortunately, we can use `sqlite3_data_count()` instead, since[2]: | If prepared statement P does not have results ready to return (via | calls to the sqlite3_column() family of interfaces) then | sqlite3_data_count(P) returns 0. Thus, we guard `SQLite3::columnType()` with `sqlite3_data_count()`, and completely drop updating the `php_sqlite3_result_object.complete` field, but keep it for ABI BC purposes. [1] <https://www.sqlite.org/c3ref/column_blob.html> [2] <https://www.sqlite.org/c3ref/data_count.html>
149 lines
4.1 KiB
C
149 lines
4.1 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| PHP Version 7 |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1997-2018 The PHP Group |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Scott MacVicar <scottmac@php.net> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifndef PHP_SQLITE_STRUCTS_H
|
|
#define PHP_SQLITE_STRUCTS_H
|
|
|
|
#include <sqlite3.h>
|
|
|
|
/* for backwards compatibility reasons */
|
|
#ifndef SQLITE_OPEN_READONLY
|
|
#define SQLITE_OPEN_READONLY 0x00000001
|
|
#endif
|
|
|
|
#ifndef SQLITE_OPEN_READWRITE
|
|
#define SQLITE_OPEN_READWRITE 0x00000002
|
|
#endif
|
|
|
|
#ifndef SQLITE_OPEN_CREATE
|
|
#define SQLITE_OPEN_CREATE 0x00000004
|
|
#endif
|
|
|
|
/* Structure for SQLite Statement Parameter. */
|
|
struct php_sqlite3_bound_param {
|
|
zend_long param_number;
|
|
zend_string *name;
|
|
zend_long type;
|
|
zval parameter;
|
|
};
|
|
|
|
struct php_sqlite3_fci {
|
|
zend_fcall_info fci;
|
|
zend_fcall_info_cache fcc;
|
|
};
|
|
|
|
/* Structure for SQLite function. */
|
|
typedef struct _php_sqlite3_func {
|
|
struct _php_sqlite3_func *next;
|
|
|
|
const char *func_name;
|
|
int argc;
|
|
|
|
zval func, step, fini;
|
|
struct php_sqlite3_fci afunc, astep, afini;
|
|
} php_sqlite3_func;
|
|
|
|
/* Structure for SQLite collation function */
|
|
typedef struct _php_sqlite3_collation {
|
|
struct _php_sqlite3_collation *next;
|
|
|
|
const char *collation_name;
|
|
zval cmp_func;
|
|
struct php_sqlite3_fci fci;
|
|
} php_sqlite3_collation;
|
|
|
|
/* Structure for SQLite Database object. */
|
|
typedef struct _php_sqlite3_db_object {
|
|
int initialised;
|
|
sqlite3 *db;
|
|
php_sqlite3_func *funcs;
|
|
php_sqlite3_collation *collations;
|
|
|
|
zend_bool exception;
|
|
|
|
zend_llist free_list;
|
|
zend_object zo;
|
|
} php_sqlite3_db_object;
|
|
|
|
static inline php_sqlite3_db_object *php_sqlite3_db_from_obj(zend_object *obj) {
|
|
return (php_sqlite3_db_object*)((char*)(obj) - XtOffsetOf(php_sqlite3_db_object, zo));
|
|
}
|
|
|
|
#define Z_SQLITE3_DB_P(zv) php_sqlite3_db_from_obj(Z_OBJ_P((zv)))
|
|
|
|
/* Structure for SQLite Database object. */
|
|
typedef struct _php_sqlite3_agg_context {
|
|
zval zval_context;
|
|
zend_long row_count;
|
|
} php_sqlite3_agg_context;
|
|
|
|
typedef struct _php_sqlite3_stmt_object php_sqlite3_stmt;
|
|
typedef struct _php_sqlite3_result_object php_sqlite3_result;
|
|
|
|
/* sqlite3 objects to be destroyed */
|
|
typedef struct _php_sqlite3_free_list {
|
|
zval stmt_obj_zval;
|
|
php_sqlite3_stmt *stmt_obj;
|
|
} php_sqlite3_free_list;
|
|
|
|
/* Structure for SQLite Result object. */
|
|
struct _php_sqlite3_result_object {
|
|
php_sqlite3_db_object *db_obj;
|
|
php_sqlite3_stmt *stmt_obj;
|
|
zval stmt_obj_zval;
|
|
|
|
int is_prepared_statement;
|
|
int complete; // unused
|
|
zend_object zo;
|
|
};
|
|
|
|
static inline php_sqlite3_result *php_sqlite3_result_from_obj(zend_object *obj) {
|
|
return (php_sqlite3_result*)((char*)(obj) - XtOffsetOf(php_sqlite3_result, zo));
|
|
}
|
|
|
|
#define Z_SQLITE3_RESULT_P(zv) php_sqlite3_result_from_obj(Z_OBJ_P((zv)))
|
|
|
|
/* Structure for SQLite Statement object. */
|
|
struct _php_sqlite3_stmt_object {
|
|
sqlite3_stmt *stmt;
|
|
php_sqlite3_db_object *db_obj;
|
|
zval db_obj_zval;
|
|
|
|
int initialised;
|
|
|
|
/* Keep track of the zvals for bound parameters */
|
|
HashTable *bound_params;
|
|
zend_object zo;
|
|
};
|
|
|
|
static inline php_sqlite3_stmt *php_sqlite3_stmt_from_obj(zend_object *obj) {
|
|
return (php_sqlite3_stmt*)((char*)(obj) - XtOffsetOf(php_sqlite3_stmt, zo));
|
|
}
|
|
|
|
#define Z_SQLITE3_STMT_P(zv) php_sqlite3_stmt_from_obj(Z_OBJ_P((zv)))
|
|
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
* c-basic-offset: 4
|
|
* indent-tabs-mode: t
|
|
* End:
|
|
*/
|