From 49856352306d1c809c425a384d2887d0f8e1d544 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 26 Sep 2009 22:42:03 +0000 Subject: [PATCH] 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. --- doc/src/sgml/bki.sgml | 14 ++++++--- src/backend/bootstrap/bootparse.y | 44 ++++++++++++++++------------- src/backend/bootstrap/bootscanner.l | 3 +- src/backend/catalog/genbki.sh | 15 ++++++---- src/backend/catalog/heap.c | 12 ++++++-- src/backend/catalog/toasting.c | 3 +- src/backend/commands/cluster.c | 3 +- src/backend/commands/tablecmds.c | 3 +- src/backend/executor/execMain.c | 3 +- src/include/catalog/catversion.h | 4 +-- src/include/catalog/duplicate_oids | 5 ++-- src/include/catalog/genbki.h | 3 +- src/include/catalog/heap.h | 3 +- src/include/catalog/pg_attribute.h | 5 ++-- src/include/catalog/pg_class.h | 5 ++-- src/include/catalog/pg_database.h | 5 ++-- src/include/catalog/pg_proc.h | 5 ++-- src/include/catalog/pg_type.h | 8 ++++-- src/include/catalog/unused_oids | 5 ++-- src/tools/msvc/Genbki.pm | 17 +++++++---- 20 files changed, 104 insertions(+), 61 deletions(-) diff --git a/doc/src/sgml/bki.sgml b/doc/src/sgml/bki.sgml index 61a736b699..d0c08e08d9 100644 --- a/doc/src/sgml/bki.sgml +++ b/doc/src/sgml/bki.sgml @@ -1,4 +1,4 @@ - + <acronym>BKI</acronym> Backend Interface @@ -67,12 +67,13 @@ - create + create + tablename + tableoid bootstrap shared_relation without_oids - tablename - tableoid + rowtype_oid oid (name1 = type1 , name2 = shared_relation is specified. It will have OIDs unless without_oids is specified. + The table's rowtype OID (pg_type OID) can optionally + be specified via the rowtype_oid clause; if not specified, + an OID is automatically generated for it. (The rowtype_oid + clause is useless if bootstrap is specified, but it can be + provided anyway for documentation.) diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index 1670e462bc..0b2733148e 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.97 2009/07/29 20:56:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.98 2009/09/26 22:42:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -108,13 +108,13 @@ int num_columns_read = 0; %type boot_const boot_ident %type optbootstrap optsharedrelation optwithoutoids %type boot_tuple boot_tuplelist -%type oidspec optoideq +%type oidspec optoideq optrowtypeoid %token 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 ec5d6944ba..d4bcffee53 100644 --- a/src/backend/bootstrap/bootscanner.l +++ b/src/backend/bootstrap/bootscanner.l @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.48 2009/01/01 17:23:36 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.49 2009/09/26 22:42:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 2582f426bb..bda9a380fd 100644 --- a/src/backend/catalog/genbki.sh +++ b/src/backend/catalog/genbki.sh @@ -11,7 +11,7 @@ # # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/catalog/genbki.sh,v 1.46 2009/01/01 17:23:36 momjian Exp $ +# $PostgreSQL: pgsql/src/backend/catalog/genbki.sh,v 1.47 2009/09/26 22:42:01 tgl Exp $ # # NOTES # non-essential whitespace is removed from the generated file. @@ -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; jrd_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 1fabfb3d65..5c483614e3 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.186 2009/06/11 20:46:11 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.187 2009/09/26 22:42:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 a36cbc51af..07b4af611c 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.298 2009/08/23 19:23:41 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.299 2009/09/26 22:42:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 1bfe48eaac..1fcf2afdd9 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.327 2009/07/29 20:56:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.328 2009/09/26 22:42:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 5e0fc24154..4ae9157556 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.539 2009/09/22 23:43:41 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.540 2009/09/26 22:42:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 ea58f4a025..ded692ca8a 100755 --- a/src/include/catalog/duplicate_oids +++ b/src/include/catalog/duplicate_oids @@ -2,7 +2,7 @@ # # duplicate_oids # -# $PostgreSQL: pgsql/src/include/catalog/duplicate_oids,v 1.8 2006/07/31 01:16:37 tgl Exp $ +# $PostgreSQL: pgsql/src/include/catalog/duplicate_oids,v 1.9 2009/09/26 22:42:01 tgl Exp $ # # finds manually-assigned oids that are duplicated in the system tables. # @@ -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 1bdd1f9e57..4c0952f00c 100644 --- a/src/include/catalog/genbki.h +++ b/src/include/catalog/genbki.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/genbki.h,v 1.3 2009/06/11 14:49:09 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/genbki.h,v 1.4 2009/09/26 22:42:02 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 1d7449f1f1..0d42cf1196 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/heap.h,v 1.92 2009/08/23 19:23:41 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/heap.h,v 1.93 2009/09/26 22:42:02 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -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 f3c19d7475..1315e4241a 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_attribute.h,v 1.152 2009/08/12 20:53:30 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_attribute.h,v 1.153 2009/09/26 22:42:02 tgl Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -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 15a3b5f8d3..2ab4e9fda0 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_class.h,v 1.115 2009/08/02 22:14:53 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_class.h,v 1.116 2009/09/26 22:42:02 tgl Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -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 f7c2327098..730c23c863 100644 --- a/src/include/catalog/pg_database.h +++ b/src/include/catalog/pg_database.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_database.h,v 1.49 2009/01/01 17:23:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_database.h,v 1.50 2009/09/26 22:42:02 tgl Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -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 f6a9a8a838..0ea894854b 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.550 2009/09/01 02:54:52 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.551 2009/09/26 22:42:02 tgl Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -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 8bd23da82c..92e6a7d188 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.209 2009/08/13 21:14:31 petere Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.210 2009/09/26 22:42:03 tgl Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -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 4003beef53..371473926c 100755 --- a/src/include/catalog/unused_oids +++ b/src/include/catalog/unused_oids @@ -2,7 +2,7 @@ # # unused_oids # -# $PostgreSQL: pgsql/src/include/catalog/unused_oids,v 1.8 2006/07/31 01:16:38 tgl Exp $ +# $PostgreSQL: pgsql/src/include/catalog/unused_oids,v 1.9 2009/09/26 22:42:03 tgl Exp $ # # finds blocks of manually-assignable oids that have not already been # claimed by post_hackers. primarily useful for finding available @@ -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 73adc3e7bb..0b0e24f120 100644 --- a/src/tools/msvc/Genbki.pm +++ b/src/tools/msvc/Genbki.pm @@ -11,7 +11,7 @@ # # # IDENTIFICATION -# $PostgreSQL: pgsql/src/tools/msvc/Genbki.pm,v 1.6 2009/01/01 17:24:05 momjian Exp $ +# $PostgreSQL: pgsql/src/tools/msvc/Genbki.pm,v 1.7 2009/09/26 22:42:03 tgl Exp $ # #------------------------------------------------------------------------- @@ -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++) { -- 2.40.0