Extend the BKI infrastructure to allow system catalogs to be given

hand-assigned rowtype OIDs, even when they are not "bootstrapped" catalogs
that have handmade type rows in pg_type.h.  Give pg_database such an OID.
Restore the availability of C macros for the rowtype OIDs of the bootstrapped
catalogs.  (These macros are now in the individual catalogs' .h files,
though, not in pg_type.h.)

This commit doesn't do anything especially useful by itself, but it's
necessary infrastructure for reverting some ill-considered changes in
relcache.c.

diff --git a/doc/src/sgml/bki.sgml b/doc/src/sgml/bki.sgml
index d7940f0cbe19a74ce5c97ff8622ba19974f7240c..f27e0450bc073f4030a452a9c6cf9724f68c1bf5 100644 (file)
--- a/doc/src/sgml/bki.sgml
+++ b/doc/src/sgml/bki.sgml
@@ -67,12 +67,13 @@
   <variablelist>
    <varlistentry>
     <term>
-     <literal>create</> 
+     <literal>create</>
+     <replaceable class="parameter">tablename</replaceable>
+     <replaceable class="parameter">tableoid</replaceable>
      <optional><literal>bootstrap</></optional>
      <optional><literal>shared_relation</></optional>
      <optional><literal>without_oids</></optional>
