diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-07 03:19:44 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-05-07 03:19:44 +0000 |
| commit | 573aaa52bc98f0a75304bcca2e73e1f04221d04e (patch) | |
| tree | eef38685635e2f5749590ab7eb2b5579a30fccd8 /src/backend/utils/adt/ruleutils.c | |
| parent | 97c7cb0930c5616cf20c204ba64eb43979a53e80 (diff) | |
| download | postgresql-573aaa52bc98f0a75304bcca2e73e1f04221d04e.tar.gz postgresql-573aaa52bc98f0a75304bcca2e73e1f04221d04e.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 412aa252d62..9cb90444a87 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * back to source text * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.164 2004/05/05 04:48:46 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.165 2004/05/07 03:19:44 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -3788,14 +3788,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 ", |