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

diff --git a/src/php_pqres.h b/src/php_pqres.h
index 507c3a4..4afff39 100644
--- a/src/php_pqres.h
+++ b/src/php_pqres.h
@@ -15,6 +15,7 @@
 #define PHP_PQRES_H
 
 #include "php_pqconn.h"
+
 typedef enum php_pqres_fetch {
 	PHP_PQRES_FETCH_ARRAY,
 	PHP_PQRES_FETCH_ASSOC,
@@ -24,8 +25,10 @@ typedef enum php_pqres_fetch {
 #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_SCALAR	0x0f
+#define PHP_PQRES_CONV_ARRAY	0x10
+#define PHP_PQRES_CONV_DATETIME	0x20
+#define PHP_PQRES_CONV_ALL		0xff
 
 typedef struct php_pqres_iterator {
 	zend_object_iterator zi;
@@ -39,8 +42,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 {