This patch changes places like this
DECLARE_UNIQUE_INDEX_PKEY(pg_aggregate_fnoid_index, 2650, on
pg_aggregate using btree(aggfnoid oid_ops));
#define AggregateFnoidIndexId 2650
to this
DECLARE_UNIQUE_INDEX_PKEY(pg_aggregate_fnoid_index, 2650,
AggregateFnoidIndexId, on pg_aggregate using btree(aggfnoid oid_ops));
and makes genbki.pl generate the #define's. This makes the handling of
catalog index OIDs consistent with the handling of catalog tables.
Compare with:
CATALOG(pg_aggregate,2600,AggregateRelationId)
From 43ffb9d952e3701b636d49dfc2884d78c0627cc7 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <pe...@eisentraut.org>
Date: Mon, 21 Jun 2021 09:10:12 +0200
Subject: [PATCH] Add index OID macro argument to DECLARE_INDEX
Instead of defining symbols such as AmOidIndexId explicitly, include
them as an argument of DECLARE_INDEX() and have genbki.pl generate the
way as the table OID symbols from the CATALOG() declaration.
---
src/backend/catalog/Catalog.pm | 5 +++--
src/backend/catalog/genbki.pl | 8 ++++++++
src/backend/utils/cache/syscache.c | 4 ++--
src/include/catalog/genbki.h | 6 +++---
src/include/catalog/pg_aggregate.h | 3 +--
src/include/catalog/pg_am.h | 6 ++----
src/include/catalog/pg_amop.h | 9 +++------
src/include/catalog/pg_amproc.h | 6 ++----
src/include/catalog/pg_attrdef.h | 6 ++----
src/include/catalog/pg_attribute.h | 6 ++----
src/include/catalog/pg_auth_members.h | 6 ++----
src/include/catalog/pg_authid.h | 6 ++----
src/include/catalog/pg_cast.h | 6 ++----
src/include/catalog/pg_class.h | 9 +++------
src/include/catalog/pg_collation.h | 6 ++----
src/include/catalog/pg_constraint.h | 15 +++++----------
src/include/catalog/pg_conversion.h | 9 +++------
src/include/catalog/pg_database.h | 6 ++----
src/include/catalog/pg_db_role_setting.h | 3 +--
src/include/catalog/pg_default_acl.h | 6 ++----
src/include/catalog/pg_depend.h | 6 ++----
src/include/catalog/pg_description.h | 3 +--
src/include/catalog/pg_enum.h | 9 +++------
src/include/catalog/pg_event_trigger.h | 6 ++----
src/include/catalog/pg_extension.h | 6 ++----
src/include/catalog/pg_foreign_data_wrapper.h | 6 ++----
src/include/catalog/pg_foreign_server.h | 6 ++----
src/include/catalog/pg_foreign_table.h | 3 +--
src/include/catalog/pg_index.h | 6 ++----
src/include/catalog/pg_inherits.h | 6 ++----
src/include/catalog/pg_init_privs.h | 3 +--
src/include/catalog/pg_language.h | 6 ++----
src/include/catalog/pg_largeobject.h | 3 +--
src/include/catalog/pg_largeobject_metadata.h | 3 +--
src/include/catalog/pg_namespace.h | 6 ++----
src/include/catalog/pg_opclass.h | 6 ++----
src/include/catalog/pg_operator.h | 6 ++----
src/include/catalog/pg_opfamily.h | 6 ++----
src/include/catalog/pg_partitioned_table.h | 3 +--
src/include/catalog/pg_policy.h | 6 ++----
src/include/catalog/pg_proc.h | 6 ++----
src/include/catalog/pg_publication.h | 6 ++----
src/include/catalog/pg_publication_rel.h | 6 ++----
src/include/catalog/pg_range.h | 8 ++------
src/include/catalog/pg_replication_origin.h | 6 ++----
src/include/catalog/pg_rewrite.h | 6 ++----
src/include/catalog/pg_seclabel.h | 3 +--
src/include/catalog/pg_sequence.h | 3 +--
src/include/catalog/pg_shdepend.h | 6 ++----
src/include/catalog/pg_shdescription.h | 3 +--
src/include/catalog/pg_shseclabel.h | 3 +--
src/include/catalog/pg_statistic.h | 3 +--
src/include/catalog/pg_statistic_ext.h | 9 +++------
src/include/catalog/pg_statistic_ext_data.h | 3 +--
src/include/catalog/pg_subscription.h | 6 ++----
src/include/catalog/pg_subscription_rel.h | 3 +--
src/include/catalog/pg_tablespace.h | 6 ++----
src/include/catalog/pg_transform.h | 6 ++----
src/include/catalog/pg_trigger.h | 9 +++------
src/include/catalog/pg_ts_config.h | 6 ++----
src/include/catalog/pg_ts_config_map.h | 3 +--
src/include/catalog/pg_ts_dict.h | 6 ++----
src/include/catalog/pg_ts_parser.h | 6 ++----
src/include/catalog/pg_ts_template.h | 6 ++----
src/include/catalog/pg_type.h | 6 ++----
src/include/catalog/pg_user_mapping.h | 6 ++----
66 files changed, 133 insertions(+), 243 deletions(-)
diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm
index a5e9869378..6eef0bc680 100644
--- a/src/backend/catalog/Catalog.pm
+++ b/src/backend/catalog/Catalog.pm
@@ -95,7 +95,7 @@ sub ParseHeader
{ parent_table => $1, toast_oid => $2,
toast_index_oid => $3 };
}
elsif (
-
/^DECLARE_(UNIQUE_)?INDEX(_PKEY)?\(\s*(\w+),\s*(\d+),\s*(.+)\)/)
+
/^DECLARE_(UNIQUE_)?INDEX(_PKEY)?\(\s*(\w+),\s*(\d+),\s*(\w+),\s*(.+)\)/)
{
push @{ $catalog{indexing} },
{
@@ -103,7 +103,8 @@ sub ParseHeader
is_pkey => $2 ? 1 : 0,
index_name => $3,
index_oid => $4,
- index_decl => $5
+ index_oid_macro => $5,
+ index_decl => $6
};
}
elsif (
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index 81363a0710..c4c54c74b9 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -469,6 +469,14 @@
printf $def "#define %s %s\n",
$catalog->{rowtype_oid_macro}, $catalog->{rowtype_oid}
if $catalog->{rowtype_oid_macro};
+
+ foreach my $index (@{ $catalog->{indexing} })
+ {
+ printf $def "#define %s %s\n",
+ $index->{index_oid_macro}, $index->{index_oid}
+ if $index->{index_oid_macro};
+ }
+
print $def "\n";
# .bki CREATE command for this catalog
diff --git a/src/backend/utils/cache/syscache.c
b/src/backend/utils/cache/syscache.c
index e4dc4ee34e..d6cb78dea8 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -96,8 +96,8 @@
There must be a unique index underlying each syscache (ie, an index
whose key is the same as that of the cache). If there is not one
- already, add definitions for it to include/catalog/pg_*.h: you need
- to add a DECLARE_UNIQUE_INDEX macro and a #define for the index OID.
+ already, add the definition for it to include/catalog/pg_*.h using
+ DECLARE_UNIQUE_INDEX.
(Adding an index requires a catversion.h update, while simply
adding/deleting caches only requires a recompile.)
diff --git a/src/include/catalog/genbki.h b/src/include/catalog/genbki.h
index b1fee54d3c..0b373ccac7 100644
--- a/src/include/catalog/genbki.h
+++ b/src/include/catalog/genbki.h
@@ -76,9 +76,9 @@
*
* The macro definitions are just to keep the C compiler from spitting up.
*/
-#define DECLARE_INDEX(name,oid,decl) extern int no_such_variable
-#define DECLARE_UNIQUE_INDEX(name,oid,decl) extern int no_such_variable
-#define DECLARE_UNIQUE_INDEX_PKEY(name,oid,decl) extern int no_such_variable
+#define DECLARE_INDEX(name,oid,oidmacro,decl) extern int no_such_variable
+#define DECLARE_UNIQUE_INDEX(name,oid,oidmacro,decl) extern int
no_such_variable
+#define DECLARE_UNIQUE_INDEX_PKEY(name,oid,oidmacro,decl) extern int
no_such_variable
/*
* These lines are processed by genbki.pl to create a table for use
diff --git a/src/include/catalog/pg_aggregate.h
b/src/include/catalog/pg_aggregate.h
index 25feb41678..08c9379ba7 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -110,8 +110,7 @@ typedef FormData_pg_aggregate *Form_pg_aggregate;
DECLARE_TOAST(pg_aggregate, 4159, 4160);
-DECLARE_UNIQUE_INDEX_PKEY(pg_aggregate_fnoid_index, 2650, on pg_aggregate
using btree(aggfnoid oid_ops));
-#define AggregateFnoidIndexId 2650
+DECLARE_UNIQUE_INDEX_PKEY(pg_aggregate_fnoid_index, 2650,
AggregateFnoidIndexId, on pg_aggregate using btree(aggfnoid oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h
index ced86faef8..62559feb5c 100644
--- a/src/include/catalog/pg_am.h
+++ b/src/include/catalog/pg_am.h
@@ -47,10 +47,8 @@ CATALOG(pg_am,2601,AccessMethodRelationId)
*/
typedef FormData_pg_am *Form_pg_am;
-DECLARE_UNIQUE_INDEX(pg_am_name_index, 2651, on pg_am using btree(amname
name_ops));
-#define AmNameIndexId 2651
-DECLARE_UNIQUE_INDEX_PKEY(pg_am_oid_index, 2652, on pg_am using btree(oid
oid_ops));
-#define AmOidIndexId 2652
+DECLARE_UNIQUE_INDEX(pg_am_name_index, 2651, AmNameIndexId, on pg_am using
btree(amname name_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_am_oid_index, 2652, AmOidIndexId, on pg_am using
btree(oid oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index e1cca35e31..126ec10c2c 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -87,12 +87,9 @@ CATALOG(pg_amop,2602,AccessMethodOperatorRelationId)
*/
typedef FormData_pg_amop *Form_pg_amop;
-DECLARE_UNIQUE_INDEX(pg_amop_fam_strat_index, 2653, on pg_amop using
btree(amopfamily oid_ops, amoplefttype oid_ops, amoprighttype oid_ops,
amopstrategy int2_ops));
-#define AccessMethodStrategyIndexId 2653
-DECLARE_UNIQUE_INDEX(pg_amop_opr_fam_index, 2654, on pg_amop using
btree(amopopr oid_ops, amoppurpose char_ops, amopfamily oid_ops));
-#define AccessMethodOperatorIndexId 2654
-DECLARE_UNIQUE_INDEX_PKEY(pg_amop_oid_index, 2756, on pg_amop using btree(oid
oid_ops));
-#define AccessMethodOperatorOidIndexId 2756
+DECLARE_UNIQUE_INDEX(pg_amop_fam_strat_index, 2653,
AccessMethodStrategyIndexId, on pg_amop using btree(amopfamily oid_ops,
amoplefttype oid_ops, amoprighttype oid_ops, amopstrategy int2_ops));
+DECLARE_UNIQUE_INDEX(pg_amop_opr_fam_index, 2654, AccessMethodOperatorIndexId,
on pg_amop using btree(amopopr oid_ops, amoppurpose char_ops, amopfamily
oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_amop_oid_index, 2756,
AccessMethodOperatorOidIndexId, on pg_amop using btree(oid oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index 8a727c359a..824a312b56 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -67,9 +67,7 @@ CATALOG(pg_amproc,2603,AccessMethodProcedureRelationId)
*/
typedef FormData_pg_amproc *Form_pg_amproc;
-DECLARE_UNIQUE_INDEX(pg_amproc_fam_proc_index, 2655, on pg_amproc using
btree(amprocfamily oid_ops, amproclefttype oid_ops, amprocrighttype oid_ops,
amprocnum int2_ops));
-#define AccessMethodProcedureIndexId 2655
-DECLARE_UNIQUE_INDEX_PKEY(pg_amproc_oid_index, 2757, on pg_amproc using
btree(oid oid_ops));
-#define AccessMethodProcedureOidIndexId 2757
+DECLARE_UNIQUE_INDEX(pg_amproc_fam_proc_index, 2655,
AccessMethodProcedureIndexId, on pg_amproc using btree(amprocfamily oid_ops,
amproclefttype oid_ops, amprocrighttype oid_ops, amprocnum int2_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_amproc_oid_index, 2757,
AccessMethodProcedureOidIndexId, on pg_amproc using btree(oid oid_ops));
#endif /* PG_AMPROC_H */
diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h
index d689ca20c8..0bcf2b7d33 100644
--- a/src/include/catalog/pg_attrdef.h
+++ b/src/include/catalog/pg_attrdef.h
@@ -49,10 +49,8 @@ typedef FormData_pg_attrdef *Form_pg_attrdef;
DECLARE_TOAST(pg_attrdef, 2830, 2831);
-DECLARE_UNIQUE_INDEX(pg_attrdef_adrelid_adnum_index, 2656, on pg_attrdef using
btree(adrelid oid_ops, adnum int2_ops));
-#define AttrDefaultIndexId 2656
-DECLARE_UNIQUE_INDEX_PKEY(pg_attrdef_oid_index, 2657, on pg_attrdef using
btree(oid oid_ops));
-#define AttrDefaultOidIndexId 2657
+DECLARE_UNIQUE_INDEX(pg_attrdef_adrelid_adnum_index, 2656, AttrDefaultIndexId,
on pg_attrdef using btree(adrelid oid_ops, adnum int2_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_attrdef_oid_index, 2657, AttrDefaultOidIndexId,
on pg_attrdef using btree(oid oid_ops));
DECLARE_FOREIGN_KEY((adrelid, adnum), pg_attribute, (attrelid, attnum));
diff --git a/src/include/catalog/pg_attribute.h
b/src/include/catalog/pg_attribute.h
index 603392fe81..5c1ec9313e 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -206,10 +206,8 @@ CATALOG(pg_attribute,1249,AttributeRelationId)
BKI_BOOTSTRAP BKI_ROWTYPE_OID(75,
*/
typedef FormData_pg_attribute *Form_pg_attribute;
-DECLARE_UNIQUE_INDEX(pg_attribute_relid_attnam_index, 2658, on pg_attribute
using btree(attrelid oid_ops, attname name_ops));
-#define AttributeRelidNameIndexId 2658
-DECLARE_UNIQUE_INDEX_PKEY(pg_attribute_relid_attnum_index, 2659, on
pg_attribute using btree(attrelid oid_ops, attnum int2_ops));
-#define AttributeRelidNumIndexId 2659
+DECLARE_UNIQUE_INDEX(pg_attribute_relid_attnam_index, 2658,
AttributeRelidNameIndexId, on pg_attribute using btree(attrelid oid_ops,
attname name_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_attribute_relid_attnum_index, 2659,
AttributeRelidNumIndexId, on pg_attribute using btree(attrelid oid_ops, attnum
int2_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_auth_members.h
b/src/include/catalog/pg_auth_members.h
index 76ab90c939..b9d3ffd1c5 100644
--- a/src/include/catalog/pg_auth_members.h
+++ b/src/include/catalog/pg_auth_members.h
@@ -42,9 +42,7 @@ CATALOG(pg_auth_members,1261,AuthMemRelationId)
BKI_SHARED_RELATION BKI_ROWTYPE_
*/
typedef FormData_pg_auth_members *Form_pg_auth_members;
-DECLARE_UNIQUE_INDEX_PKEY(pg_auth_members_role_member_index, 2694, on
pg_auth_members using btree(roleid oid_ops, member oid_ops));
-#define AuthMemRoleMemIndexId 2694
-DECLARE_UNIQUE_INDEX(pg_auth_members_member_role_index, 2695, on
pg_auth_members using btree(member oid_ops, roleid oid_ops));
-#define AuthMemMemRoleIndexId 2695
+DECLARE_UNIQUE_INDEX_PKEY(pg_auth_members_role_member_index, 2694,
AuthMemRoleMemIndexId, on pg_auth_members using btree(roleid oid_ops, member
oid_ops));
+DECLARE_UNIQUE_INDEX(pg_auth_members_member_role_index, 2695,
AuthMemMemRoleIndexId, on pg_auth_members using btree(member oid_ops, roleid
oid_ops));
#endif /* PG_AUTH_MEMBERS_H */
diff --git a/src/include/catalog/pg_authid.h b/src/include/catalog/pg_authid.h
index 609bd7fcbc..2d7115e31d 100644
--- a/src/include/catalog/pg_authid.h
+++ b/src/include/catalog/pg_authid.h
@@ -59,9 +59,7 @@ DECLARE_TOAST(pg_authid, 4175, 4176);
#define PgAuthidToastTable 4175
#define PgAuthidToastIndex 4176
-DECLARE_UNIQUE_INDEX(pg_authid_rolname_index, 2676, on pg_authid using
btree(rolname name_ops));
-#define AuthIdRolnameIndexId 2676
-DECLARE_UNIQUE_INDEX_PKEY(pg_authid_oid_index, 2677, on pg_authid using
btree(oid oid_ops));
-#define AuthIdOidIndexId 2677
+DECLARE_UNIQUE_INDEX(pg_authid_rolname_index, 2676, AuthIdRolnameIndexId, on
pg_authid using btree(rolname name_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_authid_oid_index, 2677, AuthIdOidIndexId, on
pg_authid using btree(oid oid_ops));
#endif /* PG_AUTHID_H */
diff --git a/src/include/catalog/pg_cast.h b/src/include/catalog/pg_cast.h
index f64a9df54c..c1a84070e4 100644
--- a/src/include/catalog/pg_cast.h
+++ b/src/include/catalog/pg_cast.h
@@ -56,10 +56,8 @@ CATALOG(pg_cast,2605,CastRelationId)
*/
typedef FormData_pg_cast *Form_pg_cast;
-DECLARE_UNIQUE_INDEX_PKEY(pg_cast_oid_index, 2660, on pg_cast using btree(oid
oid_ops));
-#define CastOidIndexId 2660
-DECLARE_UNIQUE_INDEX(pg_cast_source_target_index, 2661, on pg_cast using
btree(castsource oid_ops, casttarget oid_ops));
-#define CastSourceTargetIndexId 2661
+DECLARE_UNIQUE_INDEX_PKEY(pg_cast_oid_index, 2660, CastOidIndexId, on pg_cast
using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_cast_source_target_index, 2661,
CastSourceTargetIndexId, on pg_cast using btree(castsource oid_ops, casttarget
oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index 3e37729436..3458d95606 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -152,12 +152,9 @@ CATALOG(pg_class,1259,RelationRelationId) BKI_BOOTSTRAP
BKI_ROWTYPE_OID(83,Relat
*/
typedef FormData_pg_class *Form_pg_class;
-DECLARE_UNIQUE_INDEX_PKEY(pg_class_oid_index, 2662, on pg_class using
btree(oid oid_ops));
-#define ClassOidIndexId 2662
-DECLARE_UNIQUE_INDEX(pg_class_relname_nsp_index, 2663, on pg_class using
btree(relname name_ops, relnamespace oid_ops));
-#define ClassNameNspIndexId 2663
-DECLARE_INDEX(pg_class_tblspc_relfilenode_index, 3455, on pg_class using
btree(reltablespace oid_ops, relfilenode oid_ops));
-#define ClassTblspcRelfilenodeIndexId 3455
+DECLARE_UNIQUE_INDEX_PKEY(pg_class_oid_index, 2662, ClassOidIndexId, on
pg_class using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_class_relname_nsp_index, 2663, ClassNameNspIndexId, on
pg_class using btree(relname name_ops, relnamespace oid_ops));
+DECLARE_INDEX(pg_class_tblspc_relfilenode_index, 3455,
ClassTblspcRelfilenodeIndexId, on pg_class using btree(reltablespace oid_ops,
relfilenode oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_collation.h
b/src/include/catalog/pg_collation.h
index 6adbeab690..03bd4cb5d4 100644
--- a/src/include/catalog/pg_collation.h
+++ b/src/include/catalog/pg_collation.h
@@ -57,10 +57,8 @@ typedef FormData_pg_collation *Form_pg_collation;
DECLARE_TOAST(pg_collation, 6175, 6176);
-DECLARE_UNIQUE_INDEX(pg_collation_name_enc_nsp_index, 3164, on pg_collation
using btree(collname name_ops, collencoding int4_ops, collnamespace oid_ops));
-#define CollationNameEncNspIndexId 3164
-DECLARE_UNIQUE_INDEX_PKEY(pg_collation_oid_index, 3085, on pg_collation using
btree(oid oid_ops));
-#define CollationOidIndexId 3085
+DECLARE_UNIQUE_INDEX(pg_collation_name_enc_nsp_index, 3164,
CollationNameEncNspIndexId, on pg_collation using btree(collname name_ops,
collencoding int4_ops, collnamespace oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_collation_oid_index, 3085, CollationOidIndexId,
on pg_collation using btree(oid oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_constraint.h
b/src/include/catalog/pg_constraint.h
index 63f0f8bf41..e75baa8e1e 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -160,16 +160,11 @@ typedef FormData_pg_constraint *Form_pg_constraint;
DECLARE_TOAST(pg_constraint, 2832, 2833);
-DECLARE_INDEX(pg_constraint_conname_nsp_index, 2664, on pg_constraint using
btree(conname name_ops, connamespace oid_ops));
-#define ConstraintNameNspIndexId 2664
-DECLARE_UNIQUE_INDEX(pg_constraint_conrelid_contypid_conname_index, 2665, on
pg_constraint using btree(conrelid oid_ops, contypid oid_ops, conname
name_ops));
-#define ConstraintRelidTypidNameIndexId 2665
-DECLARE_INDEX(pg_constraint_contypid_index, 2666, on pg_constraint using
btree(contypid oid_ops));
-#define ConstraintTypidIndexId 2666
-DECLARE_UNIQUE_INDEX_PKEY(pg_constraint_oid_index, 2667, on pg_constraint
using btree(oid oid_ops));
-#define ConstraintOidIndexId 2667
-DECLARE_INDEX(pg_constraint_conparentid_index, 2579, on pg_constraint using
btree(conparentid oid_ops));
-#define ConstraintParentIndexId 2579
+DECLARE_INDEX(pg_constraint_conname_nsp_index, 2664, ConstraintNameNspIndexId,
on pg_constraint using btree(conname name_ops, connamespace oid_ops));
+DECLARE_UNIQUE_INDEX(pg_constraint_conrelid_contypid_conname_index, 2665,
ConstraintRelidTypidNameIndexId, on pg_constraint using btree(conrelid oid_ops,
contypid oid_ops, conname name_ops));
+DECLARE_INDEX(pg_constraint_contypid_index, 2666, ConstraintTypidIndexId, on
pg_constraint using btree(contypid oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_constraint_oid_index, 2667, ConstraintOidIndexId,
on pg_constraint using btree(oid oid_ops));
+DECLARE_INDEX(pg_constraint_conparentid_index, 2579, ConstraintParentIndexId,
on pg_constraint using btree(conparentid oid_ops));
/* conkey can contain zero (InvalidAttrNumber) if a whole-row Var is used */
DECLARE_ARRAY_FOREIGN_KEY_OPT((conrelid, conkey), pg_attribute, (attrelid,
attnum));
diff --git a/src/include/catalog/pg_conversion.h
b/src/include/catalog/pg_conversion.h
index ca556f6030..5a2c32afac 100644
--- a/src/include/catalog/pg_conversion.h
+++ b/src/include/catalog/pg_conversion.h
@@ -60,12 +60,9 @@ CATALOG(pg_conversion,2607,ConversionRelationId)
*/
typedef FormData_pg_conversion *Form_pg_conversion;
-DECLARE_UNIQUE_INDEX(pg_conversion_default_index, 2668, on pg_conversion using
btree(connamespace oid_ops, conforencoding int4_ops, contoencoding int4_ops,
oid oid_ops));
-#define ConversionDefaultIndexId 2668
-DECLARE_UNIQUE_INDEX(pg_conversion_name_nsp_index, 2669, on pg_conversion
using btree(conname name_ops, connamespace oid_ops));
-#define ConversionNameNspIndexId 2669
-DECLARE_UNIQUE_INDEX_PKEY(pg_conversion_oid_index, 2670, on pg_conversion
using btree(oid oid_ops));
-#define ConversionOidIndexId 2670
+DECLARE_UNIQUE_INDEX(pg_conversion_default_index, 2668,
ConversionDefaultIndexId, on pg_conversion using btree(connamespace oid_ops,
conforencoding int4_ops, contoencoding int4_ops, oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_conversion_name_nsp_index, 2669,
ConversionNameNspIndexId, on pg_conversion using btree(conname name_ops,
connamespace oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_conversion_oid_index, 2670, ConversionOidIndexId,
on pg_conversion using btree(oid oid_ops));
extern ObjectAddress ConversionCreate(const char *conname, Oid connamespace,
diff --git a/src/include/catalog/pg_database.h
b/src/include/catalog/pg_database.h
index d3de45821c..43f3beb6a3 100644
--- a/src/include/catalog/pg_database.h
+++ b/src/include/catalog/pg_database.h
@@ -84,9 +84,7 @@ DECLARE_TOAST(pg_database, 4177, 4178);
#define PgDatabaseToastTable 4177
#define PgDatabaseToastIndex 4178
-DECLARE_UNIQUE_INDEX(pg_database_datname_index, 2671, on pg_database using
btree(datname name_ops));
-#define DatabaseNameIndexId 2671
-DECLARE_UNIQUE_INDEX_PKEY(pg_database_oid_index, 2672, on pg_database using
btree(oid oid_ops));
-#define DatabaseOidIndexId 2672
+DECLARE_UNIQUE_INDEX(pg_database_datname_index, 2671, DatabaseNameIndexId, on
pg_database using btree(datname name_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_database_oid_index, 2672, DatabaseOidIndexId, on
pg_database using btree(oid oid_ops));
#endif /* PG_DATABASE_H */
diff --git a/src/include/catalog/pg_db_role_setting.h
b/src/include/catalog/pg_db_role_setting.h
index 705f698ae7..ecf03a954f 100644
--- a/src/include/catalog/pg_db_role_setting.h
+++ b/src/include/catalog/pg_db_role_setting.h
@@ -50,8 +50,7 @@ DECLARE_TOAST(pg_db_role_setting, 2966, 2967);
#define PgDbRoleSettingToastTable 2966
#define PgDbRoleSettingToastIndex 2967
-DECLARE_UNIQUE_INDEX_PKEY(pg_db_role_setting_databaseid_rol_index, 2965, on
pg_db_role_setting using btree(setdatabase oid_ops, setrole oid_ops));
-#define DbRoleSettingDatidRolidIndexId 2965
+DECLARE_UNIQUE_INDEX_PKEY(pg_db_role_setting_databaseid_rol_index, 2965,
DbRoleSettingDatidRolidIndexId, on pg_db_role_setting using btree(setdatabase
oid_ops, setrole oid_ops));
/*
* prototypes for functions in pg_db_role_setting.h
diff --git a/src/include/catalog/pg_default_acl.h
b/src/include/catalog/pg_default_acl.h
index 156fc0712d..eb72dd6293 100644
--- a/src/include/catalog/pg_default_acl.h
+++ b/src/include/catalog/pg_default_acl.h
@@ -51,10 +51,8 @@ typedef FormData_pg_default_acl *Form_pg_default_acl;
DECLARE_TOAST(pg_default_acl, 4143, 4144);
-DECLARE_UNIQUE_INDEX(pg_default_acl_role_nsp_obj_index, 827, on pg_default_acl
using btree(defaclrole oid_ops, defaclnamespace oid_ops, defaclobjtype
char_ops));
-#define DefaultAclRoleNspObjIndexId 827
-DECLARE_UNIQUE_INDEX_PKEY(pg_default_acl_oid_index, 828, on pg_default_acl
using btree(oid oid_ops));
-#define DefaultAclOidIndexId 828
+DECLARE_UNIQUE_INDEX(pg_default_acl_role_nsp_obj_index, 827,
DefaultAclRoleNspObjIndexId, on pg_default_acl using btree(defaclrole oid_ops,
defaclnamespace oid_ops, defaclobjtype char_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_default_acl_oid_index, 828, DefaultAclOidIndexId,
on pg_default_acl using btree(oid oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_depend.h b/src/include/catalog/pg_depend.h
index e0bc114145..f41ae3add1 100644
--- a/src/include/catalog/pg_depend.h
+++ b/src/include/catalog/pg_depend.h
@@ -72,9 +72,7 @@ CATALOG(pg_depend,2608,DependRelationId)
*/
typedef FormData_pg_depend *Form_pg_depend;
-DECLARE_INDEX(pg_depend_depender_index, 2673, on pg_depend using btree(classid
oid_ops, objid oid_ops, objsubid int4_ops));
-#define DependDependerIndexId 2673
-DECLARE_INDEX(pg_depend_reference_index, 2674, on pg_depend using
btree(refclassid oid_ops, refobjid oid_ops, refobjsubid int4_ops));
-#define DependReferenceIndexId 2674
+DECLARE_INDEX(pg_depend_depender_index, 2673, DependDependerIndexId, on
pg_depend using btree(classid oid_ops, objid oid_ops, objsubid int4_ops));
+DECLARE_INDEX(pg_depend_reference_index, 2674, DependReferenceIndexId, on
pg_depend using btree(refclassid oid_ops, refobjid oid_ops, refobjsubid
int4_ops));
#endif /* PG_DEPEND_H */
diff --git a/src/include/catalog/pg_description.h
b/src/include/catalog/pg_description.h
index adc06a854d..69dee00e81 100644
--- a/src/include/catalog/pg_description.h
+++ b/src/include/catalog/pg_description.h
@@ -65,8 +65,7 @@ typedef FormData_pg_description * Form_pg_description;
DECLARE_TOAST(pg_description, 2834, 2835);
-DECLARE_UNIQUE_INDEX_PKEY(pg_description_o_c_o_index, 2675, on pg_description
using btree(objoid oid_ops, classoid oid_ops, objsubid int4_ops));
-#define DescriptionObjIndexId 2675
+DECLARE_UNIQUE_INDEX_PKEY(pg_description_o_c_o_index, 2675,
DescriptionObjIndexId, on pg_description using btree(objoid oid_ops, classoid
oid_ops, objsubid int4_ops));
/* We do not use BKI_LOOKUP here because it causes problems for genbki.pl */
DECLARE_FOREIGN_KEY((classoid), pg_class, (oid));
diff --git a/src/include/catalog/pg_enum.h b/src/include/catalog/pg_enum.h
index 78a183b27d..3a4cdf5f04 100644
--- a/src/include/catalog/pg_enum.h
+++ b/src/include/catalog/pg_enum.h
@@ -43,12 +43,9 @@ CATALOG(pg_enum,3501,EnumRelationId)
*/
typedef FormData_pg_enum *Form_pg_enum;
-DECLARE_UNIQUE_INDEX_PKEY(pg_enum_oid_index, 3502, on pg_enum using btree(oid
oid_ops));
-#define EnumOidIndexId 3502
-DECLARE_UNIQUE_INDEX(pg_enum_typid_label_index, 3503, on pg_enum using
btree(enumtypid oid_ops, enumlabel name_ops));
-#define EnumTypIdLabelIndexId 3503
-DECLARE_UNIQUE_INDEX(pg_enum_typid_sortorder_index, 3534, on pg_enum using
btree(enumtypid oid_ops, enumsortorder float4_ops));
-#define EnumTypIdSortOrderIndexId 3534
+DECLARE_UNIQUE_INDEX_PKEY(pg_enum_oid_index, 3502, EnumOidIndexId, on pg_enum
using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_enum_typid_label_index, 3503, EnumTypIdLabelIndexId,
on pg_enum using btree(enumtypid oid_ops, enumlabel name_ops));
+DECLARE_UNIQUE_INDEX(pg_enum_typid_sortorder_index, 3534,
EnumTypIdSortOrderIndexId, on pg_enum using btree(enumtypid oid_ops,
enumsortorder float4_ops));
/*
* prototypes for functions in pg_enum.c
diff --git a/src/include/catalog/pg_event_trigger.h
b/src/include/catalog/pg_event_trigger.h
index eeaa6be518..72ca4bc53a 100644
--- a/src/include/catalog/pg_event_trigger.h
+++ b/src/include/catalog/pg_event_trigger.h
@@ -51,9 +51,7 @@ typedef FormData_pg_event_trigger *Form_pg_event_trigger;
DECLARE_TOAST(pg_event_trigger, 4145, 4146);
-DECLARE_UNIQUE_INDEX(pg_event_trigger_evtname_index, 3467, on pg_event_trigger
using btree(evtname name_ops));
-#define EventTriggerNameIndexId 3467
-DECLARE_UNIQUE_INDEX_PKEY(pg_event_trigger_oid_index, 3468, on
pg_event_trigger using btree(oid oid_ops));
-#define EventTriggerOidIndexId 3468
+DECLARE_UNIQUE_INDEX(pg_event_trigger_evtname_index, 3467,
EventTriggerNameIndexId, on pg_event_trigger using btree(evtname name_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_event_trigger_oid_index, 3468,
EventTriggerOidIndexId, on pg_event_trigger using btree(oid oid_ops));
#endif /* PG_EVENT_TRIGGER_H */
diff --git a/src/include/catalog/pg_extension.h
b/src/include/catalog/pg_extension.h
index 2d6ad9fa88..4ef4b556da 100644
--- a/src/include/catalog/pg_extension.h
+++ b/src/include/catalog/pg_extension.h
@@ -53,9 +53,7 @@ typedef FormData_pg_extension *Form_pg_extension;
DECLARE_TOAST(pg_extension, 4147, 4148);
-DECLARE_UNIQUE_INDEX_PKEY(pg_extension_oid_index, 3080, on pg_extension using
btree(oid oid_ops));
-#define ExtensionOidIndexId 3080
-DECLARE_UNIQUE_INDEX(pg_extension_name_index, 3081, on pg_extension using
btree(extname name_ops));
-#define ExtensionNameIndexId 3081
+DECLARE_UNIQUE_INDEX_PKEY(pg_extension_oid_index, 3080, ExtensionOidIndexId,
on pg_extension using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_extension_name_index, 3081, ExtensionNameIndexId, on
pg_extension using btree(extname name_ops));
#endif /* PG_EXTENSION_H */
diff --git a/src/include/catalog/pg_foreign_data_wrapper.h
b/src/include/catalog/pg_foreign_data_wrapper.h
index f6240d9eb3..a1b950bcdc 100644
--- a/src/include/catalog/pg_foreign_data_wrapper.h
+++ b/src/include/catalog/pg_foreign_data_wrapper.h
@@ -52,9 +52,7 @@ typedef FormData_pg_foreign_data_wrapper
*Form_pg_foreign_data_wrapper;
DECLARE_TOAST(pg_foreign_data_wrapper, 4149, 4150);
-DECLARE_UNIQUE_INDEX_PKEY(pg_foreign_data_wrapper_oid_index, 112, on
pg_foreign_data_wrapper using btree(oid oid_ops));
-#define ForeignDataWrapperOidIndexId 112
-DECLARE_UNIQUE_INDEX(pg_foreign_data_wrapper_name_index, 548, on
pg_foreign_data_wrapper using btree(fdwname name_ops));
-#define ForeignDataWrapperNameIndexId 548
+DECLARE_UNIQUE_INDEX_PKEY(pg_foreign_data_wrapper_oid_index, 112,
ForeignDataWrapperOidIndexId, on pg_foreign_data_wrapper using btree(oid
oid_ops));
+DECLARE_UNIQUE_INDEX(pg_foreign_data_wrapper_name_index, 548,
ForeignDataWrapperNameIndexId, on pg_foreign_data_wrapper using btree(fdwname
name_ops));
#endif /*
PG_FOREIGN_DATA_WRAPPER_H */
diff --git a/src/include/catalog/pg_foreign_server.h
b/src/include/catalog/pg_foreign_server.h
index a173699aef..200d172027 100644
--- a/src/include/catalog/pg_foreign_server.h
+++ b/src/include/catalog/pg_foreign_server.h
@@ -49,9 +49,7 @@ typedef FormData_pg_foreign_server *Form_pg_foreign_server;
DECLARE_TOAST(pg_foreign_server, 4151, 4152);
-DECLARE_UNIQUE_INDEX_PKEY(pg_foreign_server_oid_index, 113, on
pg_foreign_server using btree(oid oid_ops));
-#define ForeignServerOidIndexId 113
-DECLARE_UNIQUE_INDEX(pg_foreign_server_name_index, 549, on pg_foreign_server
using btree(srvname name_ops));
-#define ForeignServerNameIndexId 549
+DECLARE_UNIQUE_INDEX_PKEY(pg_foreign_server_oid_index, 113,
ForeignServerOidIndexId, on pg_foreign_server using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_foreign_server_name_index, 549,
ForeignServerNameIndexId, on pg_foreign_server using btree(srvname name_ops));
#endif /* PG_FOREIGN_SERVER_H
*/
diff --git a/src/include/catalog/pg_foreign_table.h
b/src/include/catalog/pg_foreign_table.h
index 3b6221b0e6..f14960c4fd 100644
--- a/src/include/catalog/pg_foreign_table.h
+++ b/src/include/catalog/pg_foreign_table.h
@@ -44,7 +44,6 @@ typedef FormData_pg_foreign_table *Form_pg_foreign_table;
DECLARE_TOAST(pg_foreign_table, 4153, 4154);
-DECLARE_UNIQUE_INDEX_PKEY(pg_foreign_table_relid_index, 3119, on
pg_foreign_table using btree(ftrelid oid_ops));
-#define ForeignTableRelidIndexId 3119
+DECLARE_UNIQUE_INDEX_PKEY(pg_foreign_table_relid_index, 3119,
ForeignTableRelidIndexId, on pg_foreign_table using btree(ftrelid oid_ops));
#endif /* PG_FOREIGN_TABLE_H */
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index 00d0b439f5..a5a6075d4d 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -68,10 +68,8 @@ CATALOG(pg_index,2610,IndexRelationId) BKI_SCHEMA_MACRO
*/
typedef FormData_pg_index *Form_pg_index;
-DECLARE_INDEX(pg_index_indrelid_index, 2678, on pg_index using btree(indrelid
oid_ops));
-#define IndexIndrelidIndexId 2678
-DECLARE_UNIQUE_INDEX_PKEY(pg_index_indexrelid_index, 2679, on pg_index using
btree(indexrelid oid_ops));
-#define IndexRelidIndexId 2679
+DECLARE_INDEX(pg_index_indrelid_index, 2678, IndexIndrelidIndexId, on pg_index
using btree(indrelid oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_index_indexrelid_index, 2679, IndexRelidIndexId,
on pg_index using btree(indexrelid oid_ops));
/* indkey can contain zero (InvalidAttrNumber) to represent expressions */
DECLARE_ARRAY_FOREIGN_KEY_OPT((indrelid, indkey), pg_attribute, (attrelid,
attnum));
diff --git a/src/include/catalog/pg_inherits.h
b/src/include/catalog/pg_inherits.h
index f47c0a8cd8..e0e6072be6 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -44,10 +44,8 @@ CATALOG(pg_inherits,2611,InheritsRelationId)
*/
typedef FormData_pg_inherits *Form_pg_inherits;
-DECLARE_UNIQUE_INDEX_PKEY(pg_inherits_relid_seqno_index, 2680, on pg_inherits
using btree(inhrelid oid_ops, inhseqno int4_ops));
-#define InheritsRelidSeqnoIndexId 2680
-DECLARE_INDEX(pg_inherits_parent_index, 2187, on pg_inherits using
btree(inhparent oid_ops));
-#define InheritsParentIndexId 2187
+DECLARE_UNIQUE_INDEX_PKEY(pg_inherits_relid_seqno_index, 2680,
InheritsRelidSeqnoIndexId, on pg_inherits using btree(inhrelid oid_ops,
inhseqno int4_ops));
+DECLARE_INDEX(pg_inherits_parent_index, 2187, InheritsParentIndexId, on
pg_inherits using btree(inhparent oid_ops));
extern List *find_inheritance_children(Oid parentrelId, LOCKMODE lockmode);
diff --git a/src/include/catalog/pg_init_privs.h
b/src/include/catalog/pg_init_privs.h
index 4aafeb246d..9790dcf285 100644
--- a/src/include/catalog/pg_init_privs.h
+++ b/src/include/catalog/pg_init_privs.h
@@ -65,8 +65,7 @@ typedef FormData_pg_init_privs * Form_pg_init_privs;
DECLARE_TOAST(pg_init_privs, 4155, 4156);
-DECLARE_UNIQUE_INDEX_PKEY(pg_init_privs_o_c_o_index, 3395, on pg_init_privs
using btree(objoid oid_ops, classoid oid_ops, objsubid int4_ops));
-#define InitPrivsObjIndexId 3395
+DECLARE_UNIQUE_INDEX_PKEY(pg_init_privs_o_c_o_index, 3395,
InitPrivsObjIndexId, on pg_init_privs using btree(objoid oid_ops, classoid
oid_ops, objsubid int4_ops));
/*
* It is important to know if the initial privileges are from initdb or from an
diff --git a/src/include/catalog/pg_language.h
b/src/include/catalog/pg_language.h
index 3e56597ece..d447d6ba9d 100644
--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -66,9 +66,7 @@ typedef FormData_pg_language *Form_pg_language;
DECLARE_TOAST(pg_language, 4157, 4158);
-DECLARE_UNIQUE_INDEX(pg_language_name_index, 2681, on pg_language using
btree(lanname name_ops));
-#define LanguageNameIndexId 2681
-DECLARE_UNIQUE_INDEX_PKEY(pg_language_oid_index, 2682, on pg_language using
btree(oid oid_ops));
-#define LanguageOidIndexId 2682
+DECLARE_UNIQUE_INDEX(pg_language_name_index, 2681, LanguageNameIndexId, on
pg_language using btree(lanname name_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_language_oid_index, 2682, LanguageOidIndexId, on
pg_language using btree(oid oid_ops));
#endif /* PG_LANGUAGE_H */
diff --git a/src/include/catalog/pg_largeobject.h
b/src/include/catalog/pg_largeobject.h
index 32225f4de7..ee1036e6f7 100644
--- a/src/include/catalog/pg_largeobject.h
+++ b/src/include/catalog/pg_largeobject.h
@@ -44,8 +44,7 @@ CATALOG(pg_largeobject,2613,LargeObjectRelationId)
*/
typedef FormData_pg_largeobject *Form_pg_largeobject;
-DECLARE_UNIQUE_INDEX_PKEY(pg_largeobject_loid_pn_index, 2683, on
pg_largeobject using btree(loid oid_ops, pageno int4_ops));
-#define LargeObjectLOidPNIndexId 2683
+DECLARE_UNIQUE_INDEX_PKEY(pg_largeobject_loid_pn_index, 2683,
LargeObjectLOidPNIndexId, on pg_largeobject using btree(loid oid_ops, pageno
int4_ops));
extern Oid LargeObjectCreate(Oid loid);
extern void LargeObjectDrop(Oid loid);
diff --git a/src/include/catalog/pg_largeobject_metadata.h
b/src/include/catalog/pg_largeobject_metadata.h
index 9b689bab84..6c124ce10d 100644
--- a/src/include/catalog/pg_largeobject_metadata.h
+++ b/src/include/catalog/pg_largeobject_metadata.h
@@ -46,7 +46,6 @@
CATALOG(pg_largeobject_metadata,2995,LargeObjectMetadataRelationId)
*/
typedef FormData_pg_largeobject_metadata *Form_pg_largeobject_metadata;
-DECLARE_UNIQUE_INDEX_PKEY(pg_largeobject_metadata_oid_index, 2996, on
pg_largeobject_metadata using btree(oid oid_ops));
-#define LargeObjectMetadataOidIndexId 2996
+DECLARE_UNIQUE_INDEX_PKEY(pg_largeobject_metadata_oid_index, 2996,
LargeObjectMetadataOidIndexId, on pg_largeobject_metadata using btree(oid
oid_ops));
#endif /*
PG_LARGEOBJECT_METADATA_H */
diff --git a/src/include/catalog/pg_namespace.h
b/src/include/catalog/pg_namespace.h
index fe87a947ee..4cd2af097c 100644
--- a/src/include/catalog/pg_namespace.h
+++ b/src/include/catalog/pg_namespace.h
@@ -53,10 +53,8 @@ typedef FormData_pg_namespace *Form_pg_namespace;
DECLARE_TOAST(pg_namespace, 4163, 4164);
-DECLARE_UNIQUE_INDEX(pg_namespace_nspname_index, 2684, on pg_namespace using
btree(nspname name_ops));
-#define NamespaceNameIndexId 2684
-DECLARE_UNIQUE_INDEX_PKEY(pg_namespace_oid_index, 2685, on pg_namespace using
btree(oid oid_ops));
-#define NamespaceOidIndexId 2685
+DECLARE_UNIQUE_INDEX(pg_namespace_nspname_index, 2684, NamespaceNameIndexId,
on pg_namespace using btree(nspname name_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_namespace_oid_index, 2685, NamespaceOidIndexId,
on pg_namespace using btree(oid oid_ops));
/*
* prototypes for functions in pg_namespace.c
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index 7b2cf25920..712f76dfc7 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -82,9 +82,7 @@ CATALOG(pg_opclass,2616,OperatorClassRelationId)
*/
typedef FormData_pg_opclass *Form_pg_opclass;
-DECLARE_UNIQUE_INDEX(pg_opclass_am_name_nsp_index, 2686, on pg_opclass using
btree(opcmethod oid_ops, opcname name_ops, opcnamespace oid_ops));
-#define OpclassAmNameNspIndexId 2686
-DECLARE_UNIQUE_INDEX_PKEY(pg_opclass_oid_index, 2687, on pg_opclass using
btree(oid oid_ops));
-#define OpclassOidIndexId 2687
+DECLARE_UNIQUE_INDEX(pg_opclass_am_name_nsp_index, 2686,
OpclassAmNameNspIndexId, on pg_opclass using btree(opcmethod oid_ops, opcname
name_ops, opcnamespace oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_opclass_oid_index, 2687, OpclassOidIndexId, on
pg_opclass using btree(oid oid_ops));
#endif /* PG_OPCLASS_H */
diff --git a/src/include/catalog/pg_operator.h
b/src/include/catalog/pg_operator.h
index d32fcdc64e..ac6755746c 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -82,10 +82,8 @@ CATALOG(pg_operator,2617,OperatorRelationId)
*/
typedef FormData_pg_operator *Form_pg_operator;
-DECLARE_UNIQUE_INDEX_PKEY(pg_operator_oid_index, 2688, on pg_operator using
btree(oid oid_ops));
-#define OperatorOidIndexId 2688
-DECLARE_UNIQUE_INDEX(pg_operator_oprname_l_r_n_index, 2689, on pg_operator
using btree(oprname name_ops, oprleft oid_ops, oprright oid_ops, oprnamespace
oid_ops));
-#define OperatorNameNspIndexId 2689
+DECLARE_UNIQUE_INDEX_PKEY(pg_operator_oid_index, 2688, OperatorOidIndexId, on
pg_operator using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_operator_oprname_l_r_n_index, 2689,
OperatorNameNspIndexId, on pg_operator using btree(oprname name_ops, oprleft
oid_ops, oprright oid_ops, oprnamespace oid_ops));
extern ObjectAddress OperatorCreate(const char *operatorName,
diff --git a/src/include/catalog/pg_opfamily.h
b/src/include/catalog/pg_opfamily.h
index 129102b576..29ea00c350 100644
--- a/src/include/catalog/pg_opfamily.h
+++ b/src/include/catalog/pg_opfamily.h
@@ -50,10 +50,8 @@ CATALOG(pg_opfamily,2753,OperatorFamilyRelationId)
*/
typedef FormData_pg_opfamily *Form_pg_opfamily;
-DECLARE_UNIQUE_INDEX(pg_opfamily_am_name_nsp_index, 2754, on pg_opfamily using
btree(opfmethod oid_ops, opfname name_ops, opfnamespace oid_ops));
-#define OpfamilyAmNameNspIndexId 2754
-DECLARE_UNIQUE_INDEX_PKEY(pg_opfamily_oid_index, 2755, on pg_opfamily using
btree(oid oid_ops));
-#define OpfamilyOidIndexId 2755
+DECLARE_UNIQUE_INDEX(pg_opfamily_am_name_nsp_index, 2754,
OpfamilyAmNameNspIndexId, on pg_opfamily using btree(opfmethod oid_ops, opfname
name_ops, opfnamespace oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_opfamily_oid_index, 2755, OpfamilyOidIndexId, on
pg_opfamily using btree(oid oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_partitioned_table.h
b/src/include/catalog/pg_partitioned_table.h
index 48cbaf30ff..01ee69f75d 100644
--- a/src/include/catalog/pg_partitioned_table.h
+++ b/src/include/catalog/pg_partitioned_table.h
@@ -66,8 +66,7 @@ typedef FormData_pg_partitioned_table
*Form_pg_partitioned_table;
DECLARE_TOAST(pg_partitioned_table, 4165, 4166);
-DECLARE_UNIQUE_INDEX_PKEY(pg_partitioned_table_partrelid_index, 3351, on
pg_partitioned_table using btree(partrelid oid_ops));
-#define PartitionedRelidIndexId 3351
+DECLARE_UNIQUE_INDEX_PKEY(pg_partitioned_table_partrelid_index, 3351,
PartitionedRelidIndexId, on pg_partitioned_table using btree(partrelid
oid_ops));
/* partattrs can contain zero (InvalidAttrNumber) to represent expressions */
DECLARE_ARRAY_FOREIGN_KEY_OPT((partrelid, partattrs), pg_attribute, (attrelid,
attnum));
diff --git a/src/include/catalog/pg_policy.h b/src/include/catalog/pg_policy.h
index 645b8fe498..d3d39ef752 100644
--- a/src/include/catalog/pg_policy.h
+++ b/src/include/catalog/pg_policy.h
@@ -52,9 +52,7 @@ typedef FormData_pg_policy *Form_pg_policy;
DECLARE_TOAST(pg_policy, 4167, 4168);
-DECLARE_UNIQUE_INDEX_PKEY(pg_policy_oid_index, 3257, on pg_policy using
btree(oid oid_ops));
-#define PolicyOidIndexId 3257
-DECLARE_UNIQUE_INDEX(pg_policy_polrelid_polname_index, 3258, on pg_policy
using btree(polrelid oid_ops, polname name_ops));
-#define PolicyPolrelidPolnameIndexId 3258
+DECLARE_UNIQUE_INDEX_PKEY(pg_policy_oid_index, 3257, PolicyOidIndexId, on
pg_policy using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_policy_polrelid_polname_index, 3258,
PolicyPolrelidPolnameIndexId, on pg_policy using btree(polrelid oid_ops,
polname name_ops));
#endif /* PG_POLICY_H */
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index a65afe7bc4..b33b8b0134 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -137,10 +137,8 @@ typedef FormData_pg_proc *Form_pg_proc;
DECLARE_TOAST(pg_proc, 2836, 2837);
-DECLARE_UNIQUE_INDEX_PKEY(pg_proc_oid_index, 2690, on pg_proc using btree(oid
oid_ops));
-#define ProcedureOidIndexId 2690
-DECLARE_UNIQUE_INDEX(pg_proc_proname_args_nsp_index, 2691, on pg_proc using
btree(proname name_ops, proargtypes oidvector_ops, pronamespace oid_ops));
-#define ProcedureNameArgsNspIndexId 2691
+DECLARE_UNIQUE_INDEX_PKEY(pg_proc_oid_index, 2690, ProcedureOidIndexId, on
pg_proc using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_proc_proname_args_nsp_index, 2691,
ProcedureNameArgsNspIndexId, on pg_proc using btree(proname name_ops,
proargtypes oidvector_ops, pronamespace oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_publication.h
b/src/include/catalog/pg_publication.h
index 1b31fee9e3..f332bad4d4 100644
--- a/src/include/catalog/pg_publication.h
+++ b/src/include/catalog/pg_publication.h
@@ -63,10 +63,8 @@ CATALOG(pg_publication,6104,PublicationRelationId)
*/
typedef FormData_pg_publication *Form_pg_publication;
-DECLARE_UNIQUE_INDEX_PKEY(pg_publication_oid_index, 6110, on pg_publication
using btree(oid oid_ops));
-#define PublicationObjectIndexId 6110
-DECLARE_UNIQUE_INDEX(pg_publication_pubname_index, 6111, on pg_publication
using btree(pubname name_ops));
-#define PublicationNameIndexId 6111
+DECLARE_UNIQUE_INDEX_PKEY(pg_publication_oid_index, 6110,
PublicationObjectIndexId, on pg_publication using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_publication_pubname_index, 6111,
PublicationNameIndexId, on pg_publication using btree(pubname name_ops));
typedef struct PublicationActions
{
diff --git a/src/include/catalog/pg_publication_rel.h
b/src/include/catalog/pg_publication_rel.h
index aecf53b3b3..b5d5504cbb 100644
--- a/src/include/catalog/pg_publication_rel.h
+++ b/src/include/catalog/pg_publication_rel.h
@@ -40,9 +40,7 @@ CATALOG(pg_publication_rel,6106,PublicationRelRelationId)
*/
typedef FormData_pg_publication_rel *Form_pg_publication_rel;
-DECLARE_UNIQUE_INDEX_PKEY(pg_publication_rel_oid_index, 6112, on
pg_publication_rel using btree(oid oid_ops));
-#define PublicationRelObjectIndexId 6112
-DECLARE_UNIQUE_INDEX(pg_publication_rel_prrelid_prpubid_index, 6113, on
pg_publication_rel using btree(prrelid oid_ops, prpubid oid_ops));
-#define PublicationRelPrrelidPrpubidIndexId 6113
+DECLARE_UNIQUE_INDEX_PKEY(pg_publication_rel_oid_index, 6112,
PublicationRelObjectIndexId, on pg_publication_rel using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_publication_rel_prrelid_prpubid_index, 6113,
PublicationRelPrrelidPrpubidIndexId, on pg_publication_rel using btree(prrelid
oid_ops, prpubid oid_ops));
#endif /* PG_PUBLICATION_REL_H
*/
diff --git a/src/include/catalog/pg_range.h b/src/include/catalog/pg_range.h
index 5dfa4eef8b..cde29114ba 100644
--- a/src/include/catalog/pg_range.h
+++ b/src/include/catalog/pg_range.h
@@ -57,12 +57,8 @@ CATALOG(pg_range,3541,RangeRelationId)
*/
typedef FormData_pg_range *Form_pg_range;
-DECLARE_UNIQUE_INDEX_PKEY(pg_range_rngtypid_index, 3542, on pg_range using
btree(rngtypid oid_ops));
-#define RangeTypidIndexId 3542
-
-DECLARE_UNIQUE_INDEX(pg_range_rngmultitypid_index, 2228, on pg_range using
btree(rngmultitypid oid_ops));
-#define RangeMultirangeTypidIndexId 2228
-
+DECLARE_UNIQUE_INDEX_PKEY(pg_range_rngtypid_index, 3542, RangeTypidIndexId, on
pg_range using btree(rngtypid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_range_rngmultitypid_index, 2228,
RangeMultirangeTypidIndexId, on pg_range using btree(rngmultitypid oid_ops));
/*
* prototypes for functions in pg_range.c
diff --git a/src/include/catalog/pg_replication_origin.h
b/src/include/catalog/pg_replication_origin.h
index 184f2403ce..8d9034ef37 100644
--- a/src/include/catalog/pg_replication_origin.h
+++ b/src/include/catalog/pg_replication_origin.h
@@ -58,9 +58,7 @@ DECLARE_TOAST(pg_replication_origin, 4181, 4182);
#define PgReplicationOriginToastTable 4181
#define PgReplicationOriginToastIndex 4182
-DECLARE_UNIQUE_INDEX_PKEY(pg_replication_origin_roiident_index, 6001, on
pg_replication_origin using btree(roident oid_ops));
-#define ReplicationOriginIdentIndex 6001
-DECLARE_UNIQUE_INDEX(pg_replication_origin_roname_index, 6002, on
pg_replication_origin using btree(roname text_ops));
-#define ReplicationOriginNameIndex 6002
+DECLARE_UNIQUE_INDEX_PKEY(pg_replication_origin_roiident_index, 6001,
ReplicationOriginIdentIndex, on pg_replication_origin using btree(roident
oid_ops));
+DECLARE_UNIQUE_INDEX(pg_replication_origin_roname_index, 6002,
ReplicationOriginNameIndex, on pg_replication_origin using btree(roname
text_ops));
#endif /*
PG_REPLICATION_ORIGIN_H */
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index 89c72545d0..2a87c5aa30 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -53,9 +53,7 @@ typedef FormData_pg_rewrite *Form_pg_rewrite;
DECLARE_TOAST(pg_rewrite, 2838, 2839);
-DECLARE_UNIQUE_INDEX_PKEY(pg_rewrite_oid_index, 2692, on pg_rewrite using
btree(oid oid_ops));
-#define RewriteOidIndexId 2692
-DECLARE_UNIQUE_INDEX(pg_rewrite_rel_rulename_index, 2693, on pg_rewrite using
btree(ev_class oid_ops, rulename name_ops));
-#define RewriteRelRulenameIndexId 2693
+DECLARE_UNIQUE_INDEX_PKEY(pg_rewrite_oid_index, 2692, RewriteOidIndexId, on
pg_rewrite using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_rewrite_rel_rulename_index, 2693,
RewriteRelRulenameIndexId, on pg_rewrite using btree(ev_class oid_ops, rulename
name_ops));
#endif /* PG_REWRITE_H */
diff --git a/src/include/catalog/pg_seclabel.h
b/src/include/catalog/pg_seclabel.h
index 0a12225eb7..9530b6ced2 100644
--- a/src/include/catalog/pg_seclabel.h
+++ b/src/include/catalog/pg_seclabel.h
@@ -40,7 +40,6 @@ CATALOG(pg_seclabel,3596,SecLabelRelationId)
DECLARE_TOAST(pg_seclabel, 3598, 3599);
-DECLARE_UNIQUE_INDEX_PKEY(pg_seclabel_object_index, 3597, on pg_seclabel using
btree(objoid oid_ops, classoid oid_ops, objsubid int4_ops, provider text_ops));
-#define SecLabelObjectIndexId 3597
+DECLARE_UNIQUE_INDEX_PKEY(pg_seclabel_object_index, 3597,
SecLabelObjectIndexId, on pg_seclabel using btree(objoid oid_ops, classoid
oid_ops, objsubid int4_ops, provider text_ops));
#endif /* PG_SECLABEL_H */
diff --git a/src/include/catalog/pg_sequence.h
b/src/include/catalog/pg_sequence.h
index 8d0a00baf6..aea586d66b 100644
--- a/src/include/catalog/pg_sequence.h
+++ b/src/include/catalog/pg_sequence.h
@@ -39,7 +39,6 @@ CATALOG(pg_sequence,2224,SequenceRelationId)
*/
typedef FormData_pg_sequence *Form_pg_sequence;
-DECLARE_UNIQUE_INDEX_PKEY(pg_sequence_seqrelid_index, 5002, on pg_sequence
using btree(seqrelid oid_ops));
-#define SequenceRelidIndexId 5002
+DECLARE_UNIQUE_INDEX_PKEY(pg_sequence_seqrelid_index, 5002,
SequenceRelidIndexId, on pg_sequence using btree(seqrelid oid_ops));
#endif /* PG_SEQUENCE_H */
diff --git a/src/include/catalog/pg_shdepend.h
b/src/include/catalog/pg_shdepend.h
index 4faa95794d..c77452c584 100644
--- a/src/include/catalog/pg_shdepend.h
+++ b/src/include/catalog/pg_shdepend.h
@@ -72,9 +72,7 @@ CATALOG(pg_shdepend,1214,SharedDependRelationId)
BKI_SHARED_RELATION
*/
typedef FormData_pg_shdepend *Form_pg_shdepend;
-DECLARE_INDEX(pg_shdepend_depender_index, 1232, on pg_shdepend using
btree(dbid oid_ops, classid oid_ops, objid oid_ops, objsubid int4_ops));
-#define SharedDependDependerIndexId 1232
-DECLARE_INDEX(pg_shdepend_reference_index, 1233, on pg_shdepend using
btree(refclassid oid_ops, refobjid oid_ops));
-#define SharedDependReferenceIndexId 1233
+DECLARE_INDEX(pg_shdepend_depender_index, 1232, SharedDependDependerIndexId,
on pg_shdepend using btree(dbid oid_ops, classid oid_ops, objid oid_ops,
objsubid int4_ops));
+DECLARE_INDEX(pg_shdepend_reference_index, 1233, SharedDependReferenceIndexId,
on pg_shdepend using btree(refclassid oid_ops, refobjid oid_ops));
#endif /* PG_SHDEPEND_H */
diff --git a/src/include/catalog/pg_shdescription.h
b/src/include/catalog/pg_shdescription.h
index 543e216710..7e60015b0b 100644
--- a/src/include/catalog/pg_shdescription.h
+++ b/src/include/catalog/pg_shdescription.h
@@ -59,8 +59,7 @@ DECLARE_TOAST(pg_shdescription, 2846, 2847);
#define PgShdescriptionToastTable 2846
#define PgShdescriptionToastIndex 2847
-DECLARE_UNIQUE_INDEX_PKEY(pg_shdescription_o_c_index, 2397, on
pg_shdescription using btree(objoid oid_ops, classoid oid_ops));
-#define SharedDescriptionObjIndexId 2397
+DECLARE_UNIQUE_INDEX_PKEY(pg_shdescription_o_c_index, 2397,
SharedDescriptionObjIndexId, on pg_shdescription using btree(objoid oid_ops,
classoid oid_ops));
/* We do not use BKI_LOOKUP here because it causes problems for genbki.pl */
DECLARE_FOREIGN_KEY((classoid), pg_class, (oid));
diff --git a/src/include/catalog/pg_shseclabel.h
b/src/include/catalog/pg_shseclabel.h
index 5d6864cf8c..4feb20d189 100644
--- a/src/include/catalog/pg_shseclabel.h
+++ b/src/include/catalog/pg_shseclabel.h
@@ -43,7 +43,6 @@ DECLARE_TOAST(pg_shseclabel, 4060, 4061);
#define PgShseclabelToastTable 4060
#define PgShseclabelToastIndex 4061
-DECLARE_UNIQUE_INDEX_PKEY(pg_shseclabel_object_index, 3593, on pg_shseclabel
using btree(objoid oid_ops, classoid oid_ops, provider text_ops));
-#define SharedSecLabelObjectIndexId 3593
+DECLARE_UNIQUE_INDEX_PKEY(pg_shseclabel_object_index, 3593,
SharedSecLabelObjectIndexId, on pg_shseclabel using btree(objoid oid_ops,
classoid oid_ops, provider text_ops));
#endif /* PG_SHSECLABEL_H */
diff --git a/src/include/catalog/pg_statistic.h
b/src/include/catalog/pg_statistic.h
index d1827858e2..4f95d7ade4 100644
--- a/src/include/catalog/pg_statistic.h
+++ b/src/include/catalog/pg_statistic.h
@@ -136,8 +136,7 @@ typedef FormData_pg_statistic *Form_pg_statistic;
DECLARE_TOAST(pg_statistic, 2840, 2841);
-DECLARE_UNIQUE_INDEX_PKEY(pg_statistic_relid_att_inh_index, 2696, on
pg_statistic using btree(starelid oid_ops, staattnum int2_ops, stainherit
bool_ops));
-#define StatisticRelidAttnumInhIndexId 2696
+DECLARE_UNIQUE_INDEX_PKEY(pg_statistic_relid_att_inh_index, 2696,
StatisticRelidAttnumInhIndexId, on pg_statistic using btree(starelid oid_ops,
staattnum int2_ops, stainherit bool_ops));
DECLARE_FOREIGN_KEY((starelid, staattnum), pg_attribute, (attrelid, attnum));
diff --git a/src/include/catalog/pg_statistic_ext.h
b/src/include/catalog/pg_statistic_ext.h
index 36912ce528..da286d16b1 100644
--- a/src/include/catalog/pg_statistic_ext.h
+++ b/src/include/catalog/pg_statistic_ext.h
@@ -70,12 +70,9 @@ typedef FormData_pg_statistic_ext *Form_pg_statistic_ext;
DECLARE_TOAST(pg_statistic_ext, 3439, 3440);
-DECLARE_UNIQUE_INDEX_PKEY(pg_statistic_ext_oid_index, 3380, on
pg_statistic_ext using btree(oid oid_ops));
-#define StatisticExtOidIndexId 3380
-DECLARE_UNIQUE_INDEX(pg_statistic_ext_name_index, 3997, on pg_statistic_ext
using btree(stxname name_ops, stxnamespace oid_ops));
-#define StatisticExtNameIndexId 3997
-DECLARE_INDEX(pg_statistic_ext_relid_index, 3379, on pg_statistic_ext using
btree(stxrelid oid_ops));
-#define StatisticExtRelidIndexId 3379
+DECLARE_UNIQUE_INDEX_PKEY(pg_statistic_ext_oid_index, 3380,
StatisticExtOidIndexId, on pg_statistic_ext using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_statistic_ext_name_index, 3997,
StatisticExtNameIndexId, on pg_statistic_ext using btree(stxname name_ops,
stxnamespace oid_ops));
+DECLARE_INDEX(pg_statistic_ext_relid_index, 3379, StatisticExtRelidIndexId, on
pg_statistic_ext using btree(stxrelid oid_ops));
DECLARE_ARRAY_FOREIGN_KEY((stxrelid, stxkeys), pg_attribute, (attrelid,
attnum));
diff --git a/src/include/catalog/pg_statistic_ext_data.h
b/src/include/catalog/pg_statistic_ext_data.h
index 5729154383..7b73b790d2 100644
--- a/src/include/catalog/pg_statistic_ext_data.h
+++ b/src/include/catalog/pg_statistic_ext_data.h
@@ -53,7 +53,6 @@ typedef FormData_pg_statistic_ext_data *
Form_pg_statistic_ext_data;
DECLARE_TOAST(pg_statistic_ext_data, 3430, 3431);
-DECLARE_UNIQUE_INDEX_PKEY(pg_statistic_ext_data_stxoid_index, 3433, on
pg_statistic_ext_data using btree(stxoid oid_ops));
-#define StatisticExtDataStxoidIndexId 3433
+DECLARE_UNIQUE_INDEX_PKEY(pg_statistic_ext_data_stxoid_index, 3433,
StatisticExtDataStxoidIndexId, on pg_statistic_ext_data using btree(stxoid
oid_ops));
#endif /*
PG_STATISTIC_EXT_DATA_H */
diff --git a/src/include/catalog/pg_subscription.h
b/src/include/catalog/pg_subscription.h
index 0060ebfb40..750d46912a 100644
--- a/src/include/catalog/pg_subscription.h
+++ b/src/include/catalog/pg_subscription.h
@@ -78,10 +78,8 @@ DECLARE_TOAST(pg_subscription, 4183, 4184);
#define PgSubscriptionToastTable 4183
#define PgSubscriptionToastIndex 4184
-DECLARE_UNIQUE_INDEX_PKEY(pg_subscription_oid_index, 6114, on pg_subscription
using btree(oid oid_ops));
-#define SubscriptionObjectIndexId 6114
-DECLARE_UNIQUE_INDEX(pg_subscription_subname_index, 6115, on pg_subscription
using btree(subdbid oid_ops, subname name_ops));
-#define SubscriptionNameIndexId 6115
+DECLARE_UNIQUE_INDEX_PKEY(pg_subscription_oid_index, 6114,
SubscriptionObjectIndexId, on pg_subscription using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_subscription_subname_index, 6115,
SubscriptionNameIndexId, on pg_subscription using btree(subdbid oid_ops,
subname name_ops));
typedef struct Subscription
{
diff --git a/src/include/catalog/pg_subscription_rel.h
b/src/include/catalog/pg_subscription_rel.h
index ed94f57baa..4d2056318d 100644
--- a/src/include/catalog/pg_subscription_rel.h
+++ b/src/include/catalog/pg_subscription_rel.h
@@ -49,8 +49,7 @@ CATALOG(pg_subscription_rel,6102,SubscriptionRelRelationId)
typedef FormData_pg_subscription_rel *Form_pg_subscription_rel;
-DECLARE_UNIQUE_INDEX_PKEY(pg_subscription_rel_srrelid_srsubid_index, 6117, on
pg_subscription_rel using btree(srrelid oid_ops, srsubid oid_ops));
-#define SubscriptionRelSrrelidSrsubidIndexId 6117
+DECLARE_UNIQUE_INDEX_PKEY(pg_subscription_rel_srrelid_srsubid_index, 6117,
SubscriptionRelSrrelidSrsubidIndexId, on pg_subscription_rel using
btree(srrelid oid_ops, srsubid oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_tablespace.h
b/src/include/catalog/pg_tablespace.h
index 58bb1087a3..bc5779a9ee 100644
--- a/src/include/catalog/pg_tablespace.h
+++ b/src/include/catalog/pg_tablespace.h
@@ -51,9 +51,7 @@ DECLARE_TOAST(pg_tablespace, 4185, 4186);
#define PgTablespaceToastTable 4185
#define PgTablespaceToastIndex 4186
-DECLARE_UNIQUE_INDEX_PKEY(pg_tablespace_oid_index, 2697, on pg_tablespace
using btree(oid oid_ops));
-#define TablespaceOidIndexId 2697
-DECLARE_UNIQUE_INDEX(pg_tablespace_spcname_index, 2698, on pg_tablespace using
btree(spcname name_ops));
-#define TablespaceNameIndexId 2698
+DECLARE_UNIQUE_INDEX_PKEY(pg_tablespace_oid_index, 2697, TablespaceOidIndexId,
on pg_tablespace using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_tablespace_spcname_index, 2698, TablespaceNameIndexId,
on pg_tablespace using btree(spcname name_ops));
#endif /* PG_TABLESPACE_H */
diff --git a/src/include/catalog/pg_transform.h
b/src/include/catalog/pg_transform.h
index d603246138..7d0c4d30b3 100644
--- a/src/include/catalog/pg_transform.h
+++ b/src/include/catalog/pg_transform.h
@@ -42,9 +42,7 @@ CATALOG(pg_transform,3576,TransformRelationId)
*/
typedef FormData_pg_transform *Form_pg_transform;
-DECLARE_UNIQUE_INDEX_PKEY(pg_transform_oid_index, 3574, on pg_transform using
btree(oid oid_ops));
-#define TransformOidIndexId 3574
-DECLARE_UNIQUE_INDEX(pg_transform_type_lang_index, 3575, on pg_transform using
btree(trftype oid_ops, trflang oid_ops));
-#define TransformTypeLangIndexId 3575
+DECLARE_UNIQUE_INDEX_PKEY(pg_transform_oid_index, 3574, TransformOidIndexId,
on pg_transform using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_transform_type_lang_index, 3575,
TransformTypeLangIndexId, on pg_transform using btree(trftype oid_ops, trflang
oid_ops));
#endif /* PG_TRANSFORM_H */
diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h
index 2e3d233876..8b9ea909d7 100644
--- a/src/include/catalog/pg_trigger.h
+++ b/src/include/catalog/pg_trigger.h
@@ -81,12 +81,9 @@ typedef FormData_pg_trigger *Form_pg_trigger;
DECLARE_TOAST(pg_trigger, 2336, 2337);
-DECLARE_INDEX(pg_trigger_tgconstraint_index, 2699, on pg_trigger using
btree(tgconstraint oid_ops));
-#define TriggerConstraintIndexId 2699
-DECLARE_UNIQUE_INDEX(pg_trigger_tgrelid_tgname_index, 2701, on pg_trigger
using btree(tgrelid oid_ops, tgname name_ops));
-#define TriggerRelidNameIndexId 2701
-DECLARE_UNIQUE_INDEX_PKEY(pg_trigger_oid_index, 2702, on pg_trigger using
btree(oid oid_ops));
-#define TriggerOidIndexId 2702
+DECLARE_INDEX(pg_trigger_tgconstraint_index, 2699, TriggerConstraintIndexId,
on pg_trigger using btree(tgconstraint oid_ops));
+DECLARE_UNIQUE_INDEX(pg_trigger_tgrelid_tgname_index, 2701,
TriggerRelidNameIndexId, on pg_trigger using btree(tgrelid oid_ops, tgname
name_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_trigger_oid_index, 2702, TriggerOidIndexId, on
pg_trigger using btree(oid oid_ops));
DECLARE_ARRAY_FOREIGN_KEY((tgrelid, tgattr), pg_attribute, (attrelid, attnum));
diff --git a/src/include/catalog/pg_ts_config.h
b/src/include/catalog/pg_ts_config.h
index 2e0263962d..8250d78cdc 100644
--- a/src/include/catalog/pg_ts_config.h
+++ b/src/include/catalog/pg_ts_config.h
@@ -47,9 +47,7 @@ CATALOG(pg_ts_config,3602,TSConfigRelationId)
typedef FormData_pg_ts_config *Form_pg_ts_config;
-DECLARE_UNIQUE_INDEX(pg_ts_config_cfgname_index, 3608, on pg_ts_config using
btree(cfgname name_ops, cfgnamespace oid_ops));
-#define TSConfigNameNspIndexId 3608
-DECLARE_UNIQUE_INDEX_PKEY(pg_ts_config_oid_index, 3712, on pg_ts_config using
btree(oid oid_ops));
-#define TSConfigOidIndexId 3712
+DECLARE_UNIQUE_INDEX(pg_ts_config_cfgname_index, 3608, TSConfigNameNspIndexId,
on pg_ts_config using btree(cfgname name_ops, cfgnamespace oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_ts_config_oid_index, 3712, TSConfigOidIndexId, on
pg_ts_config using btree(oid oid_ops));
#endif /* PG_TS_CONFIG_H */
diff --git a/src/include/catalog/pg_ts_config_map.h
b/src/include/catalog/pg_ts_config_map.h
index f39d14fd79..8a615bfc18 100644
--- a/src/include/catalog/pg_ts_config_map.h
+++ b/src/include/catalog/pg_ts_config_map.h
@@ -44,7 +44,6 @@ CATALOG(pg_ts_config_map,3603,TSConfigMapRelationId)
typedef FormData_pg_ts_config_map *Form_pg_ts_config_map;
-DECLARE_UNIQUE_INDEX_PKEY(pg_ts_config_map_index, 3609, on pg_ts_config_map
using btree(mapcfg oid_ops, maptokentype int4_ops, mapseqno int4_ops));
-#define TSConfigMapIndexId 3609
+DECLARE_UNIQUE_INDEX_PKEY(pg_ts_config_map_index, 3609, TSConfigMapIndexId, on
pg_ts_config_map using btree(mapcfg oid_ops, maptokentype int4_ops, mapseqno
int4_ops));
#endif /* PG_TS_CONFIG_MAP_H */
diff --git a/src/include/catalog/pg_ts_dict.h b/src/include/catalog/pg_ts_dict.h
index e53eead829..4ab50fdb0e 100644
--- a/src/include/catalog/pg_ts_dict.h
+++ b/src/include/catalog/pg_ts_dict.h
@@ -53,9 +53,7 @@ typedef FormData_pg_ts_dict *Form_pg_ts_dict;
DECLARE_TOAST(pg_ts_dict, 4169, 4170);
-DECLARE_UNIQUE_INDEX(pg_ts_dict_dictname_index, 3604, on pg_ts_dict using
btree(dictname name_ops, dictnamespace oid_ops));
-#define TSDictionaryNameNspIndexId 3604
-DECLARE_UNIQUE_INDEX_PKEY(pg_ts_dict_oid_index, 3605, on pg_ts_dict using
btree(oid oid_ops));
-#define TSDictionaryOidIndexId 3605
+DECLARE_UNIQUE_INDEX(pg_ts_dict_dictname_index, 3604,
TSDictionaryNameNspIndexId, on pg_ts_dict using btree(dictname name_ops,
dictnamespace oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_ts_dict_oid_index, 3605, TSDictionaryOidIndexId,
on pg_ts_dict using btree(oid oid_ops));
#endif /* PG_TS_DICT_H */
diff --git a/src/include/catalog/pg_ts_parser.h
b/src/include/catalog/pg_ts_parser.h
index 0231051cee..8ebf9e8595 100644
--- a/src/include/catalog/pg_ts_parser.h
+++ b/src/include/catalog/pg_ts_parser.h
@@ -54,9 +54,7 @@ CATALOG(pg_ts_parser,3601,TSParserRelationId)
typedef FormData_pg_ts_parser *Form_pg_ts_parser;
-DECLARE_UNIQUE_INDEX(pg_ts_parser_prsname_index, 3606, on pg_ts_parser using
btree(prsname name_ops, prsnamespace oid_ops));
-#define TSParserNameNspIndexId 3606
-DECLARE_UNIQUE_INDEX_PKEY(pg_ts_parser_oid_index, 3607, on pg_ts_parser using
btree(oid oid_ops));
-#define TSParserOidIndexId 3607
+DECLARE_UNIQUE_INDEX(pg_ts_parser_prsname_index, 3606, TSParserNameNspIndexId,
on pg_ts_parser using btree(prsname name_ops, prsnamespace oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_ts_parser_oid_index, 3607, TSParserOidIndexId, on
pg_ts_parser using btree(oid oid_ops));
#endif /* PG_TS_PARSER_H */
diff --git a/src/include/catalog/pg_ts_template.h
b/src/include/catalog/pg_ts_template.h
index 194b921136..8fd494ab7e 100644
--- a/src/include/catalog/pg_ts_template.h
+++ b/src/include/catalog/pg_ts_template.h
@@ -45,9 +45,7 @@ CATALOG(pg_ts_template,3764,TSTemplateRelationId)
typedef FormData_pg_ts_template *Form_pg_ts_template;
-DECLARE_UNIQUE_INDEX(pg_ts_template_tmplname_index, 3766, on pg_ts_template
using btree(tmplname name_ops, tmplnamespace oid_ops));
-#define TSTemplateNameNspIndexId 3766
-DECLARE_UNIQUE_INDEX_PKEY(pg_ts_template_oid_index, 3767, on pg_ts_template
using btree(oid oid_ops));
-#define TSTemplateOidIndexId 3767
+DECLARE_UNIQUE_INDEX(pg_ts_template_tmplname_index, 3766,
TSTemplateNameNspIndexId, on pg_ts_template using btree(tmplname name_ops,
tmplnamespace oid_ops));
+DECLARE_UNIQUE_INDEX_PKEY(pg_ts_template_oid_index, 3767,
TSTemplateOidIndexId, on pg_ts_template using btree(oid oid_ops));
#endif /* PG_TS_TEMPLATE_H */
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index 33557760e1..b05db9641a 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -262,10 +262,8 @@ typedef FormData_pg_type *Form_pg_type;
DECLARE_TOAST(pg_type, 4171, 4172);
-DECLARE_UNIQUE_INDEX_PKEY(pg_type_oid_index, 2703, on pg_type using btree(oid
oid_ops));
-#define TypeOidIndexId 2703
-DECLARE_UNIQUE_INDEX(pg_type_typname_nsp_index, 2704, on pg_type using
btree(typname name_ops, typnamespace oid_ops));
-#define TypeNameNspIndexId 2704
+DECLARE_UNIQUE_INDEX_PKEY(pg_type_oid_index, 2703, TypeOidIndexId, on pg_type
using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_type_typname_nsp_index, 2704, TypeNameNspIndexId, on
pg_type using btree(typname name_ops, typnamespace oid_ops));
#ifdef EXPOSE_TO_CLIENT_CODE
diff --git a/src/include/catalog/pg_user_mapping.h
b/src/include/catalog/pg_user_mapping.h
index d440c67da1..16f16b89a7 100644
--- a/src/include/catalog/pg_user_mapping.h
+++ b/src/include/catalog/pg_user_mapping.h
@@ -49,9 +49,7 @@ typedef FormData_pg_user_mapping *Form_pg_user_mapping;
DECLARE_TOAST(pg_user_mapping, 4173, 4174);
-DECLARE_UNIQUE_INDEX_PKEY(pg_user_mapping_oid_index, 174, on pg_user_mapping
using btree(oid oid_ops));
-#define UserMappingOidIndexId 174
-DECLARE_UNIQUE_INDEX(pg_user_mapping_user_server_index, 175, on
pg_user_mapping using btree(umuser oid_ops, umserver oid_ops));
-#define UserMappingUserServerIndexId 175
+DECLARE_UNIQUE_INDEX_PKEY(pg_user_mapping_oid_index, 174,
UserMappingOidIndexId, on pg_user_mapping using btree(oid oid_ops));
+DECLARE_UNIQUE_INDEX(pg_user_mapping_user_server_index, 175,
UserMappingUserServerIndexId, on pg_user_mapping using btree(umuser oid_ops,
umserver oid_ops));
#endif /* PG_USER_MAPPING_H */
--
2.32.0
