pg_query 2.0.3 → 5.1.0

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_index.h

@@ -4,7 +4,7 @@
  *	  definition of the "index" system catalog (pg_index)
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_index.h
@@ -28,11 +28,13 @@
  */
 CATALOG(pg_index,2610,IndexRelationId) BKI_SCHEMA_MACRO
 {
-	Oid			indexrelid;		/* OID of the index */
-	Oid			indrelid;		/* OID of the relation it indexes */
+	Oid			indexrelid BKI_LOOKUP(pg_class);	/* OID of the index */
+	Oid			indrelid BKI_LOOKUP(pg_class);	/* OID of the relation it
+												 * indexes */
 	int16		indnatts;		/* total number of columns in index */
 	int16		indnkeyatts;	/* number of key columns in index */
 	bool		indisunique;	/* is this a unique index? */
+	bool		indnullsnotdistinct;	/* null treatment in unique index */
 	bool		indisprimary;	/* is this index for primary key? */
 	bool		indisexclusion; /* is this index for exclusion constraint? */
 	bool		indimmediate;	/* is uniqueness enforced immediately? */
@@ -44,12 +46,14 @@ CATALOG(pg_index,2610,IndexRelationId) BKI_SCHEMA_MACRO
 	bool		indisreplident; /* is this index the identity for replication? */
 
 	/* variable-length fields start here, but we allow direct access to indkey */
-	int2vector	indkey;			/* column numbers of indexed cols, or 0 */
+	int2vector	indkey BKI_FORCE_NOT_NULL;	/* column numbers of indexed cols,
+											 * or 0 */
 
 #ifdef CATALOG_VARLEN
-	oidvector	indcollation;	/* collation identifiers */
-	oidvector	indclass;		/* opclass identifiers */
-	int2vector	indoption;		/* per-column flags (AM-specific meanings) */
+	oidvector	indcollation BKI_LOOKUP_OPT(pg_collation) BKI_FORCE_NOT_NULL;	/* collation identifiers */
+	oidvector	indclass BKI_LOOKUP(pg_opclass) BKI_FORCE_NOT_NULL; /* opclass identifiers */
+	int2vector	indoption BKI_FORCE_NOT_NULL;	/* per-column flags
+												 * (AM-specific meanings) */
 	pg_node_tree indexprs;		/* expression trees for index attributes that
 								 * are not simple column references; one for
 								 * each zero entry in indkey[] */
@@ -65,6 +69,12 @@ CATALOG(pg_index,2610,IndexRelationId) BKI_SCHEMA_MACRO
  */
 typedef FormData_pg_index *Form_pg_index;
 
+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));
+
 #ifdef EXPOSE_TO_CLIENT_CODE
 
 /*

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_index_d.h

@@ -3,7 +3,7 @@
  * pg_index_d.h
  *    Macro definitions for pg_index
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -19,29 +19,32 @@
 #define PG_INDEX_D_H
 
 #define IndexRelationId 2610
+#define IndexIndrelidIndexId 2678
+#define IndexRelidIndexId 2679
 
 #define Anum_pg_index_indexrelid 1
 #define Anum_pg_index_indrelid 2
 #define Anum_pg_index_indnatts 3
 #define Anum_pg_index_indnkeyatts 4
 #define Anum_pg_index_indisunique 5
-#define Anum_pg_index_indisprimary 6
-#define Anum_pg_index_indisexclusion 7
-#define Anum_pg_index_indimmediate 8
-#define Anum_pg_index_indisclustered 9
-#define Anum_pg_index_indisvalid 10
-#define Anum_pg_index_indcheckxmin 11
-#define Anum_pg_index_indisready 12
-#define Anum_pg_index_indislive 13
-#define Anum_pg_index_indisreplident 14
-#define Anum_pg_index_indkey 15
-#define Anum_pg_index_indcollation 16
-#define Anum_pg_index_indclass 17
-#define Anum_pg_index_indoption 18
-#define Anum_pg_index_indexprs 19
-#define Anum_pg_index_indpred 20
+#define Anum_pg_index_indnullsnotdistinct 6
+#define Anum_pg_index_indisprimary 7
+#define Anum_pg_index_indisexclusion 8
+#define Anum_pg_index_indimmediate 9
+#define Anum_pg_index_indisclustered 10
+#define Anum_pg_index_indisvalid 11
+#define Anum_pg_index_indcheckxmin 12
+#define Anum_pg_index_indisready 13
+#define Anum_pg_index_indislive 14
+#define Anum_pg_index_indisreplident 15
+#define Anum_pg_index_indkey 16
+#define Anum_pg_index_indcollation 17
+#define Anum_pg_index_indclass 18
+#define Anum_pg_index_indoption 19
+#define Anum_pg_index_indexprs 20
+#define Anum_pg_index_indpred 21
 
-#define Natts_pg_index 20
+#define Natts_pg_index 21
 
 
 /*

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_language.h

@@ -4,7 +4,7 @@
  *	  definition of the "language" system catalog (pg_language)
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_language.h
@@ -34,7 +34,7 @@ CATALOG(pg_language,2612,LanguageRelationId)
 	NameData	lanname;
 
 	/* Language's owner */
