Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit72eee41

Browse files
committed
Move pg_constraint.h function declarations to new file pg_constraint_fn.h.
A pending patch requires exporting a function returning Bitmapset fromcatalog/pg_constraint.c. As things stand, that would mean includingnodes/bitmapset.h in pg_constraint.h, which might be hazardous for theclient-side includability of that header. It's not entirely clear whetherany client-side code needs to include pg_constraint.h, but it seems prudentto assume that there is some such code somewhere. Therefore, split off thefunction definitions into a new file pg_constraint_fn.h, similarly to whatwe've done for some other catalog header files.
1 parent2564be3 commit72eee41

File tree

13 files changed

+97
-66
lines changed

13 files changed

+97
-66
lines changed

‎src/backend/catalog/dependency.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include"catalog/pg_collation.h"
2929
#include"catalog/pg_collation_fn.h"
3030
#include"catalog/pg_constraint.h"
31+
#include"catalog/pg_constraint_fn.h"
3132
#include"catalog/pg_conversion.h"
3233
#include"catalog/pg_conversion_fn.h"
3334
#include"catalog/pg_database.h"

‎src/backend/catalog/heap.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
#include"catalog/pg_attrdef.h"
4545
#include"catalog/pg_collation.h"
4646
#include"catalog/pg_constraint.h"
47+
#include"catalog/pg_constraint_fn.h"
4748
#include"catalog/pg_foreign_table.h"
4849
#include"catalog/pg_inherits.h"
4950
#include"catalog/pg_namespace.h"

‎src/backend/catalog/index.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include"catalog/pg_am.h"
4141
#include"catalog/pg_collation.h"
4242
#include"catalog/pg_constraint.h"
43+
#include"catalog/pg_constraint_fn.h"
4344
#include"catalog/pg_operator.h"
4445
#include"catalog/pg_opclass.h"
4546
#include"catalog/pg_tablespace.h"

‎src/backend/catalog/objectaddress.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include"catalog/pg_event_trigger.h"
3131
#include"catalog/pg_collation.h"
3232
#include"catalog/pg_constraint.h"
33+
#include"catalog/pg_constraint_fn.h"
3334
#include"catalog/pg_conversion.h"
3435
#include"catalog/pg_database.h"
3536
#include"catalog/pg_extension.h"

‎src/backend/catalog/pg_constraint.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include"catalog/indexing.h"
2222
#include"catalog/objectaccess.h"
2323
#include"catalog/pg_constraint.h"
24+
#include"catalog/pg_constraint_fn.h"
2425
#include"catalog/pg_operator.h"
2526
#include"catalog/pg_type.h"
2627
#include"commands/defrem.h"

‎src/backend/commands/tablecmds.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include"catalog/pg_am.h"
3333
#include"catalog/pg_collation.h"
3434
#include"catalog/pg_constraint.h"
35+
#include"catalog/pg_constraint_fn.h"
3536
#include"catalog/pg_depend.h"
3637
#include"catalog/pg_foreign_table.h"
3738
#include"catalog/pg_inherits.h"

‎src/backend/commands/trigger.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include"catalog/indexing.h"
2424
#include"catalog/objectaccess.h"
2525
#include"catalog/pg_constraint.h"
26+
#include"catalog/pg_constraint_fn.h"
2627
#include"catalog/pg_proc.h"
2728
#include"catalog/pg_trigger.h"
2829
#include"catalog/pg_type.h"

‎src/backend/commands/typecmds.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
#include"catalog/pg_authid.h"
4242
#include"catalog/pg_collation.h"
4343
#include"catalog/pg_constraint.h"
44+
#include"catalog/pg_constraint_fn.h"
4445
#include"catalog/pg_depend.h"
4546
#include"catalog/pg_enum.h"
4647
#include"catalog/pg_language.h"

‎src/backend/parser/parse_agg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include"postgres.h"
1616

1717
#include"catalog/pg_aggregate.h"
18-
#include"catalog/pg_constraint.h"
18+
#include"catalog/pg_constraint_fn.h"
1919
#include"catalog/pg_type.h"
2020
#include"nodes/makefuncs.h"
2121
#include"nodes/nodeFuncs.h"

‎src/backend/parser/parse_clause.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include"catalog/catalog.h"
2323
#include"catalog/heap.h"
2424
#include"catalog/pg_am.h"
25-
#include"catalog/pg_constraint.h"
25+
#include"catalog/pg_constraint_fn.h"
2626
#include"catalog/pg_type.h"
2727
#include"commands/defrem.h"
2828
#include"nodes/makefuncs.h"

‎src/backend/parser/parse_utilcmd.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include"catalog/pg_am.h"
3737
#include"catalog/pg_collation.h"
3838
#include"catalog/pg_constraint.h"
39+
#include"catalog/pg_constraint_fn.h"
3940
#include"catalog/pg_opclass.h"
4041
#include"catalog/pg_operator.h"
4142
#include"catalog/pg_type.h"

‎src/include/catalog/pg_constraint.h

Lines changed: 7 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#definePG_CONSTRAINT_H
2121

2222
#include"catalog/genbki.h"
23-
#include"catalog/dependency.h"
24-
#include"nodes/pg_list.h"
2523

2624
/* ----------------
2725
*pg_constraint definition. cpp turns this into
@@ -178,6 +176,13 @@ typedef FormData_pg_constraint *Form_pg_constraint;
178176
#defineAnum_pg_constraint_conbin23
179177
#defineAnum_pg_constraint_consrc24
180178

179+
/* ----------------
180+
*initial contents of pg_constraint
181+
* ----------------
182+
*/
183+
184+
/* nothing, at present */
185+
181186

