database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

New warning code about auto-created range table entries.

Browse Source
This commit is contained in:
Bruce Momjian
2000-06-03 04:41:34 +00:00
parent 58785757dd
commit 2ea370a3ce
4 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/parser/parse_func.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.81 2000/05/30 00:49:50 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.82 2000/06/03 04:41:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -307,11 +307,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
rte = addRangeTableEntry(pstate, refname, rte = addRangeTableEntry(pstate, refname,
makeAttr(refname, NULL), makeAttr(refname, NULL),
FALSE, FALSE, TRUE); FALSE, FALSE, TRUE);
#ifdef WARN_FROM warnAutoRange(pstate, refname);
elog(NOTICE, "Adding missing FROM-clause entry%s for table %s",
pstate->parentParseState != NULL ? " in subquery" : "",
refname);
#endif
} }
relname = rte->relname; relname = rte->relname;
@ -525,11 +521,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
rte = addRangeTableEntry(pstate, refname, rte = addRangeTableEntry(pstate, refname,
makeAttr(refname, NULL), makeAttr(refname, NULL),
FALSE, FALSE, TRUE); FALSE, FALSE, TRUE);
#ifdef WARN_FROM warnAutoRange(pstate, refname);
elog(NOTICE, "Adding missing FROM-clause entry%s for table %s",
pstate->parentParseState != NULL ? " in subquery" : "",
refname);
#endif
} }
relname = rte->relname; relname = rte->relname;

31
src/backend/parser/parse_relation.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.40 2000/04/12 17:15:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.41 2000/06/03 04:41:32 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -373,11 +373,7 @@ expandAll(ParseState *pstate, char *relname, Attr *ref, int *this_resno)
{ {
rte = addRangeTableEntry(pstate, relname, ref, rte = addRangeTableEntry(pstate, relname, ref,
FALSE, FALSE, TRUE); FALSE, FALSE, TRUE);
#ifdef WARN_FROM warnAutoRange(pstate, ref->relname);
elog(NOTICE, "Adding missing FROM-clause entry%s for table %s",
pstate->parentParseState != NULL ? " in subquery" : "",
refname);
#endif
} }
rel = heap_open(rte->relid, AccessShareLock); rel = heap_open(rte->relid, AccessShareLock);
@ -526,3 +522,26 @@ attnumTypeId(Relation rd, int attid)
*/ */
return rd->rd_att->attrs[attid - 1]->atttypid; return rd->rd_att->attrs[attid - 1]->atttypid;
} }
void
warnAutoRange(ParseState *pstate, char *refname)
{
List *temp;
bool foundInFromCl = false;
foreach(temp, pstate->p_rtable)
{
RangeTblEntry *rte = lfirst(temp);
if (rte->inFromCl)
{
foundInFromCl = true;
break;
}
}
if (foundInFromCl)
elog(NOTICE, "Adding missing FROM-clause entry%s for table %s",
pstate->parentParseState != NULL ? " in subquery" : "",
refname);
}

3
src/include/parser/parse_relation.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: parse_relation.h,v 1.16 2000/04/12 17:16:45 momjian Exp $ * $Id: parse_relation.h,v 1.17 2000/06/03 04:41:33 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,5 +35,6 @@ extern int specialAttNum(char *a);
extern bool attnameIsSet(Relation rd, char *name); extern bool attnameIsSet(Relation rd, char *name);
extern int attnumAttNelems(Relation rd, int attid); extern int attnumAttNelems(Relation rd, int attid);
extern Oid attnumTypeId(Relation rd, int attid); extern Oid attnumTypeId(Relation rd, int attid);
extern void warnAutoRange(ParseState *pstate, char *refname);
#endif /* PARSE_RELATION_H */ #endif /* PARSE_RELATION_H */

3
src/test/regress/expected/select_into.out
View File

@ -5,9 +5,12 @@ SELECT *
INTO TABLE tmp1 INTO TABLE tmp1
FROM tmp FROM tmp
WHERE onek.unique1 < 2; WHERE onek.unique1 < 2;
NOTICE: Adding missing FROM-clause entry for table onek
DROP TABLE tmp1; DROP TABLE tmp1;
SELECT * SELECT *
INTO TABLE tmp1 INTO TABLE tmp1
FROM tmp FROM tmp
WHERE onek2.unique1 < 2; WHERE onek2.unique1 < 2;
DROP TABLE tmp1; DROP TABLE tmp1;
NOTICE: Adding missing FROM-clause entry for table onek