Change the parameter_types column of the pg_prepared_statements to be
authorNeil Conway <neilc@samurai.com>
Mon, 16 Jan 2006 18:15:31 +0000 (18:15 +0000)
committerNeil Conway <neilc@samurai.com>
Mon, 16 Jan 2006 18:15:31 +0000 (18:15 +0000)
an array of regtype, rather than an array of OIDs. This is likely to
be more useful to user, and the type OID can easily be obtained by
casting a regtype value to OID. Per suggestion from Tom.

Update the documentation and regression tests, and bump the catversion.

doc/src/sgml/catalogs.sgml
src/backend/catalog/system_views.sql
src/backend/commands/prepare.c
src/include/catalog/catversion.h
src/include/catalog/pg_type.h
src/test/regress/expected/prepare.out
src/test/regress/expected/rules.out

index 624b5df96f981e9a788773ce982fcec7e1645ccc..c346005bd96c77842042c41bb6826b0c8d2f5a12 100644 (file)
@@ -1,6 +1,6 @@
 <!--
  Documentation of the system catalogs, directed toward PostgreSQL developers
- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.116 2006/01/08 07:00:24 neilc Exp $
+ $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.117 2006/01/16 18:15:30 neilc Exp $
  -->
 
 <chapter id="catalogs">
       <entry>
        The initial value of the transition state.  This is a text
        field containing the initial value in its external string
-       representation.  If this field is null, the transition state
-       value starts out null.
+       representation.  If this field is NULL, the transition state
+       value starts out NULL.
       </entry>
      </row>
     </tbody>
   </table>
 
   <para>
-   New aggregate functions are registered with the <command>CREATE
-   AGGREGATE</command> command.  See <xref linkend="xaggr"> for more
-   information about writing aggregate functions and the meaning of
-   the transition functions, etc.
+   New aggregate functions are registered with the <xref
+   linkend="sql-createaggregate" endterm="sql-createaggregate-title">
+   command.  See <xref linkend="xaggr"> for more information about
+   writing aggregate functions and the meaning of the transition
+   functions, etc.
   </para>
 
  </sect1>
       <entry><type>bool</type></entry>
       <entry></entry>
       <entry>
-       Role may log in, that is, this role can be given as the initial
+       Role may log in. That is, this role can be given as the initial
        session authorization identifier.
       </entry>
      </row>
       <entry><structfield>relukeys</structfield></entry>
       <entry><type>int2</type></entry>
       <entry></entry>
-      <entry>unused  (<emphasis>not</emphasis> the number of unique keys)</entry>
+      <entry>Unused  (<emphasis>not</emphasis> the number of unique keys)</entry>
      </row>
 
      <row>
       <entry><structfield>relfkeys</structfield></entry>
       <entry><type>int2</type></entry>
       <entry></entry>
-      <entry>unused  (<emphasis>not</emphasis> the number of foreign keys on the table)</entry>
+      <entry>Unused  (<emphasis>not</emphasis> the number of foreign keys on the table)</entry>
      </row>
 
      <row>
       <entry><structfield>relrefs</structfield></entry>
       <entry><type>int2</type></entry>
       <entry></entry>
-      <entry>unused</entry>
+      <entry>Unused</entry>
      </row>
 
      <row>
       <entry><type>bool</type></entry>
       <entry></entry>
       <entry>
-       True if we generate an OID for each row of the relation.
+       True if we generate an OID for each row of the relation
       </entry>
      </row>
 
       <entry><type>bool</type></entry>
       <entry></entry>
       <entry>
-       True if the table has (or once had) a primary key.
+       True if the table has (or once had) a primary key
       </entry>
      </row>
 
       <entry><type>bool</type></entry>
       <entry></entry>
       <entry>True if table has rules; see
-       <structname>pg_rewrite</structname> catalog.
+       <structname>pg_rewrite</structname> catalog
       </entry>
      </row>
 
       <entry><structfield>relhassubclass</structfield></entry>
       <entry><type>bool</type></entry>
       <entry></entry>
