diff options
Diffstat (limited to 'src/include/catalog')
| -rw-r--r-- | src/include/catalog/indexing.h | 5 | ||||
| -rw-r--r-- | src/include/catalog/pg_constraint.h | 19 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index fce84e72ae..4a76a27dec 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: indexing.h,v 1.76 2002/10/18 20:33:57 tgl Exp $ + * $Id: indexing.h,v 1.77 2002/11/15 02:50:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,6 +40,7 @@ #define ConstraintNameNspIndex "pg_constraint_conname_nsp_index" #define ConstraintOidIndex "pg_constraint_oid_index" #define ConstraintRelidIndex "pg_constraint_conrelid_index" +#define ConstraintTypidIndex "pg_constraint_contypid_index" #define ConversionDefaultIndex "pg_conversion_default_index" #define ConversionNameNspIndex "pg_conversion_name_nsp_index" #define ConversionOidIndex "pg_conversion_oid_index" @@ -129,6 +130,8 @@ DECLARE_UNIQUE_INDEX(pg_class_relname_nsp_index on pg_class using btree(relname DECLARE_INDEX(pg_constraint_conname_nsp_index on pg_constraint using btree(conname name_ops, connamespace oid_ops)); /* This following index is not used for a cache and is not unique */ DECLARE_INDEX(pg_constraint_conrelid_index on pg_constraint using btree(conrelid oid_ops)); +/* This following index is not used for a cache and is not unique */ +DECLARE_INDEX(pg_constraint_contypid_index on pg_constraint using btree(contypid oid_ops)); DECLARE_UNIQUE_INDEX(pg_constraint_oid_index on pg_constraint using btree(oid oid_ops)); DECLARE_UNIQUE_INDEX(pg_conversion_default_index 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 on pg_conversion using btree(conname name_ops, connamespace oid_ops)); diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h index ffe6a740ca..80ff185579 100644 --- a/src/include/catalog/pg_constraint.h +++ b/src/include/catalog/pg_constraint.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_constraint.h,v 1.4 2002/09/22 00:37:09 tgl Exp $ + * $Id: pg_constraint.h,v 1.5 2002/11/15 02:50:10 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -140,6 +140,15 @@ typedef FormData_pg_constraint *Form_pg_constraint; * the FKCONSTR_MATCH_xxx constants defined in parsenodes.h. */ +/* + * Used for constraint support functions where the + * and conrelid, contypid columns being looked up + */ +typedef enum CONSTRAINTCATEGORY { + CONSTRAINT_RELATION, + CONSTRAINT_DOMAIN, + CONSTRAINT_ASSERTION +} CONSTRAINTCATEGORY; /* * prototypes for functions in pg_constraint.c @@ -166,10 +175,10 @@ extern Oid CreateConstraintEntry(const char *constraintName, extern void RemoveConstraintById(Oid conId); -extern bool ConstraintNameIsUsed(Oid relId, Oid relNamespace, - const char *cname); -extern char *GenerateConstraintName(Oid relId, Oid relNamespace, - int *counter); +extern bool ConstraintNameIsUsed(CONSTRAINTCATEGORY conCat, Oid objId, Oid objNamespace, + const char *cname); +extern char *GenerateConstraintName(CONSTRAINTCATEGORY conCat, Oid objId, Oid objNamespace, + int *counter); extern bool ConstraintNameIsGenerated(const char *cname); #endif /* PG_CONSTRAINT_H */ |