From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 7 May 2004 03:20:01 +0000 (+0000)
Subject: NATURAL CROSS JOIN is a contradiction in terms, not to mention disallowed
X-Git-Tag: REL7_4_3~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d86b89ec0360d00826003a5a404a3b0bb73911d;p=postgresql

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.
---

diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index d3269e1106..ce072990ad 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 ",