-      <entry>True if table has (or once had) any inheritance children.</entry>
+      <entry>True if table has (or once had) any inheritance children</entry>
      </row>
 
      <row>
        Access privileges; see
        <xref linkend="sql-grant" endterm="sql-grant-title"> and
        <xref linkend="sql-revoke" endterm="sql-revoke-title">
-       for details.
+       for details
       </entry>
      </row>
     </tbody>
        Access privileges; see
        <xref linkend="sql-grant" endterm="sql-grant-title"> and
        <xref linkend="sql-revoke" endterm="sql-revoke-title">
-       for details.
+       for details
       </entry>
      </row>
     </tbody>
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       A code defining the specific semantics of this dependency relationship; see text.
+       A code defining the specific semantics of this dependency relationship; see text
       </entry>
      </row>
 
       <entry><structfield>description</structfield></entry>
       <entry><type>text</type></entry>
       <entry></entry>
-      <entry>Arbitrary text that serves as the description of this object.</entry>
+      <entry>Arbitrary text that serves as the description of this object</entry>
      </row>
     </tbody>
    </tgroup>
       <entry><structfield>indisunique</structfield></entry>
       <entry><type>bool</type></entry>
       <entry></entry>
-      <entry>If true, this is a unique index.</entry>
+      <entry>If true, this is a unique index</entry>
      </row>
 
      <row>
       <entry><structfield>indisclustered</structfield></entry>
       <entry><type>bool</type></entry>
       <entry></entry>
-      <entry>If true, the table was last clustered on this index.</entry>
+      <entry>If true, the table was last clustered on this index</entry>
      </row>
 
      <row>
       <entry>Expression trees (in <function>nodeToString()</function> representation)
       for index attributes that are not simple column references.  This is a
       list with one element for each zero entry in <structfield>indkey</>.
-      Null if all index attributes are simple references.</entry>
+      NULL if all index attributes are simple references.</entry>
      </row>
 
      <row>
       <entry><type>text</type></entry>
       <entry></entry>
       <entry>Expression tree (in <function>nodeToString()</function> representation)
-      for partial index predicate.  Null if not a partial index.</entry>
+      for partial index predicate.  NULL if not a partial index.</entry>
      </row>
     </tbody>
    </tgroup>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
       <entry>
-       The OID of the child table.
+       The OID of the child table
       </entry>
      </row>
 
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
       <entry>
-       The OID of the parent table.
+       The OID of the parent table
       </entry>
      </row>
 
        Access privileges; see
        <xref linkend="sql-grant" endterm="sql-grant-title"> and
        <xref linkend="sql-revoke" endterm="sql-revoke-title">
-       for details.
+       for details
       </entry>
      </row>
     </tbody>
       <entry><structfield>listenerpid</structfield></entry>
       <entry><type>int4</type></entry>
       <entry></entry>
-      <entry>PID of the server process that created this entry.</entry>
+      <entry>PID of the server process that created this entry</entry>
      </row>
 
      <row>
        Access privileges; see
        <xref linkend="sql-grant" endterm="sql-grant-title"> and
        <xref linkend="sql-revoke" endterm="sql-revoke-title">
-       for details.
+       for details
       </entry>
      </row>
     </tbody>
   </table>
 
   <para>
-   Unused column contain zeroes, for example <structfield>oprleft</structfield> is zero for a
-   prefix operator.
+   Unused column contain zeroes. For example, <structfield>oprleft</structfield>
+   is zero for a prefix operator.
   </para>
 
  </sect1>
   <para>
    There are not currently any commands that manipulate procedural language
    templates; to change the built-in information, a superuser must modify
-   the table using ordinary INSERT, DELETE, or UPDATE commands.  It is
-   likely that a future release of <productname>PostgreSQL</productname>
-   will offer commands to change the entries in a cleaner fashion.
+   the table using ordinary <command>INSERT</command>, <command>DELETE</command>,
+   or <command>UPDATE</command> commands.  It is likely that a future
+   release of <productname>PostgreSQL</productname> will offer
+   commands to change the entries in a cleaner fashion.
   </para>
 
   <para>
        Access privileges; see
        <xref linkend="sql-grant" endterm="sql-grant-title"> and
        <xref linkend="sql-revoke" endterm="sql-revoke-title">
