diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/catalog/Catalog.pm | 1 | ||||
-rw-r--r-- | src/backend/catalog/genbki.pl | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm index b15f513183f..be56cc153f9 100644 --- a/src/backend/catalog/Catalog.pm +++ b/src/backend/catalog/Catalog.pm @@ -117,6 +117,7 @@ sub ParseHeader (?<index_name>\w+),\s* (?<index_oid>\d+),\s* (?<index_oid_macro>\w+),\s* + (?<table_name>\w+),\s* (?<index_decl>.+)\s* \)/x ) diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl index 4a7205472c1..c7657cc47ca 100644 --- a/src/backend/catalog/genbki.pl +++ b/src/backend/catalog/genbki.pl @@ -135,19 +135,18 @@ foreach my $header (@ARGV) foreach my $index (@{ $catalog->{indexing} }) { push @index_decls, - sprintf "declare %sindex %s %s %s\n", + sprintf "declare %sindex %s %s on %s using %s\n", $index->{is_unique} ? 'unique ' : '', $index->{index_name}, $index->{index_oid}, + $index->{table_name}, $index->{index_decl}; $oidcounts{ $index->{index_oid} }++; if ($index->{is_unique}) { - $index->{index_decl} =~ /on (\w+) using/; - my $tblname = $1; push @system_constraints, sprintf "ALTER TABLE %s ADD %s USING INDEX %s;", - $tblname, + $index->{table_name}, $index->{is_pkey} ? "PRIMARY KEY" : "UNIQUE", $index->{index_name}; } |