Change some notices to warnings and vice versa according to criteria

developed on -hackers.

diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 0dcb16a0d785fbb7037e9183c5957df5e15f3ad8..35ab80c09a7dc1bbf640a0466e60d74493ab1b6b 100644 (file)
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.37 2003/09/29 00:05:24 petere Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.38 2003/10/02 06:34:03 petere Exp $
  *
  * DESCRIPTION
  *   These routines take the parse tree and pick out the
@@ -718,7 +718,7 @@ RenameFunction(List *name, List *argtypes, const char *newname)
  *
  * This is presently only used for adjusting legacy functions that return
  * OPAQUE to return whatever we find their correct definition should be.
- * The caller should emit a suitable NOTICE explaining what we did.
+ * The caller should emit a suitable warning explaining what we did.
  */
 void
 SetFunctionReturnType(Oid funcOid, Oid newRetType)

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index e264938be6ef562c6fabfbf29ebd4ebf4f9e326d..dbbbc376e004280443f338abc8c31b64f66d87fe 100644 (file)
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.113 2003/09/29 16:37:29 petere Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.114 2003/10/02 06:34:03 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -654,7 +654,7 @@ ReindexTable(RangeVar *relation, bool force /* currently unused */ )
    ReleaseSysCache(tuple);
 
    if (!reindex_relation(heapOid))
-       ereport(WARNING,
+       ereport(NOTICE,
                (errmsg("table \"%s\" has no indexes",
                        relation->relname)));
 }

diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 475a76c78b1f627845aea2097eb0c3841cc11ae1..09325d647ca6351f4e3f508ee29e65456a9e612e 100644 (file)
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/proclang.c,v 1.50 2003/09/25 06:57:58 petere Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/proclang.c,v 1.51 2003/10/02 06:34:03 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -91,7 +91,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
         */
        if (funcrettype == OPAQUEOID)
        {
-           ereport(NOTICE,
+           ereport(WARNING,
                    (errcode(ERRCODE_WRONG_OBJECT_TYPE),
                     errmsg("changing return type of function %s from \"opaque\" to \"language_handler\"",
                            NameListToString(stmt->plhandler))));

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 5a824ce40ee3a2d417c000e1971c8847b0790d4a..d2cc87e43d5739a91f5c17b6113d270a2b315a08 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.158 2003/09/25 18:58:35 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.159 2003/10/02 06:34:03 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -286,7 +286,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint)
         */
        if (funcrettype == OPAQUEOID)
        {
-           ereport(NOTICE,
+           ereport(WARNING,
                    (errmsg("changing return type of function %s from \"opaque\" to \"trigger\"",
                            NameListToString(stmt->funcname))));
            SetFunctionReturnType(funcoid, TRIGGEROID);

diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index a41ccf5923bd72a9c2824404b2e157924d63bc44..e6d1b5c50b271f97106bb1ee6df2a9a91659fabe 100644 (file)
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.47 2003/09/29 00:05:25 petere Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/commands/typecmds.c,v 1.48 2003/10/02 06:34:03 petere Exp $
  *
  * DESCRIPTION
  *   The "DefineFoo" routines take the parse tree and pick out the
@@ -271,7 +271,7 @@ DefineType(List *names, List *parameters)
        if (resulttype == OPAQUEOID)
        {
            /* backwards-compatibility hack */
-           ereport(NOTICE,
+           ereport(WARNING,
                    (errmsg("changing return type of function %s from \"opaque\" to %s",
                            NameListToString(inputName), typeName)));
            SetFunctionReturnType(inputOid, typoid);
@@ -288,7 +288,7 @@ DefineType(List *names, List *parameters)
        if (resulttype == OPAQUEOID)
        {
            /* backwards-compatibility hack */
-           ereport(NOTICE,
+           ereport(WARNING,
                    (errmsg("changing return type of function %s from \"opaque\" to \"cstring\"",
                            NameListToString(outputName))));
            SetFunctionReturnType(outputOid, CSTRINGOID);
@@ -839,7 +839,7 @@ findTypeInputFunction(List *procname, Oid typeOid)
     * three arguments (string, element OID, typmod).
     *
     * For backwards compatibility we allow OPAQUE in place of CSTRING; if we
-    * see this, we issue a NOTICE and fix up the pg_proc entry.
+    * see this, we issue a warning and fix up the pg_proc entry.
     */
    MemSet(argList, 0, FUNC_MAX_ARGS * sizeof(Oid));
 
@@ -874,7 +874,7 @@ findTypeInputFunction(List *procname, Oid typeOid)
    if (OidIsValid(procOid))
    {
        /* Found, but must complain and fix the pg_proc entry */
-       ereport(NOTICE,
+       ereport(WARNING,
                (errmsg("changing argument type of function %s from \"opaque\" to \"cstring\"",
                        NameListToString(procname))));
        SetFunctionArgType(procOid, 0, CSTRINGOID);
@@ -910,7 +910,7 @@ findTypeOutputFunction(List *procname, Oid typeOid)
     * arguments (data value, element OID).
     *
     * For backwards compatibility we allow OPAQUE in place of the actual
-    * type name; if we see this, we issue a NOTICE and fix up the pg_proc
+    * type name; if we see this, we issue a warning and fix up the pg_proc
     * entry.
     */
    MemSet(argList, 0, FUNC_MAX_ARGS * sizeof(Oid));
@@ -944,7 +944,7 @@ findTypeOutputFunction(List *procname, Oid typeOid)
    if (OidIsValid(procOid))
    {
        /* Found, but must complain and fix the pg_proc entry */
-       ereport(NOTICE,
+       ereport(WARNING,
        (errmsg("changing argument type of function %s from \"opaque\" to %s",
                NameListToString(procname), format_type_be(typeOid))));
        SetFunctionArgType(procOid, 0, typeOid);

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 9e72f3bcd3f5f1eae31c2feb2254e11b7d62a07b..b73aa6f9eef5198aabb0d49ec822802ab6ddb82c 100644 (file)
--- 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.435 2003/09/26 15:27:32 petere Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.436 2003/10/02 06:34:04 petere Exp $
  *
  * HISTORY
  *   AUTHOR            DATE            MAJOR EVENT
@@ -973,7 +973,7 @@ zone_value:
                                        $3)));
                    if ($3 > MAX_INTERVAL_PRECISION)
                    {
-                       ereport(NOTICE,
+                       ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("INTERVAL(%d) precision reduced to maximum allowed, %d",
                                        $3, MAX_INTERVAL_PRECISION)));
@@ -5091,7 +5091,7 @@ SimpleTypename:
                                        $3)));
                    if ($3 > MAX_INTERVAL_PRECISION)
                    {
-                       ereport(NOTICE,
+                       ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("INTERVAL(%d) precision reduced to maximum allowed, %d",
                                        $3, MAX_INTERVAL_PRECISION)));
@@ -5470,7 +5470,7 @@ ConstDatetime:
                                        $3, ($5 ? " WITH TIME ZONE": ""))));
                    if ($3 > MAX_TIMESTAMP_PRECISION)
                    {
-                       ereport(NOTICE,
+                       ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("TIMESTAMP(%d)%s precision reduced to maximum allowed, %d",
                                        $3, ($5 ? " WITH TIME ZONE": ""),
@@ -5511,7 +5511,7 @@ ConstDatetime:
                                        $3, ($5 ? " WITH TIME ZONE": ""))));
                    if ($3 > MAX_TIME_PRECISION)
                    {
-                       ereport(NOTICE,
+                       ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("TIME(%d)%s precision reduced to maximum allowed, %d",
                                        $3, ($5 ? " WITH TIME ZONE": ""),
@@ -6318,7 +6318,7 @@ c_expr:       columnref                               { $$ = (Node *) $1; }
                                        $3)));
                    if ($3 > MAX_TIME_PRECISION)
                    {
-                       ereport(NOTICE,
+                       ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("CURRENT_TIME(%d) precision reduced to maximum allowed, %d",
                                        $3, MAX_TIME_PRECISION)));
@@ -6372,7 +6372,7 @@ c_expr:       columnref                               { $$ = (Node *) $1; }
                                        $3)));
                    if ($3 > MAX_TIMESTAMP_PRECISION)
                    {
-                       ereport(NOTICE,
+                       ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("CURRENT_TIMESTAMP(%d) precision reduced to maximum allowed, %d",
                                        $3, MAX_TIMESTAMP_PRECISION)));
@@ -6425,7 +6425,7 @@ c_expr:       columnref                               { $$ = (Node *) $1; }
                                        $3)));
                    if ($3 > MAX_TIME_PRECISION)
                    {
-                       ereport(NOTICE,
+                       ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("LOCALTIME(%d) precision reduced to maximum allowed, %d",
                                        $3, MAX_TIME_PRECISION)));
@@ -6479,7 +6479,7 @@ c_expr:       columnref                               { $$ = (Node *) $1; }
                                        $3)));
                    if ($3 > MAX_TIMESTAMP_PRECISION)
                    {
-                       ereport(NOTICE,
+                       ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("LOCALTIMESTAMP(%d) precision reduced to maximum allowed, %d",
                                        $3, MAX_TIMESTAMP_PRECISION)));
@@ -7189,7 +7189,7 @@ AexprConst: Iconst
                                        $3)));
                    if ($3 > MAX_INTERVAL_PRECISION)
                    {
-                       ereport(NOTICE,
+                       ereport(WARNING,
                                (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
                                 errmsg("INTERVAL(%d) precision reduced to maximum allowed, %d",
                                        $3, MAX_INTERVAL_PRECISION)));

diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index a8e3cebf4837f425a0d1354f74e1e1694d6f7e80..833f3ecfa15edc74b002276add4b5246fa2062b6 100644 (file)
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.368 2003/09/29 18:50:58 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.369 2003/10/02 06:34:04 petere Exp $
  *
  * NOTES
  *   this is the "main" module of the postgres backend and
@@ -559,8 +559,7 @@ pg_rewrite_queries(List *querytree_list)
    new_list = (List *) copyObject(querytree_list);
    /* This checks both copyObject() and the equal() routines... */
    if (!equal(new_list, querytree_list))
-       ereport(WARNING,
-          (errmsg("copyObject() failed to produce an equal parse tree")));
+       elog(WARNING, "copyObject() failed to produce an equal parse tree");
    else
        querytree_list = new_list;
 #endif
@@ -604,8 +603,7 @@ pg_plan_query(Query *querytree)
 #ifdef NOT_USED
        /* This checks both copyObject() and the equal() routines... */
        if (!equal(new_plan, plan))
-           ereport(WARNING,
-           (errmsg("copyObject() failed to produce an equal plan tree")));
+           elog(WARNING, "copyObject() failed to produce an equal plan tree");
        else
 #endif
            plan = new_plan;
@@ -2654,7 +2652,7 @@ PostgresMain(int argc, char *argv[], const char *username)
    if (!IsUnderPostmaster)
    {
        puts("\nPOSTGRES backend interactive interface ");
-       puts("$Revision: 1.368 $ $Date: 2003/09/29 18:50:58 $\n");
+       puts("$Revision: 1.369 $ $Date: 2003/10/02 06:34:04 $\n");
    }
 
    /*

diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 356948e12b86429f71f4e96d00730c14abc0f4eb..200fc3599b1a72788f67f9b2fc71e5ce9bfed439 100644 (file)
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.207 2003/09/24 18:54:01 tgl Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.208 2003/10/02 06:34:04 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1555,7 +1555,7 @@ CreateCommandTag(Node *parsetree)
            break;
 
        default:
-           elog(NOTICE, "unrecognized node type: %d",
+           elog(WARNING, "unrecognized node type: %d",
                 (int) nodeTag(parsetree));
            tag = "???";
            break;