Deal pgpool_adm extension with PostgreSQL 12.
authorTatsuo Ishii <ishii@sraoss.co.jp>
Tue, 21 May 2019 22:39:37 +0000 (07:39 +0900)
committerTatsuo Ishii <ishii@sraoss.co.jp>
Tue, 21 May 2019 22:48:33 +0000 (07:48 +0900)
Now that oid is gone, the signature of CreateTemplateTupleDesc() has
been changed.

src/sql/pgpool_adm/pgpool_adm.c

index bb6e9a70585d4ab461768c41c00ef012ee18bec4..490b0e30559b3707e507aeb05a0dc0734be14577 100644 (file)
@@ -180,7 +180,11 @@ _pcp_node_info(PG_FUNCTION_ARGS)
        /**
         * Construct a tuple descriptor for the result rows.
         **/
+#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 120000)
+       tupledesc = CreateTemplateTupleDesc(4);
+#else
        tupledesc = CreateTemplateTupleDesc(4, false);
+#endif
        TupleDescInitEntry(tupledesc, (AttrNumber) 1, "hostname", TEXTOID, -1, 0);
        TupleDescInitEntry(tupledesc, (AttrNumber) 2, "port", INT4OID, -1, 0);
        TupleDescInitEntry(tupledesc, (AttrNumber) 3, "status", TEXTOID, -1, 0);
@@ -307,7 +311,11 @@ _pcp_pool_status(PG_FUNCTION_ARGS)
                pcp_disconnect();
 
                /* Construct a tuple descriptor for the result rows */
+#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 120000)
+               tupdesc = CreateTemplateTupleDesc(3);
+#else
                tupdesc = CreateTemplateTupleDesc(3, false);
+#endif
                TupleDescInitEntry(tupdesc, (AttrNumber) 1, "item", TEXTOID, -1, 0);
                TupleDescInitEntry(tupdesc, (AttrNumber) 2, "value", TEXTOID, -1, 0);
                TupleDescInitEntry(tupdesc, (AttrNumber) 3, "description", TEXTOID, -1, 0);