Add support for fetching meta data

2 files changed, 54 insertions, 3 deletions

diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index 2b4ec2c203..2970476486 100644
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -314,11 +314,12 @@ static struct pdo_dbh_methods pgsql_methods = {
 	pgsql_handle_begin,
 	pgsql_handle_commit,
 	pgsql_handle_rollback,
-	NULL,
+	NULL, /* set_attr */
 	pdo_pgsql_last_insert_id,
 	pdo_pgsql_fetch_error_func,
 	pdo_pgsql_get_attribute,
-	NULL	/* check_liveness */
+	NULL,	/* check_liveness */
+	NULL  /* get_driver_methods */
 };
 
 static int pdo_pgsql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_DC) /* {{{ */
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index 5f7a40c98e..2e38b1f941 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -235,13 +235,63 @@ static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, unsigned
 	return 1;
 }
 
+static int pgsql_stmt_get_column_meta(pdo_stmt_t *stmt, long colno, zval *return_value TSRMLS_DC)
+{
+	pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data;
+	PGresult *res;
+	char *q=NULL;
+	ExecStatusType status;
+	int i;
+	
+	if (!S->result) {
+		return FAILURE;
+	}
+	
+	if (colno >= stmt->column_count) {
+		return FAILURE;
+	}
+	
+	array_init(return_value);
+	add_assoc_long(return_value, "pgsql:oid", S->cols[colno].pgsql_type);
+
+	/* Fetch metadata from Postgres system catalogue */
+	spprintf(&q, 0, "SELECT TYPNAME FROM PG_TYPE WHERE OID=%d", S->cols[colno].pgsql_type);
+	res = PQexec(S->H->server, q);
+	efree(q);
+	
+	status = PQresultStatus(res);
+	
+	if (status != PGRES_TUPLES_OK) {
+		/* Failed to get system catalogue, but return success
+		 * with the data we have collected so far
+		 */
+		PQclear(res);
+		return 1;
+	}
+
+	/* We want exactly one row returned */
+	if (1 != PQntuples(res)) {
+		PQclear(res);
+		return 1;
+	}
+
+	add_assoc_string(return_value, "native_type", PQgetvalue(res, 0, 0), 1);
+
+	PQclear(res);		
+	return 1;
+}
+
 struct pdo_stmt_methods pgsql_stmt_methods = {
 	pgsql_stmt_dtor,
 	pgsql_stmt_execute,
 	pgsql_stmt_fetch,
 	pgsql_stmt_describe,
 	pgsql_stmt_get_col,
-	pgsql_stmt_param_hook
+	pgsql_stmt_param_hook,
+	NULL, /* set_attr */
+	NULL, /* get_attr */
+	pgsql_stmt_get_column_meta,
+	NULL  /* next_rowset */
 };
 
 /*