diff options
Diffstat (limited to 'src/include/parser')
| -rw-r--r-- | src/include/parser/analyze.h | 6 | ||||
| -rw-r--r-- | src/include/parser/parse_node.h | 6 | ||||
| -rw-r--r-- | src/include/parser/parsetree.h | 9 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index 57188b9fce9..0b245c77e83 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/analyze.h,v 1.32 2006/03/14 22:48:22 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/analyze.h,v 1.33 2006/04/30 18:30:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,8 @@ extern List *parse_analyze_varparams(Node *parseTree, const char *sourceText, Oid **paramTypes, int *numParams); extern List *parse_sub_analyze(Node *parseTree, ParseState *parentParseState); extern List *analyzeCreateSchemaStmt(CreateSchemaStmt *stmt); -extern void CheckSelectLocking(Query *qry, bool forUpdate); +extern void CheckSelectLocking(Query *qry); +extern void applyLockingClause(Query *qry, Index rtindex, + bool forUpdate, bool noWait); #endif /* ANALYZE_H */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 2c23cf78946..1a28d099546 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_node.h,v 1.48 2006/03/14 22:48:22 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_node.h,v 1.49 2006/04/30 18:30:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -71,8 +71,8 @@ typedef struct ParseState Oid *p_paramtypes; /* OIDs of types for $n parameter symbols */ int p_numparams; /* allocated size of p_paramtypes[] */ int p_next_resno; /* next targetlist resno to assign */ - LockingClause *p_locking_clause; /* FOR UPDATE/FOR SHARE info */ - Node *p_value_substitute; /* what to replace VALUE with, if any */ + List *p_locking_clause; /* raw FOR UPDATE/FOR SHARE info */ + Node *p_value_substitute; /* what to replace VALUE with, if any */ bool p_variableparams; bool p_hasAggs; bool p_hasSubLinks; diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h index 5cd5002109f..d9b65aec8c8 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parsetree.h,v 1.32 2006/03/05 15:58:58 momjian Exp $ + * $PostgreSQL: pgsql/src/include/parser/parsetree.h,v 1.33 2006/04/30 18:30:40 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -70,4 +70,11 @@ extern bool get_rte_attribute_is_dropped(RangeTblEntry *rte, extern TargetEntry *get_tle_by_resno(List *tlist, AttrNumber resno); +/* ---------------- + * FOR UPDATE/SHARE info + * ---------------- + */ + +extern RowMarkClause *get_rowmark(Query *qry, Index rtindex); + #endif /* PARSETREE_H */ |