diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-07 03:20:01 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-07 03:20:01 +0000 |
| commit | 8d86b89ec0360d00826003a5a404a3b0bb73911d (patch) | |
| tree | b3f2974a492b5d2e396871bb395c7462b3cd8c71 /src/backend/utils/adt/ruleutils.c | |
| parent | 69f5e41be302005475c8ac9460c2904215d9deff (diff) | |
| download | postgresql-8d86b89ec0360d00826003a5a404a3b0bb73911d.tar.gz postgresql-8d86b89ec0360d00826003a5a404a3b0bb73911d.zip | |
NATURAL CROSS JOIN is a contradiction in terms, not to mention disallowed
by the SQL spec and by our parser. Thanks to Jonathan Scott for finding
this longstanding error.
Diffstat (limited to 'src/backend/utils/adt/ruleutils.c')
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index d3269e11067..ce072990ad2 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * back to source text * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.157 2003/10/04 18:22:59 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.157.2.1 2004/05/07 03:20:01 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -3830,14 +3830,9 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context) switch (j->jointype) { case JOIN_INNER: - if (j->quals) - appendContextKeyword(context, "NATURAL JOIN ", - -PRETTYINDENT_JOIN, - PRETTYINDENT_JOIN, 0); - else - appendContextKeyword(context, "NATURAL CROSS JOIN ", - -PRETTYINDENT_JOIN, - PRETTYINDENT_JOIN, 0); + appendContextKeyword(context, "NATURAL JOIN ", + -PRETTYINDENT_JOIN, + PRETTYINDENT_JOIN, 0); break; case JOIN_LEFT: appendContextKeyword(context, "NATURAL LEFT JOIN ", |