diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-08-08 01:44:31 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-08-08 01:44:31 +0000 |
| commit | b084cc3504ec62cd0b36ae47c11b4b6f06e0bb97 (patch) | |
| tree | 0e21ffe15a562533b7b4bee17295ebd76f18db65 /src/backend/parser/parse_expr.c | |
| parent | e42f8e32e9f6580d081ac13136469c0cd8338ffa (diff) | |
| download | postgresql-b084cc3504ec62cd0b36ae47c11b4b6f06e0bb97.tar.gz postgresql-b084cc3504ec62cd0b36ae47c11b4b6f06e0bb97.zip | |
Cause schema-qualified FROM items and schema-qualified variable references
to behave according to SQL92 (or according to my current understanding
of same, anyway). Per pghackers discussion way back in March 2002:
thread 'Do FROM items of different schemas conflict?'
Diffstat (limited to 'src/backend/parser/parse_expr.c')
| -rw-r--r-- | src/backend/parser/parse_expr.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 3cd09a9b43c..85cdc431a0e 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.124 2002/08/04 06:46:12 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.125 2002/08/08 01:44:30 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -709,6 +709,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref) /* Try to identify as an unqualified column */ node = colnameToVar(pstate, name); + if (node == NULL) { /* @@ -716,11 +717,15 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref) * try to find the name as a relation ... but not if * subscripts appear. Note also that only relations * already entered into the rangetable will be recognized. + * + * This is a hack for backwards compatibility with PostQUEL- + * inspired syntax. The preferred form now is "rel.*". */ int levels_up; if (cref->indirection == NIL && - refnameRangeTblEntry(pstate, name, &levels_up) != NULL) + refnameRangeTblEntry(pstate, NULL, name, + &levels_up) != NULL) { rv = makeNode(RangeVar); rv->relname = name; @@ -748,7 +753,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref) } /* Try to identify as a once-qualified column */ - node = qualifiedNameToVar(pstate, name1, name2, true); + node = qualifiedNameToVar(pstate, NULL, name1, name2, true); if (node == NULL) { /* @@ -784,8 +789,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref) } /* Try to identify as a twice-qualified column */ - /* XXX do something with schema name here */ - node = qualifiedNameToVar(pstate, name2, name3, true); + node = qualifiedNameToVar(pstate, name1, name2, name3, true); if (node == NULL) { /* Try it as a function call */ @@ -825,8 +829,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref) } /* Try to identify as a twice-qualified column */ - /* XXX do something with schema name here */ - node = qualifiedNameToVar(pstate, name3, name4, true); + node = qualifiedNameToVar(pstate, name2, name3, name4, true); if (node == NULL) { /* Try it as a function call */ |