Add a "USING" clause to DELETE, which is equivalent to the FROM clause

in UPDATE. We also now issue a NOTICE if a query has _any_ implicit
range table entries -- in the past, we would only warn about implicit
RTEs in SELECTs with at least one explicit RTE.

As a result of the warning change, 25 of the regression tests had to
be updated. I also took the opportunity to remove some bogus whitespace
differences between some of the float4 and float8 variants. I believe
I have correctly updated all the platform-specific variants, but let
me know if that's not the case.

Original patch for DELETE ... USING from Euler Taveira de Oliveira,
reworked by Neil Conway.

3 files changed, 25 insertions, 25 deletions

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 191f4446b06..4dad0ae80af 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.317 2005/04/06 16:34:06 tgl Exp $
+ *	$PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.318 2005/04/07 01:51:38 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -479,6 +479,14 @@ transformDeleteStmt(ParseState *pstate, DeleteStmt *stmt)
 
 	qry->distinctClause = NIL;
 
+	/*
+	 * The USING clause is non-standard SQL syntax, and is equivalent
+	 * in functionality to the FROM list that can be specified for
+	 * UPDATE. The USING keyword is used rather than FROM because FROM
+	 * is already a keyword in the DELETE syntax.
+	 */
+	transformFromClause(pstate, stmt->usingClause);
+
 	/* fix where clause */
 	qual = transformWhereClause(pstate, stmt->whereClause, "WHERE");
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 6bbf4a4de18..c33a7e65738 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.486 2005/03/31 22:46:11 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.487 2005/04/07 01:51:38 neilc Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -229,7 +229,7 @@ static void doNegateFloat(Value *v);
 				transaction_mode_list_or_empty
 				TableFuncElementList
 				prep_type_clause prep_type_list
-				execute_param_clause
+				execute_param_clause using_clause
 
 %type <range>	into_clause OptTempTableName
 
@@ -4734,15 +4734,21 @@ insert_column_item:
  *
  *****************************************************************************/
 
-DeleteStmt: DELETE_P FROM relation_expr where_clause
+DeleteStmt: DELETE_P FROM relation_expr using_clause where_clause
 				{
 					DeleteStmt *n = makeNode(DeleteStmt);
 					n->relation = $3;
-					n->whereClause = $4;
+					n->usingClause = $4;
+					n->whereClause = $5;
 					$$ = (Node *)n;
 				}
 		;
 
+using_clause:
+	    		USING from_list						{ $$ = $2; }
+			| /*EMPTY*/								{ $$ = NIL; }
+		;
+
 LockStmt:	LOCK_P opt_table qualified_name_list opt_lock opt_nowait
 				{
 					LockStmt *n = makeNode(LockStmt);
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 031bfa8fe24..edd59917e93 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.104 2005/04/06 16:34:06 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.105 2005/04/07 01:51:39 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -596,6 +596,7 @@ colNameToVar(ParseState *pstate, char *colname, bool localonly)
 				RangeTblEntry *rte = rt_fetch(varno, pstate->p_rtable);
 
 				/* joins are always inFromCl, so no need to check */
+				Assert(rte->inFromCl);
 
 				/* use orig_pstate here to get the right sublevels_up */
 				newresult = scanRTEForColumn(orig_pstate, rte, colname);
@@ -1966,17 +1967,12 @@ attnumTypeId(Relation rd, int attid)
 /*
  * Generate a warning or error about an implicit RTE, if appropriate.
  *
- * If ADD_MISSING_FROM is not enabled, raise an error.
- *
- * Our current theory on warnings is that we should allow "SELECT foo.*"
- * but warn about a mixture of explicit and implicit RTEs.
+ * If ADD_MISSING_FROM is not enabled, raise an error. Otherwise, emit
+ * a warning.
  */
 static void
 warnAutoRange(ParseState *pstate, RangeVar *relation)
 {
-	bool		foundInFromCl = false;
-	ListCell   *temp;
-
 	if (!add_missing_from)
 	{
 		if (pstate->parentParseState != NULL)
@@ -1990,19 +1986,9 @@ warnAutoRange(ParseState *pstate, RangeVar *relation)
 					 errmsg("missing FROM-clause entry for table \"%s\"",
 							relation->relname)));
 	}
-
-	foreach(temp, pstate->p_rtable)
-	{
-		RangeTblEntry *rte = lfirst(temp);
-
-		if (rte->inFromCl)
-		{
-			foundInFromCl = true;
-			break;
-		}
-	}
-	if (foundInFromCl)
+	else
 	{
+		/* just issue a warning */
 		if (pstate->parentParseState != NULL)
 			ereport(NOTICE,
 					(errcode(ERRCODE_UNDEFINED_TABLE),