-       for details.
+       for details
       </entry>
      </row>
     </tbody>
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       A code defining the specific semantics of this dependency relationship; see text.
+       A code defining the specific semantics of this dependency relationship; see text
       </entry>
      </row>
 
       <entry></entry>
       <entry>
        Numerical statistics of the appropriate kind for the
-       <replaceable>N</>th <quote>slot</quote>, or null if the slot
-       kind does not involve numerical values.
+       <replaceable>N</>th <quote>slot</quote>, or NULL if the slot
+       kind does not involve numerical values
       </entry>
      </row>
 
       <entry></entry>
       <entry>
        Column data values of the appropriate kind for the
-       <replaceable>N</>th <quote>slot</quote>, or null if the slot
+       <replaceable>N</>th <quote>slot</quote>, or NULL if the slot
        kind does not store any data values.  Each array's element
        values are actually of the specific column's data type, so there
        is no way to define these columns' type more specifically than
        Access privileges; see
        <xref linkend="sql-grant" endterm="sql-grant-title"> and
        <xref linkend="sql-revoke" endterm="sql-revoke-title">
-       for details.
+       for details
       </entry>
      </row>
     </tbody>
       <entry><structfield>tgargs</structfield></entry>
       <entry><type>bytea</type></entry>
       <entry></entry>
-      <entry>Argument strings to pass to trigger, each null-terminated</entry>
+      <entry>Argument strings to pass to trigger, each NULL-terminated</entry>
      </row>
     </tbody>
    </tgroup>
 
      <row>
       <entry><link linkend="view-pg-prepared-statements"><structname>pg_prepared_statements</structname></link></entry>
-      <entry>current prepared statements</entry>
+      <entry>prepared statements</entry>
      </row>
 
      <row>
       <entry><link linkend="view-pg-prepared-xacts"><structname>pg_prepared_xacts</structname></link></entry>
-      <entry>currently prepared transactions</entry>
+      <entry>prepared transactions</entry>
      </row>
 
      <row>
       <entry><type>xid</type></entry>
       <entry></entry>
       <entry>
-       ID of the transaction that is holding or awaiting this lock.
+       ID of the transaction that is holding or awaiting this lock
       </entry>
      </row>
      <row>
       <entry></entry>
       <entry>
        Process ID of the server process holding or awaiting this
-       lock.  Null if the lock is held by a prepared transaction.
+       lock.  NULL if the lock is held by a prepared transaction.
       </entry>
      </row>
      <row>
   <para>
    <structname>pg_prepared_statements</structname> contains one row
    for each prepared statement. Rows are added to the view when a new
-   prepared statement is created, and removed when a prepared
-   statement is released (for example, via the <xref
-   linkend="sql-deallocate" endterm="sql-deallocate-title">
-   command).
+   prepared statement is created and removed when a prepared statement
+   is released (for example, via the <xref linkend="sql-deallocate"
+   endterm="sql-deallocate-title"> command).
   </para>
 
   <table>
       <entry><type>text</type></entry>
       <entry></entry>
       <entry>
-       The identifier of the prepared statement.
+       The identifier of the prepared statement
       </entry>
      </row>
      <row>
       <entry><type>timestamptz</type></entry>
       <entry></entry>
       <entry>
-       The time at which the prepared statement was created.
+       The time at which the prepared statement was created
       </entry>
      </row>
      <row>
       <entry><structfield>parameter_types</structfield></entry>
-      <entry><type>oid[]</type></entry>
+      <entry><type>regtype[]</type></entry>
       <entry></entry>
       <entry>
-       The expected parameter types for the prepared statement in the form of
-       an array of type OIDs.
+       The expected parameter types for the prepared statement in the
+       form of an array of <type>regtype</type>. The OID corresponding
+       to an element of this array can be obtained by casting the
+       <type>regtype</type> value to <type>oid</type>.
       </entry>
      </row>
      <row>
        <literal>true</literal> if the prepared statement was created
        via the <command>PREPARE</command> SQL statement;
        <literal>false</literal> if the statement was prepared via the
