Introduce fb_insert_aliases

Author: mlazdans

ibase_query.c

@@ -1550,6 +1550,36 @@ static int _php_ibase_arr_zval(zval *ar_zval, char *data, zend_ulong data_size,
 }
 /* }}} */
 
+void _php_ibase_insert_alias(HashTable *ht, const char *alias, size_t alias_len)
+{
+	char buf[METADATALENGTH + 3 + 1]; // _00 + \0
+	zval t2;
+	int i = 0;
+	char const *base = "FIELD"; /* use 'FIELD' if name is empty */
+	size_t alias_len_w_suff = alias_len + 3;
+
+	switch (*alias) {
+		void *p;
+
+		default:
+			i = 1;
+			base = alias;
+
+			while ((p = zend_symtable_str_find_ptr(
+					ht, alias, alias_len)) != NULL) {
+
+		case '\0':
+				// TODO: i > 99?
+				snprintf(buf, sizeof(buf), "%s_%02d", base, i++);
+				alias = buf;
+				alias_len = alias_len_w_suff;
+			}
+	}
+
+	ZVAL_NULL(&t2);
+	zend_hash_str_add_new(ht, alias, alias_len, &t2);
+}
+
 static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type) /* {{{ */
 {
 	zval *result_arg;

pdo_firebird_utils.cpp

@@ -18,9 +18,11 @@
 
 #if FB_API_VER >= 40
 
-#include "pdo_firebird_utils.h"
 #include <firebird/Interface.h>
 #include <cstring>
+#include "php.h"
+#include "pdo_firebird_utils.h"
+#include "php_ibase_includes.h"
 
 /* Returns the client version. 0 bytes are minor version, 1 bytes are major version. */
 extern "C" unsigned fb_get_client_version(void)
@@ -81,24 +83,38 @@ extern "C" void fb_decode_timestamp_tz(const ISC_TIMESTAMP_TZ* timestampTz,
 							timeZoneBufferLength, timeZoneBuffer);
 }
 
-extern "C" int fb_get_sql_info(ISC_STATUS* st, isc_stmt_handle* stmt,
-	unsigned itemsLength, const unsigned char* items,
-	unsigned bufferLength, unsigned char* buffer)
+extern "C" int fb_insert_aliases(ISC_STATUS* st, ibase_query *ib_query)
 {
 	Firebird::IMaster* master = Firebird::fb_get_master_interface();
 	Firebird::ThrowStatusWrapper status(master->getStatus());
 	Firebird::IStatement* statement = NULL;
+	Firebird::IMessageMetadata* meta = NULL;
+	ISC_STATUS res;
 
-	if (fb_get_statement_interface(st, &statement, stmt)){
-		// if (sv[0] == 1 && sv[1] > 0)
-		return st[1];
+	if (res = fb_get_statement_interface(st, &statement, &ib_query->stmt)){
+		return res;
 	}
 
-	// TODO: check status;
-	statement->getInfo(&status, itemsLength, items, bufferLength, buffer);
+	try {
+		meta = statement->getOutputMetadata(&status);
+		unsigned cols = meta->getCount(&status);
 
-	statement->release();
-	statement = NULL;
+		assert(cols == ib_query->out_fields_count);
+
+		zval t;
+		for (unsigned i = 0; i < cols; ++i)
+		{
+			_php_ibase_insert_alias(ib_query->ht_aliases,
+				meta->getAlias(&status, i), strlen(meta->getAlias(&status, i)));
+		}
+	}
+	catch (const Firebird::FbException& error)
+	{
+		if (status.hasData())  {
+			fb_copy_status((const ISC_STATUS*)status.getErrors(), st, 20);
+			return st[1];
+		}
+	}
 
 	return 0;
 }

pdo_firebird_utils.h

@@ -17,7 +17,10 @@
 #ifndef PDO_FIREBIRD_UTILS_H
 #define PDO_FIREBIRD_UTILS_H
 
+#if FB_API_VER >= 40
+
 #include <ibase.h>
+#include "php_ibase_includes.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,8 +32,6 @@ ISC_TIME fb_encode_time(unsigned hours, unsigned minutes, unsigned seconds, unsi
 
 ISC_DATE fb_encode_date(unsigned year, unsigned month, unsigned day);
 
-#if FB_API_VER >= 40
-
 void fb_decode_time_tz(const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
 	unsigned timeZoneBufferLength, char* timeZoneBuffer);
 
@@ -39,14 +40,11 @@ void fb_decode_timestamp_tz(const ISC_TIMESTAMP_TZ* timestampTz,
 	unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
 	unsigned timeZoneBufferLength, char* timeZoneBuffer);
 
-int fb_get_sql_info(ISC_STATUS* st, isc_stmt_handle* stmt,
-	unsigned itemsLength, const unsigned char* items,
-	unsigned bufferLength, unsigned char* buffer);
-
-#endif
+int fb_insert_aliases(ISC_STATUS* st, ibase_query *ib_query);
 
 #ifdef __cplusplus
 }
 #endif
+#endif
 
 #endif	/* PDO_FIREBIRD_UTILS_H */

php_ibase_includes.h

@@ -249,6 +249,16 @@ void _php_ibase_free_event(ibase_event *event);
 /* provided by ibase_service.c */
 void php_ibase_service_minit(INIT_FUNC_ARGS);
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void _php_ibase_insert_alias(HashTable *ht, const char *alias, size_t alias_len);
+
+#ifdef __cplusplus
+}
+#endif
+
 #ifndef max
 #define max(a,b) ((a)>(b)?(a):(b))
 #endif