diff options
| author | Neil Conway | 2005-04-07 01:51:41 +0000 |
|---|---|---|
| committer | Neil Conway | 2005-04-07 01:51:41 +0000 |
| commit | f5ab0a14ea83eb6c27196b0c5d600b7f8b8b75fc (patch) | |
| tree | 3a40f9e70af0338c3dd1210b859f1a7445a40e6c | |
| parent | be2f825d51176bd21a627a529476f94de5bad4c2 (diff) | |
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.
68 files changed, 393 insertions, 234 deletions
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml index 6b6c8bf66d8..954391a228b 100644 --- a/doc/src/sgml/ref/delete.sgml +++ b/doc/src/sgml/ref/delete.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/delete.sgml,v 1.22 2005/01/09 05:57:45 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/delete.sgml,v 1.23 2005/04/07 01:51:37 neilc Exp $ PostgreSQL documentation --> @@ -20,7 +20,9 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ WHERE <replaceable class="PARAMETER">condition</replaceable> ] +DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> + [ USING <replaceable class="PARAMETER">usinglist</replaceable> ] + [ WHERE <replaceable class="PARAMETER">condition</replaceable> ] </synopsis> </refsynopsisdiv> @@ -50,9 +52,18 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ WHERE </para> <para> + There are two ways to delete rows in a table using information + contained in other tables in the database: using sub-selects, or + specifying additional tables in the <literal>USING</literal> clause. + Which technique is more appropriate depends on the specific + circumstances. + </para> + + <para> You must have the <literal>DELETE</literal> privilege on the table to delete from it, as well as the <literal>SELECT</literal> - privilege for any table whose values are read in the <replaceable + privilege for any table in the <literal>USING</literal> clause or + whose values are read in the <replaceable class="parameter">condition</replaceable>. </para> </refsect1> @@ -71,6 +82,20 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table</replaceable> [ WHERE </varlistentry> <varlistentry> + <term><replaceable class="PARAMETER">usinglist</replaceable></term> + <listitem> + <para> + A list of table expressions, allowing columns from other tables + to appear in the <literal>WHERE</> condition. This is similar + to the list of tables that can be specified in the <xref + linkend="sql-from" endterm="sql-from-title"> of a + <command>SELECT</command> statement; for example, an alias for + the table name can be specified. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><replaceable class="parameter">condition</replaceable></term> <listitem> <para> @@ -105,10 +130,11 @@ DELETE <replaceable class="parameter">count</replaceable> <para> <productname>PostgreSQL</productname> lets you reference columns of - other tables in the <literal>WHERE</> condition. For example, to - delete all films produced by a given producer, one might do + other tables in the <literal>WHERE</> condition by specifying the + other tables in the <literal>USING</literal> clause. For example, + to delete all films produced by a given producer, one might do <programlisting> -DELETE FROM films +DELETE FROM films USING producers WHERE producer_id = producers.id AND producers.name = 'foo'; </programlisting> What is essentially happening here is a join between <structname>films</> @@ -120,10 +146,13 @@ DELETE FROM films WHERE producer_id IN (SELECT id FROM producers WHERE name = 'foo'); </programlisting> In some cases the join style is easier to write or faster to - execute than the sub-select style. One objection to the join style - is that there is no explicit list of what tables are being used, - which makes the style somewhat error-prone; also it cannot handle - self-joins. + execute than the sub-select style. + </para> + + <para> + If <varname>add_missing_from</varname> is enabled, any relations + mentioned in the <literal>WHERE</literal> condition will be + implicitly added to the <literal>USING</literal> clause. </para> </refsect1> @@ -149,9 +178,10 @@ DELETE FROM films; <title>Compatibility</title> <para> - This command conforms to the SQL standard, except that the ability to - reference other tables in the <literal>WHERE</> clause is a - <productname>PostgreSQL</productname> extension. + This command conforms to the SQL standard, except that the + <literal>USING</> clause and the ability to reference other tables + in the <literal>WHERE</> clause are <productname>PostgreSQL</> + extensions. </para> </refsect1> </refentry> diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index e314959e373..0e480f5e086 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.300 2005/04/06 16:34:05 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.301 2005/04/07 01:51:38 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -1563,6 +1563,7 @@ _copyDeleteStmt(DeleteStmt *from) COPY_NODE_FIELD(relation); COPY_NODE_FIELD(whereClause); + COPY_NODE_FIELD(usingClause); return newnode; } diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 958e320b47d..fb599097005 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -18,7 +18,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.239 2005/04/06 16:34:05 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.240 2005/04/07 01:51:38 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -675,6 +675,7 @@ _equalDeleteStmt(DeleteStmt *a, DeleteStmt *b) { COMPARE_NODE_FIELD(relation); COMPARE_NODE_FIELD(whereClause); + COMPARE_NODE_FIELD(usingClause); return true; } 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), diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 2f8e86e4b06..a6e5699357c 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.190 2005/04/06 16:34:06 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.191 2005/04/07 01:51:39 neilc Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -199,7 +199,8 @@ static void get_func_expr(FuncExpr *expr, deparse_context *context, static void get_agg_expr(Aggref *aggref, deparse_context *context); static void get_const_expr(Const *constval, deparse_context *context); static void get_sublink_expr(SubLink *sublink, deparse_context *context); -static void get_from_clause(Query *query, deparse_context *context); +static void get_from_clause(Query *query, const char *prefix, + deparse_context *context); static void get_from_clause_item(Node *jtnode, Query *query, deparse_context *context); static void get_from_clause_alias(Alias *alias, int varno, @@ -2020,7 +2021,7 @@ get_basic_select_query(Query *query, deparse_context *context, } /* Add the FROM clause if needed */ - get_from_clause(query, context); + get_from_clause(query, " FROM ", context); /* Add the WHERE clause if given */ if (query->jointree->quals != NULL) @@ -2325,7 +2326,7 @@ get_update_query_def(Query *query, deparse_context *context) } /* Add the FROM clause if needed */ - get_from_clause(query, context); + get_from_clause(query, " FROM ", context); /* Finally add a WHERE clause if given */ if (query->jointree->quals != NULL) @@ -2361,6 +2362,9 @@ get_delete_query_def(Query *query, deparse_context *context) only_marker(rte), generate_relation_name(rte->relid)); + /* Add the USING clause if given */ + get_from_clause(query, " USING ", context); + /* Add a WHERE clause if given */ if (query->jointree->quals != NULL) { @@ -3805,10 +3809,14 @@ get_sublink_expr(SubLink *sublink, deparse_context *context) /* ---------- * get_from_clause - Parse back a FROM clause + * + * "prefix" is the keyword that denotes the start of the list of FROM + * elements. It is FROM when used to parse back SELECT and UPDATE, but + * is USING when parsing back DELETE. * ---------- */ static void -get_from_clause(Query *query, deparse_context *context) +get_from_clause(Query *query, const char *prefix, deparse_context *context) { StringInfo buf = context->buf; bool first = true; @@ -3840,7 +3848,7 @@ get_from_clause(Query *query, deparse_context *context) if (first) { - appendContextKeyword(context, " FROM ", + appendContextKeyword(context, prefix, -PRETTYINDENT_STD, PRETTYINDENT_STD, 2); first = false; } diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index aa7c686fb6b..f8645f030c2 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2005, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.123 2005/04/04 07:19:44 neilc Exp $ + * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.124 2005/04/07 01:51:39 neilc Exp $ */ /*---------------------------------------------------------------------- @@ -1164,10 +1164,16 @@ psql_completion(char *text, int start, int end) else if (pg_strcasecmp(prev2_wd, "DELETE") == 0 && pg_strcasecmp(prev_wd, "FROM") == 0) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, NULL); - /* Complete DELETE FROM <table> with "WHERE" (perhaps a safe idea?) */ + /* Complete DELETE FROM <table> */ else if (pg_strcasecmp(prev3_wd, "DELETE") == 0 && pg_strcasecmp(prev2_wd, "FROM") == 0) - COMPLETE_WITH_CONST("WHERE"); + { + static const char *const list_DELETE[] = + {"USING", "WHERE", "SET", NULL}; + + COMPLETE_WITH_LIST(list_DELETE); + } + /* XXX: implement tab completion for DELETE ... USING */ /* EXPLAIN */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 85016f35112..e8a44c34b2f 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.276 2005/04/06 16:34:07 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.277 2005/04/07 01:51:40 neilc Exp $ * *------------------------------------------------------------------------- */ @@ -613,6 +613,7 @@ typedef struct DeleteStmt NodeTag type; RangeVar *relation; /* relation to delete from */ Node *whereClause; /* qualifications */ + List *usingClause; /* optional using clause for more tables */ } DeleteStmt; /* ---------------------- diff --git a/src/test/regress/expected/abstime.out b/src/test/regress/expected/abstime.out index 358902f28f0..309fb1d6710 100644 --- a/src/test/regress/expected/abstime.out +++ b/src/test/regress/expected/abstime.out @@ -37,7 +37,7 @@ INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format'); ERROR: invalid input syntax for type abstime: "bad date format" INSERT INTO ABSTIME_TBL (f1) VALUES ('Jun 10, 1843'); -- test abstime operators -SELECT '' AS eight, ABSTIME_TBL.*; +SELECT '' AS eight, * FROM ABSTIME_TBL; eight | f1 -------+------------------------------ | Sun Jan 14 03:14:21 1973 PST @@ -49,7 +49,7 @@ SELECT '' AS eight, ABSTIME_TBL.*; | invalid (7 rows) -SELECT '' AS six, ABSTIME_TBL.* +SELECT '' AS six, * FROM ABSTIME_TBL WHERE ABSTIME_TBL.f1 < abstime 'Jun 30, 2001'; six | f1 -----+------------------------------ @@ -60,7 +60,7 @@ SELECT '' AS six, ABSTIME_TBL.* | Sat May 10 23:59:12 1947 PST (5 rows) -SELECT '' AS six, ABSTIME_TBL.* +SELECT '' AS six, * FROM ABSTIME_TBL WHERE ABSTIME_TBL.f1 > abstime '-infinity'; six | f1 -----+------------------------------ @@ -72,7 +72,7 @@ SELECT '' AS six, ABSTIME_TBL.* | invalid (6 rows) -SELECT '' AS six, ABSTIME_TBL.* +SELECT '' AS six, * FROM ABSTIME_TBL WHERE abstime 'May 10, 1947 23:59:12' <> ABSTIME_TBL.f1; six | f1 -----+------------------------------ @@ -84,7 +84,7 @@ SELECT '' AS six, ABSTIME_TBL.* | invalid (6 rows) -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE abstime 'epoch' >= ABSTIME_TBL.f1; three | f1 -------+------------------------------ @@ -93,7 +93,7 @@ SELECT '' AS three, ABSTIME_TBL.* | Sat May 10 23:59:12 1947 PST (3 rows) -SELECT '' AS four, ABSTIME_TBL.* +SELECT '' AS four, * FROM ABSTIME_TBL WHERE ABSTIME_TBL.f1 <= abstime 'Jan 14, 1973 03:14:21'; four | f1 ------+------------------------------ @@ -103,7 +103,7 @@ SELECT '' AS four, ABSTIME_TBL.* | Sat May 10 23:59:12 1947 PST (4 rows) -SELECT '' AS four, ABSTIME_TBL.* +SELECT '' AS four, * FROM ABSTIME_TBL WHERE ABSTIME_TBL.f1 <?> tinterval '["Apr 1 1950 00:00:00" "Dec 30 1999 23:00:00"]'; four | f1 diff --git a/src/test/regress/expected/boolean.out b/src/test/regress/expected/boolean.out index 06f2fac16b5..93e475b673f 100644 --- a/src/test/regress/expected/boolean.out +++ b/src/test/regress/expected/boolean.out @@ -59,7 +59,7 @@ INSERT INTO BOOLTBL1 (f1) VALUES (bool 't'); INSERT INTO BOOLTBL1 (f1) VALUES (bool 'True'); INSERT INTO BOOLTBL1 (f1) VALUES (bool 'true'); -- BOOLTBL1 should be full of true's at this point -SELECT '' AS t_3, BOOLTBL1.*; +SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1; t_3 | f1 -----+---- | t @@ -114,7 +114,7 @@ INSERT INTO BOOLTBL2 (f1) VALUES (bool 'XXX'); ERROR: invalid input syntax for type boolean: "XXX" -- BOOLTBL2 should be full of false's at this point -SELECT '' AS f_4, BOOLTBL2.*; +SELECT '' AS f_4, BOOLTBL2.* FROM BOOLTBL2; f_4 | f1 -----+---- | f @@ -124,6 +124,7 @@ SELECT '' AS f_4, BOOLTBL2.*; (4 rows) SELECT '' AS tf_12, BOOLTBL1.*, BOOLTBL2.* + FROM BOOLTBL1, BOOLTBL2 WHERE BOOLTBL2.f1 <> BOOLTBL1.f1; tf_12 | f1 | f1 -------+----+---- @@ -142,6 +143,7 @@ SELECT '' AS tf_12, BOOLTBL1.*, BOOLTBL2.* (12 rows) SELECT '' AS tf_12, BOOLTBL1.*, BOOLTBL2.* + FROM BOOLTBL1, BOOLTBL2 WHERE boolne(BOOLTBL2.f1,BOOLTBL1.f1); tf_12 | f1 | f1 -------+----+---- @@ -160,6 +162,7 @@ SELECT '' AS tf_12, BOOLTBL1.*, BOOLTBL2.* (12 rows) SELECT '' AS ff_4, BOOLTBL1.*, BOOLTBL2.* + FROM BOOLTBL1, BOOLTBL2 WHERE BOOLTBL2.f1 = BOOLTBL1.f1 and BOOLTBL1.f1 = bool 'false'; ff_4 | f1 | f1 ------+----+---- @@ -170,6 +173,7 @@ SELECT '' AS ff_4, BOOLTBL1.*, BOOLTBL2.* (4 rows) SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.* + FROM BOOLTBL1, BOOLTBL2 WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = bool 'true' ORDER BY BOOLTBL1.f1, BOOLTBL2.f1; tf_12_ff_4 | f1 | f1 diff --git a/src/test/regress/expected/box.out b/src/test/regress/expected/box.out index edde87f315d..02b07dfe617 100644 --- a/src/test/regress/expected/box.out +++ b/src/test/regress/expected/box.out @@ -27,7 +27,7 @@ INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)'); ERROR: invalid input syntax for type box: "(2.3, 4.5)" INSERT INTO BOX_TBL (f1) VALUES ('asdfasdf(ad'); ERROR: invalid input syntax for type box: "asdfasdf(ad" -SELECT '' AS four, BOX_TBL.*; +SELECT '' AS four, * FROM BOX_TBL; four | f1 ------+--------------------- | (2,2),(0,0) diff --git a/src/test/regress/expected/char.out b/src/test/regress/expected/char.out index 0c46e079762..a0ba3d4a8c0 100644 --- a/src/test/regress/expected/char.out +++ b/src/test/regress/expected/char.out @@ -25,7 +25,7 @@ INSERT INTO CHAR_TBL (f1) VALUES (''); INSERT INTO CHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character(1) INSERT INTO CHAR_TBL (f1) VALUES ('c '); -SELECT '' AS seven, CHAR_TBL.*; +SELECT '' AS seven, * FROM CHAR_TBL; seven | f1 -------+---- | a @@ -111,7 +111,7 @@ INSERT INTO CHAR_TBL (f1) VALUES ('abcd'); INSERT INTO CHAR_TBL (f1) VALUES ('abcde'); ERROR: value too long for type character(4) INSERT INTO CHAR_TBL (f1) VALUES ('abcd '); -SELECT '' AS four, CHAR_TBL.*; +SELECT '' AS four, * FROM CHAR_TBL; four | f1 ------+------ | a diff --git a/src/test/regress/expected/char_1.out b/src/test/regress/expected/char_1.out index 0d5be3097d0..4cc081deae7 100644 --- a/src/test/regress/expected/char_1.out +++ b/src/test/regress/expected/char_1.out @@ -25,7 +25,7 @@ INSERT INTO CHAR_TBL (f1) VALUES (''); INSERT INTO CHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character(1) INSERT INTO CHAR_TBL (f1) VALUES ('c '); -SELECT '' AS seven, CHAR_TBL.*; +SELECT '' AS seven, * FROM CHAR_TBL; seven | f1 -------+---- | a @@ -111,7 +111,7 @@ INSERT INTO CHAR_TBL (f1) VALUES ('abcd'); INSERT INTO CHAR_TBL (f1) VALUES ('abcde'); ERROR: value too long for type character(4) INSERT INTO CHAR_TBL (f1) VALUES ('abcd '); -SELECT '' AS four, CHAR_TBL.*; +SELECT '' AS four, * FROM CHAR_TBL; four | f1 ------+------ | a diff --git a/src/test/regress/expected/create_misc.out b/src/test/regress/expected/create_misc.out index 2189e300496..775d1bd1a77 100644 --- a/src/test/regress/expected/create_misc.out +++ b/src/test/regress/expected/create_misc.out @@ -4,9 +4,9 @@ -- CLASS POPULATION -- (any resemblance to real life is purely coincidental) -- -INSERT INTO tenk2 VALUES (tenk1.*); +INSERT INTO tenk2 SELECT * FROM tenk1; SELECT * INTO TABLE onek2 FROM onek; -INSERT INTO fast_emp4000 VALUES (slow_emp4000.*); +INSERT INTO fast_emp4000 SELECT * FROM slow_emp4000; SELECT * INTO TABLE Bprime FROM tenk1 diff --git a/src/test/regress/expected/create_view.out b/src/test/regress/expected/create_view.out index b6be7450638..79eed2b7a6e 100644 --- a/src/test/regress/expected/create_view.out +++ b/src/test/regress/expected/create_view.out @@ -126,8 +126,8 @@ NOTICE: view "v12_temp" will be a temporary view -- a view should also be temporary if it references a temporary sequence CREATE SEQUENCE seq1; CREATE TEMPORARY SEQUENCE seq1_temp; -CREATE VIEW v9 AS SELECT seq1.is_called; -CREATE VIEW v13_temp AS SELECT seq1_temp.is_called; +CREATE VIEW v9 AS SELECT seq1.is_called FROM seq1; +CREATE VIEW v13_temp AS SELECT seq1_temp.is_called FROM seq1_temp; NOTICE: view "v13_temp" will be a temporary view SELECT relname FROM pg_class WHERE relname LIKE 'v_' diff --git a/src/test/regress/expected/float4-exp-three-digits.out b/src/test/regress/expected/float4-exp-three-digits.out index 8e0d643d255..a696a6d1c51 100644 --- a/src/test/regress/expected/float4-exp-three-digits.out +++ b/src/test/regress/expected/float4-exp-three-digits.out @@ -2,9 +2,9 @@ -- FLOAT4 -- CREATE TABLE FLOAT4_TBL (f1 float4); -INSERT INTO FLOAT4_TBL(f1) VALUES ('0.0'); -INSERT INTO FLOAT4_TBL(f1) VALUES ('1004.30'); -INSERT INTO FLOAT4_TBL(f1) VALUES ('-34.84'); +INSERT INTO FLOAT4_TBL(f1) VALUES (' 0.0'); +INSERT INTO FLOAT4_TBL(f1) VALUES ('1004.30 '); +INSERT INTO FLOAT4_TBL(f1) VALUES (' -34.84 '); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e+20'); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20'); -- test for over and under flow @@ -85,7 +85,7 @@ SELECT 'nan'::float4 / 'nan'::float4; NaN (1 row) -SELECT '' AS five, FLOAT4_TBL.*; +SELECT '' AS five, * FROM FLOAT4_TBL; five | f1 ------+-------------- | 0 @@ -183,7 +183,7 @@ SELECT '' AS three, f.f1, f.f1 - '-10' AS x FROM FLOAT4_TBL f -- test divide by zero SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f; ERROR: division by zero -SELECT '' AS five, FLOAT4_TBL.*; +SELECT '' AS five, * FROM FLOAT4_TBL; five | f1 ------+-------------- | 0 @@ -207,7 +207,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; UPDATE FLOAT4_TBL SET f1 = FLOAT4_TBL.f1 * '-1' WHERE FLOAT4_TBL.f1 > '0.0'; -SELECT '' AS five, FLOAT4_TBL.*; +SELECT '' AS five, * FROM FLOAT4_TBL; five | f1 ------+--------------- | 0 diff --git a/src/test/regress/expected/float4.out b/src/test/regress/expected/float4.out index 8ababaad6e7..b94816eaebd 100644 --- a/src/test/regress/expected/float4.out +++ b/src/test/regress/expected/float4.out @@ -85,7 +85,7 @@ SELECT 'nan'::float4 / 'nan'::float4; NaN (1 row) -SELECT '' AS five, FLOAT4_TBL.*; +SELECT '' AS five, * FROM FLOAT4_TBL; five | f1 ------+------------- | 0 @@ -183,7 +183,7 @@ SELECT '' AS three, f.f1, f.f1 - '-10' AS x FROM FLOAT4_TBL f -- test divide by zero SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f; ERROR: division by zero -SELECT '' AS five, FLOAT4_TBL.*; +SELECT '' AS five, * FROM FLOAT4_TBL; five | f1 ------+------------- | 0 @@ -207,7 +207,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; UPDATE FLOAT4_TBL SET f1 = FLOAT4_TBL.f1 * '-1' WHERE FLOAT4_TBL.f1 > '0.0'; -SELECT '' AS five, FLOAT4_TBL.*; +SELECT '' AS five, * FROM FLOAT4_TBL; five | f1 ------+-------------- | 0 diff --git a/src/test/regress/expected/float8-exp-three-digits-win32.out b/src/test/regress/expected/float8-exp-three-digits-win32.out index a7f15c5bbde..63d5e33c936 100644 --- a/src/test/regress/expected/float8-exp-three-digits-win32.out +++ b/src/test/regress/expected/float8-exp-three-digits-win32.out @@ -2,9 +2,9 @@ -- FLOAT8 -- CREATE TABLE FLOAT8_TBL(f1 float8); -INSERT INTO FLOAT8_TBL(f1) VALUES ('0.0'); -INSERT INTO FLOAT8_TBL(f1) VALUES ('1004.30'); -INSERT INTO FLOAT8_TBL(f1) VALUES ('-34.84'); +INSERT INTO FLOAT8_TBL(f1) VALUES (' 0.0 '); +INSERT INTO FLOAT8_TBL(f1) VALUES ('1004.30 '); +INSERT INTO FLOAT8_TBL(f1) VALUES (' -34.84'); INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e+200'); INSERT INTO FLOAT8_TBL(f1) VALUES ('1.2345678901234e-200'); -- test for underflow and overflow handling @@ -85,7 +85,7 @@ SELECT 'nan'::float8 / 'nan'::float8; NaN (1 row) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -328,7 +328,7 @@ SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; | 1.2345678901234e-200 | 2.3112042409018e-067 (5 rows) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -353,7 +353,7 @@ SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f; ERROR: result is out of range SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; ERROR: division by zero -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 @@ -380,7 +380,7 @@ INSERT INTO FLOAT8_TBL(f1) VALUES ('-34.84'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1004.30'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e+200'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e-200'); -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 diff --git a/src/test/regress/expected/float8-exp-three-digits.out b/src/test/regress/expected/float8-exp-three-digits.out index c466ce6402d..7f345c4b37e 100644 --- a/src/test/regress/expected/float8-exp-three-digits.out +++ b/src/test/regress/expected/float8-exp-three-digits.out @@ -84,7 +84,7 @@ SELECT 'nan'::float8 / 'nan'::float8; NaN (1 row) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -327,7 +327,7 @@ SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; | 1.2345678901234e-200 | 2.3112042409018e-067 (5 rows) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -352,7 +352,7 @@ SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f; ERROR: result is out of range SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; ERROR: division by zero -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 @@ -379,7 +379,7 @@ INSERT INTO FLOAT8_TBL(f1) VALUES ('-34.84'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1004.30'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e+200'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e-200'); -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 diff --git a/src/test/regress/expected/float8-small-is-zero.out b/src/test/regress/expected/float8-small-is-zero.out index afa892ae243..a22ca55e228 100644 --- a/src/test/regress/expected/float8-small-is-zero.out +++ b/src/test/regress/expected/float8-small-is-zero.out @@ -93,7 +93,7 @@ SELECT 'nan'::float8 / 'nan'::float8; NaN (1 row) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -336,7 +336,7 @@ SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; | 1.2345678901234e-200 | 2.3112042409018e-67 (5 rows) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -361,7 +361,7 @@ SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f; ERROR: result is out of range SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; ERROR: division by zero -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 @@ -386,7 +386,7 @@ INSERT INTO FLOAT8_TBL(f1) VALUES ('-34.84'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1004.30'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e+200'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e-200'); -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 diff --git a/src/test/regress/expected/float8-small-is-zero_1.out b/src/test/regress/expected/float8-small-is-zero_1.out index a6b1ae2c04c..dbb0b1a69d5 100644 --- a/src/test/regress/expected/float8-small-is-zero_1.out +++ b/src/test/regress/expected/float8-small-is-zero_1.out @@ -93,7 +93,7 @@ SELECT 'nan'::float8 / 'nan'::float8; NaN (1 row) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -336,7 +336,7 @@ SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; | 1.2345678901234e-200 | 2.3112042409018e-67 (5 rows) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -361,7 +361,7 @@ SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f; ERROR: result is out of range SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; ERROR: division by zero -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 @@ -386,7 +386,7 @@ INSERT INTO FLOAT8_TBL(f1) VALUES ('-34.84'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1004.30'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e+200'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e-200'); -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 diff --git a/src/test/regress/expected/float8.out b/src/test/regress/expected/float8.out index 579f80abfeb..fbf8c721768 100644 --- a/src/test/regress/expected/float8.out +++ b/src/test/regress/expected/float8.out @@ -85,7 +85,7 @@ SELECT 'nan'::float8 / 'nan'::float8; NaN (1 row) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -328,7 +328,7 @@ SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; | 1.2345678901234e-200 | 2.3112042409018e-67 (5 rows) -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+---------------------- | 0 @@ -353,7 +353,7 @@ SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f; ERROR: result is out of range SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; ERROR: division by zero -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 @@ -380,7 +380,7 @@ INSERT INTO FLOAT8_TBL(f1) VALUES ('-34.84'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1004.30'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e+200'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e-200'); -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; five | f1 ------+----------------------- | 0 diff --git a/src/test/regress/expected/hash_index.out b/src/test/regress/expected/hash_index.out index db687e5a242..432c932480e 100644 --- a/src/test/regress/expected/hash_index.out +++ b/src/test/regress/expected/hash_index.out @@ -2,7 +2,7 @@ -- HASH_INDEX -- grep 843938989 hash.data -- -SELECT hash_i4_heap.* +SELECT * FROM hash_i4_heap WHERE hash_i4_heap.random = 843938989; seqno | random -------+----------- @@ -13,7 +13,7 @@ SELECT hash_i4_heap.* -- hash index -- grep 66766766 hash.data -- -SELECT hash_i4_heap.* +SELECT * FROM hash_i4_heap WHERE hash_i4_heap.random = 66766766; seqno | random -------+-------- @@ -23,7 +23,7 @@ SELECT hash_i4_heap.* -- hash index -- grep 1505703298 hash.data -- -SELECT hash_name_heap.* +SELECT * FROM hash_name_heap WHERE hash_name_heap.random = '1505703298'::name; seqno | random -------+------------ @@ -34,7 +34,7 @@ SELECT hash_name_heap.* -- hash index -- grep 7777777 hash.data -- -SELECT hash_name_heap.* +SELECT * FROM hash_name_heap WHERE hash_name_heap.random = '7777777'::name; seqno | random -------+-------- @@ -44,7 +44,7 @@ SELECT hash_name_heap.* -- hash index -- grep 1351610853 hash.data -- -SELECT hash_txt_heap.* +SELECT * FROM hash_txt_heap WHERE hash_txt_heap.random = '1351610853'::text; seqno | random -------+------------ @@ -55,7 +55,7 @@ SELECT hash_txt_heap.* -- hash index -- grep 111111112222222233333333 hash.data -- -SELECT hash_txt_heap.* +SELECT * FROM hash_txt_heap WHERE hash_txt_heap.random = '111111112222222233333333'::text; seqno | random -------+-------- @@ -65,7 +65,7 @@ SELECT hash_txt_heap.* -- hash index -- grep 444705537 hash.data -- -SELECT hash_f8_heap.* +SELECT * FROM hash_f8_heap WHERE hash_f8_heap.random = '444705537'::float8; seqno | random -------+----------- @@ -76,7 +76,7 @@ SELECT hash_f8_heap.* -- hash index -- grep 88888888 hash.data -- -SELECT hash_f8_heap.* +SELECT * FROM hash_f8_heap WHERE hash_f8_heap.random = '88888888'::float8; seqno | random -------+-------- diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out index d35241dab93..ca8bc3d0e5c 100644 --- a/src/test/regress/expected/horology.out +++ b/src/test/regress/expected/horology.out @@ -2213,6 +2213,7 @@ SELECT '' AS "226", d1.f1 AS timestamp1, d2.f1 AS timestamp2, d1.f1 - d2.f1 AS d -- abstime, reltime arithmetic -- SELECT '' AS ten, ABSTIME_TBL.f1 AS abstime, RELTIME_TBL.f1 AS reltime + FROM ABSTIME_TBL, RELTIME_TBL WHERE (ABSTIME_TBL.f1 + RELTIME_TBL.f1) < abstime 'Jan 14 14:00:00 1971' ORDER BY abstime, reltime; ten | abstime | reltime @@ -2232,7 +2233,7 @@ SELECT '' AS ten, ABSTIME_TBL.f1 AS abstime, RELTIME_TBL.f1 AS reltime -- these four queries should return the same answer -- the "infinity" and "-infinity" tuples in ABSTIME_TBL cannot be added and -- therefore, should not show up in the results. -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE (ABSTIME_TBL.f1 + reltime '@ 3 year') -- +3 years < abstime 'Jan 14 14:00:00 1977'; three | f1 @@ -2242,7 +2243,7 @@ SELECT '' AS three, ABSTIME_TBL.* | Sat May 10 23:59:12 1947 PST (3 rows) -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE (ABSTIME_TBL.f1 + reltime '@ 3 year ago') -- -3 years < abstime 'Jan 14 14:00:00 1971'; three | f1 @@ -2252,7 +2253,7 @@ SELECT '' AS three, ABSTIME_TBL.* | Sat May 10 23:59:12 1947 PST (3 rows) -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE (ABSTIME_TBL.f1 - reltime '@ 3 year') -- -(+3) years < abstime 'Jan 14 14:00:00 1971'; three | f1 @@ -2262,7 +2263,7 @@ SELECT '' AS three, ABSTIME_TBL.* | Sat May 10 23:59:12 1947 PST (3 rows) -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE (ABSTIME_TBL.f1 - reltime '@ 3 year ago') -- -(-3) years < abstime 'Jan 14 14:00:00 1977'; three | f1 diff --git a/src/test/regress/expected/int2.out b/src/test/regress/expected/int2.out index f72aeb278ae..e34e85bc971 100644 --- a/src/test/regress/expected/int2.out +++ b/src/test/regress/expected/int2.out @@ -27,7 +27,7 @@ INSERT INTO INT2_TBL(f1) VALUES ('123 dt'); ERROR: invalid input syntax for integer: "123 dt" INSERT INTO INT2_TBL(f1) VALUES (''); ERROR: invalid input syntax for integer: "" -SELECT '' AS five, INT2_TBL.*; +SELECT '' AS five, * FROM INT2_TBL; five | f1 ------+-------- | 0 diff --git a/src/test/regress/expected/int4.out b/src/test/regress/expected/int4.out index 0e6049f29a8..3e0eff13a31 100644 --- a/src/test/regress/expected/int4.out +++ b/src/test/regress/expected/int4.out @@ -27,7 +27,7 @@ INSERT INTO INT4_TBL(f1) VALUES ('123 5'); ERROR: invalid input syntax for integer: "123 5" INSERT INTO INT4_TBL(f1) VALUES (''); ERROR: invalid input syntax for integer: "" -SELECT '' AS five, INT4_TBL.*; +SELECT '' AS five, * FROM INT4_TBL; five | f1 ------+------------- | 0 diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out index 8ba178c8bf3..ab89b2232d5 100644 --- a/src/test/regress/expected/interval.out +++ b/src/test/regress/expected/interval.out @@ -62,7 +62,7 @@ ERROR: invalid input syntax for type interval: "badly formatted interval" INSERT INTO INTERVAL_TBL (f1) VALUES ('@ 30 eons ago'); ERROR: invalid input syntax for type interval: "@ 30 eons ago" -- test interval operators -SELECT '' AS ten, INTERVAL_TBL.*; +SELECT '' AS ten, * FROM INTERVAL_TBL; ten | f1 -----+----------------- | 00:01:00 @@ -77,7 +77,7 @@ SELECT '' AS ten, INTERVAL_TBL.*; | 5 mons 12:00:00 (10 rows) -SELECT '' AS nine, INTERVAL_TBL.* +SELECT '' AS nine, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 <> interval '@ 10 days'; nine | f1 ------+----------------- @@ -92,7 +92,7 @@ SELECT '' AS nine, INTERVAL_TBL.* | 5 mons 12:00:00 (9 rows) -SELECT '' AS three, INTERVAL_TBL.* +SELECT '' AS three, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 <= interval '@ 5 hours'; three | f1 -------+----------- @@ -101,7 +101,7 @@ SELECT '' AS three, INTERVAL_TBL.* | -00:00:14 (3 rows) -SELECT '' AS three, INTERVAL_TBL.* +SELECT '' AS three, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 < interval '@ 1 day'; three | f1 -------+----------- @@ -110,14 +110,14 @@ SELECT '' AS three, INTERVAL_TBL.* | -00:00:14 (3 rows) -SELECT '' AS one, INTERVAL_TBL.* +SELECT '' AS one, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 = interval '@ 34 years'; one | f1 -----+---------- | 34 years (1 row) -SELECT '' AS five, INTERVAL_TBL.* +SELECT '' AS five, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 >= interval '@ 1 month'; five | f1 ------+----------------- @@ -128,7 +128,7 @@ SELECT '' AS five, INTERVAL_TBL.* | 5 mons 12:00:00 (5 rows) -SELECT '' AS nine, INTERVAL_TBL.* +SELECT '' AS nine, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 > interval '@ 3 seconds ago'; nine | f1 ------+----------------- @@ -197,7 +197,7 @@ SELECT '' AS fortyfive, r1.*, r2.* (45 rows) SET DATESTYLE = 'postgres'; -SELECT '' AS ten, INTERVAL_TBL.*; +SELECT '' AS ten, * FROM INTERVAL_TBL; ten | f1 -----+------------------------------- | @ 1 min diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out index 83f6939945c..c01136970c3 100644 --- a/src/test/regress/expected/join.out +++ b/src/test/regress/expected/join.out @@ -2147,3 +2147,40 @@ DROP TABLE t2; DROP TABLE t3; DROP TABLE J1_TBL; DROP TABLE J2_TBL; +-- Both DELETE and UPDATE allow the specification of additional tables +-- to "join" against to determine which rows should be modified. +CREATE TEMP TABLE t1 (a int, b int); +CREATE TEMP TABLE t2 (a int, b int); +CREATE TEMP TABLE t3 (x int, y int); +INSERT INTO t1 VALUES (5, 10); +INSERT INTO t1 VALUES (15, 20); +INSERT INTO t1 VALUES (100, 100); +INSERT INTO t1 VALUES (200, 1000); +INSERT INTO t2 VALUES (200, 2000); +INSERT INTO t3 VALUES (5, 20); +INSERT INTO t3 VALUES (6, 7); +INSERT INTO t3 VALUES (7, 8); +INSERT INTO t3 VALUES (500, 100); +DELETE FROM t3 USING t1 table1 WHERE t3.x = table1.a; +SELECT * FROM t3; + x | y +-----+----- + 6 | 7 + 7 | 8 + 500 | 100 +(3 rows) + +DELETE FROM t3 USING t1 JOIN t2 USING (a) WHERE t3.x > t1.a; +SELECT * FROM t3; + x | y +---+--- + 6 | 7 + 7 | 8 +(2 rows) + +DELETE FROM t3 USING t3 t3_other WHERE t3.x = t3_other.x AND t3.y = t3_other.y; +SELECT * FROM t3; + x | y +---+--- +(0 rows) + diff --git a/src/test/regress/expected/join_1.out b/src/test/regress/expected/join_1.out index e8c8f44d048..c3bfb04fb47 100644 --- a/src/test/regress/expected/join_1.out +++ b/src/test/regress/expected/join_1.out @@ -2147,3 +2147,39 @@ DROP TABLE t2; DROP TABLE t3; DROP TABLE J1_TBL; DROP TABLE J2_TBL; +-- Both DELETE and UPDATE allow the specification of additional tables +-- to "join" against to determine which rows should be modified. +CREATE TEMP TABLE t1 (a int, b int); +CREATE TEMP TABLE t2 (a int, b int); +CREATE TEMP TABLE t3 (x int, y int); +INSERT INTO t1 VALUES (5, 10); +INSERT INTO t1 VALUES (15, 20); +INSERT INTO t1 VALUES (100, 100); +INSERT INTO t1 VALUES (200, 1000); +INSERT INTO t2 VALUES (200, 2000); +INSERT INTO t3 VALUES (5, 20); +INSERT INTO t3 VALUES (6, 7); +INSERT INTO t3 VALUES (7, 8); +INSERT INTO t3 VALUES (500, 100); +DELETE FROM t3 USING t1 table1 WHERE t3.x = table1.a; +SELECT * FROM t3; + x | y +-----+----- + 6 | 7 + 7 | 8 + 500 | 100 +(3 rows) + +DELETE FROM t3 USING t1 JOIN t2 USING (a) WHERE t3.x > t1.a; +SELECT * FROM t3; + x | y +---+--- + 6 | 7 + 7 | 8 +(2 rows) + +DELETE FROM t3 USING t3 t3_other WHERE t3.x = t3_other.x AND t3.y = t3_other.y; +SELECT * FROM t3; + x | y +---+--- +(0 rows) diff --git a/src/test/regress/expected/name.out b/src/test/regress/expected/name.out index f6c3a17fe51..b359d528225 100644 --- a/src/test/regress/expected/name.out +++ b/src/test/regress/expected/name.out @@ -26,7 +26,7 @@ INSERT INTO NAME_TBL(f1) VALUES ('343f%2a'); INSERT INTO NAME_TBL(f1) VALUES ('d34aaasdf'); INSERT INTO NAME_TBL(f1) VALUES (''); INSERT INTO NAME_TBL(f1) VALUES ('1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ'); -SELECT '' AS seven, NAME_TBL.*; +SELECT '' AS seven, * FROM NAME_TBL; seven | f1 -------+----------------------------------------------------------------- | 1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890ABCDEFGHIJKLMNOPQ diff --git a/src/test/regress/expected/oid.out b/src/test/regress/expected/oid.out index 22976218069..e01db08c202 100644 --- a/src/test/regress/expected/oid.out +++ b/src/test/regress/expected/oid.out @@ -32,7 +32,7 @@ INSERT INTO OID_TBL(f1) VALUES ('32958209582039852935'); ERROR: value "32958209582039852935" is out of range for type oid INSERT INTO OID_TBL(f1) VALUES ('-23582358720398502385'); ERROR: value "-23582358720398502385" is out of range for type oid -SELECT '' AS six, OID_TBL.*; +SELECT '' AS six, * FROM OID_TBL; six | f1 -----+------------ | 1234 diff --git a/src/test/regress/expected/point.out b/src/test/regress/expected/point.out index 1ad75abdb2e..b77a42b3243 100644 --- a/src/test/regress/expected/point.out +++ b/src/test/regress/expected/point.out @@ -15,7 +15,7 @@ INSERT INTO POINT_TBL(f1) VALUES ('(10.0 10.0)'); ERROR: invalid input syntax for type point: "(10.0 10.0)" INSERT INTO POINT_TBL(f1) VALUES ('(10.0,10.0'); ERROR: invalid input syntax for type point: "(10.0,10.0" -SELECT '' AS six, POINT_TBL.*; +SELECT '' AS six, * FROM POINT_TBL; six | f1 -----+------------ | (0,0) diff --git a/src/test/regress/expected/polygon.out b/src/test/regress/expected/polygon.out index 5ffa39b1bc6..e9032d4dbcd 100644 --- a/src/test/regress/expected/polygon.out +++ b/src/test/regress/expected/polygon.out @@ -30,7 +30,7 @@ INSERT INTO POLYGON_TBL(f1) VALUES ('(0,1,2,3'); ERROR: invalid input syntax for type polygon: "(0,1,2,3" INSERT INTO POLYGON_TBL(f1) VALUES ('asdf'); ERROR: invalid input syntax for type polygon: "asdf" -SELECT '' AS four, POLYGON_TBL.*; +SELECT '' AS four, * FROM POLYGON_TBL; four | f1 ------+--------------------- | ((2,0),(2,4),(0,0)) diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out index c5b6ffbc287..8ac111b5e18 100644 --- a/src/test/regress/expected/privileges.out +++ b/src/test/regress/expected/privileges.out @@ -128,7 +128,7 @@ ERROR: permission denied for relation atest1 UPDATE atest2 SET col2 = NULL; -- ok UPDATE atest2 SET col2 = NOT col2; -- fails; requires SELECT on atest2 ERROR: permission denied for relation atest2 -UPDATE atest2 SET col2 = true WHERE atest1.a = 5; -- ok +UPDATE atest2 SET col2 = true FROM atest1 WHERE atest1.a = 5; -- ok SELECT * FROM atest1 FOR UPDATE; -- fail ERROR: permission denied for relation atest1 SELECT * FROM atest2 FOR UPDATE; -- fail diff --git a/src/test/regress/expected/reltime.out b/src/test/regress/expected/reltime.out index 50f2dba1382..8f4faef1248 100644 --- a/src/test/regress/expected/reltime.out +++ b/src/test/regress/expected/reltime.out @@ -14,7 +14,7 @@ ERROR: invalid input syntax for type reltime: "badly formatted reltime" INSERT INTO RELTIME_TBL (f1) VALUES ('@ 30 eons ago'); ERROR: invalid input syntax for type reltime: "@ 30 eons ago" -- test reltime operators -SELECT '' AS six, RELTIME_TBL.*; +SELECT '' AS six, * FROM RELTIME_TBL; six | f1 -----+--------------- | @ 1 min @@ -25,7 +25,7 @@ SELECT '' AS six, RELTIME_TBL.*; | @ 14 secs ago (6 rows) -SELECT '' AS five, RELTIME_TBL.* +SELECT '' AS five, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 <> reltime '@ 10 days'; five | f1 ------+--------------- @@ -36,7 +36,7 @@ SELECT '' AS five, RELTIME_TBL.* | @ 14 secs ago (5 rows) -SELECT '' AS three, RELTIME_TBL.* +SELECT '' AS three, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 <= reltime '@ 5 hours'; three | f1 -------+--------------- @@ -45,7 +45,7 @@ SELECT '' AS three, RELTIME_TBL.* | @ 14 secs ago (3 rows) -SELECT '' AS three, RELTIME_TBL.* +SELECT '' AS three, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 < reltime '@ 1 day'; three | f1 -------+--------------- @@ -54,14 +54,14 @@ SELECT '' AS three, RELTIME_TBL.* | @ 14 secs ago (3 rows) -SELECT '' AS one, RELTIME_TBL.* +SELECT '' AS one, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 = reltime '@ 34 years'; one | f1 -----+------------ | @ 34 years (1 row) -SELECT '' AS two, RELTIME_TBL.* +SELECT '' AS two, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 >= reltime '@ 1 month'; two | f1 -----+------------ @@ -69,7 +69,7 @@ SELECT '' AS two, RELTIME_TBL.* | @ 3 mons (2 rows) -SELECT '' AS five, RELTIME_TBL.* +SELECT '' AS five, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 > reltime '@ 3 seconds ago'; five | f1 ------+------------ diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index 0d46494596c..5c4c0ef6f2a 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -277,7 +277,9 @@ select * from rtest_v1; (3 rows) delete from rtest_v1; -insert into rtest_v1 select rtest_t2.a, rtest_t3.b where rtest_t2.a = rtest_t3.a; +insert into rtest_v1 select rtest_t2.a, rtest_t3.b + from rtest_t2, rtest_t3 + where rtest_t2.a = rtest_t3.a; select * from rtest_v1; a | b ---+---- @@ -287,7 +289,7 @@ select * from rtest_v1; (3 rows) -- updates in a mergejoin -update rtest_v1 set b = rtest_t2.b where a = rtest_t2.a; +update rtest_v1 set b = rtest_t2.b from rtest_t2 where rtest_v1.a = rtest_t2.a; select * from rtest_v1; a | b ---+---- @@ -324,7 +326,7 @@ select * from rtest_v1; 15 | 35 (8 rows) -update rtest_v1 set a = rtest_t3.a + 20 where b = rtest_t3.b; +update rtest_v1 set a = rtest_t3.a + 20 from rtest_t3 where rtest_v1.b = rtest_t3.b; select * from rtest_v1; a | b ----+---- @@ -435,7 +437,7 @@ select ename, who = current_user as "matches user", action, newsal, oldsal from (8 rows) update rtest_empmass set salary = salary + '1000.00'; -update rtest_emp set salary = rtest_empmass.salary where ename = rtest_empmass.ename; +update rtest_emp set salary = rtest_empmass.salary from rtest_empmass where rtest_emp.ename = rtest_empmass.ename; select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal; ename | matches user | action | newsal | oldsal ----------------------+--------------+------------+------------+------------ @@ -452,7 +454,7 @@ select ename, who = current_user as "matches user", action, newsal, oldsal from wieck | t | honored | $7,000.00 | $6,000.00 (11 rows) -delete from rtest_emp where ename = rtest_empmass.ename; +delete from rtest_emp using rtest_empmass where rtest_emp.ename = rtest_empmass.ename; select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal; ename | matches user | action | newsal | oldsal ----------------------+--------------+------------+------------+------------ diff --git a/src/test/regress/expected/select.out b/src/test/regress/expected/select.out index 7974d141c54..b51aea8fb5c 100644 --- a/src/test/regress/expected/select.out +++ b/src/test/regress/expected/select.out @@ -4,7 +4,8 @@ -- btree index -- awk '{if($1<10){print;}else{next;}}' onek.data | sort +0n -1 -- -SELECT onek.* WHERE onek.unique1 < 10 +SELECT * FROM onek + WHERE onek.unique1 < 10 ORDER BY onek.unique1; unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+--------- @@ -23,7 +24,7 @@ SELECT onek.* WHERE onek.unique1 < 10 -- -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- -SELECT onek.unique1, onek.stringu1 +SELECT onek.unique1, onek.stringu1 FROM onek WHERE onek.unique1 < 20 ORDER BY unique1 using >; unique1 | stringu1 @@ -53,7 +54,7 @@ SELECT onek.unique1, onek.stringu1 -- -- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2 -- -SELECT onek.unique1, onek.stringu1 +SELECT onek.unique1, onek.stringu1 FROM onek WHERE onek.unique1 > 980 ORDER BY stringu1 using <; unique1 | stringu1 @@ -84,7 +85,7 @@ SELECT onek.unique1, onek.stringu1 -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1d -2 +0nr -1 -- -SELECT onek.unique1, onek.string4 +SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 > 980 ORDER BY string4 using <, unique1 using >; unique1 | string4 @@ -115,7 +116,7 @@ SELECT onek.unique1, onek.string4 -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1dr -2 +0n -1 -- -SELECT onek.unique1, onek.string4 +SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 > 980 ORDER BY string4 using >, unique1 using <; unique1 | string4 @@ -146,7 +147,7 @@ SELECT onek.unique1, onek.string4 -- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data | -- sort +0nr -1 +1d -2 -- -SELECT onek.unique1, onek.string4 +SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 < 20 ORDER BY unique1 using >, string4 using <; unique1 | string4 @@ -177,7 +178,7 @@ SELECT onek.unique1, onek.string4 -- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data | -- sort +0n -1 +1dr -2 -- -SELECT onek.unique1, onek.string4 +SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 < 20 ORDER BY unique1 using <, string4 using >; unique1 | string4 @@ -214,7 +215,7 @@ ANALYZE onek2; -- -- awk '{if($1<10){print $0;}else{next;}}' onek.data | sort +0n -1 -- -SELECT onek2.* WHERE onek2.unique1 < 10; +SELECT onek2.* FROM onek2 WHERE onek2.unique1 < 10; unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 ---------+---------+-----+------+-----+--------+---------+----------+-------------+-----------+----------+-----+------+----------+----------+--------- 0 | 998 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | AAAAAA | KMBAAA | OOOOxx @@ -232,7 +233,7 @@ SELECT onek2.* WHERE onek2.unique1 < 10; -- -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- -SELECT onek2.unique1, onek2.stringu1 +SELECT onek2.unique1, onek2.stringu1 FROM onek2 WHERE onek2.unique1 < 20 ORDER BY unique1 using >; unique1 | stringu1 @@ -262,7 +263,7 @@ SELECT onek2.unique1, onek2.stringu1 -- -- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2 -- -SELECT onek2.unique1, onek2.stringu1 +SELECT onek2.unique1, onek2.stringu1 FROM onek2 WHERE onek2.unique1 > 980; unique1 | stringu1 ---------+---------- diff --git a/src/test/regress/expected/tinterval.out b/src/test/regress/expected/tinterval.out index 3cb215a4702..5644cbc4932 100644 --- a/src/test/regress/expected/tinterval.out +++ b/src/test/regress/expected/tinterval.out @@ -22,7 +22,7 @@ INSERT INTO TINTERVAL_TBL (f1) VALUES ('["" "infinity"]'); ERROR: invalid input syntax for type abstime: "" -- test tinterval operators -SELECT '' AS five, TINTERVAL_TBL.*; +SELECT '' AS five, * FROM TINTERVAL_TBL; five | f1 ------+----------------------------------------------------------------- | ["-infinity" "infinity"] diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out index 952875cfdf1..06a8a8f47c5 100644 --- a/src/test/regress/expected/transactions.out +++ b/src/test/regress/expected/transactions.out @@ -54,7 +54,7 @@ SELECT * FROM writetest; -- ok (0 rows) DELETE FROM temptest; -- ok -UPDATE temptest SET a = 0 WHERE a = 1 AND writetest.a = temptest.a; -- ok +UPDATE temptest SET a = 0 FROM writetest WHERE temptest.a = 1 AND writetest.a = temptest.a; -- ok PREPARE test AS UPDATE writetest SET a = 0; -- ok EXECUTE test; -- fail ERROR: transaction is read-only diff --git a/src/test/regress/expected/varchar.out b/src/test/regress/expected/varchar.out index e33782eed74..48a77f5e130 100644 --- a/src/test/regress/expected/varchar.out +++ b/src/test/regress/expected/varchar.out @@ -14,7 +14,7 @@ INSERT INTO VARCHAR_TBL (f1) VALUES (''); INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character varying(1) INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); -SELECT '' AS seven, VARCHAR_TBL.*; +SELECT '' AS seven, * FROM VARCHAR_TBL; seven | f1 -------+---- | a @@ -100,7 +100,7 @@ INSERT INTO VARCHAR_TBL (f1) VALUES ('abcd'); INSERT INTO VARCHAR_TBL (f1) VALUES ('abcde'); ERROR: value too long for type character varying(4) INSERT INTO VARCHAR_TBL (f1) VALUES ('abcd '); -SELECT '' AS four, VARCHAR_TBL.*; +SELECT '' AS four, * FROM VARCHAR_TBL; four | f1 ------+------ | a diff --git a/src/test/regress/expected/varchar_1.out b/src/test/regress/expected/varchar_1.out index a24ca342110..d726e4cc438 100644 --- a/src/test/regress/expected/varchar_1.out +++ b/src/test/regress/expected/varchar_1.out @@ -14,7 +14,7 @@ INSERT INTO VARCHAR_TBL (f1) VALUES (''); INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character varying(1) INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); -SELECT '' AS seven, VARCHAR_TBL.*; +SELECT '' AS seven, * FROM VARCHAR_TBL; seven | f1 -------+---- | a @@ -100,7 +100,7 @@ INSERT INTO VARCHAR_TBL (f1) VALUES ('abcd'); INSERT INTO VARCHAR_TBL (f1) VALUES ('abcde'); ERROR: value too long for type character varying(4) INSERT INTO VARCHAR_TBL (f1) VALUES ('abcd '); -SELECT '' AS four, VARCHAR_TBL.*; +SELECT '' AS four, * FROM VARCHAR_TBL; four | f1 ------+------ | a diff --git a/src/test/regress/input/misc.source b/src/test/regress/input/misc.source index cfaaea95131..c82b1405978 100644 --- a/src/test/regress/input/misc.source +++ b/src/test/regress/input/misc.source @@ -29,11 +29,13 @@ UPDATE onek -- UPDATE tmp SET stringu1 = reverse_name(onek.stringu1) + FROM onek WHERE onek.stringu1 = 'JBAAAA' and onek.stringu1 = tmp.stringu1; UPDATE tmp SET stringu1 = reverse_name(onek2.stringu1) + FROM onek2 WHERE onek2.stringu1 = 'JCAAAA' and onek2.stringu1 = tmp.stringu1; diff --git a/src/test/regress/sql/abstime.sql b/src/test/regress/sql/abstime.sql index 28a0f284838..cbaeb629573 100644 --- a/src/test/regress/sql/abstime.sql +++ b/src/test/regress/sql/abstime.sql @@ -37,24 +37,24 @@ INSERT INTO ABSTIME_TBL (f1) VALUES ('Jun 10, 1843'); -- test abstime operators -SELECT '' AS eight, ABSTIME_TBL.*; +SELECT '' AS eight, * FROM ABSTIME_TBL; -SELECT '' AS six, ABSTIME_TBL.* +SELECT '' AS six, * FROM ABSTIME_TBL WHERE ABSTIME_TBL.f1 < abstime 'Jun 30, 2001'; -SELECT '' AS six, ABSTIME_TBL.* +SELECT '' AS six, * FROM ABSTIME_TBL WHERE ABSTIME_TBL.f1 > abstime '-infinity'; -SELECT '' AS six, ABSTIME_TBL.* +SELECT '' AS six, * FROM ABSTIME_TBL WHERE abstime 'May 10, 1947 23:59:12' <> ABSTIME_TBL.f1; -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE abstime 'epoch' >= ABSTIME_TBL.f1; -SELECT '' AS four, ABSTIME_TBL.* +SELECT '' AS four, * FROM ABSTIME_TBL WHERE ABSTIME_TBL.f1 <= abstime 'Jan 14, 1973 03:14:21'; -SELECT '' AS four, ABSTIME_TBL.* +SELECT '' AS four, * FROM ABSTIME_TBL WHERE ABSTIME_TBL.f1 <?> tinterval '["Apr 1 1950 00:00:00" "Dec 30 1999 23:00:00"]'; diff --git a/src/test/regress/sql/boolean.sql b/src/test/regress/sql/boolean.sql index 86d4bb428ce..df97dfab3b3 100644 --- a/src/test/regress/sql/boolean.sql +++ b/src/test/regress/sql/boolean.sql @@ -37,7 +37,7 @@ INSERT INTO BOOLTBL1 (f1) VALUES (bool 'true'); -- BOOLTBL1 should be full of true's at this point -SELECT '' AS t_3, BOOLTBL1.*; +SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1; SELECT '' AS t_3, BOOLTBL1.* @@ -76,22 +76,26 @@ INSERT INTO BOOLTBL2 (f1) VALUES (bool 'XXX'); -- BOOLTBL2 should be full of false's at this point -SELECT '' AS f_4, BOOLTBL2.*; +SELECT '' AS f_4, BOOLTBL2.* FROM BOOLTBL2; SELECT '' AS tf_12, BOOLTBL1.*, BOOLTBL2.* + FROM BOOLTBL1, BOOLTBL2 WHERE BOOLTBL2.f1 <> BOOLTBL1.f1; SELECT '' AS tf_12, BOOLTBL1.*, BOOLTBL2.* + FROM BOOLTBL1, BOOLTBL2 WHERE boolne(BOOLTBL2.f1,BOOLTBL1.f1); SELECT '' AS ff_4, BOOLTBL1.*, BOOLTBL2.* + FROM BOOLTBL1, BOOLTBL2 WHERE BOOLTBL2.f1 = BOOLTBL1.f1 and BOOLTBL1.f1 = bool 'false'; SELECT '' AS tf_12_ff_4, BOOLTBL1.*, BOOLTBL2.* + FROM BOOLTBL1, BOOLTBL2 WHERE BOOLTBL2.f1 = BOOLTBL1.f1 or BOOLTBL1.f1 = bool 'true' ORDER BY BOOLTBL1.f1, BOOLTBL2.f1; diff --git a/src/test/regress/sql/box.sql b/src/test/regress/sql/box.sql index 68dbe138223..6e5935ceb65 100644 --- a/src/test/regress/sql/box.sql +++ b/src/test/regress/sql/box.sql @@ -37,7 +37,7 @@ INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)'); INSERT INTO BOX_TBL (f1) VALUES ('asdfasdf(ad'); -SELECT '' AS four, BOX_TBL.*; +SELECT '' AS four, * FROM BOX_TBL; SELECT '' AS four, b.*, area(b.f1) as barea FROM BOX_TBL b; diff --git a/src/test/regress/sql/char.sql b/src/test/regress/sql/char.sql index 049f22fad39..fcaef7e086d 100644 --- a/src/test/regress/sql/char.sql +++ b/src/test/regress/sql/char.sql @@ -32,7 +32,7 @@ INSERT INTO CHAR_TBL (f1) VALUES ('cd'); INSERT INTO CHAR_TBL (f1) VALUES ('c '); -SELECT '' AS seven, CHAR_TBL.*; +SELECT '' AS seven, * FROM CHAR_TBL; SELECT '' AS six, c.* FROM CHAR_TBL c @@ -72,4 +72,4 @@ INSERT INTO CHAR_TBL (f1) VALUES ('abcd'); INSERT INTO CHAR_TBL (f1) VALUES ('abcde'); INSERT INTO CHAR_TBL (f1) VALUES ('abcd '); -SELECT '' AS four, CHAR_TBL.*; +SELECT '' AS four, * FROM CHAR_TBL; diff --git a/src/test/regress/sql/create_misc.sql b/src/test/regress/sql/create_misc.sql index a4cb816fa01..40c9b417d93 100644 --- a/src/test/regress/sql/create_misc.sql +++ b/src/test/regress/sql/create_misc.sql @@ -6,12 +6,11 @@ -- (any resemblance to real life is purely coincidental) -- -INSERT INTO tenk2 VALUES (tenk1.*); +INSERT INTO tenk2 SELECT * FROM tenk1; SELECT * INTO TABLE onek2 FROM onek; - -INSERT INTO fast_emp4000 VALUES (slow_emp4000.*); +INSERT INTO fast_emp4000 SELECT * FROM slow_emp4000; SELECT * INTO TABLE Bprime diff --git a/src/test/regress/sql/create_view.sql b/src/test/regress/sql/create_view.sql index 008ebae7045..30a9bb1152d 100644 --- a/src/test/regress/sql/create_view.sql +++ b/src/test/regress/sql/create_view.sql @@ -127,8 +127,8 @@ CREATE VIEW v12_temp AS SELECT true FROM v11_temp; -- a view should also be temporary if it references a temporary sequence CREATE SEQUENCE seq1; CREATE TEMPORARY SEQUENCE seq1_temp; -CREATE VIEW v9 AS SELECT seq1.is_called; -CREATE VIEW v13_temp AS SELECT seq1_temp.is_called; +CREATE VIEW v9 AS SELECT seq1.is_called FROM seq1; +CREATE VIEW v13_temp AS SELECT seq1_temp.is_called FROM seq1_temp; SELECT relname FROM pg_class WHERE relname LIKE 'v_' diff --git a/src/test/regress/sql/float4.sql b/src/test/regress/sql/float4.sql index 916431fbcc0..a2140f547e5 100644 --- a/src/test/regress/sql/float4.sql +++ b/src/test/regress/sql/float4.sql @@ -42,7 +42,7 @@ SELECT 'Infinity'::float4 / 'Infinity'::float4; SELECT 'nan'::float4 / 'nan'::float4; -SELECT '' AS five, FLOAT4_TBL.*; +SELECT '' AS five, * FROM FLOAT4_TBL; SELECT '' AS four, f.* FROM FLOAT4_TBL f WHERE f.f1 <> '1004.3'; @@ -71,7 +71,7 @@ SELECT '' AS three, f.f1, f.f1 - '-10' AS x FROM FLOAT4_TBL f -- test divide by zero SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f; -SELECT '' AS five, FLOAT4_TBL.*; +SELECT '' AS five, * FROM FLOAT4_TBL; -- test the unary float4abs operator SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; @@ -80,5 +80,5 @@ UPDATE FLOAT4_TBL SET f1 = FLOAT4_TBL.f1 * '-1' WHERE FLOAT4_TBL.f1 > '0.0'; -SELECT '' AS five, FLOAT4_TBL.*; +SELECT '' AS five, * FROM FLOAT4_TBL; diff --git a/src/test/regress/sql/float8.sql b/src/test/regress/sql/float8.sql index 0ff71be5d42..fc38e372d52 100644 --- a/src/test/regress/sql/float8.sql +++ b/src/test/regress/sql/float8.sql @@ -41,7 +41,7 @@ SELECT 'Infinity'::float8 + 100.0; SELECT 'Infinity'::float8 / 'Infinity'::float8; SELECT 'nan'::float8 / 'nan'::float8; -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <> '1004.3'; @@ -119,7 +119,7 @@ SELECT ||/ float8 '27' AS three; SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; UPDATE FLOAT8_TBL SET f1 = FLOAT8_TBL.f1 * '-1' @@ -137,7 +137,7 @@ SELECT '' AS bad, exp(f.f1) from FLOAT8_TBL f; SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; -- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); @@ -163,5 +163,5 @@ INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e+200'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-1.2345678901234e-200'); -SELECT '' AS five, FLOAT8_TBL.*; +SELECT '' AS five, * FROM FLOAT8_TBL; diff --git a/src/test/regress/sql/hash_index.sql b/src/test/regress/sql/hash_index.sql index cfd77d57203..b0811b7dc0a 100644 --- a/src/test/regress/sql/hash_index.sql +++ b/src/test/regress/sql/hash_index.sql @@ -3,56 +3,56 @@ -- grep 843938989 hash.data -- -SELECT hash_i4_heap.* +SELECT * FROM hash_i4_heap WHERE hash_i4_heap.random = 843938989; -- -- hash index -- grep 66766766 hash.data -- -SELECT hash_i4_heap.* +SELECT * FROM hash_i4_heap WHERE hash_i4_heap.random = 66766766; -- -- hash index -- grep 1505703298 hash.data -- -SELECT hash_name_heap.* +SELECT * FROM hash_name_heap WHERE hash_name_heap.random = '1505703298'::name; -- -- hash index -- grep 7777777 hash.data -- -SELECT hash_name_heap.* +SELECT * FROM hash_name_heap WHERE hash_name_heap.random = '7777777'::name; -- -- hash index -- grep 1351610853 hash.data -- -SELECT hash_txt_heap.* +SELECT * FROM hash_txt_heap WHERE hash_txt_heap.random = '1351610853'::text; -- -- hash index -- grep 111111112222222233333333 hash.data -- -SELECT hash_txt_heap.* +SELECT * FROM hash_txt_heap WHERE hash_txt_heap.random = '111111112222222233333333'::text; -- -- hash index -- grep 444705537 hash.data -- -SELECT hash_f8_heap.* +SELECT * FROM hash_f8_heap WHERE hash_f8_heap.random = '444705537'::float8; -- -- hash index -- grep 88888888 hash.data -- -SELECT hash_f8_heap.* +SELECT * FROM hash_f8_heap WHERE hash_f8_heap.random = '88888888'::float8; -- diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql index 874700c4b92..afc9feb0c80 100644 --- a/src/test/regress/sql/horology.sql +++ b/src/test/regress/sql/horology.sql @@ -256,6 +256,7 @@ SELECT '' AS "226", d1.f1 AS timestamp1, d2.f1 AS timestamp2, d1.f1 - d2.f1 AS d -- SELECT '' AS ten, ABSTIME_TBL.f1 AS abstime, RELTIME_TBL.f1 AS reltime + FROM ABSTIME_TBL, RELTIME_TBL WHERE (ABSTIME_TBL.f1 + RELTIME_TBL.f1) < abstime 'Jan 14 14:00:00 1971' ORDER BY abstime, reltime; @@ -263,19 +264,19 @@ SELECT '' AS ten, ABSTIME_TBL.f1 AS abstime, RELTIME_TBL.f1 AS reltime -- the "infinity" and "-infinity" tuples in ABSTIME_TBL cannot be added and -- therefore, should not show up in the results. -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE (ABSTIME_TBL.f1 + reltime '@ 3 year') -- +3 years < abstime 'Jan 14 14:00:00 1977'; -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE (ABSTIME_TBL.f1 + reltime '@ 3 year ago') -- -3 years < abstime 'Jan 14 14:00:00 1971'; -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE (ABSTIME_TBL.f1 - reltime '@ 3 year') -- -(+3) years < abstime 'Jan 14 14:00:00 1971'; -SELECT '' AS three, ABSTIME_TBL.* +SELECT '' AS three, * FROM ABSTIME_TBL WHERE (ABSTIME_TBL.f1 - reltime '@ 3 year ago') -- -(-3) years < abstime 'Jan 14 14:00:00 1977'; diff --git a/src/test/regress/sql/int2.sql b/src/test/regress/sql/int2.sql index 81bff557120..65c89e4abdd 100644 --- a/src/test/regress/sql/int2.sql +++ b/src/test/regress/sql/int2.sql @@ -29,7 +29,7 @@ INSERT INTO INT2_TBL(f1) VALUES ('123 dt'); INSERT INTO INT2_TBL(f1) VALUES (''); -SELECT '' AS five, INT2_TBL.*; +SELECT '' AS five, * FROM INT2_TBL; SELECT '' AS four, i.* FROM INT2_TBL i WHERE i.f1 <> int2 '0'; diff --git a/src/test/regress/sql/int4.sql b/src/test/regress/sql/int4.sql index b4c3929d09f..5212c687952 100644 --- a/src/test/regress/sql/int4.sql +++ b/src/test/regress/sql/int4.sql @@ -29,7 +29,7 @@ INSERT INTO INT4_TBL(f1) VALUES ('123 5'); INSERT INTO INT4_TBL(f1) VALUES (''); -SELECT '' AS five, INT4_TBL.*; +SELECT '' AS five, * FROM INT4_TBL; SELECT '' AS four, i.* FROM INT4_TBL i WHERE i.f1 <> int2 '0'; diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql index b6a6eb20ef3..a05d818a330 100644 --- a/src/test/regress/sql/interval.sql +++ b/src/test/regress/sql/interval.sql @@ -32,24 +32,24 @@ INSERT INTO INTERVAL_TBL (f1) VALUES ('@ 30 eons ago'); -- test interval operators -SELECT '' AS ten, INTERVAL_TBL.*; +SELECT '' AS ten, * FROM INTERVAL_TBL; -SELECT '' AS nine, INTERVAL_TBL.* +SELECT '' AS nine, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 <> interval '@ 10 days'; -SELECT '' AS three, INTERVAL_TBL.* +SELECT '' AS three, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 <= interval '@ 5 hours'; -SELECT '' AS three, INTERVAL_TBL.* +SELECT '' AS three, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 < interval '@ 1 day'; -SELECT '' AS one, INTERVAL_TBL.* +SELECT '' AS one, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 = interval '@ 34 years'; -SELECT '' AS five, INTERVAL_TBL.* +SELECT '' AS five, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 >= interval '@ 1 month'; -SELECT '' AS nine, INTERVAL_TBL.* +SELECT '' AS nine, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 > interval '@ 3 seconds ago'; SELECT '' AS fortyfive, r1.*, r2.* @@ -59,7 +59,7 @@ SELECT '' AS fortyfive, r1.*, r2.* SET DATESTYLE = 'postgres'; -SELECT '' AS ten, INTERVAL_TBL.*; +SELECT '' AS ten, * FROM INTERVAL_TBL; -- test avg(interval), which is somewhat fragile since people have been -- known to change the allowed input syntax for type interval without diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql index 9bda6f1d002..ba48cad7fe6 100644 --- a/src/test/regress/sql/join.sql +++ b/src/test/regress/sql/join.sql @@ -349,3 +349,27 @@ DROP TABLE t3; DROP TABLE J1_TBL; DROP TABLE J2_TBL; + +-- Both DELETE and UPDATE allow the specification of additional tables +-- to "join" against to determine which rows should be modified. + +CREATE TEMP TABLE t1 (a int, b int); +CREATE TEMP TABLE t2 (a int, b int); +CREATE TEMP TABLE t3 (x int, y int); + +INSERT INTO t1 VALUES (5, 10); +INSERT INTO t1 VALUES (15, 20); +INSERT INTO t1 VALUES (100, 100); +INSERT INTO t1 VALUES (200, 1000); +INSERT INTO t2 VALUES (200, 2000); +INSERT INTO t3 VALUES (5, 20); +INSERT INTO t3 VALUES (6, 7); +INSERT INTO t3 VALUES (7, 8); +INSERT INTO t3 VALUES (500, 100); + +DELETE FROM t3 USING t1 table1 WHERE t3.x = table1.a; +SELECT * FROM t3; +DELETE FROM t3 USING t1 JOIN t2 USING (a) WHERE t3.x > t1.a; +SELECT * FROM t3; +DELETE FROM t3 USING t3 t3_other WHERE t3.x = t3_other.x AND t3.y = t3_other.y; +SELECT * FROM t3;
\ No newline at end of file diff --git a/src/test/regress/sql/name.sql b/src/test/regress/sql/name.sql index 58fa0120fda..1c7a6716eea 100644 --- a/src/test/regress/sql/name.sql +++ b/src/test/regress/sql/name.sql @@ -29,7 +29,7 @@ INSERT INTO NAME_TBL(f1) VALUES (''); INSERT INTO NAME_TBL(f1) VALUES ('1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ'); -SELECT '' AS seven, NAME_TBL.*; +SELECT '' AS seven, * FROM NAME_TBL; SELECT '' AS six, c.f1 FROM NAME_TBL c WHERE c.f1 <> '1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890ABCDEFGHIJKLMNOPQR'; diff --git a/src/test/regress/sql/oid.sql b/src/test/regress/sql/oid.sql index e2357cd2e56..1bdb127a4ae 100644 --- a/src/test/regress/sql/oid.sql +++ b/src/test/regress/sql/oid.sql @@ -26,8 +26,7 @@ INSERT INTO OID_TBL(f1) VALUES (' - 500'); INSERT INTO OID_TBL(f1) VALUES ('32958209582039852935'); INSERT INTO OID_TBL(f1) VALUES ('-23582358720398502385'); -SELECT '' AS six, OID_TBL.*; - +SELECT '' AS six, * FROM OID_TBL; SELECT '' AS one, o.* FROM OID_TBL o WHERE o.f1 = 1234; diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql index 6c6867c4325..bc45f9f0d80 100644 --- a/src/test/regress/sql/point.sql +++ b/src/test/regress/sql/point.sql @@ -24,7 +24,7 @@ INSERT INTO POINT_TBL(f1) VALUES ('(10.0 10.0)'); INSERT INTO POINT_TBL(f1) VALUES ('(10.0,10.0'); -SELECT '' AS six, POINT_TBL.*; +SELECT '' AS six, * FROM POINT_TBL; -- left of SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)'; diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql index 99d674e8d29..1e20f381753 100644 --- a/src/test/regress/sql/polygon.sql +++ b/src/test/regress/sql/polygon.sql @@ -38,7 +38,7 @@ INSERT INTO POLYGON_TBL(f1) VALUES ('(0,1,2,3'); INSERT INTO POLYGON_TBL(f1) VALUES ('asdf'); -SELECT '' AS four, POLYGON_TBL.*; +SELECT '' AS four, * FROM POLYGON_TBL; -- overlap SELECT '' AS three, p.* diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql index d3e9b543035..3e224c556a2 100644 --- a/src/test/regress/sql/privileges.sql +++ b/src/test/regress/sql/privileges.sql @@ -78,7 +78,7 @@ INSERT INTO atest1 SELECT 1, b FROM atest1; -- fail UPDATE atest1 SET a = 1 WHERE a = 2; -- fail UPDATE atest2 SET col2 = NULL; -- ok UPDATE atest2 SET col2 = NOT col2; -- fails; requires SELECT on atest2 -UPDATE atest2 SET col2 = true WHERE atest1.a = 5; -- ok +UPDATE atest2 SET col2 = true FROM atest1 WHERE atest1.a = 5; -- ok SELECT * FROM atest1 FOR UPDATE; -- fail SELECT * FROM atest2 FOR UPDATE; -- fail DELETE FROM atest2; -- fail diff --git a/src/test/regress/sql/reltime.sql b/src/test/regress/sql/reltime.sql index 53295d3e66b..a07b64e29d8 100644 --- a/src/test/regress/sql/reltime.sql +++ b/src/test/regress/sql/reltime.sql @@ -24,28 +24,27 @@ INSERT INTO RELTIME_TBL (f1) VALUES ('@ 30 eons ago'); -- test reltime operators -SELECT '' AS six, RELTIME_TBL.*; +SELECT '' AS six, * FROM RELTIME_TBL; -SELECT '' AS five, RELTIME_TBL.* +SELECT '' AS five, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 <> reltime '@ 10 days'; -SELECT '' AS three, RELTIME_TBL.* +SELECT '' AS three, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 <= reltime '@ 5 hours'; -SELECT '' AS three, RELTIME_TBL.* +SELECT '' AS three, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 < reltime '@ 1 day'; -SELECT '' AS one, RELTIME_TBL.* +SELECT '' AS one, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 = reltime '@ 34 years'; -SELECT '' AS two, RELTIME_TBL.* +SELECT '' AS two, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 >= reltime '@ 1 month'; -SELECT '' AS five, RELTIME_TBL.* +SELECT '' AS five, * FROM RELTIME_TBL WHERE RELTIME_TBL.f1 > reltime '@ 3 seconds ago'; SELECT '' AS fifteen, r1.*, r2.* FROM RELTIME_TBL r1, RELTIME_TBL r2 WHERE r1.f1 > r2.f1 ORDER BY r1.f1, r2.f1; - diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql index cd0ae43c3e6..ead8011a313 100644 --- a/src/test/regress/sql/rules.sql +++ b/src/test/regress/sql/rules.sql @@ -218,17 +218,19 @@ select * from rtest_v1; update rtest_v1 set b = 88 where b < 50; select * from rtest_v1; delete from rtest_v1; -insert into rtest_v1 select rtest_t2.a, rtest_t3.b where rtest_t2.a = rtest_t3.a; +insert into rtest_v1 select rtest_t2.a, rtest_t3.b + from rtest_t2, rtest_t3 + where rtest_t2.a = rtest_t3.a; select * from rtest_v1; -- updates in a mergejoin -update rtest_v1 set b = rtest_t2.b where a = rtest_t2.a; +update rtest_v1 set b = rtest_t2.b from rtest_t2 where rtest_v1.a = rtest_t2.a; select * from rtest_v1; insert into rtest_v1 select * from rtest_t3; select * from rtest_v1; update rtest_t1 set a = a + 10 where b > 30; select * from rtest_v1; -update rtest_v1 set a = rtest_t3.a + 20 where b = rtest_t3.b; +update rtest_v1 set a = rtest_t3.a + 20 from rtest_t3 where rtest_v1.b = rtest_t3.b; select * from rtest_v1; -- @@ -285,9 +287,9 @@ insert into rtest_empmass values ('mayr', '6000.00'); insert into rtest_emp select * from rtest_empmass; select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal; update rtest_empmass set salary = salary + '1000.00'; -update rtest_emp set salary = rtest_empmass.salary where ename = rtest_empmass.ename; +update rtest_emp set salary = rtest_empmass.salary from rtest_empmass where rtest_emp.ename = rtest_empmass.ename; select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal; -delete from rtest_emp where ename = rtest_empmass.ename; +delete from rtest_emp using rtest_empmass where rtest_emp.ename = rtest_empmass.ename; select ename, who = current_user as "matches user", action, newsal, oldsal from rtest_emplog order by ename, action, newsal; -- diff --git a/src/test/regress/sql/select.sql b/src/test/regress/sql/select.sql index ee9389dc597..02aac6c5068 100644 --- a/src/test/regress/sql/select.sql +++ b/src/test/regress/sql/select.sql @@ -5,20 +5,21 @@ -- btree index -- awk '{if($1<10){print;}else{next;}}' onek.data | sort +0n -1 -- -SELECT onek.* WHERE onek.unique1 < 10 +SELECT * FROM onek + WHERE onek.unique1 < 10 ORDER BY onek.unique1; -- -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- -SELECT onek.unique1, onek.stringu1 +SELECT onek.unique1, onek.stringu1 FROM onek WHERE onek.unique1 < 20 ORDER BY unique1 using >; -- -- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2 -- -SELECT onek.unique1, onek.stringu1 +SELECT onek.unique1, onek.stringu1 FROM onek WHERE onek.unique1 > 980 ORDER BY stringu1 using <; @@ -26,7 +27,7 @@ SELECT onek.unique1, onek.stringu1 -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1d -2 +0nr -1 -- -SELECT onek.unique1, onek.string4 +SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 > 980 ORDER BY string4 using <, unique1 using >; @@ -34,7 +35,7 @@ SELECT onek.unique1, onek.string4 -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1dr -2 +0n -1 -- -SELECT onek.unique1, onek.string4 +SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 > 980 ORDER BY string4 using >, unique1 using <; @@ -42,7 +43,7 @@ SELECT onek.unique1, onek.string4 -- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data | -- sort +0nr -1 +1d -2 -- -SELECT onek.unique1, onek.string4 +SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 < 20 ORDER BY unique1 using >, string4 using <; @@ -50,7 +51,7 @@ SELECT onek.unique1, onek.string4 -- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data | -- sort +0n -1 +1dr -2 -- -SELECT onek.unique1, onek.string4 +SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 < 20 ORDER BY unique1 using <, string4 using >; @@ -65,19 +66,19 @@ ANALYZE onek2; -- -- awk '{if($1<10){print $0;}else{next;}}' onek.data | sort +0n -1 -- -SELECT onek2.* WHERE onek2.unique1 < 10; +SELECT onek2.* FROM onek2 WHERE onek2.unique1 < 10; -- -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- -SELECT onek2.unique1, onek2.stringu1 +SELECT onek2.unique1, onek2.stringu1 FROM onek2 WHERE onek2.unique1 < 20 ORDER BY unique1 using >; -- -- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2 -- -SELECT onek2.unique1, onek2.stringu1 +SELECT onek2.unique1, onek2.stringu1 FROM onek2 WHERE onek2.unique1 > 980; diff --git a/src/test/regress/sql/tinterval.sql b/src/test/regress/sql/tinterval.sql index dabf504e0c2..82d61dda3e8 100644 --- a/src/test/regress/sql/tinterval.sql +++ b/src/test/regress/sql/tinterval.sql @@ -32,7 +32,7 @@ INSERT INTO TINTERVAL_TBL (f1) -- test tinterval operators -SELECT '' AS five, TINTERVAL_TBL.*; +SELECT '' AS five, * FROM TINTERVAL_TBL; -- length == SELECT '' AS one, t.* diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql index 6aebfcc867e..247d6facb8e 100644 --- a/src/test/regress/sql/transactions.sql +++ b/src/test/regress/sql/transactions.sql @@ -45,7 +45,7 @@ DROP TABLE writetest; -- fail INSERT INTO writetest VALUES (1); -- fail SELECT * FROM writetest; -- ok DELETE FROM temptest; -- ok -UPDATE temptest SET a = 0 WHERE a = 1 AND writetest.a = temptest.a; -- ok +UPDATE temptest SET a = 0 FROM writetest WHERE temptest.a = 1 AND writetest.a = temptest.a; -- ok PREPARE test AS UPDATE writetest SET a = 0; -- ok EXECUTE test; -- fail SELECT * FROM writetest, temptest; -- ok diff --git a/src/test/regress/sql/varchar.sql b/src/test/regress/sql/varchar.sql index 70fa8afb4b3..414c585d9a3 100644 --- a/src/test/regress/sql/varchar.sql +++ b/src/test/regress/sql/varchar.sql @@ -23,7 +23,7 @@ INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); -SELECT '' AS seven, VARCHAR_TBL.*; +SELECT '' AS seven, * FROM VARCHAR_TBL; SELECT '' AS six, c.* FROM VARCHAR_TBL c @@ -63,4 +63,4 @@ INSERT INTO VARCHAR_TBL (f1) VALUES ('abcd'); INSERT INTO VARCHAR_TBL (f1) VALUES ('abcde'); INSERT INTO VARCHAR_TBL (f1) VALUES ('abcd '); -SELECT '' AS four, VARCHAR_TBL.*; +SELECT '' AS four, * FROM VARCHAR_TBL; |