-	Oid			lanowner BKI_DEFAULT(PGUID);
+	Oid			lanowner BKI_DEFAULT(POSTGRES) BKI_LOOKUP(pg_authid);
 
 	/* Is a procedural language */
 	bool		lanispl BKI_DEFAULT(f);
@@ -43,13 +43,13 @@ CATALOG(pg_language,2612,LanguageRelationId)
 	bool		lanpltrusted BKI_DEFAULT(f);
 
 	/* Call handler, if it's a PL */
-	Oid			lanplcallfoid BKI_DEFAULT(0) BKI_LOOKUP(pg_proc);
+	Oid			lanplcallfoid BKI_DEFAULT(0) BKI_LOOKUP_OPT(pg_proc);
 
 	/* Optional anonymous-block handler function */
-	Oid			laninline BKI_DEFAULT(0) BKI_LOOKUP(pg_proc);
+	Oid			laninline BKI_DEFAULT(0) BKI_LOOKUP_OPT(pg_proc);
 
 	/* Optional validation function */
-	Oid			lanvalidator BKI_DEFAULT(0) BKI_LOOKUP(pg_proc);
+	Oid			lanvalidator BKI_DEFAULT(0) BKI_LOOKUP_OPT(pg_proc);
 
 #ifdef CATALOG_VARLEN			/* variable-length fields start here */
 	/* Access privileges */
@@ -64,4 +64,9 @@ CATALOG(pg_language,2612,LanguageRelationId)
  */
 typedef FormData_pg_language *Form_pg_language;
 
+DECLARE_TOAST(pg_language, 4157, 4158);
+
+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 */

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_language_d.h

@@ -3,7 +3,7 @@
  * pg_language_d.h
  *    Macro definitions for pg_language
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -19,6 +19,8 @@
 #define PG_LANGUAGE_D_H
 
 #define LanguageRelationId 2612
+#define LanguageNameIndexId 2681
+#define LanguageOidIndexId 2682
 
 #define Anum_pg_language_oid 1
 #define Anum_pg_language_lanname 2

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_namespace.h

@@ -4,7 +4,7 @@
  *	  definition of the "namespace" system catalog (pg_namespace)
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_namespace.h
@@ -37,7 +37,7 @@ CATALOG(pg_namespace,2615,NamespaceRelationId)
 	Oid			oid;			/* oid */
 
 	NameData	nspname;
-	Oid			nspowner;
+	Oid			nspowner BKI_DEFAULT(POSTGRES) BKI_LOOKUP(pg_authid);
 
 #ifdef CATALOG_VARLEN			/* variable-length fields start here */
 	aclitem		nspacl[1];
@@ -51,6 +51,11 @@ CATALOG(pg_namespace,2615,NamespaceRelationId)
  */
 typedef FormData_pg_namespace *Form_pg_namespace;
 
+DECLARE_TOAST(pg_namespace, 4163, 4164);
+
+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
  */

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_namespace_d.h

