summaryrefslogtreecommitdiff
path: root/src/backend/parser
diff options
context:
space:
mode:
authorBruce Momjian2002-03-06 06:10:59 +0000
committerBruce Momjian2002-03-06 06:10:59 +0000
commit92288a1cf9490be3835dc8524ee2ba407f1b885a (patch)
treec4fe79ee2cb5cb8fa3385580c6cf431a97c2fc48 /src/backend/parser
parent22ebad9e39e268c9d4c6c2e422af727058830089 (diff)
Change made to elog:
o Change all current CVS messages of NOTICE to WARNING. We were going to do this just before 7.3 beta but it has to be done now, as you will see below. o Change current INFO messages that should be controlled by client_min_messages to NOTICE. o Force remaining INFO messages, like from EXPLAIN, VACUUM VERBOSE, etc. to always go to the client. o Remove INFO from the client_min_messages options and add NOTICE. Seems we do need three non-ERROR elog levels to handle the various behaviors we need for these messages. Regression passed.
Diffstat (limited to 'src/backend/parser')
-rw-r--r--src/backend/parser/analyze.c16
-rw-r--r--src/backend/parser/gram.y6
-rw-r--r--src/backend/parser/parse_node.c4
-rw-r--r--src/backend/parser/parse_relation.c4
-rw-r--r--src/backend/parser/scan.l10
5 files changed, 20 insertions, 20 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 4871e78a72f..d882957a340 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.216 2002/03/02 21:39:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.217 2002/03/06 06:09:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -425,7 +425,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt,
/*
* Note: we are not expecting that extras_before and extras_after
* are going to be used by the transformation of the SELECT statement.
- */
+ */
selectQuery = transformStmt(sub_pstate, stmt->selectStmt,
extras_before, extras_after);
@@ -849,7 +849,7 @@ transformColumnDefinition(ParseState *pstate, CreateStmtContext *cxt,
sequence->istemp = cxt->istemp;
sequence->options = NIL;
- elog(INFO, "%s will create implicit sequence '%s' for SERIAL column '%s.%s'",
+ elog(NOTICE, "%s will create implicit sequence '%s' for SERIAL column '%s.%s'",
cxt->stmtType, sequence->seqname, cxt->relname, column->colname);
cxt->blist = lappend(cxt->blist, sequence);
@@ -1125,7 +1125,7 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt)
* later. That would likely be cleaner, but
* too much work to contemplate right now.
* Instead, raise an error if the inherited
- * column won't be NOT NULL. (Would a NOTICE
+ * column won't be NOT NULL. (Would a WARNING
* be more reasonable?)
*/
if (constraint->contype == CONSTR_PRIMARY &&
@@ -1245,7 +1245,7 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt)
/*
* Finally, select unique names for all not-previously-named indices,
- * and display notice messages.
+ * and display WARNING messages.
*
* XXX in ALTER TABLE case, we fail to consider name collisions against
* pre-existing indexes.
@@ -1264,7 +1264,7 @@ transformIndexConstraints(ParseState *pstate, CreateStmtContext *cxt)
elog(ERROR, "%s: failed to make implicit index name",
cxt->stmtType);
- elog(INFO, "%s / %s%s will create implicit index '%s' for table '%s'",
+ elog(NOTICE, "%s / %s%s will create implicit index '%s' for table '%s'",
cxt->stmtType,
(strcmp(cxt->stmtType, "ALTER TABLE") == 0) ? "ADD " : "",
(index->primary ? "PRIMARY KEY" : "UNIQUE"),
@@ -1288,7 +1288,7 @@ transformFKConstraints(ParseState *pstate, CreateStmtContext *cxt)
if (cxt->fkconstraints == NIL)
return;
- elog(INFO, "%s will create implicit trigger(s) for FOREIGN KEY check(s)",
+ elog(NOTICE, "%s will create implicit trigger(s) for FOREIGN KEY check(s)",
cxt->stmtType);
foreach(fkclist, cxt->fkconstraints)
@@ -2710,7 +2710,7 @@ transformTypeRef(ParseState *pstate, TypeName *tn)
elog(ERROR, "unsupported expression in %%TYPE");
v = (Var *) n;
tyn = typeidTypeName(v->vartype);
- elog(INFO, "%s.%s%%TYPE converted to %s", tn->name, tn->attrname, tyn);
+ elog(NOTICE, "%s.%s%%TYPE converted to %s", tn->name, tn->attrname, tyn);
tn->name = tyn;
tn->typmod = v->vartypmod;
tn->attrname = NULL;
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index dfc8898653c..a8aba404e76 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.284 2002/03/05 05:33:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.285 2002/03/06 06:09:53 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -1349,7 +1349,7 @@ columnDef: ColId Typename ColQualList opt_collate
n->constraints = $3;
if ($4 != NULL)
- elog(INFO,"CREATE TABLE / COLLATE %s not yet implemented"
+ elog(NOTICE,"CREATE TABLE / COLLATE %s not yet implemented"
"; clause ignored", $4);
$$ = (Node *)n;
@@ -2347,7 +2347,7 @@ direction: FORWARD { $$ = FORWARD; }
| RELATIVE { $$ = RELATIVE; }
| ABSOLUTE
{
- elog(INFO,"FETCH / ABSOLUTE not supported, using RELATIVE");
+ elog(NOTICE,"FETCH / ABSOLUTE not supported, using RELATIVE");
$$ = RELATIVE;
}
;
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index e2a79c47374..a43dcb13af2 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.57 2001/10/28 06:25:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.58 2002/03/06 06:09:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -483,7 +483,7 @@ make_const(Value *value)
break;
default:
- elog(NOTICE, "make_const: unknown type %d", nodeTag(value));
+ elog(WARNING, "make_const: unknown type %d", nodeTag(value));
/* FALLTHROUGH */
case T_Null:
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 4846bafde8c..9440914a776 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.61 2002/03/02 21:39:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.62 2002/03/06 06:09:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1041,7 +1041,7 @@ warnAutoRange(ParseState *pstate, char *refname)
}
}
if (foundInFromCl)
- elog(INFO, "Adding missing FROM-clause entry%s for table \"%s\"",
+ elog(NOTICE, "Adding missing FROM-clause entry%s for table \"%s\"",
pstate->parentParseState != NULL ? " in subquery" : "",
refname);
}
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index b071032972a..e8b43ec0d76 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.90 2001/09/07 23:17:14 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.91 2002/03/06 06:09:56 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -362,11 +362,11 @@ other .
#ifdef MULTIBYTE
int len;
len = pg_mbcliplen(literalbuf,strlen(literalbuf),NAMEDATALEN-1);
- elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"",
+ elog(WARNING, "identifier \"%s\" will be truncated to \"%.*s\"",
literalbuf, len, literalbuf);
literalbuf[len] = '\0';
#else
- elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"",
+ elog(WARNING, "identifier \"%s\" will be truncated to \"%.*s\"",
literalbuf, NAMEDATALEN-1, literalbuf);
literalbuf[NAMEDATALEN-1] = '\0';
#endif
@@ -517,11 +517,11 @@ other .
#ifdef MULTIBYTE
int len;
len = pg_mbcliplen(yytext,i,NAMEDATALEN-1);
- elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"",
+ elog(WARNING, "identifier \"%s\" will be truncated to \"%.*s\"",
yytext, len, yytext);
yytext[len] = '\0';
#else
- elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"",
+ elog(WARNING, "identifier \"%s\" will be truncated to \"%.*s\"",
yytext, NAMEDATALEN-1, yytext);
yytext[NAMEDATALEN-1] = '\0';
#endif