diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-03-14 22:48:25 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-03-14 22:48:25 +0000 |
| commit | 20ab467d76d78271006818d2baf4c9c8658d1f38 (patch) | |
| tree | 7a536111b5cc4e494ac75558aad5655dfc8ab964 /src/include/parser/parse_relation.h | |
| parent | 48fb696753e267447f99914c7968d0b4ffb5c5dc (diff) | |
| download | postgresql-20ab467d76d78271006818d2baf4c9c8658d1f38.tar.gz | |
Improve parser so that we can show an error cursor position for errors
during parse analysis, not only errors detected in the flex/bison stages.
This is per my earlier proposal. This commit includes all the basic
infrastructure, but locations are only tracked and reported for errors
involving column references, function calls, and operators. More could
be done later but this seems like a good set to start with. I've also
moved the ReportSyntaxErrorPosition logic out of psql and into libpq,
which should make it available to more people --- even within psql this
is an improvement because warnings weren't handled by ReportSyntaxErrorPosition.
Diffstat (limited to 'src/include/parser/parse_relation.h')
| -rw-r--r-- | src/include/parser/parse_relation.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 4faa3351a5..33ebad8abc 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.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_relation.h,v 1.52 2006/03/05 15:58:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.53 2006/03/14 22:48:22 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -31,13 +31,15 @@ extern RangeTblEntry *GetRTEByRangeTablePosn(ParseState *pstate, int varno, int sublevels_up); extern Node *scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte, - char *colname); -extern Node *colNameToVar(ParseState *pstate, char *colname, bool localonly); + char *colname, int location); +extern Node *colNameToVar(ParseState *pstate, char *colname, bool localonly, + int location); extern Node *qualifiedNameToVar(ParseState *pstate, char *schemaname, char *refname, char *colname, - bool implicitRTEOK); + bool implicitRTEOK, + int location); extern RangeTblEntry *addRangeTableEntry(ParseState *pstate, RangeVar *relation, Alias *alias, @@ -66,7 +68,8 @@ extern RangeTblEntry *addRangeTableEntryForJoin(ParseState *pstate, extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte, bool addToJoinList, bool addToRelNameSpace, bool addToVarNameSpace); -extern RangeTblEntry *addImplicitRTE(ParseState *pstate, RangeVar *relation); +extern RangeTblEntry *addImplicitRTE(ParseState *pstate, RangeVar *relation, + int location); extern void expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up, bool include_dropped, List **colnames, List **colvars); |