@@ -3,7 +3,7 @@
  * pg_namespace_d.h
  *    Macro definitions for pg_namespace
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -19,6 +19,8 @@
 #define PG_NAMESPACE_D_H
 
 #define NamespaceRelationId 2615
+#define NamespaceNameIndexId 2684
+#define NamespaceOidIndexId 2685
 
 #define Anum_pg_namespace_oid 1
 #define Anum_pg_namespace_nspname 2

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_opclass.h

@@ -24,7 +24,7 @@
  * AMs support this.
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_opclass.h
@@ -57,10 +57,10 @@ CATALOG(pg_opclass,2616,OperatorClassRelationId)
 	NameData	opcname;
 
 	/* namespace of this opclass */
-	Oid			opcnamespace BKI_DEFAULT(PGNSP);
+	Oid			opcnamespace BKI_DEFAULT(pg_catalog) BKI_LOOKUP(pg_namespace);
 
 	/* opclass owner */
-	Oid			opcowner BKI_DEFAULT(PGUID);
+	Oid			opcowner BKI_DEFAULT(POSTGRES) BKI_LOOKUP(pg_authid);
 
 	/* containing operator family */
 	Oid			opcfamily BKI_LOOKUP(pg_opfamily);
@@ -71,8 +71,8 @@ CATALOG(pg_opclass,2616,OperatorClassRelationId)
 	/* T if opclass is default for opcintype */
 	bool		opcdefault BKI_DEFAULT(t);
 
-	/* type of data in index, or InvalidOid */
-	Oid			opckeytype BKI_DEFAULT(0) BKI_LOOKUP(pg_type);
+	/* type of data in index, or InvalidOid if same as input column type */
+	Oid			opckeytype BKI_DEFAULT(0) BKI_LOOKUP_OPT(pg_type);
 } FormData_pg_opclass;
 
 /* ----------------
@@ -82,4 +82,7 @@ CATALOG(pg_opclass,2616,OperatorClassRelationId)
  */
 typedef FormData_pg_opclass *Form_pg_opclass;
 
+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 */

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_opclass_d.h

@@ -3,7 +3,7 @@
  * pg_opclass_d.h
  *    Macro definitions for pg_opclass
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -19,6 +19,8 @@
 #define PG_OPCLASS_D_H
 
 #define OperatorClassRelationId 2616
+#define OpclassAmNameNspIndexId 2686
+#define OpclassOidIndexId 2687
 
 #define Anum_pg_opclass_oid 1
 #define Anum_pg_opclass_opcmethod 2

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_operator.h

@@ -4,7 +4,7 @@
  *	  definition of the "operator" system catalog (pg_operator)
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_operator.h
@@ -36,12 +36,12 @@ CATALOG(pg_operator,2617,OperatorRelationId)
 	NameData	oprname;
 
 	/* OID of namespace containing this oper */
-	Oid			oprnamespace BKI_DEFAULT(PGNSP);
+	Oid			oprnamespace BKI_DEFAULT(pg_catalog) BKI_LOOKUP(pg_namespace);
 
 	/* operator owner */
-	Oid			oprowner BKI_DEFAULT(PGUID);
+	Oid			oprowner BKI_DEFAULT(POSTGRES) BKI_LOOKUP(pg_authid);
 
-	/* 'l', 'r', or 'b' */
+	/* 'l' for prefix or 'b' for infix */
 	char		oprkind BKI_DEFAULT(b);
 
 	/* can be used in merge join? */
@@ -50,29 +50,29 @@ CATALOG(pg_operator,2617,OperatorRelationId)
 	/* can be used in hash join? */
 	bool		oprcanhash BKI_DEFAULT(f);
 
-	/* left arg type, or 0 if 'l' oprkind */
-	Oid			oprleft BKI_LOOKUP(pg_type);
+	/* left arg type, or 0 if prefix operator */
+	Oid			oprleft BKI_LOOKUP_OPT(pg_type);
 
-	/* right arg type, or 0 if 'r' oprkind */
+	/* right arg type */
 	Oid			oprright BKI_LOOKUP(pg_type);
 
-	/* result datatype */
-	Oid			oprresult BKI_LOOKUP(pg_type);
+	/* result datatype; can be 0 in a "shell" operator */
+	Oid			oprresult BKI_LOOKUP_OPT(pg_type);
 
 	/* OID of commutator oper, or 0 if none */
-	Oid			oprcom BKI_DEFAULT(0) BKI_LOOKUP(pg_operator);
+	Oid			oprcom BKI_DEFAULT(0) BKI_LOOKUP_OPT(pg_operator);
 
 	/* OID of negator oper, or 0 if none */
-	Oid			oprnegate BKI_DEFAULT(0) BKI_LOOKUP(pg_operator);
+	Oid			oprnegate BKI_DEFAULT(0) BKI_LOOKUP_OPT(pg_operator);
 
-	/* OID of underlying function */
-	regproc		oprcode BKI_LOOKUP(pg_proc);
+	/* OID of underlying function; can be 0 in a "shell" operator */
+	regproc		oprcode BKI_LOOKUP_OPT(pg_proc);
 
 	/* OID of restriction estimator, or 0 */
-	regproc		oprrest BKI_DEFAULT(-) BKI_LOOKUP(pg_proc);
+	regproc		oprrest BKI_DEFAULT(-) BKI_LOOKUP_OPT(pg_proc);
 
 	/* OID of join estimator, or 0 */
-	regproc		oprjoin BKI_DEFAULT(-) BKI_LOOKUP(pg_proc);
+	regproc		oprjoin BKI_DEFAULT(-) BKI_LOOKUP_OPT(pg_proc);
 } FormData_pg_operator;
 
 /* ----------------
@@ -82,6 +82,9 @@ CATALOG(pg_operator,2617,OperatorRelationId)
  */
 typedef FormData_pg_operator *Form_pg_operator;
 
+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,
 									Oid operatorNamespace,
@@ -95,7 +98,9 @@ extern ObjectAddress OperatorCreate(const char *operatorName,
 									bool canMerge,
 									bool canHash);
 
-extern ObjectAddress makeOperatorDependencies(HeapTuple tuple, bool isUpdate);
+extern ObjectAddress makeOperatorDependencies(HeapTuple tuple,
+											  bool makeExtensionDep,
+											  bool isUpdate);
 
 extern void OperatorUpd(Oid baseId, Oid commId, Oid negId, bool isDelete);
 

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_operator_d.h

@@ -3,7 +3,7 @@
  * pg_operator_d.h
  *    Macro definitions for pg_operator
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -19,6 +19,8 @@
 #define PG_OPERATOR_D_H
 
 #define OperatorRelationId 2617
+#define OperatorOidIndexId 2688
+#define OperatorNameNspIndexId 2689
 
 #define Anum_pg_operator_oid 1
 #define Anum_pg_operator_oprname 2
@@ -43,11 +45,15 @@
 #define Int4EqualOperator 96
 #define Int4LessOperator 97
 #define TextEqualOperator 98
+#define TextPrefixOperator 3877
 #define NameEqualTextOperator 254
 #define NameLessTextOperator 255
 #define NameGreaterEqualTextOperator 257
 #define TIDEqualOperator 387
 #define TIDLessOperator 2799
+#define TIDGreaterOperator 2800
+#define TIDLessEqOperator 2801
+#define TIDGreaterEqOperator 2802
 #define Int8LessOperator 412
 #define OID_NAME_REGEXEQ_OP 639
 #define OID_TEXT_REGEXEQ_OP 641
@@ -102,5 +108,35 @@
 #define OID_RANGE_RIGHT_OP 3894
 #define OID_RANGE_OVERLAPS_LEFT_OP 3895
 #define OID_RANGE_OVERLAPS_RIGHT_OP 3896
+#define OID_MULTIRANGE_LESS_OP 2862
+#define OID_MULTIRANGE_LESS_EQUAL_OP 2863
+#define OID_MULTIRANGE_GREATER_EQUAL_OP 2864
+#define OID_MULTIRANGE_GREATER_OP 2865
+#define OID_RANGE_OVERLAPS_MULTIRANGE_OP 2866
+#define OID_MULTIRANGE_OVERLAPS_RANGE_OP 2867
+#define OID_MULTIRANGE_OVERLAPS_MULTIRANGE_OP 2868
+#define OID_MULTIRANGE_CONTAINS_ELEM_OP 2869
+#define OID_MULTIRANGE_CONTAINS_RANGE_OP 2870
+#define OID_MULTIRANGE_CONTAINS_MULTIRANGE_OP 2871
+#define OID_MULTIRANGE_ELEM_CONTAINED_OP 2872
+#define OID_MULTIRANGE_RANGE_CONTAINED_OP 2873
+#define OID_MULTIRANGE_MULTIRANGE_CONTAINED_OP 2874
+#define OID_RANGE_CONTAINS_MULTIRANGE_OP 4539
+#define OID_RANGE_MULTIRANGE_CONTAINED_OP 4540
+#define OID_RANGE_OVERLAPS_LEFT_MULTIRANGE_OP 2875
+#define OID_MULTIRANGE_OVERLAPS_LEFT_RANGE_OP 2876
+#define OID_MULTIRANGE_OVERLAPS_LEFT_MULTIRANGE_OP 2877
+#define OID_RANGE_OVERLAPS_RIGHT_MULTIRANGE_OP 3585
+#define OID_MULTIRANGE_OVERLAPS_RIGHT_RANGE_OP 4035
+#define OID_MULTIRANGE_OVERLAPS_RIGHT_MULTIRANGE_OP 4142
+#define OID_RANGE_ADJACENT_MULTIRANGE_OP 4179
+#define OID_MULTIRANGE_ADJACENT_RANGE_OP 4180
+#define OID_MULTIRANGE_ADJACENT_MULTIRANGE_OP 4198
+#define OID_RANGE_LEFT_MULTIRANGE_OP 4395
+#define OID_MULTIRANGE_LEFT_RANGE_OP 4396
+#define OID_MULTIRANGE_LEFT_MULTIRANGE_OP 4397
+#define OID_RANGE_RIGHT_MULTIRANGE_OP 4398
+#define OID_MULTIRANGE_RIGHT_RANGE_OP 4399
+#define OID_MULTIRANGE_RIGHT_MULTIRANGE_OP 4400
 
 #endif							/* PG_OPERATOR_D_H */

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_opfamily.h

@@ -4,7 +4,7 @@
  *	  definition of the "operator family" system catalog (pg_opfamily)
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_opfamily.h
@@ -37,10 +37,10 @@ CATALOG(pg_opfamily,2753,OperatorFamilyRelationId)
 	NameData	opfname;
 
 	/* namespace of this opfamily */
-	Oid			opfnamespace BKI_DEFAULT(PGNSP);
+	Oid			opfnamespace BKI_DEFAULT(pg_catalog) BKI_LOOKUP(pg_namespace);
 
 	/* opfamily owner */
-	Oid			opfowner BKI_DEFAULT(PGUID);
+	Oid			opfowner BKI_DEFAULT(POSTGRES) BKI_LOOKUP(pg_authid);
 } FormData_pg_opfamily;
 
 /* ----------------
@@ -50,9 +50,13 @@ CATALOG(pg_opfamily,2753,OperatorFamilyRelationId)
  */
 typedef FormData_pg_opfamily *Form_pg_opfamily;
 
+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
 
-#define IsBooleanOpfamily(opfamily) \
+/* This does not account for non-core opfamilies that might accept boolean */
+#define IsBuiltinBooleanOpfamily(opfamily) \
 	((opfamily) == BOOL_BTREE_FAM_OID || (opfamily) == BOOL_HASH_FAM_OID)
 
 #endif							/* EXPOSE_TO_CLIENT_CODE */

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_opfamily_d.h

@@ -3,7 +3,7 @@
  * pg_opfamily_d.h
  *    Macro definitions for pg_opfamily
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -19,6 +19,8 @@
 #define PG_OPFAMILY_D_H
 
 #define OperatorFamilyRelationId 2753
