Changeset 76

Timestamp:

07/22/08 08:48:15 (1 month ago)

Author:

scott

Message:

More refactoring, breaks some tests for the moment

Files:

• trunk/php_sqlite3.h (modified) (4 diffs)
• trunk/sqlite3.c (modified) (58 diffs)

trunk/php_sqlite3.h

@@ -109 +109 @@
-        sqlite3 *db;
-        php_sqlite3_func *funcs;
+} php_sqlite3_db_object;
-
-
-
+
+
+
+
-
-/* sqlite3 objects to be destroyed */
@@ -124 +127 @@
-typedef struct _php_sqlite3_result_object  {
-        zend_object zo;
-*
+
-        php_sqlite3_db_object *db_obj;
-        int initialised;
@@ -130 +133 @@
-        int is_prepared_statement;
-        int complete;
-        int buffered;
-
-        long num_rows;
-} php_sqlite3_result;
-
@@ -141 +141 @@
-        php_sqlite3_db_object *db_obj;
-        int initialised;
-
+
-        /* Keep track of the zvals for bound parameters */
-        HashTable *bound_params;

trunk/sqlite3.c

@@ -40 +40 @@
-static int php_sqlite3_compare_stmt_free( php_sqlite3_stmt_free_list **stmt_list, sqlite3_stmt *statement );
-
+#define SQLITE3_CHECK_INITIALIZED(member, class_name) \
+        if (!(member)) { \
+                php_error_docref(NULL TSRMLS_CC, E_WARNING, "The " #class_name " object has not been correctly initialised"); \
+                RETURN_FALSE; \
+        }
+
-/* {{{ PHP_INI
- */
@@ -148 +154 @@
-        }
-
-        zend_llist_clean(&(db_obj->stmt_list));
-        if (db_obj->initialised) {
-                errcode = sqlite3_close(db_obj->db);
@@ -173 +178 @@
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
-
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+
-        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
-                                &sql, &sql_len)) {
@@ -215 +222 @@
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
-
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+
-        if (ZEND_NUM_ARGS() != 0) {
-                WRONG_PARAM_COUNT;
@@ -232 +241 @@
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
-
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+
-        if (ZEND_NUM_ARGS() != 0) {
-                WRONG_PARAM_COUNT;
@@ -248 +259 @@
-        zval *object = getThis();
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
+
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
-
-        if (ZEND_NUM_ARGS() != 0) {
@@ -268 +281 @@
-        int extension_len, extension_dir_len;
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
+
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
-
-        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
@@ -329 +344 @@
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
-
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+
-        if (ZEND_NUM_ARGS() != 0) {
-                WRONG_PARAM_COUNT;
@@ -342 +359 @@
-PHP_METHOD(sqlite3, escapeString)
-{
-        php_sqlite3_db_object *db_obj;
-        zval *object = getThis();
-        char *sql, *ret;
-        int sql_len;
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
-
-        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
@@ -371 +385 @@
-{
-        php_sqlite3_db_object *db_obj;
-internp
+stmt_obj
-        zval *object = getThis();
-        char *sql;
@@ -377 +391 @@
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
-
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+
-        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
-                                &sql, &sql_len)) {
@@ -387 +403 @@
-
-        object_init_ex(return_value, php_sqlite3_stmt_entry);
-internp
-internp
-
-internp
+stmt_obj
+stmt_obj
+
+stmt_obj
-        if (errcode != SQLITE_OK) {
-                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to prepare statement: %d, %s", errcode, sqlite3_errmsg(db_obj->db));
+                zval_dtor(return_value);
-                RETURN_FALSE;
-        }
@@ -409 +426 @@
-        int sql_len, return_code;
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
+
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
-
-        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s",
@@ -432 +451 @@
-        result->db_obj = db_obj;
-
-result->intern_stmt
+&(result->intern_stmt)
-        if (return_code != SQLITE_OK) {
-                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to prepare statement: %d, %s", return_code, sqlite3_errmsg(db_obj->db));
-                efree(result->intern_stmt);
-                result->intern_stmt = NULL;
-                RETURN_FALSE;
-        }
-
-
-
-
+
+
-
-        switch (return_code) {
-                case SQLITE_ROW: /* Valid Row */
-                {
-#ifdef scottmac_0
-                        /* loop through to fill numRows */
-                        do
-                        {
-                                result->num_rows++;
-                        } while (sqlite3_step(*(result->intern_stmt)) == SQLITE_ROW);
-#endif
-                }
-                /* No break is intentional */
-                case SQLITE_DONE: /* Valid but no results */
-                {
-
+/*
-                        free_item = emalloc(sizeof(php_sqlite3_stmt_free_list));
-*(result->intern_stmt)
+result->intern_stmt
-                        free_item->statement_object = NULL;
-                        free_item->result_object = return_value;
-
-
-*(result->intern_stmt)
+//
+*/
+result->intern_stmt
-                        break;
-                }
-                default:
-                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db));
-
+
+
-                        RETURN_FALSE;
-        }
@@ -519 +527 @@
-        sqlite3_stmt *stmt;
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
+
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
-
-        if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b",
@@ -763 +773 @@
-        long sql_func_num_args = -1;
-
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
+
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
-
@@ -813 +825 @@
-        zval *step_callback, *fini_callback;
-        long sql_func_num_args = -1;
-
-        db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC);
+
+        SQLITE3_CHECK_INITIALIZED(db_obj->initialised, SQLite3)
-
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szz|l", &sql_func, &sql_func_len, &step_callback, &fini_callback, &sql_func_num_args) == FAILURE) {
@@ -868 +881 @@
-PHP_METHOD(sqlite3_stmt, paramCount)
-{
-
-
-
-
+
+
+
-
-        if (ZEND_NUM_ARGS() != 0) {
@@ -877 +889 @@
-        }
-
-internp
+stmt_obj
-}
-/* }}} */
@@ -886 +898 @@
-PHP_METHOD(sqlite3_stmt, close)
-{
-
-
-
-
+
+
+
-
-        if (ZEND_NUM_ARGS() != 0) {
@@ -895 +906 @@
-        }
-
-zend_llist_del_element(&(internp->db_obj->stmt_list), internp
-
+/*zend_llist_del_element(&(stmt_obj->db_obj->stmt_list), stmt_obj
+*/
-
-        RETURN_TRUE;
@@ -907 +918 @@
-PHP_METHOD(sqlite3_stmt, reset)
-{
-
-
-
-
+
+
+
-
-        if (ZEND_NUM_ARGS() != 0) {
@@ -916 +926 @@
-        }
-
-internp
-internp
+stmt_obj
+stmt_obj
-                RETURN_FALSE;
-        }
@@ -929 +939 @@
-PHP_METHOD(sqlite3_stmt, clear)
-{
-
-
-
-
+
+
+
-
-        if (ZEND_NUM_ARGS() != 0) {
@@ -938 +947 @@
-        }
-
-internp
-internp
+stmt_obj
+stmt_obj
-                RETURN_FALSE;
-        }
@@ -946 +955 @@
-}
-/* }}} */
-
-#if scottmac_0
-/* {{{ proto bool SQLite3_stmt::bind_params(string types, mixed variable [,mixed,....])
-        Bind Paramater to a stmt variable
-*/
-PHP_METHOD(sqlite3_stmt, bind_params)
-{
-        php_sqlite3_stmt *internp;
-        zval *object = getThis();
-        int argc = ZEND_NUM_ARGS();
-        char *types;
-        int types_len, num_varargs, i, ofs = 0;
-        zval ***varargs = NULL;
-
-        internp = (php_sqlite3_stmt *)zend_object_store_get_object(object TSRMLS_CC);
-
-        if (argc < 2) {
-                WRONG_PARAM_COUNT;
-        }
-
-        if (zend_parse_parameters(1 TSRMLS_CC, "s",
-                                &types, &types_len) == FAILURE) {
-                return;
-        }
-
-        num_varargs = argc - 1;
-
-        if (!types_len) {
-                php_error_docref(NULL TSRMLS_CC, E_WARNING, "No parameter types specified");
-                RETURN_FALSE;
-        }
-
-        if (types_len != num_varargs) {
-                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of parameter types specified does not match number of bind variables");
-                RETURN_FALSE;
-        }
-
-        if (types_len != sqlite3_bind_parameter_count(internp->stmt)) {
-                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Number of bind variables does not match number of parameters in prepared statement");
-                RETURN_FALSE;
-        }
-
-        varargs = (zval ***)safe_emalloc(argc, sizeof(zval **), 0);
-
-        if (zend_get_parameters_array_ex(argc, varargs) == FAILURE) {
-                zend_wrong_param_count(TSRMLS_C);
-                efree(varargs);
-                RETURN_FALSE;
-        }
-
-        for (i = 1; i <= sqlite3_bind_parameter_count(internp->stmt); i++) {
-                switch (types[ofs]) {
-                        case 'i': /* Integer */
-                                sqlite3_bind_int(internp->stmt, i, Z_LVAL_PP(varargs[i]));
-                        break;
-
-                        case 'd': /* double */
-                                sqlite3_bind_double(internp->stmt, i, Z_DVAL_PP(varargs[i]));
-                        break;
-
-                        case 'b': /* blob */
-                        case 's': /* string */
-                                sqlite3_bind_text(internp->stmt, i, Z_STRVAL_PP(varargs[i]), Z_STRLEN_PP(varargs[i]), SQLITE_STATIC);
-                        break;
-
-                        case 'n': /* null */
-                                sqlite3_bind_null(internp->stmt, i);
-                        break;
-
-                }
-                ofs++;
-        }
-
-        efree(varargs);
-        RETURN_TRUE;
-}
-/* }}} */
-#endif
-
-static int register_bound_parameter_to_sqlite(struct php_sqlite3_bound_param *param, php_sqlite3_stmt *stmt TSRMLS_DC) /* {{{ */
@@ -1075 +1006 @@
-PHP_METHOD(sqlite3_stmt, bindParam)
-{
-internp
+stmt_obj
-        zval *object = getThis();
-        struct php_sqlite3_bound_param param = {0};
-internp
+stmt_obj
-
-        param.param_number = -1;
@@ -1093 +1024 @@
-        Z_ADDREF_P(param.parameter);
-
-internp
+stmt_obj
-                if (param.parameter) {
-                        zval_ptr_dtor(&(param.parameter));
@@ -1109 +1040 @@
-PHP_METHOD(sqlite3_stmt, bindValue)
-{
-internp
+stmt_obj
-        zval *object = getThis();
-        struct php_sqlite3_bound_param param = {0};
-internp
+stmt_obj
-
-        param.param_number = -1;
@@ -1127 +1058 @@
-        Z_ADDREF_P(param.parameter);
-
-internp
+stmt_obj
-                if (param.parameter) {
-                        zval_ptr_dtor(&(param.parameter));
@@ -1143 +1074 @@
-PHP_METHOD(sqlite3_stmt, execute)
-{
-internp
+stmt_obj
-        php_sqlite3_result *result;
-        zval *object = getThis();
-, num_rows = 0
+
-        struct php_sqlite3_bound_param *param;
-internp
+stmt_obj
-
-        if (ZEND_NUM_ARGS() != 0) {
@@ -1154 +1085 @@
-        }
-
-internp
-internp
-internp
+stmt_obj
+stmt_obj
+stmt_obj
-                        /* If the ZVAL is null then it should be bound as that */
-                        if (Z_TYPE_P(param->parameter) == IS_NULL) {
-internp
+stmt_obj
-                                continue;
-                        }
@@ -1166 +1097 @@
-                                case SQLITE_INTEGER:
-                                        convert_to_long(param->parameter);
-internp
+stmt_obj
-                                        break;
-
-                                case SQLITE_FLOAT:
-                                        /* convert_to_double(param->parameter);*/
-internp
+stmt_obj
-                                        break;
-
@@ -1192 +1123 @@
-                                        }
-
-internp
+stmt_obj
-
-                                        if (stream) {
@@ -1202 +1133 @@
-                                case SQLITE3_TEXT:
-                                        convert_to_string(param->parameter);
-internp
+stmt_obj
-                                        break;
-
-                                case SQLITE_NULL:
-internp
+stmt_obj
-                                        break;
-
@@ -1213 +1144 @@
-                                        RETURN_FALSE;
-                        }
-internp
-
-
-
-internp
+stmt_obj
+
+
+
+stmt_obj
-
-        switch (return_code) {
-                case SQLITE_ROW: /* Valid Row */
-#ifdef scottmac_0
-                        /* loop through to fill numRows */
-                        do
-                        {
-                                num_rows++;
-                        } while (sqlite3_step(internp->stmt) == SQLITE_ROW);
-#endif
-                case SQLITE_DONE: /* Valid but no results */
-                {
-
-
-
+
-                        object_init_ex(return_value, php_sqlite3_result_entry);
-                        result = (php_sqlite3_result *)zend_object_store_get_object(return_value TSRMLS_CC);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                        result->is_prepared_statement = 1;
-tern_stmt = &internp->stmt
-num_rows = num_rows
-internp
+itialised = 1
+intern_stmt = stmt_obj->stmt
+stmt_obj
-                        break;
-                }
-                case SQLITE_ERROR:
-internp
+stmt_obj
-
-                default:
-
+
+
-                        RETURN_FALSE;
-        }
@@ -1270 +1184 @@
-PHP_METHOD(sqlite3_result, numColumns)
-{
-
-
-
+
+
+
+
+
-
-        if (ZEND_NUM_ARGS() != 0) {
@@ -1278 +1194 @@
-        }
-
-*(internp->intern_stmt)
+result_obj->intern_stmt
-}
-/* }}} */
@@ -1287 +1203 @@
-PHP_METHOD(sqlite3_result, columnName)
-{
-internp
+result_obj
-        zval *object = getThis();
-        int column = 0;
-
+
+
+
-
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &column) == FAILURE) {
@@ -1296 +1214 @@
-        }
-
-*(internp->intern_stmt)
+result_obj->intern_stmt
-}
-/* }}} */
@@ -1305 +1223 @@
-PHP_METHOD(sqlite3_result, columnType)
-{
-internp
+result_obj
-        zval *object = getThis();
-        int column = 0;
-
+
+
+
-
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &column) == FAILURE) {
@@ -1314 +1234 @@
-        }
-
-*(internp->intern_stmt)
+result_obj->intern_stmt
-}
-/* }}} */
@@ -1323 +1243 @@
-PHP_METHOD(sqlite3_result, fetchArray)
-{
-internp
+result_obj
-        zval *object = getThis();
-        int i, ret, mode = PHP_SQLITE3_BOTH;
-
+
+
+
-
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &mode) == FAILURE) {
@@ -1332 +1254 @@
-        }
-
-internp
-
-
-
-*(internp->intern_stmt)
+result_obj
+
+
+
+result_obj->intern_stmt
-        switch (ret) {
-                case SQLITE_ROW:
@@ -1346 +1268 @@
-                        array_init(return_value);
-
-*(internp->intern_stmt)
+result_obj->intern_stmt
-                                zval *data;
-
-*(internp->intern_stmt)
+result_obj->intern_stmt
-
-                                if (mode & PHP_SQLITE3_NUM) {
@@ -1359 +1281 @@
-                                                Z_ADDREF_P(data);
-                                        }
-*(internp->intern_stmt)
+result_obj->intern_stmt
-                                }
-                        }
@@ -1365 +1287 @@
-                case SQLITE_DONE:
-                        /* Can't call sqlite3_step again, so store the value */
-internp
+result_obj
-                        RETURN_FALSE;
-
-                default:
-*(internp->intern_stmt)
+result_obj->intern_stmt
-        }
-}
@@ -1379 +1301 @@
-PHP_METHOD(sqlite3_result, reset)
-{
-
-
-
+
+
+
+
+
-
-        if (ZEND_NUM_ARGS() != 0) {
@@ -1387 +1311 @@
-        }
-
-*(internp->intern_stmt)
-
-
-
-internp
+result_obj->intern_stmt
+
+
+
+result_obj
-
-        RETURN_TRUE;
@@ -1397 +1321 @@
-/* }}} */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        if (ZEND_NUM_ARGS() != 0) {
-                WRONG_PARAM_COUNT;
-        }
-        RETURN_LONG(internp->num_rows);
-}
-/* }}} */
-#endif
-
-/* {{{ proto bool SQLite3_result::finalize()
-        Closes the result set
-*/
-PHP_METHOD(sqlite3_result, finalize)
-{
-        php_sqlite3_result *internp;
-        zval *object = getThis();
-        internp = (php_sqlite3_result *)zend_object_store_get_object(object TSRMLS_CC);
-
-        if (ZEND_NUM_ARGS() != 0) {
-                WRONG_PARAM_COUNT;
-        }
-
-        /* We need to finalize an internal statement */
-internp
-zend_llist_del_element(&(internp->db_obj->stmt_list), *(internp->intern_stmt),
-                                       (int (*)(void *, void *)) php_sqlite3_compare_stmt_free
+result_obj
+result_obj->initialised = 0;
+sqlite3_finalize(result_obj->intern_stmt
-        } else {
-
-
-
-
-
+
+
-
-        RETURN_TRUE;
@@ -1577 +1482 @@
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_result_reset, 0)
-ZEND_END_ARG_INFO()
-
-#ifdef scottmac_0
-static
-ZEND_BEGIN_ARG_INFO(arginfo_sqlite3_result_numrows, 0)
-ZEND_END_ARG_INFO()
-#endif
-
-static
@@ -1620 +1519 @@
-        PHP_ME(sqlite3_stmt, clear,                     arginfo_sqlite3_stmt_clear, ZEND_ACC_PUBLIC)
-        PHP_ME(sqlite3_stmt, execute,           arginfo_sqlite3_stmt_execute, ZEND_ACC_PUBLIC)
-#if scottmac_0
-        PHP_ME(sqlite3_stmt, bind_params,       NULL, ZEND_ACC_PUBLIC)
-#endif
-        PHP_ME(sqlite3_stmt, bindParam, arginfo_sqlite3_stmt_bindparam, ZEND_ACC_PUBLIC)
-        PHP_ME(sqlite3_stmt, bindValue, arginfo_sqlite3_stmt_bindvalue, ZEND_ACC_PUBLIC)
@@ -1636 +1532 @@
-        PHP_ME(sqlite3_result, fetchArray,              arginfo_sqlite3_result_fetcharray, ZEND_ACC_PUBLIC)
-        PHP_ME(sqlite3_result, reset,                   arginfo_sqlite3_result_reset, ZEND_ACC_PUBLIC)
-#ifdef scottmac_0
-        PHP_ME(sqlite3_result, numRows,                 arginfo_sqlite3_result_numrows, ZEND_ACC_PUBLIC)
-#endif
-        PHP_ME(sqlite3_result, finalize,                arginfo_sqlite3_result_finalize, ZEND_ACC_PUBLIC)
-
@@ -1707 +1600 @@
-                func = intern->funcs;
-                intern->funcs = func->next;
-
+initialised && intern->
-                        sqlite3_create_function(intern->db, func->func_name, func->argc, SQLITE_UTF8, func, NULL, NULL, NULL);
-                }
@@ -1725 +1618 @@
-        }
-
-
-
-
+
-                sqlite3_close(intern->db);
-db = NULL
+initialised = 0
-        }
-
@@ -1768 +1659 @@
-
-        if (intern->intern_stmt) {
-*(intern->intern_stmt)
+intern->intern_stmt
-        }
-
-        /* The result set occured from a straight execute statement */
-        if (intern->intern_stmt && intern->is_prepared_statement == 0) {
-
-
+
-        }
-
@@ -1793 +1683 @@
-        memset(&intern->zo, 0, sizeof(php_sqlite3_db_object));
-
- */
-
+
+*/
-
-        zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
@@ -1834 +1724 @@
-        memset(&intern->zo, 0, sizeof(php_sqlite3_result));
-
-
-
+
-        intern->complete = 0;
-        intern->is_prepared_statement = 0;
-        intern->num_rows = 0;
-
-        zend_object_std_init(&intern->zo, class_type TSRMLS_CC);