X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_pqres.c;h=03ad83a8348aacabec8e17211ec513ef0787c254;hb=debf050947d82b394db70659607d49652e396061;hp=cbaf93344c0de775ac91f89f7749a9b184247512;hpb=218002ba9087cf49f90e5f098f68a154d6092c78;p=m6w6%2Fext-pq

diff --git a/src/php_pqres.c b/src/php_pqres.c
index cbaf933..03ad83a 100644
--- a/src/php_pqres.c
+++ b/src/php_pqres.c
@@ -24,6 +24,8 @@
 #include "php_pq_object.h"
 #include "php_pqexc.h"
 #include "php_pqres.h"
+#undef PHP_PQ_TYPE
+#include "php_pq_type.h"
 
 zend_class_entry *php_pqres_class_entry;
 static zend_object_handlers php_pqres_object_handlers;
@@ -109,9 +111,6 @@ zval *php_pqres_typed_zval(php_pqres_t *res, char *val, size_t len, Oid typ TSRM
 	}
 
 	switch (typ) {
-#ifdef HAVE_PHP_PQ_TYPE_H
-#	undef PHP_PQ_TYPE
-#	include "php_pq_type.h"
 	case PHP_PQ_OID_BOOL:
 		if (!(res->auto_convert & PHP_PQRES_CONV_BOOL)) {
 			goto noconversion;
@@ -179,20 +178,63 @@ zval *php_pqres_typed_zval(php_pqres_t *res, char *val, size_t len, Oid typ TSRM
 			ZVAL_STRINGL(zv, val, len, 1);
 		}
 		break;
-#else
-	case 16: /* BOOL */
-		if (res->auto_convert & PHP_PQRES_CONV_BOOL) {
-			ZVAL_BOOL(zv, *val == 't');
-			break;
-		}
-	default:
-		ZVAL_STRINGL(zv, val, len, 1);
-#endif
 	}
 
 	return zv;
 }
 
