X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqres.h;h=ca22aa1815b83c3ad83034f1cc5cdbd9b40aea0e;hp=f5b9b6e10d3968d1ad84ff446cba89d11ffb0810;hb=db9b923fd2f690875eccccd7ff384d504e542611;hpb=d613997b3072b8093bca3fe9d8aca115e2a579aa

diff --git a/src/php_pqres.h b/src/php_pqres.h
index f5b9b6e..ca22aa1 100644
--- a/src/php_pqres.h
+++ b/src/php_pqres.h
@@ -15,12 +15,22 @@
 #define PHP_PQRES_H
 
 #include "php_pqconn.h"
+
 typedef enum php_pqres_fetch {
 	PHP_PQRES_FETCH_ARRAY,
 	PHP_PQRES_FETCH_ASSOC,
 	PHP_PQRES_FETCH_OBJECT
 } php_pqres_fetch_t;
 
+#define PHP_PQRES_CONV_BOOL		0x0001
+#define PHP_PQRES_CONV_INT		0x0002
+#define PHP_PQRES_CONV_FLOAT	0x0004
+#define PHP_PQRES_CONV_SCALAR	0x000f
+#define PHP_PQRES_CONV_ARRAY	0x0010
+#define PHP_PQRES_CONV_DATETIME	0x0020
+#define PHP_PQRES_CONV_JSON		0x0100
+#define PHP_PQRES_CONV_ALL		0xffff
+
 typedef struct php_pqres_iterator {
 	zend_object_iterator zi;
 	zval *current_val;
@@ -33,7 +43,8 @@ typedef struct php_pqres {
 	php_pqres_iterator_t *iter;
 	HashTable bound;
 	HashTable converters;
-	unsigned default_fetch_type:2;
+	unsigned auto_convert;
+	php_pqres_fetch_t default_fetch_type;
 } php_pqres_t;
 
 typedef struct php_pqres_object {
@@ -43,9 +54,11 @@ typedef struct php_pqres_object {
 	php_pqres_t *intern;
 } php_pqres_object_t;
 
-STATUS php_pqres_success(PGresult *res TSRMLS_DC);
-void php_pqres_init_instance_data(PGresult *res, php_pqconn_object_t *obj, php_pqres_object_t **ptr TSRMLS_DC);
-zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch_type, zval **data_ptr TSRMLS_DC);
+extern STATUS php_pqres_success(PGresult *res TSRMLS_DC);
+extern void php_pqres_init_instance_data(PGresult *res, php_pqconn_object_t *obj, php_pqres_object_t **ptr TSRMLS_DC);
+extern zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch_type, zval **data_ptr TSRMLS_DC);
+extern zval *php_pqres_typed_zval(php_pqres_t *res, char *val, size_t len, Oid typ TSRMLS_DC);
+extern php_pqres_fetch_t php_pqres_fetch_type(php_pqres_t *res);
 
 #include "php_pq_object.h"
 #include "php_pqconn_event.h"
@@ -58,11 +71,11 @@ zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch
 	} \
 } while(0)
 
-zend_class_entry *php_pqres_class_entry;
-zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, php_pqres_t *intern, php_pqres_object_t **ptr TSRMLS_DC);
+extern zend_class_entry *php_pqres_class_entry;
+extern zend_object_value php_pqres_create_object_ex(zend_class_entry *ce, php_pqres_t *intern, php_pqres_object_t **ptr TSRMLS_DC);
 
-PHP_MINIT_FUNCTION(pqres);
-PHP_MSHUTDOWN_FUNCTION(pqres);
+extern PHP_MINIT_FUNCTION(pqres);
+extern PHP_MSHUTDOWN_FUNCTION(pqres);
 
 #endif