182187
/* Valid values for contype */
183188
#defineCONSTRAINT_CHECK'c'
@@ -193,66 +198,4 @@ typedef FormData_pg_constraint *Form_pg_constraint;
193198
* the FKCONSTR_MATCH_xxx constants defined in parsenodes.h.
194199
*/
195200

196-
/*
197-
* Identify constraint type for lookup purposes
198-
*/
199-
typedefenumConstraintCategory
200-
{
201-
CONSTRAINT_RELATION,
202-
CONSTRAINT_DOMAIN,
203-
CONSTRAINT_ASSERTION/* for future expansion */
204-
}ConstraintCategory;
205-
206-
/*
207-
* prototypes for functions in pg_constraint.c
208-
*/
209-
externOidCreateConstraintEntry(constchar*constraintName,
210-
OidconstraintNamespace,
211-
charconstraintType,
212-
boolisDeferrable,
213-
boolisDeferred,
214-
boolisValidated,
215-
OidrelId,
216-
constint16*constraintKey,
217-
intconstraintNKeys,
218-
OiddomainId,
219-
OidindexRelId,
220-
OidforeignRelId,
221-
constint16*foreignKey,
222-
constOid*pfEqOp,
223-
constOid*ppEqOp,
224-
constOid*ffEqOp,
225-
intforeignNKeys,
226-
charforeignUpdateType,
227-
charforeignDeleteType,
228-
charforeignMatchType,
229-
constOid*exclOp,
230-
Node*conExpr,
231-
constchar*conBin,
232-
constchar*conSrc,
233-
boolconIsLocal,
234-
intconInhCount,
235-
boolconNoInherit,
236-
boolis_internal);
237-
238-
externvoidRemoveConstraintById(OidconId);
239-
externvoidRenameConstraintById(OidconId,constchar*newname);
240-
externvoidSetValidatedConstraintById(OidconId);
241-
242-
externboolConstraintNameIsUsed(ConstraintCategoryconCat,OidobjId,
243-
OidobjNamespace,constchar*conname);
244-
externchar*ChooseConstraintName(constchar*name1,constchar*name2,
245-
constchar*label,Oidnamespaceid,
246-
List*others);
247-
248-
externvoidAlterConstraintNamespaces(OidownerId,OidoldNspId,
249-
OidnewNspId,boolisType,ObjectAddresses*objsMoved);
250-
externOidget_relation_constraint_oid(Oidrelid,constchar*conname,boolmissing_ok);
251-
externOidget_domain_constraint_oid(Oidtypid,constchar*conname,boolmissing_ok);
252-
253-
externboolcheck_functional_grouping(Oidrelid,
254-
Indexvarno,Indexvarlevelsup,
255-
List*grouping_columns,
256-
List**constraintDeps);
257-
258201
#endif/* PG_CONSTRAINT_H */
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* pg_constraint_fn.h
4+
* prototypes for functions in catalog/pg_constraint.c
5+
*
6+
*
7+
* Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
8+
* Portions Copyright (c) 1994, Regents of the University of California
9+
*
10+
* src/include/catalog/pg_constraint_fn.h
11+
*
12+
*-------------------------------------------------------------------------
13+
*/
14+
#ifndefPG_CONSTRAINT_FN_H
15+
#definePG_CONSTRAINT_FN_H
16+
17+
#include"catalog/dependency.h"
18+
#include"nodes/pg_list.h"
19+
20+
/*
21+
* Identify constraint type for lookup purposes
22+
*/
23+
typedefenumConstraintCategory
24+
{
25+
CONSTRAINT_RELATION,
26+
CONSTRAINT_DOMAIN,
27+
CONSTRAINT_ASSERTION/* for future expansion */
28+
}ConstraintCategory;
29+
30+
externOidCreateConstraintEntry(constchar*constraintName,
31+
OidconstraintNamespace,
32+
charconstraintType,
33+
boolisDeferrable,
34+
boolisDeferred,
35+
boolisValidated,
36+
OidrelId,
37+
constint16*constraintKey,
38+
intconstraintNKeys,
39+
OiddomainId,
40+
OidindexRelId,
41+
OidforeignRelId,
42+
constint16*foreignKey,
43+
constOid*pfEqOp,
44+
constOid*ppEqOp,
45+
constOid*ffEqOp,
46+
intforeignNKeys,
47+
charforeignUpdateType,
48+
charforeignDeleteType,
49+
charforeignMatchType,
50+
constOid*exclOp,
51+
Node*conExpr,
52+
constchar*conBin,
53+
constchar*conSrc,
54+
boolconIsLocal,
55+
intconInhCount,
56+
boolconNoInherit,
57+
boolis_internal);
58+
59+
externvoidRemoveConstraintById(OidconId);
60+
externvoidRenameConstraintById(OidconId,constchar*newname);
61+
externvoidSetValidatedConstraintById(OidconId);
62+
63+
externboolConstraintNameIsUsed(ConstraintCategoryconCat,OidobjId,
64+
OidobjNamespace,constchar*conname);
65+
externchar*ChooseConstraintName(constchar*name1,constchar*name2,
66+
constchar*label,Oidnamespaceid,
67+
List*others);
68+
69+
externvoidAlterConstraintNamespaces(OidownerId,OidoldNspId,
70+
OidnewNspId,boolisType,ObjectAddresses*objsMoved);
71+
externOidget_relation_constraint_oid(Oidrelid,constchar*conname,boolmissing_ok);
72+
externOidget_domain_constraint_oid(Oidtypid,constchar*conname,boolmissing_ok);
73+
74+
externboolcheck_functional_grouping(Oidrelid,
75+
Indexvarno,Indexvarlevelsup,
76+
List*grouping_columns,
77+
List**constraintDeps);
78+
79+
#endif/* PG_CONSTRAINT_FN_H */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp