Introduce fb_insert_field_info()

Author: mlazdans

ibase_query.c

@@ -1894,8 +1894,19 @@ static void _php_ibase_field_info(zval *return_value, ibase_query *ib_query, int
 
 	array_init(return_value);
 
-	if (is_outvar) {
-		// TODO: use newer API for long names
+	// AFAIK describe bind does not set sqlname, aliasname, relname?
+	// Confirmation needed so I leave this as is. After that we can check
+	// is_outvar
+
+#if FB_API_VER >= 40
+	if(IBG(fb_get_master_interface) && IBG(fb_get_statement_interface)) {
+		if(fb_insert_field_info(IB_STATUS, ib_query, is_outvar, num, return_value)){
+			_php_ibase_error();
+			RETURN_FALSE;
+		}
+	} else {
+#endif
+		// Old API
 		add_index_stringl(return_value, 0, var->sqlname, MIN(31, var->sqlname_length));
 		add_assoc_stringl(return_value, "name", var->sqlname, MIN(31, var->sqlname_length));
 
@@ -1904,15 +1915,9 @@ static void _php_ibase_field_info(zval *return_value, ibase_query *ib_query, int
 
 		add_index_stringl(return_value, 2, var->relname, MIN(31, var->relname_length));
 		add_assoc_stringl(return_value, "relation", var->relname, MIN(31, var->relname_length));
-	} else {
-		// AFAIK describe bind does not set these. Confirmation pending.
-		add_index_stringl(return_value, 0, "", 0);
-		add_assoc_stringl(return_value, "name", "", 0);
-		add_index_stringl(return_value, 1, "", 0);
-		add_assoc_stringl(return_value, "alias", "", 0);
-		add_index_stringl(return_value, 2, "", 0);
-		add_assoc_stringl(return_value, "relation", "", 0);
+#if FB_API_VER >= 40
 	}
+#endif
 
 	len = slprintf(buf, 16, "%d", var->sqllen);
 	add_index_stringl(return_value, 3, buf, len);

pdo_firebird_utils.cpp

@@ -101,7 +101,6 @@ extern "C" int fb_insert_aliases(ISC_STATUS* st, ibase_query *ib_query)
 
 		assert(cols == ib_query->out_fields_count);
 
-		zval t;
 		for (unsigned i = 0; i < cols; ++i)
 		{
 			_php_ibase_insert_alias(ib_query->ht_aliases,
@@ -119,4 +118,43 @@ extern "C" int fb_insert_aliases(ISC_STATUS* st, ibase_query *ib_query)
 	return 0;
 }
 
+extern "C" int fb_insert_field_info(ISC_STATUS* st, ibase_query *ib_query, int is_outvar, int num, zval *into_array)
+{
+	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 (res = fb_get_statement_interface(st, &statement, &ib_query->stmt)){
+		return res;
+	}
+
+	try {
+		if(is_outvar) {
+			meta = statement->getOutputMetadata(&status);
+		} else {
+			meta = statement->getInputMetadata(&status);
+		}
+
+		add_index_string(into_array, 0, meta->getField(&status, num));
+		add_assoc_string(into_array, "name", meta->getField(&status, num));
+
+		add_index_string(into_array, 1, meta->getAlias(&status, num));
+		add_assoc_string(into_array, "alias", meta->getAlias(&status, num));
+
+		add_index_string(into_array, 2, meta->getRelation(&status, num));
+		add_assoc_string(into_array, "relation", meta->getRelation(&status, num));
+	}
+	catch (const Firebird::FbException& error)
+	{
+		if (status.hasData())  {
+			fb_copy_status((const ISC_STATUS*)status.getErrors(), st, 20);
+			return st[1];
+		}
+	}
+
+	return 0;
+}
+
 #endif

pdo_firebird_utils.h

@@ -41,6 +41,7 @@ void fb_decode_timestamp_tz(const ISC_TIMESTAMP_TZ* timestampTz,
 	unsigned timeZoneBufferLength, char* timeZoneBuffer);
 
 int fb_insert_aliases(ISC_STATUS* st, ibase_query *ib_query);
+int fb_insert_field_info(ISC_STATUS* st, ibase_query *ib_query, int is_outvar, int num, zval *into_array);
 
 #ifdef __cplusplus
 }