+static inline zval *php_pqres_get_col(php_pqres_t *r, unsigned row, unsigned col TSRMLS_DC)
+{
+	zval *zv;
+
+	if (PQgetisnull(r->res, row, col)) {
+		MAKE_STD_ZVAL(zv);
+		ZVAL_NULL(zv);
+	} else {
+		zv = php_pqres_typed_zval(r, PQgetvalue(r->res, row, col), PQgetlength(r->res, row, col), PQftype(r->res, col) TSRMLS_CC);
+	}
+
+	return zv;
+}
+
+static inline void php_pqres_add_col_to_zval(php_pqres_t *r, unsigned row, unsigned col, php_pqres_fetch_t fetch_type, zval *data TSRMLS_DC)
+{
+	if (PQgetisnull(r->res, row, col)) {
+		switch (fetch_type) {
+		case PHP_PQRES_FETCH_OBJECT:
+			add_property_null(data, PQfname(r->res, col));
+			break;
+
+		case PHP_PQRES_FETCH_ASSOC:
+			add_assoc_null(data, PQfname(r->res, col));
+			break;
+
+		case PHP_PQRES_FETCH_ARRAY:
+			add_index_null(data, col);
+			break;
+		}
+	} else {
+		zval *zv;
+
+		zv = php_pqres_typed_zval(r, PQgetvalue(r->res, row, col), PQgetlength(r->res, row, col), PQftype(r->res, col) TSRMLS_CC);
+
+		switch (fetch_type) {
+		case PHP_PQRES_FETCH_OBJECT:
+			add_property_zval(data, PQfname(r->res, col), zv);
+			zval_ptr_dtor(&zv);
+			break;
+
+		case PHP_PQRES_FETCH_ASSOC:
+			add_assoc_zval(data, PQfname(r->res, col), zv);
+			break;
+
+		case PHP_PQRES_FETCH_ARRAY:
+			add_index_zval(data, col, zv);
+			break;
+		}
+	}
+}
+
 zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch_type, zval **data_ptr TSRMLS_DC)
 {
 	zval *data = NULL;
@@ -216,40 +258,7 @@ zval *php_pqres_row_to_zval(PGresult *res, unsigned row, php_pqres_fetch_t fetch
 
 	if (PQntuples(res) > row) {
 		for (c = 0, cols = PQnfields(res); c < cols; ++c) {
-			if (PQgetisnull(res, row, c)) {
-				switch (fetch_type) {
-				case PHP_PQRES_FETCH_OBJECT:
-					add_property_null(data, PQfname(res, c));
-					break;
-
-				case PHP_PQRES_FETCH_ASSOC:
-					add_assoc_null(data, PQfname(res, c));
-					break;
-
-				case PHP_PQRES_FETCH_ARRAY:
-					add_index_null(data, c);
-					break;
-				}
-			} else {
-				zval *zv;
-
-				zv = php_pq_typed_zval(&res_obj->intern->converters, PQgetvalue(res, row, c), PQgetlength(res, row, c), PQftype(res, c) TSRMLS_CC);
-
-				switch (fetch_type) {
-				case PHP_PQRES_FETCH_OBJECT:
-					add_property_zval(data, PQfname(res, c), zv);
-					zval_ptr_dtor(&zv);
-					break;
-
-				case PHP_PQRES_FETCH_ASSOC:
-					add_assoc_zval(data, PQfname(res, c), zv);
-					break;
-
-				case PHP_PQRES_FETCH_ARRAY:
-					add_index_zval(data, c, zv);
-					break;
-				}
-			}
+			php_pqres_add_col_to_zval(res_obj->intern, row, c, fetch_type, data TSRMLS_CC);
 		}
 	}
 
@@ -365,6 +374,7 @@ void php_pqres_init_instance_data(PGresult *res, php_pqconn_object_t *conn_obj,
 	zend_hash_init(&r->converters, 0, 0, ZVAL_PTR_DTOR, 0);
 	zend_hash_copy(&r->converters, &conn_obj->intern->converters, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 
+	r->auto_convert = conn_obj->intern->default_auto_convert;
 	r->default_fetch_type = conn_obj->intern->default_fetch_type;
 
 	php_pqres_create_object_ex(php_pqres_class_entry, r, &obj TSRMLS_CC);
@@ -517,6 +527,37 @@ static void php_pqres_object_write_fetch_type(zval *object, void *o, zval *value
 	}
 }
 
+static void php_pqres_object_read_auto_conv(zval *object, void *o, zval *return_value TSRMLS_DC)
+{
+	php_pqres_object_t *obj = o;
+
+	RETVAL_LONG(obj->intern->auto_convert);
+}
+
+static void php_pqres_object_write_auto_conv(zval *object, void *o, zval *value TSRMLS_DC)
+{
+	php_pqres_object_t *obj = o;
+	zval *zauto_conv = value;
+
+	if (Z_TYPE_P(value) != IS_LONG) {
+		if (Z_REFCOUNT_P(value) > 1) {
+			zval *tmp;
+			MAKE_STD_ZVAL(tmp);
+			ZVAL_ZVAL(tmp, zauto_conv, 1, 0);
+			convert_to_long(tmp);
+			zauto_conv = tmp;
+		} else {
+			convert_to_long_ex(&zauto_conv);
+		}
+	}
+
+	obj->intern->auto_convert = Z_LVAL_P(zauto_conv);
+
+	if (zauto_conv != value) {
+		zval_ptr_dtor(&zauto_conv);
+	}
+}
+
 static STATUS php_pqres_iteration(zval *this_ptr, php_pqres_object_t *obj, php_pqres_fetch_t fetch_type, zval ***row TSRMLS_DC)
 {
 	STATUS rv;
@@ -773,6 +814,42 @@ static PHP_METHOD(pqres, fetchCol) {
 	}
 }
 
+ZEND_BEGIN_ARG_INFO_EX(ai_pqres_fetch_all_cols, 0, 0, 1)
+	ZEND_ARG_INFO(0, col)
+ZEND_END_ARG_INFO();
+static PHP_METHOD(pqres, fetchAllCols) {
+	zend_error_handling zeh;
+	zval *zcol;
+	STATUS rv;
+
+	zend_replace_error_handling(EH_THROW, exce(EX_INVALID_ARGUMENT), &zeh TSRMLS_CC);
+	rv = zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zcol);
+	zend_restore_error_handling(&zeh TSRMLS_CC);
+
+	if (SUCCESS == rv) {
+		php_pqres_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+		if (!obj->intern) {
+			throw_exce(EX_UNINITIALIZED TSRMLS_CC, "pq\\Result not initialized");
+		} else {
+			php_pqres_col_t col;
+
+			zend_replace_error_handling(EH_THROW, exce(EX_RUNTIME), &zeh TSRMLS_CC);
+
+			if (SUCCESS == column_nn(obj, zcol, &col TSRMLS_CC)) {
+				int r, rows = PQntuples(obj->intern->res);
+
+				array_init(return_value);
+				for (r = 0; r < rows; ++r) {
+					add_next_index_zval(return_value, php_pqres_get_col(obj->intern, r, col.num TSRMLS_CC));
+				}
+			}
+
+			zend_restore_error_handling(&zeh TSRMLS_CC);
+		}
+	}
+}
+
 static int apply_to_col(void *p TSRMLS_DC, int argc, va_list argv, zend_hash_key *key)
 {
 	zval **c = p;
@@ -1001,6 +1078,7 @@ static zend_function_entry php_pqres_methods[] = {
 	PHP_ME(pqres, fetchRow, ai_pqres_fetch_row, ZEND_ACC_PUBLIC)
 	PHP_ME(pqres, fetchCol, ai_pqres_fetch_col, ZEND_ACC_PUBLIC)
 	PHP_ME(pqres, fetchAll, ai_pqres_fetch_all, ZEND_ACC_PUBLIC)
+	PHP_ME(pqres, fetchAllCols, ai_pqres_fetch_all_cols, ZEND_ACC_PUBLIC)
 	PHP_ME(pqres, count, ai_pqres_count, ZEND_ACC_PUBLIC)
 	PHP_ME(pqres, map, ai_pqres_map, ZEND_ACC_PUBLIC)
 	PHP_ME(pqres, desc, ai_pqres_desc, ZEND_ACC_PUBLIC)
@@ -1067,6 +1145,12 @@ PHP_MINIT_FUNCTION(pqres)
 	zend_hash_add(&php_pqres_object_prophandlers, "fetchType", sizeof("fetchType"), (void *) &ph, sizeof(ph), NULL);
 	ph.write = NULL;
 
+	zend_declare_property_long(php_pqres_class_entry, ZEND_STRL("autoConvert"), PHP_PQRES_FETCH_ARRAY, ZEND_ACC_PUBLIC TSRMLS_CC);
+	ph.read = php_pqres_object_read_auto_conv;
+	ph.write = php_pqres_object_write_auto_conv;
+	zend_hash_add(&php_pqres_object_prophandlers, "autoConvert", sizeof("autoConvert"), (void *) &ph, sizeof(ph), NULL);
+	ph.write = NULL;
+
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("EMPTY_QUERY"), PGRES_EMPTY_QUERY TSRMLS_CC);
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("COMMAND_OK"), PGRES_COMMAND_OK TSRMLS_CC);
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("TUPLES_OK"), PGRES_TUPLES_OK TSRMLS_CC);
@@ -1082,6 +1166,14 @@ PHP_MINIT_FUNCTION(pqres)
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("FETCH_ASSOC"), PHP_PQRES_FETCH_ASSOC TSRMLS_CC);
 	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("FETCH_OBJECT"), PHP_PQRES_FETCH_OBJECT TSRMLS_CC);
 
+	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_BOOL"), PHP_PQRES_CONV_BOOL TSRMLS_CC);
+	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_INT"), PHP_PQRES_CONV_INT TSRMLS_CC);
+	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_FLOAT"), PHP_PQRES_CONV_FLOAT TSRMLS_CC);
+	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_SCALAR"), PHP_PQRES_CONV_SCALAR TSRMLS_CC);
+	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_ARRAY"), PHP_PQRES_CONV_ARRAY TSRMLS_CC);
+	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_DATETIME"), PHP_PQRES_CONV_DATETIME TSRMLS_CC);
+	zend_declare_class_constant_long(php_pqres_class_entry, ZEND_STRL("CONV_ALL"), PHP_PQRES_CONV_ALL TSRMLS_CC);
+
 	return SUCCESS;
 }