-     <replaceable class="parameter">tablename</replaceable>
-     <replaceable class="parameter">tableoid</replaceable>
+     <optional><literal>rowtype_oid</> <replaceable>oid</></optional>
      (<replaceable class="parameter">name1</replaceable> =
      <replaceable class="parameter">type1</replaceable> <optional>,
      <replaceable class="parameter">name2</replaceable> = <replaceable
@@ -121,6 +122,11 @@
       The table is created as shared if <literal>shared_relation</> is
       specified.
       It will have OIDs unless <literal>without_oids</> is specified.
+      The table's rowtype OID (<structname>pg_type</> OID) can optionally
+      be specified via the <literal>rowtype_oid</> clause; if not specified,
+      an OID is automatically generated for it.  (The <literal>rowtype_oid</>
+      clause is useless if <literal>bootstrap</> is specified, but it can be
+      provided anyway for documentation.)
      </para>
     </listitem>
    </varlistentry>

diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 0c75ae6a52b50bf928d757edd9c571895f80fa47..7ddbfe4e0b228786b903da3d62c9b58906fc1587 100644 (file)
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -108,13 +108,13 @@ int num_columns_read = 0;
 %type <ival>  boot_const boot_ident
 %type <ival>  optbootstrap optsharedrelation optwithoutoids
 %type <ival>  boot_tuple boot_tuplelist
-%type <oidval> oidspec optoideq
+%type <oidval> oidspec optoideq optrowtypeoid
 
 %token <ival> CONST_P ID
 %token OPEN XCLOSE XCREATE INSERT_TUPLE
 %token XDECLARE INDEX ON USING XBUILD INDICES UNIQUE XTOAST
 %token COMMA EQUALS LPAREN RPAREN
-%token OBJ_ID XBOOTSTRAP XSHARED_RELATION XWITHOUT_OIDS NULLVAL
+%token OBJ_ID XBOOTSTRAP XSHARED_RELATION XWITHOUT_OIDS XROWTYPE_OID NULLVAL
 %start TopLevel
 
 %nonassoc low
@@ -168,15 +168,15 @@ Boot_CloseStmt:
                ;
 
 Boot_CreateStmt:
-                 XCREATE optbootstrap optsharedrelation optwithoutoids boot_ident oidspec LPAREN
+                 XCREATE boot_ident oidspec optbootstrap optsharedrelation optwithoutoids optrowtypeoid LPAREN
                                {
                                        do_start();
                                        numattr = 0;
                                        elog(DEBUG4, "creating%s%s relation %s %u",
-                                                $2 ? " bootstrap" : "",
-                                                $3 ? " shared" : "",
-                                                LexIDStr($5),
-                                                $6);
+                                                $4 ? " bootstrap" : "",
+                                                $5 ? " shared" : "",
+                                                LexIDStr($2),
+                                                $3);
                                }
                  boot_typelist
                                {
@@ -188,9 +188,9 @@ Boot_CreateStmt:
 
                                        do_start();
 
-                                       tupdesc = CreateTupleDesc(numattr, !($4), attrtypes);
+                                       tupdesc = CreateTupleDesc(numattr, !($6), attrtypes);
 
-                                       if ($2)
+                                       if ($4)
                                        {
                                                if (boot_reldesc)
                                                {
@@ -198,13 +198,13 @@ Boot_CreateStmt:
                                                        closerel(NULL);
                                                }
 
-                                               boot_reldesc = heap_create(LexIDStr($5),
+                                               boot_reldesc = heap_create(LexIDStr($2),
                                                                                                   PG_CATALOG_NAMESPACE,
-                                                                                                  $3 ? GLOBALTABLESPACE_OID : 0,
-                                                                                                  $6,
+                                                                                                  $5 ? GLOBALTABLESPACE_OID : 0,
+                                                                                                  $3,
                                                                                                   tupdesc,
                                                                                                   RELKIND_RELATION,
-                                                                                                  $3,
+                                                                                                  $5,
                                                                                                   true);
                                                elog(DEBUG4, "bootstrap relation created");
                                        }
@@ -212,15 +212,16 @@ Boot_CreateStmt:
                                        {
                                                Oid id;
 
-                                               id = heap_create_with_catalog(LexIDStr($5),
+                                               id = heap_create_with_catalog(LexIDStr($2),
                                                                                                          PG_CATALOG_NAMESPACE,
-                                                                                                         $3 ? GLOBALTABLESPACE_OID : 0,
-                                                                                                         $6,
+                                                                                                         $5 ? GLOBALTABLESPACE_OID : 0,
+                                                                                                         $3,
+                                                                                                         $7,
                                                                                                          BOOTSTRAP_SUPERUSERID,
                                                                                                          tupdesc,
                                                                                                          NIL,
                                                                                                          RELKIND_RELATION,
-                                                                                                         $3,
+                                                                                                         $5,
                                                                                                          true,
                                                                                                          0,
                                                                                                          ONCOMMIT_NOOP,
@@ -343,6 +344,11 @@ optwithoutoids:
                |                                       { $$ = 0; }
                ;
 
+optrowtypeoid:
+                       XROWTYPE_OID oidspec    { $$ = $2; }
+               |                                                       { $$ = InvalidOid; }
+               ;
+
 boot_typelist:
                  boot_type_thing
                | boot_typelist COMMA boot_type_thing
@@ -363,7 +369,7 @@ oidspec:
 
 optoideq:
                        OBJ_ID EQUALS oidspec                           { $$ = $3; }
-               |                                                                               { $$ = (Oid) 0; }
+               |                                                                               { $$ = InvalidOid; }
                ;
 
 boot_tuplelist:

diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index fba262416f459920798d72a69ee9d4f68fccb475..07dfdb6bb6ce0096d106427852bfcccbd4aa8501 100644 (file)
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -77,6 +77,7 @@ OID                           { return(OBJ_ID); }
 bootstrap              { return(XBOOTSTRAP); }
 "shared_relation"      { return(XSHARED_RELATION); }
 "without_oids" { return(XWITHOUT_OIDS); }
+"rowtype_oid"  { return(XROWTYPE_OID); }
 _null_                 { return(NULLVAL); }
 
 insert                 { return(INSERT_TUPLE); }

diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh
index 4abc25723da39fea3c5158f517a40880bc64df32..d597e8fe8ac04b0e30b3908e53afb7cdb7524f47 100644 (file)
--- a/src/backend/catalog/genbki.sh
+++ b/src/backend/catalog/genbki.sh
@@ -178,6 +178,7 @@ BEGIN {
        bootstrap = "";
        shared_relation = "";
        without_oids = "";
+       rowtype_oid = "";
        nc = 0;
        reln_open = 0;
        comment_level = 0;
@@ -319,13 +320,16 @@ comment_level > 0 { next; }
        oid = substr(catalogandoid, pos+1, length(catalogandoid)-pos);
 
        if ($0 ~ /BKI_BOOTSTRAP/) {
-               bootstrap = "bootstrap ";
+               bootstrap = " bootstrap";
        }
        if ($0 ~ /BKI_SHARED_RELATION/) {
-               shared_relation = "shared_relation ";
+               shared_relation = " shared_relation";
        }
        if ($0 ~ /BKI_WITHOUT_OIDS/) {
-               without_oids = "without_oids ";
+               without_oids = " without_oids";
+       }
+       if ($0 ~ /BKI_ROWTYPE_OID\([0-9]*\)/) {
+               rowtype_oid = gensub(/^.*BKI_ROWTYPE_OID\(([0-9]*)\).*$/, " rowtype_oid \\1", 1);
        }
 
         i = 1;
@@ -351,7 +355,7 @@ inside == 1 {
 #  if this is the last line, then output the bki catalog stuff.
 # ----
        if ($1 ~ /}/) {
-               print "create " bootstrap shared_relation without_oids catalog " " oid;
+               print "create " catalog " " oid bootstrap shared_relation without_oids rowtype_oid;
                print "\t(";
 
                for (j=1; j<i-1; j++) {
@@ -370,6 +374,7 @@ inside == 1 {
                bootstrap = "";
                shared_relation = "";
                without_oids = "";
+               rowtype_oid = "";
                next;
        }
 

diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index ae406ae6abb9972a7a823408888344e21159500d..e404dbe40e72bdc4ae7162d3f9fcebadf1ac518b 100644 (file)
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -80,6 +80,7 @@ static Oid AddNewRelationType(const char *typeName,
                                   Oid new_rel_oid,
                                   char new_rel_kind,
                                   Oid ownerid,
+                                  Oid new_row_type,
                                   Oid new_array_type);
 static void RelationRemoveInheritance(Oid relid);
 static void StoreRelCheck(Relation rel, char *ccname, Node *expr,
@@ -790,10 +791,11 @@ AddNewRelationType(const char *typeName,
                                   Oid new_rel_oid,
                                   char new_rel_kind,
                                   Oid ownerid,
+                                  Oid new_row_type,
                                   Oid new_array_type)
 {
        return
-               TypeCreate(InvalidOid,  /* no predetermined OID */
+               TypeCreate(new_row_type,                /* optional predetermined OID */
                                   typeName,    /* type name */
                                   typeNamespace,               /* type namespace */
                                   new_rel_oid, /* relation oid */
@@ -836,6 +838,7 @@ heap_create_with_catalog(const char *relname,
                                                 Oid relnamespace,
                                                 Oid reltablespace,
                                                 Oid relid,
+                                                Oid reltypeid,
                                                 Oid ownerid,
                                                 TupleDesc tupdesc,
                                                 List *cooked_constraints,
@@ -952,7 +955,9 @@ heap_create_with_catalog(const char *relname,
 
        /*
         * Since defining a relation also defines a complex type, we add a new
-        * system type corresponding to the new relation.
+        * system type corresponding to the new relation.  The OID of the type
+        * can be preselected by the caller, but if reltypeid is InvalidOid,
+        * we'll generate a new OID for it.
         *
         * NOTE: we could get a unique-index failure here, in case someone else is
         * creating the same type name in parallel but hadn't committed yet when
@@ -963,6 +968,7 @@ heap_create_with_catalog(const char *relname,
                                                                          relid,
                                                                          relkind,
                                                                          ownerid,
+                                                                         reltypeid,
                                                                          new_array_oid);
 
        /*

diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c
index 1eb65e0338c9d13fc6c3e6d18efd9795b84fa82f..be171503f3733929e582d86e0b11f6e871886375 100644 (file)
--- a/src/backend/catalog/toasting.c
+++ b/src/backend/catalog/toasting.c
@@ -203,6 +203,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
                                                                                   namespaceid,
                                                                                   rel->rd_rel->reltablespace,
                                                                                   toastOid,
+                                                                                  InvalidOid,
                                                                                   rel->rd_rel->relowner,
                                                                                   tupdesc,
                                                                                   NIL,

diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a6ba2ec3cb3e3dc27632d63a5eacab7f1c296291..29602a4eea0d2a6db739fd22704332ce99c7b187 100644 (file)
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -703,6 +703,7 @@ make_new_heap(Oid OIDOldHeap, const char *NewName, Oid NewTableSpace)
                                                                                  RelationGetNamespace(OldHeap),
                                                                                  NewTableSpace,
                                                                                  InvalidOid,
+                                                                                 InvalidOid,
                                                                                  OldHeap->rd_rel->relowner,
                                                                                  tupdesc,
                                                                                  NIL,

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 89dd19b2649c743d33e4bc46150d1bdcbf8dee8b..90281d38e790764bd048c53d2e7e5996184e0da5 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -510,6 +510,7 @@ DefineRelation(CreateStmt *stmt, char relkind)
                                                                                  namespaceId,
                                                                                  tablespaceId,
                                                                                  InvalidOid,
+                                                                                 InvalidOid,
                                                                                  GetUserId(),
                                                                                  descriptor,
                                                                                  list_concat(cookedDefaults,

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 55df5d0d78fcd492ace16231d280ce59d8492d5e..10f26cdf5ad9aed99b9dcabf94144015a36ac193 100644 (file)
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -2925,6 +2925,7 @@ OpenIntoRel(QueryDesc *queryDesc)
                                                                                          namespaceId,
                                                                                          tablespaceId,
                                                                                          InvalidOid,
+                                                                                         InvalidOid,
                                                                                          GetUserId(),
                                                                                          tupdesc,
                                                                                          NIL,

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 03010376321316f9c3ea974df0f78e8ac993db11..64d62e41e7c5898d109689a1916a3d282b7bc799 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     200909221
+#define CATALOG_VERSION_NO     200909261
 
 #endif

diff --git a/src/include/catalog/duplicate_oids b/src/include/catalog/duplicate_oids
index a75c4d8f0971ab505641e7e2501e0204f87fc810..73697a9df67fcdd1bee0931e0edbb71c9983725b 100755 (executable)
--- a/src/include/catalog/duplicate_oids
+++ b/src/include/catalog/duplicate_oids
@@ -10,11 +10,12 @@
 #
 
 # note: we exclude BKI_BOOTSTRAP relations since they are expected to have
-# matching DATA lines in pg_class.h
+# matching DATA lines in pg_class.h and pg_type.h
 
 cat pg_*.h toasting.h indexing.h | \
 egrep -v -e '^CATALOG\(.*BKI_BOOTSTRAP' | \
 sed -n -e 's/^DATA(insert *OID *= *\([0-9][0-9]*\).*$/\1/p' \
+       -e 's/^CATALOG([^,]*, *\([0-9][0-9]*\).*BKI_ROWTYPE_OID(\([0-9][0-9]*\)).*$/\1,\2/p' \
        -e 's/^CATALOG([^,]*, *\([0-9][0-9]*\).*$/\1/p' \
        -e 's/^DECLARE_INDEX([^,]*, *\([0-9][0-9]*\).*$/\1/p' \
        -e 's/^DECLARE_UNIQUE_INDEX([^,]*, *\([0-9][0-9]*\).*$/\1/p' \

diff --git a/src/include/catalog/genbki.h b/src/include/catalog/genbki.h
index 6fad591df45667ae68eb8d213b45b2f06620e9db..c399d1f000575544a7a647d14323d8d67192435f 100644 (file)
--- a/src/include/catalog/genbki.h
+++ b/src/include/catalog/genbki.h
@@ -26,6 +26,7 @@
 #define BKI_BOOTSTRAP
 #define BKI_SHARED_RELATION
 #define BKI_WITHOUT_OIDS
+#define BKI_ROWTYPE_OID(oid)
 
 /* Declarations that provide the initial content of a catalog */
 /* In C, these need to expand into some harmless, repeatable declaration */

diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index d7fdc9b1f930bf15a72326b17e301f961420cd78..e276b25b1f93c7630728054cd33fb38416bbe88a 100644 (file)
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -47,6 +47,7 @@ extern Oid heap_create_with_catalog(const char *relname,
                                                 Oid relnamespace,
                                                 Oid reltablespace,
                                                 Oid relid,
+                                                Oid reltypeid,
                                                 Oid ownerid,
                                                 TupleDesc tupdesc,
                                                 List *cooked_constraints,

diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index 411f63f8e3aabd4a3b860172dff4d9d1ff061409..66da0151495e6795bc7e7cb069b71a03deb42462 100644 (file)
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -35,8 +35,9 @@
  * ----------------
  */
 #define AttributeRelationId  1249
+#define AttributeRelation_Rowtype_Id  75
 
-CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS
+CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75)
 {
        Oid                     attrelid;               /* OID of relation containing this attribute */
        NameData        attname;                /* name of attribute */

diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index 79d94b4d09ee5c281dff9d0ce85477edd4f3ee56..eaf42dd80d787e870c3616aace893ee34df29a6b 100644 (file)
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -27,8 +27,9 @@
  * ----------------
  */
 #define RelationRelationId     1259
+#define RelationRelation_Rowtype_Id  83
 
-CATALOG(pg_class,1259) BKI_BOOTSTRAP
+CATALOG(pg_class,1259) BKI_BOOTSTRAP BKI_ROWTYPE_OID(83)
 {
        NameData        relname;                /* class name */
        Oid                     relnamespace;   /* OID of namespace containing this class */

diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h
index 3a0516f31b93b737c61605b1b89c3ae5ab3a33f0..a04f05892092289dffcd23180f87e0521b7fed9f 100644 (file)
--- a/src/include/catalog/pg_database.h
+++ b/src/include/catalog/pg_database.h
@@ -27,8 +27,9 @@
  * ----------------
  */
 #define DatabaseRelationId     1262
+#define DatabaseRelation_Rowtype_Id  1248
 
-CATALOG(pg_database,1262) BKI_SHARED_RELATION
+CATALOG(pg_database,1262) BKI_SHARED_RELATION BKI_ROWTYPE_OID(1248)
 {
        NameData        datname;                /* database name */
        Oid                     datdba;                 /* owner of database */

diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index b2e7e6dc91bfd9a219d7a1f96fb8c327011518a0..8547b6c7318af0d6828c213bcde89e02c400fc45 100644 (file)
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -31,8 +31,9 @@
  * ----------------
  */
 #define ProcedureRelationId  1255
+#define ProcedureRelation_Rowtype_Id  81
 
-CATALOG(pg_proc,1255) BKI_BOOTSTRAP
+CATALOG(pg_proc,1255) BKI_BOOTSTRAP BKI_ROWTYPE_OID(81)
 {
        NameData        proname;                /* procedure name */
        Oid                     pronamespace;   /* OID of namespace containing this proc */

diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 582e7ee1f1dced4d63deca50ce83c00705c9b56a..b96b2988a7a833d6f6aa5446660a91e96b6219d8 100644 (file)
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -32,8 +32,9 @@
  * ----------------
  */
 #define TypeRelationId 1247
+#define TypeRelation_Rowtype_Id  71
 
-CATALOG(pg_type,1247) BKI_BOOTSTRAP
+CATALOG(pg_type,1247) BKI_BOOTSTRAP BKI_ROWTYPE_OID(71)
 {
        NameData        typname;                /* type name */
        Oid                     typnamespace;   /* OID of namespace containing this type */
@@ -330,7 +331,8 @@ DATA(insert OID = 30 (      oidvector  PGNSP PGUID -1 f b A f t \054 0      26 1013 oidvec
 DESCR("array of oids, used in system tables");
 #define OIDVECTOROID   30
 
-/* hand-built rowtype entries for bootstrapped catalogs: */
+/* hand-built rowtype entries for bootstrapped catalogs */
+/* NB: OIDs assigned here must match the BKI_ROWTYPE_OID declarations */
 
 DATA(insert OID = 71 ( pg_type                 PGNSP PGUID -1 f c C f t \054 1247 0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));
 DATA(insert OID = 75 ( pg_attribute    PGNSP PGUID -1 f c C f t \054 1249 0 0 record_in record_out record_recv record_send - - - d x f 0 -1 0 _null_ _null_ ));

diff --git a/src/include/catalog/unused_oids b/src/include/catalog/unused_oids
index 0a1a64d85898d5ad20babf85928703bf7033c9dd..9308a057603eea494f911e0ac95b650fb1bb238a 100755 (executable)
--- a/src/include/catalog/unused_oids
+++ b/src/include/catalog/unused_oids
@@ -25,11 +25,12 @@ export FIRSTOBJECTID
 
 # this part (down to the uniq step) should match the duplicate_oids script
 # note: we exclude BKI_BOOTSTRAP relations since they are expected to have
-# matching DATA lines in pg_class.h
+# matching DATA lines in pg_class.h and pg_type.h
 
 cat pg_*.h toasting.h indexing.h | \
 egrep -v -e '^CATALOG\(.*BKI_BOOTSTRAP' | \
 sed -n -e 's/^DATA(insert *OID *= *\([0-9][0-9]*\).*$/\1/p' \
+       -e 's/^CATALOG([^,]*, *\([0-9][0-9]*\).*BKI_ROWTYPE_OID(\([0-9][0-9]*\)).*$/\1,\2/p' \
        -e 's/^CATALOG([^,]*, *\([0-9][0-9]*\).*$/\1/p' \
        -e 's/^DECLARE_INDEX([^,]*, *\([0-9][0-9]*\).*$/\1/p' \
        -e 's/^DECLARE_UNIQUE_INDEX([^,]*, *\([0-9][0-9]*\).*$/\1/p' \

diff --git a/src/tools/msvc/Genbki.pm b/src/tools/msvc/Genbki.pm
index 2543708cedd567e7e23044b04185bfc49bc519fc..f41a20de4d6f1f7b468f7478589ee24708739564 100644 (file)
--- a/src/tools/msvc/Genbki.pm
+++ b/src/tools/msvc/Genbki.pm
@@ -79,6 +79,7 @@ sub genbki
     my $bootstrap = "";
     my $shared_relation = "";
     my $without_oids = "";
+    my $rowtype_oid = "";
     my $nc = 0;
     my $inside = 0;
     my @attr;
@@ -152,18 +153,22 @@ sub genbki
             my @fields = split /,/,$1;
             $catalog = $fields[0];
             $oid = $fields[1];
-            $bootstrap=$shared_relation=$without_oids="";
+            $bootstrap=$shared_relation=$without_oids=$rowtype_oid="";
             if ($rest =~ /BKI_BOOTSTRAP/)
             {
-                $bootstrap = "bootstrap ";
+                $bootstrap = " bootstrap";
             }
             if ($rest =~ /BKI_SHARED_RELATION/)
             {
-                $shared_relation = "shared_relation ";
+                $shared_relation = " shared_relation";
             }
             if ($rest =~ /BKI_WITHOUT_OIDS/)
             {
-                $without_oids = "without_oids ";
+                $without_oids = " without_oids";
+            }
+            if ($rest =~ /BKI_ROWTYPE_OID\((\d+)\)/)
+            {
+                $rowtype_oid = " rowtype_oid $1";
             }
             $nc++;
             $inside = 1;
@@ -176,7 +181,7 @@ sub genbki
             {
 
                 # Last line
-                $bki .= "create $bootstrap$shared_relation$without_oids$catalog $oid\n (\n";
+                $bki .= "create $catalog $oid$bootstrap$shared_relation$without_oids$rowtype_oid\n\t(\n";
                 my $first = 1;
                 for (my $i = 0; $i <= $#attr; $i++)
                 {