-       frontend/backend protocol.
+       frontend/backend protocol
       </entry>
      </row>
     </tbody>
       <entry><structfield>definition</structfield></entry>
       <entry><type>text</type></entry>
       <entry></entry>
-      <entry>view definition (a reconstructed SELECT query)</entry>
+      <entry>view definition (a reconstructed <command>SELECT</command> query)</entry>
      </row>
     </tbody>
    </tgroup>
index a186c33b4447b3d1bf79cdf5104691c904c48d0e..c44e9ed72f1ca5946655a0936aed66b0b21cea17 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1996-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.23 2006/01/08 07:00:25 neilc Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.24 2006/01/16 18:15:30 neilc Exp $
  */
 
 CREATE VIEW pg_roles AS 
@@ -160,7 +160,7 @@ CREATE VIEW pg_prepared_statements AS
     SELECT P.name, P.statement, P.prepare_time, P.parameter_types, P.from_sql
     FROM pg_prepared_statement() AS P
     (name text, statement text, prepare_time timestamptz,
-     parameter_types oid[], from_sql boolean);
+     parameter_types regtype[], from_sql boolean);
 
 CREATE VIEW pg_settings AS 
     SELECT * 
index ccf8c297b21fc204ee4dd5e1948adf12476c020b..f523984e5a8cef719054024c831ebfe626b6e6c9 100644 (file)
@@ -10,7 +10,7 @@
  * Copyright (c) 2002-2005, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.45 2006/01/08 07:00:25 neilc Exp $
+ *       $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.46 2006/01/16 18:15:30 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,7 +45,7 @@ static HTAB *prepared_queries = NULL;
 static void InitQueryHashTable(void);
 static ParamListInfo EvaluateParams(EState *estate,
                           List *params, List *argtypes);
-static Datum build_oid_array(List *oid_list);
+static Datum build_regtype_array(List *oid_list);
 
 /*
  * Implements the 'PREPARE' utility statement.
@@ -674,7 +674,7 @@ ExplainExecuteQuery(ExplainStmt *stmt, ParamListInfo params,
 
 /*
  * This set returning function reads all the prepared statements and
- * returns a set of (name, statement, prepare_time, param_types).
+ * returns a set of (name, statement, prepare_time, param_types, from_sql).
  */
 Datum
 pg_prepared_statement(PG_FUNCTION_ARGS)
@@ -721,7 +721,7 @@ pg_prepared_statement(PG_FUNCTION_ARGS)
                TupleDescInitEntry(tupdesc, (AttrNumber) 3, "prepare_time",
                                                   TIMESTAMPTZOID, -1, 0);
                TupleDescInitEntry(tupdesc, (AttrNumber) 4, "parameter_types",
-                                                  OIDARRAYOID, -1, 0);
+                                                  REGTYPEARRAYOID, -1, 0);
                TupleDescInitEntry(tupdesc, (AttrNumber) 5, "from_sql",
                                                   BOOLOID, -1, 0);
 
@@ -757,7 +757,7 @@ pg_prepared_statement(PG_FUNCTION_ARGS)
                                                                        CStringGetDatum(prep_stmt->query_string));
 
                values[2] = TimestampTzGetDatum(prep_stmt->prepare_time);
-               values[3] = build_oid_array(prep_stmt->argtype_list);
+               values[3] = build_regtype_array(prep_stmt->argtype_list);
                values[4] = BoolGetDatum(prep_stmt->from_sql);
 
                tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls);
@@ -770,26 +770,33 @@ pg_prepared_statement(PG_FUNCTION_ARGS)
 
 /*
  * This utility function takes a List of Oids, and returns a Datum
- * pointing to a Postgres array containing those OIDs. The empty list
- * is returned as a zero-element array, not NULL.
+ * pointing to a one-dimensional Postgres array of regtypes. The empty
+ * list is returned as a zero-element array, not NULL.
  */
 static Datum