+#define OpfamilyAmNameNspIndexId 2754
+#define OpfamilyOidIndexId 2755
 
 #define Anum_pg_opfamily_oid 1
 #define Anum_pg_opfamily_opfmethod 2
@@ -29,7 +31,8 @@
 #define Natts_pg_opfamily 5
 
 
-#define IsBooleanOpfamily(opfamily) \
+/* This does not account for non-core opfamilies that might accept boolean */
+#define IsBuiltinBooleanOpfamily(opfamily) \
 	((opfamily) == BOOL_BTREE_FAM_OID || (opfamily) == BOOL_HASH_FAM_OID)
 
 #define BOOL_BTREE_FAM_OID 424
@@ -37,6 +40,7 @@
 #define BYTEA_BTREE_FAM_OID 428
 #define NETWORK_BTREE_FAM_OID 1974
 #define INTEGER_BTREE_FAM_OID 1976
+#define INTERVAL_BTREE_FAM_OID 1982
 #define OID_BTREE_FAM_OID 1989
 #define TEXT_BTREE_FAM_OID 1994
 #define TEXT_PATTERN_BTREE_FAM_OID 2095

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_partitioned_table.h

@@ -5,7 +5,7 @@
  *	  (pg_partitioned_table)
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_partitioned_table.h
@@ -29,11 +29,11 @@
  */
 CATALOG(pg_partitioned_table,3350,PartitionedRelationId)
 {
-	Oid			partrelid;		/* partitioned table oid */
+	Oid			partrelid BKI_LOOKUP(pg_class); /* partitioned table oid */
 	char		partstrat;		/* partitioning strategy */
 	int16		partnatts;		/* number of partition key columns */
-	Oid			partdefid;		/* default partition oid; InvalidOid if there
-								 * isn't one */
+	Oid			partdefid BKI_LOOKUP_OPT(pg_class); /* default partition oid;
+													 * 0 if there isn't one */
 
 	/*
 	 * variable-length fields start here, but we allow direct access to
@@ -41,13 +41,17 @@ CATALOG(pg_partitioned_table,3350,PartitionedRelationId)
 	 * field of a heap tuple can be reliably accessed using its C struct
 	 * offset, as previous fields are all non-nullable fixed-length fields.
 	 */
-	int2vector	partattrs;		/* each member of the array is the attribute
-								 * number of a partition key column, or 0 if
-								 * the column is actually an expression */
+	int2vector	partattrs BKI_FORCE_NOT_NULL;	/* each member of the array is
+												 * the attribute number of a
+												 * partition key column, or 0
+												 * if the column is actually
+												 * an expression */
 
 #ifdef CATALOG_VARLEN
-	oidvector	partclass;		/* operator class to compare keys */
-	oidvector	partcollation;	/* user-specified collation for keys */
+	oidvector	partclass BKI_LOOKUP(pg_opclass) BKI_FORCE_NOT_NULL;	/* operator class to
+																		 * compare keys */
+	oidvector	partcollation BKI_LOOKUP_OPT(pg_collation) BKI_FORCE_NOT_NULL;	/* user-specified
+																				 * collation for keys */
 	pg_node_tree partexprs;		/* list of expressions in the partition key;
 								 * one item for each zero entry in partattrs[] */
 #endif
@@ -60,4 +64,11 @@ CATALOG(pg_partitioned_table,3350,PartitionedRelationId)
  */
 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, 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));
+
 #endif							/* PG_PARTITIONED_TABLE_H */

data/ext/pg_query/include/{catalog → postgres/catalog}/pg_partitioned_table_d.h

@@ -3,7 +3,7 @@
  * pg_partitioned_table_d.h
  *    Macro definitions for pg_partitioned_table
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -19,6 +19,7 @@
 #define PG_PARTITIONED_TABLE_D_H
 
 #define PartitionedRelationId 3350
+#define PartitionedRelidIndexId 3351
 
 #define Anum_pg_partitioned_table_partrelid 1
 #define Anum_pg_partitioned_table_partstrat 2