X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pqres.h;h=d2d35d465fa85cdcd73977a5f2e33531b3056366;hp=507c3a4d9960c97ce9c130fd051fd28aac129672;hb=753359f19c5d29f08faca43ee735c49c217230a7;hpb=218002ba9087cf49f90e5f098f68a154d6092c78

diff --git a/src/php_pqres.h b/src/php_pqres.h
index 507c3a4..d2d35d4 100644
--- a/src/php_pqres.h
+++ b/src/php_pqres.h
@@ -15,17 +15,21 @@
 #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		0x01
-#define PHP_PQRES_CONV_INT		0x02
-#define PHP_PQRES_CONV_FLOAT	0x04
-#define PHP_PQRES_CONV_ARRAY	0x08
-#define PHP_PQRES_CONV_DATETIME	0x10
+#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;
@@ -39,8 +43,8 @@ typedef struct php_pqres {
 	php_pqres_iterator_t *iter;
 	HashTable bound;
 	HashTable converters;
-	unsigned default_fetch_type:2;
-	unsigned auto_convert:6;
+	unsigned auto_convert;
+	php_pqres_fetch_t default_fetch_type;
 } php_pqres_t;
 
 typedef struct php_pqres_object {