-build_oid_array(List *oid_list)
+build_regtype_array(List *oid_list)
 {
-       ListCell *lc;
-       int len;
-       int i;
-       Datum *tmp_ary;
-       ArrayType *ary;
+       ListCell   *lc;
+       int                     len;
+       int                     i;
+       Datum      *tmp_ary;
+       ArrayType  *result;
 
        len = list_length(oid_list);
        tmp_ary = (Datum *) palloc(len * sizeof(Datum));
 
        i = 0;
        foreach(lc, oid_list)
-               tmp_ary[i++] = ObjectIdGetDatum(lfirst_oid(lc));
+       {
+               Oid             oid;
+               Datum   oid_str;
+
+               oid = lfirst_oid(lc);
+               oid_str = DirectFunctionCall1(oidout, ObjectIdGetDatum(oid));
+               tmp_ary[i++] = DirectFunctionCall1(regtypein, oid_str);
+       }
 
-       /* XXX: this hardcodes assumptions about the OID type... */
-       ary = construct_array(tmp_ary, len, OIDOID, sizeof(Oid), true, 'i');
-       return PointerGetDatum(ary);
+       /* XXX: this hardcodes assumptions about the regtype type */
+       result = construct_array(tmp_ary, len, REGTYPEOID, 4, true, 'i');
+       return PointerGetDatum(result);
 }
index 258a9956f4a20293a17d11dfbf0848f32fcdaf0e..b844196c4ff958bb3e52e3e42b9aa66adb3427ac 100644 (file)
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.310 2006/01/11 20:12:39 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.311 2006/01/16 18:15:30 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     200601111
+#define CATALOG_VERSION_NO     200601161
 
 #endif
index c6ca59c87e2f5aa410b6c78ddef5174c7228ec0f..dfaa69eca52813baaa2d5772337aa066fa5221c8 100644 (file)
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.168 2006/01/08 07:00:26 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.169 2006/01/16 18:15:30 neilc Exp $
  *
  * NOTES
  *       the genbki.sh script reads this file and generates .bki
