From 23bd7791762b230942d10267d4a831cad968d4ad Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 15 Dec 2000 20:01:55 +0000 Subject: [PATCH] Change ET_WARN to ET_NOTICE to match internal codes, leave message as WARNING. Fix German FAQ mention about warning. --- doc/FAQ_german | 2 +- doc/src/FAQ/FAQ_german.html | 2 +- src/bin/pgaccess/lib/help/create_database.hlp | 2 +- src/interfaces/ecpg/preproc/descriptor.c | 10 +++++----- src/interfaces/ecpg/preproc/pgc.l | 6 +++--- src/interfaces/ecpg/preproc/preproc.y | 16 ++++++++-------- src/interfaces/ecpg/preproc/type.h | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/doc/FAQ_german b/doc/FAQ_german index 0f6afb04f1..65312c2bb3 100644 --- a/doc/FAQ_german +++ b/doc/FAQ_german @@ -515,7 +515,7 @@ * überprüfe, daß keine Binaries vorheriger Versionen in Deinem Pfad (PATH-Variable) sind. (Wenn Du die Meldung siehst: - WARN:heap_modifytuple: repl is \ 9, ist das das Problem.) + NOTICE:heap_modifytuple: repl is \ 9, ist das das Problem.) * überprüfe, daß der Pfad richtig gesetzt ist * überprüfe, ob der User postgres der Eigentümer der entsprechenden Dateien ist diff --git a/doc/src/FAQ/FAQ_german.html b/doc/src/FAQ/FAQ_german.html index b8c012bfe6..2a956f06b9 100644 --- a/doc/src/FAQ/FAQ_german.html +++ b/doc/src/FAQ/FAQ_german.html @@ -540,7 +540,7 @@ Wir haben:
  • überprüfe, daß keine Binaries vorheriger Versionen in Deinem Pfad (PATH-Variable) sind. -(Wenn Du die Meldung siehst: WARN:heap_modifytuple: repl is \ 9, ist das das Problem.) +(Wenn Du die Meldung siehst: NOTICE:heap_modifytuple: repl is \ 9, ist das das Problem.)
  • überprüfe, daß der Pfad richtig gesetzt ist
  • überprüfe, ob der User postgres der Eigentümer der entsprechenden Dateien ist

    diff --git a/src/bin/pgaccess/lib/help/create_database.hlp b/src/bin/pgaccess/lib/help/create_database.hlp index a14e1e5a63..52422c1cd5 100644 --- a/src/bin/pgaccess/lib/help/create_database.hlp +++ b/src/bin/pgaccess/lib/help/create_database.hlp @@ -18,7 +18,7 @@ CREATE DATABASE name \[ WITH LOCATION = 'dbpath' \] " {} "CREATEDB" {italic} " Message returned if the command completes successfully. -" {} "WARN: createdb: database \"name\" already exists." {italic} " +" {} "NOTICE: createdb: database \"name\" already exists." {italic} " This occurs if database specified already exists. " {} "ERROR: Unable to create database directory directory" {italic} " diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c index 6c249f4a6a..f3d08484b6 100644 --- a/src/interfaces/ecpg/preproc/descriptor.c +++ b/src/interfaces/ecpg/preproc/descriptor.c @@ -109,7 +109,7 @@ drop_descriptor(char *name, char *connection) } } snprintf(errortext, sizeof errortext, "unknown descriptor %s", name); - mmerror(ET_WARN, errortext); + mmerror(ET_NOTICE, errortext); } struct descriptor @@ -128,7 +128,7 @@ struct descriptor } } snprintf(errortext, sizeof errortext, "unknown descriptor %s", name); - mmerror(ET_WARN, errortext); + mmerror(ET_NOTICE, errortext); return NULL; } @@ -145,7 +145,7 @@ output_get_descr_header(char *desc_name) else { snprintf(errortext, sizeof errortext, "unknown descriptor header item '%d'", results->value); - mmerror(ET_WARN, errortext); + mmerror(ET_NOTICE, errortext); } } @@ -167,10 +167,10 @@ output_get_descr(char *desc_name, char *index) switch (results->value) { case ECPGd_nullable: - mmerror(ET_WARN, "nullable is always 1"); + mmerror(ET_NOTICE, "nullable is always 1"); break; case ECPGd_key_member: - mmerror(ET_WARN, "key_member is always 0"); + mmerror(ET_NOTICE, "key_member is always 0"); break; default: break; diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index 7965cb629b..7fe527293f 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.69 2000/12/03 20:45:38 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.70 2000/12/15 20:01:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -392,7 +392,7 @@ cppline {space}*#(.*\\{line_end})*.* literalbuf, NAMEDATALEN-1, literalbuf); literalbuf[NAMEDATALEN-1] = '\0'; #endif - mmerror(ET_WARN, errortext); + mmerror(ET_NOTICE, errortext); } yylval.str = mm_strdup(literalbuf); @@ -554,7 +554,7 @@ cppline {space}*#(.*\\{line_end})*.* lower_text, NAMEDATALEN-1, lower_text); lower_text[NAMEDATALEN-1] = '\0'; #endif - mmerror(ET_WARN, errortext); + mmerror(ET_NOTICE, errortext); yytext[NAMEDATALEN-1] = '\0'; } diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 14146a118b..061f8d0027 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -42,7 +42,7 @@ mmerror(enum errortype type, char * error) { switch(type) { - case ET_WARN: + case ET_NOTICE: fprintf(stderr, "%s:%d: WARNING: %s\n", input_filename, yylineno, error); break; case ET_ERROR: @@ -1124,7 +1124,7 @@ columnDef: ColId Typename ColQualList opt_collate if (strlen($4) > 0) { sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4); - mmerror(ET_WARN, errortext); + mmerror(ET_NOTICE, errortext); } $$ = cat_str(4, $1, $2, $3, $4); } @@ -1133,7 +1133,7 @@ columnDef: ColId Typename ColQualList opt_collate if (strlen($4) > 0) { sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4); - mmerror(ET_WARN, errortext); + mmerror(ET_NOTICE, errortext); } $$ = cat_str(4, $1, make_str(" serial "), $3, $4); } @@ -1248,7 +1248,7 @@ key_match: MATCH FULL } | MATCH PARTIAL { - mmerror(ET_WARN, "FOREIGN KEY/MATCH PARTIAL not yet implemented"); + mmerror(ET_NOTICE, "FOREIGN KEY/MATCH PARTIAL not yet implemented"); $$ = make_str("match partial"); } | /*EMPTY*/ @@ -1651,7 +1651,7 @@ direction: FORWARD { $$ = make_str("forward"); } | BACKWARD { $$ = make_str("backward"); } | RELATIVE { $$ = make_str("relative"); } | ABSOLUTE { - mmerror(ET_WARN, "FETCH/ABSOLUTE not supported, backend will use RELATIVE"); + mmerror(ET_NOTICE, "FETCH/ABSOLUTE not supported, backend will use RELATIVE"); $$ = make_str("absolute"); } ; @@ -3512,7 +3512,7 @@ c_expr: attr if (atol($3) != 0) { sprintf(errortext, "CURRENT_TIME(%s) precision not implemented; backend will use zero instead", $3); - mmerror(ET_WARN, errortext); + mmerror(ET_NOTICE, errortext); } $$ = make_str("current_time"); @@ -3524,7 +3524,7 @@ c_expr: attr if (atol($3) != 0) { sprintf(errortext, "CURRENT_TIMESTAMP(%s) precision not implemented; backend will use zero instead", $3); - mmerror(ET_WARN, errortext); + mmerror(ET_NOTICE, errortext); } $$ = make_str("current_timestamp"); @@ -3664,7 +3664,7 @@ case_expr: CASE case_arg when_clause_list case_default END_TRANS { $$ = cat_str(5, make_str("nullif("), $3, make_str(","), $5, make_str(")")); - mmerror(ET_WARN, "NULLIF() not yet fully implemented"); + mmerror(ET_NOTICE, "NULLIF() not yet fully implemented"); } | COALESCE '(' expr_list ')' { diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h index ca3002a1ec..dd844cb12b 100644 --- a/src/interfaces/ecpg/preproc/type.h +++ b/src/interfaces/ecpg/preproc/type.h @@ -155,7 +155,7 @@ struct assignment enum errortype { - ET_WARN, ET_ERROR, ET_FATAL + ET_NOTICE, ET_ERROR, ET_FATAL }; struct fetch_desc