Changeset 68

Timestamp:

06/25/08 15:29:27 (2 months ago)

Author:

scott

Message:

Fix error when querySingle returns no rows and use NULL rather than empty string so a differentiation can be made.

Files:

• trunk/sqlite3.c (modified) (9 diffs)

trunk/sqlite3.c

@@ -571 +571 @@
-                {
-                        if (!entire_row) {
-ZVAL_EMPTY_STRING(return_value
+RETVAL_NULL(
-                        } else {
-                                array_init(return_value);
-                        }
+                        break;
-                }
-                default:
-                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to execute statement: %s", sqlite3_errmsg(db->db));
-URN
-
-        
+VAL
+
+
-}
-/* }}} */
@@ -894 +895 @@
-        }
-
- 
+
-                                                        (int (*)(void *, void *)) php_sqlite3_compare_stmt_free);
-
@@ -1230 +1231 @@
-                {
-                        php_sqlite3_stmt_free_list *free_item;
-
+
-                        sqlite3_reset(internp->stmt);
-                        object_init_ex(return_value, php_sqlite3_result_entry);
@@ -1241 +1242 @@
-                        Z_ADDREF_P(object);
-                        Z_ADDREF_P(return_value);
-
+
-                        zend_llist_add_element(&(internp->db_object->stmt_list), &free_item);
-                        /* We don't need the default one that came with it now */
@@ -1349 +1350 @@
-
-                                data = sqlite_value_to_zval(*(internp->intern_stmt), i);
-
+
-                                if (mode & PHP_SQLITE3_NUM) {
-                                        add_index_zval(return_value, i, data);
@@ -1405 +1406 @@
-        zval *object = getThis();
-        internp = (php_sqlite3_result *)zend_object_store_get_object(object TSRMLS_CC);
-
+
-        if (ZEND_NUM_ARGS() != 0) {
-                WRONG_PARAM_COUNT;
@@ -1429 +1430 @@
-        /* We need to finalize an internal statement */
-        if (internp->is_prepared_statement == 0) {
- 
+
-                                                        (int (*)(void *, void *)) php_sqlite3_compare_stmt_free);
-        } else {
@@ -1677 +1678 @@
-{
-        php_sqlite3_stmt_free_list *free_item = (php_sqlite3_stmt_free_list *)*item;
-
+
-        zval_dtor(free_item->result_object);
-        Z_TYPE_P(free_item->result_object) = IS_NULL;
@@ -1792 +1793 @@
-        memset(&intern->zo, 0, sizeof(php_sqlite3_db));
-
-    
+
-        intern->db = NULL;
-        zend_object_std_init(&intern->zo, class_type TSRMLS_CC);