@@ -406,7 +406,6 @@ DATA(insert OID = 1007 (  _int4              PGNSP PGUID -1 f b t \054 0    23 array_in array_
 DATA(insert OID = 1008 (  _regproc      PGNSP PGUID -1 f b t \054 0    24 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1009 (  _text                 PGNSP PGUID -1 f b t \054 0    25 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1028 (  _oid          PGNSP PGUID -1 f b t \054 0    26 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ ));
-#define OIDARRAYOID                    1028
 DATA(insert OID = 1010 (  _tid          PGNSP PGUID -1 f b t \054 0    27 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1011 (  _xid          PGNSP PGUID -1 f b t \054 0    28 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 1012 (  _cid          PGNSP PGUID -1 f b t \054 0    29 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ ));
@@ -517,6 +516,7 @@ DATA(insert OID = 2208 ( _regoper      PGNSP PGUID -1 f b t \054 0 2203 array_in a
 DATA(insert OID = 2209 ( _regoperator  PGNSP PGUID -1 f b t \054 0 2204 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 2210 ( _regclass        PGNSP PGUID -1 f b t \054 0 2205 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 2211 ( _regtype         PGNSP PGUID -1 f b t \054 0 2206 array_in array_out array_recv array_send - i x f 0 -1 0 _null_ _null_ ));
+#define REGTYPEARRAYOID        2211
 
 /*
  * pseudo-types
index f7d1a7581497ffb3dc86cd402c8f97ffada81199..3532953f552acec5adf0923963fe027f595c6627 100644 (file)
@@ -148,19 +148,19 @@ PREPARE q7(unknown) AS
     SELECT * FROM road WHERE thepath = $1;
 SELECT name, statement, parameter_types FROM pg_prepared_statements
     ORDER BY name;
- name |                                                                                    statement                                                                                    |   parameter_types    
-------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------
+ name |                                                                                    statement                                                                                    |                    parameter_types                     
+------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------
  q2   | PREPARE q2(text) AS
        SELECT datname, datistemplate, datallowconn
-       FROM pg_database WHERE datname = $1;                                                                          | {25}
+       FROM pg_database WHERE datname = $1;                                                                          | {text}
  q3   | PREPARE q3(text, int, float, boolean, oid, smallint) AS
        SELECT * FROM tenk1 WHERE string4 = $1 AND (four = $2 OR
-       ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::int); | {25,23,701,16,26,21}
+       ten = $3::bigint OR true = $4 OR oid = $5 OR odd = $6::int); | {text,integer,"double precision",boolean,oid,smallint}
  q5   | PREPARE q5(int, text) AS
-       SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2;                                                                                              | {23,25}
+       SELECT * FROM tenk1 WHERE unique1 = $1 OR stringu1 = $2;                                                                                              | {integer,text}
  q6   | PREPARE q6 AS
-    SELECT * FROM tenk1 WHERE unique1 = $1 AND stringu1 = $2;                                                                                                     | {23,19}
+    SELECT * FROM tenk1 WHERE unique1 = $1 AND stringu1 = $2;                                                                                                     | {integer,name}
  q7   | PREPARE q7(unknown) AS
-    SELECT * FROM road WHERE thepath = $1;                                                                                                               | {602}
+    SELECT * FROM road WHERE thepath = $1;                                                                                                               | {path}
 (5 rows)
 
index 67616b73335ca2e7bb15b284071f3d1a8d9c0340..63c06ec75ace9e09f988eb5dfa8e2a62175e5248 100644 (file)
@@ -1280,7 +1280,7 @@ SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schem
  pg_group                 | SELECT pg_authid.rolname AS groname, pg_authid.oid AS grosysid, ARRAY(SELECT pg_auth_members.member FROM pg_auth_members WHERE (pg_auth_members.roleid = pg_authid.oid)) AS grolist FROM pg_authid WHERE (NOT pg_authid.rolcanlogin);
  pg_indexes               | SELECT n.nspname AS schemaname, c.relname AS tablename, i.relname AS indexname, t.spcname AS "tablespace", pg_get_indexdef(i.oid) AS indexdef FROM ((((pg_index x JOIN pg_class c ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_tablespace t ON ((t.oid = i.reltablespace))) WHERE ((c.relkind = 'r'::"char") AND (i.relkind = 'i'::"char"));
  pg_locks                 | SELECT l.locktype, l."database", l.relation, l.page, l.tuple, l.transactionid, l.classid, l.objid, l.objsubid, l."transaction", l.pid, l."mode", l."granted" FROM pg_lock_status() l(locktype text, "database" oid, relation oid, page integer, tuple smallint, transactionid xid, classid oid, objid oid, objsubid smallint, "transaction" xid, pid integer, "mode" text, "granted" boolean);
- pg_prepared_statements   | SELECT p.name, p."statement", p.prepare_time, p.parameter_types, p.from_sql FROM pg_prepared_statement() p(name text, "statement" text, prepare_time timestamp with time zone, parameter_types oid[], from_sql boolean);
+ pg_prepared_statements   | SELECT p.name, p."statement", p.prepare_time, p.parameter_types, p.from_sql FROM pg_prepared_statement() p(name text, "statement" text, prepare_time timestamp with time zone, parameter_types regtype[], from_sql boolean);
  pg_prepared_xacts        | SELECT p."transaction", p.gid, p."prepared", u.rolname AS "owner", d.datname AS "database" FROM ((pg_prepared_xact() p("transaction" xid, gid text, "prepared" timestamp with time zone, ownerid oid, dbid oid) LEFT JOIN pg_authid u ON ((p.ownerid = u.oid))) LEFT JOIN pg_database d ON ((p.dbid = d.oid)));
  pg_roles                 | SELECT pg_authid.rolname, pg_authid.rolsuper, pg_authid.rolinherit, pg_authid.rolcreaterole, pg_authid.rolcreatedb, pg_authid.rolcatupdate, pg_authid.rolcanlogin, pg_authid.rolconnlimit, '********'::text AS rolpassword, pg_authid.rolvaliduntil, pg_authid.rolconfig, pg_authid.oid FROM pg_authid;
  pg_rules                 | SELECT n.nspname AS schemaname, c.relname AS tablename, r.rulename, pg_get_ruledef(r.oid) AS definition FROM ((pg_rewrite r JOIN pg_class c ON ((c.oid = r.ev_class))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (r.rulename <> '_RETURN'::name);