8000 Various message fixes, among those fixes for the previous round of fixes · postgrespro/postgres_cluster@d84b6ef · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit d84b6ef

Browse files
peterepetere
committed
Various message fixes, among those fixes for the previous round of fixes
1 parent 98150f1 commit d84b6ef

File tree

18 files changed

+46
-44
lines changed
  • date.c
  • init
  • misc

    • 18 files changed

    +46
    -44
    lines changed

    ‎src/backend/access/transam/xlog.c

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@
    77
    * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
    88
    * Portions Copyright (c) 1994, Regents of the University of California
    99
    *
    10-
    * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.123 2003/09/25 06:57:57 petere Exp $
    10+
    * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.124 2003/09/26 15:27:19 petere Exp $
    1111
    *
    1212
    *-------------------------------------------------------------------------
    1313
    */
    @@ -1962,7 +1962,7 @@ got_record:;
    19621962
    {
    19631963
    ereport(emode,
    19641964
    (errcode_for_file_access(),
    1965-
    errmsg("could not read log file %u, segment %u, offset %u: %m",
    1965+
    errmsg("could not from read log file %u, segment %u, offset %u: %m",
    19661966
    readId, readSeg, readOff)));
    19671967
    goto next_record_is_invalid;
    19681968
    }
    @@ -2197,7 +2197,7 @@ WriteControlFile(void)
    21972197
    if (pg_fsync(fd) != 0)
    21982198
    ereport(PANIC,
    21992199
    (errcode_for_file_access(),
    2200-
    errmsg("could not fsync of control file: %m")));
    2200+
    errmsg("could not fsync control file: %m")));
    22012201

    22022202
    close(fd);
    22032203
    }

    ‎src/backend/catalog/pg_proc.c

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@
    88
    *
    99
    *
    1010
    * IDENTIFICATION
    11-
    * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.106 2003/09/25 06:57:58 petere Exp $
    11+
    * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.107 2003/09/26 15:27:26 petere Exp $
    1212
    *
    1313
    *-------------------------------------------------------------------------
    1414
    */
    @@ -532,7 +532,7 @@ check_sql_fn_retval(Oid rettype, char fn_typtype, List *queryTreeList)
    532532
    /* This should already have been caught ... */
    533533
    ereport(ERROR,
    534534
    (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
    535-
    errmsg("cannot determine result datatype"),
    535+
    errmsg("cannot determine result data type"),
    536536
    errdetail("A function returning ANYARRAY or ANYELEMENT must have at least one argument of either type.")));
    537537
    }
    538538
    else

    ‎src/backend/commands/indexcmds.c

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@
    88
    *
    99
    *
    1010
    * IDENTIFICATION
    11-
    * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.110 2003/09/25 06:57:58 petere Exp $
    11+
    * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.111 2003/09/26 15:27:31 petere Exp $
    1212
    *
    1313
    *-------------------------------------------------------------------------
    1414
    */
    @@ -168,7 +168,7 @@ DefineIndex(RangeVar *heapRelation,
    168168
    if (length(rangetable) != 1 || getrelid(1, rangetable) != relationId)
    169169
    ereport(ERROR,
    170170
    (errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
    171-
    errmsg("index expressions and predicates may refer only to the base relation")));
    171+
    errmsg("index expressions and predicates may refer only to the table being indexed")));
    172172
    }
    173173

    174174
    /*

    ‎src/backend/commands/opclasscmds.c

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -9,7 +9,7 @@
    99
    *
    1010
    *
    1111
    * IDENTIFICATION
    12-
    * $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.20 2003/09/25 06:57:58 petere Exp $
    12+
    * $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.21 2003/09/26 15:27:31 petere Exp $
    1313
    *
    1414
    *-------------------------------------------------------------------------
    1515
    */
    @@ -284,10 +284,10 @@ DefineOpClass(CreateOpClassStmt *stmt)
    284284
    if (opclass->opcintype == typeoid && opclass->opcdefault)
    285285
    ereport(ERROR,
    286286
    (errcode(ERRCODE_DUPLICATE_OBJECT),
    287-
    errmsg("could not make class \"%s\" be default for type %s",
    287+
    errmsg("could not make operator class \"%s\" be default for type %s",
    288288
    opcname,
    289289
    TypeNameToString(stmt->data 628C type)),
    290-
    errdetail("Class \"%s\" already is the default.",
    290+
    errdetail("Operator class \"%s\" already is the default.",
    291291
    NameStr(opclass->opcname))));
    292292
    }
    293293

    ‎src/backend/libpq/auth.c

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@
    88
    *
    99
    *
    1010
    * IDENTIFICATION
    11-
    * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.111 2003/09/25 06:57:59 petere Exp $
    11+
    * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.112 2003/09/26 15:27:31 petere Exp $
    1212
    *
    1313
    *-------------------------------------------------------------------------
    1414
    */
    @@ -492,7 +492,7 @@ ClientAuthentication(Port *port)
    492492
    if (setsockopt(port->sock, 0, LOCAL_CREDS, &on, sizeof(on)) < 0)
    493493
    ereport(FATAL,
    494494
    (errcode_for_socket_access(),
    495-
    errmsg("failed to enable credential receipt: %m")));
    495+
    errmsg("could not enable credential reception: %m")));
    496496
    }
    497497
    #endif
    498498
    if (port->raddr.addr.ss_family == AF_UNIX)

    ‎src/backend/libpq/be-secure.c

    Lines changed: 5 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,7 +11,7 @@
    1111
    *
    1212
    *
    1313
    * IDENTIFICATION
    14-
    * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.42 2003/09/25 06:57:59 petere Exp $
    14+
    * $Header: /cvsroot/pgsql/src/backend/libpq/be-secure.c,v 1.43 2003/09/26 15:27:31 petere Exp $
    1515
    *
    1616
    * Since the server static private key ($DataDir/server.key)
    1717
    * will normally be stored unencrypted so that the database
    @@ -293,7 +293,8 @@ secure_read(Port *port, void *ptr, size_t len)
    293293
    default:
    294294
    ereport(COMMERROR,
    295295
    (errcode(ERRCODE_PROTOCOL_VIOLATION),
    296-
    errmsg("unr F438 ecognized SSL error code")));
    296+
    errmsg("unrecognized SSL error code %d",
    297+
    SSL_get_error(port->ssl, n))));
    297298
    n = -1;
    298299
    break;
    299300
    }
    @@ -377,7 +378,8 @@ secure_write(Port *port, void *ptr, size_t len)
    377378
    default:
    378379
    ereport(COMMERROR,
    379380
    (errcode(ERRCODE_PROTOCOL_VIOLATION),
    380-
    errmsg("unrecognized SSL error code")));
    381+
    errmsg("unrecognized SSL error code %d",
    382+
    SSL_get_error(port->ssl, n))));
    381383
    n = -1;
    382384
    break;
    383385
    }

    ‎src/backend/parser/analyze.c

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,7 @@
    66
    * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
    77
    * Portions Copyright (c) 1994, Regents of the University of California
    88
    *
    9-
    * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.288 2003/09/25 06:58:00 petere Exp $
    9+
    * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.289 2003/09/26 15:27:32 petere Exp $
    1010
    *
    1111
    *-------------------------------------------------------------------------
    1212
    */
    @@ -3029,7 +3029,7 @@ transformConstraintAttrs(List *constraintList)
    30293029
    else if (!((FkConstraint *) lastprimarynode)->deferrable)
    30303030
    ereport(ERROR,
    30313031
    (errcode(ERRCODE_SYNTAX_ERROR),
    3032-
    errmsg("INITIALLY DEFERRED constraint must be DEFERRABLE")));
    3032+
    errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
    30333033
    break;
    30343034
    case CONSTR_ATTR_IMMEDIATE:
    30353035
    if (lastprimarynode == NULL ||

    ‎src/backend/parser/gram.y

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,7 +11,7 @@
    1111
    *
    1212
    *
    1313
    * IDENTIFICATION
    14-
    * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.434 2003/09/25 06:58:00 petere Exp $
    14+
    * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.435 2003/09/26 15:27:32 petere Exp $
    1515
    *
    1616
    * HISTORY
    1717
    * AUTHOR DATE MAJOR EVENT
    @@ -2190,7 +2190,7 @@ ConstraintAttributeSpec:
    21902190
    if ($1 == 0 && $2 != 0)
    21912191
    ereport(ERROR,
    21922192
    (errcode(ERRCODE_SYNTAX_ERROR),
    2193-
    errmsg("INITIALLY DEFERRED constraint must be DEFERRABLE")));
    2193+
    errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
    21942194
    $$ = $1 | $2;
    21952195
    }
    21962196
    | ConstraintTimeSpec
    @@ -2205,7 +2205,7 @@ ConstraintAttributeSpec:
    22052205
    if ($2 == 0 && $1 != 0)
    22062206
    ereport(ERROR,
    22072207
    (errcode(ERRCODE_SYNTAX_ERROR),
    2208-
    errmsg("INITIALLY DEFERRED constraint must be DEFERRABLE")));
    2208+
    errmsg("constraint declared INITIALLY DEFERRED must be DEFERRABLE")));
    22092209
    $$ = $1 | $2;
    22102210
    }
    22112211
    | /*EMPTY*/

    ‎src/backend/parser/parse_clause.c

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@
    88
    *
    99
    *
    1010
    * IDENTIFICATION
    11-
    * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.123 2003/09/25 06:58:01 petere Exp $
    11+
    * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.124 2003/09/26 15:27:35 petere Exp $
    1212
    *
    1313
    *-------------------------------------------------------------------------
    1414
    */
    @@ -749,7 +749,7 @@ transformFromClauseItem(ParseState *pstate, Node *n, List **containedRels)
    749749
    if (l_index < 0)
    750750
    ereport(ERROR,
    751751
    (errcode(ERRCODE_UNDEFINED_COLUMN),
    752-
    errmsg("column \"%s\" specified in USING clause not found in left table",
    752+
    errmsg("column \"%s\" specified in USING clause does not exist in left table",
    753753
    u_colname)));
    754754

    755755
    /* Find it in right input */
    @@ -772,7 +772,7 @@ transformFromClauseItem(ParseState *pstate, Node *n, List **containedRels)
    772772
    if (r_index < 0)
    773773
    ereport(ERROR,
    774774
    (errcode(ERRCODE_UNDEFINED_COLUMN),
    775-
    errmsg("column \"%s\" specified in USING clause not found in right table",
    775+
    errmsg("column \"%s\" specified in USING clause does not exist in right table",
    776776
    u_colname)));
    777777

    778778
    l_colvar = nth(l_index, l_colvars);

    ‎src/backend/parser/parse_expr.c

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@
    88
    *
    99
    *
    1010
    * IDENTIFICATION
    11-
    * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.162 2003/09/25 06:58:01 petere Exp $
    11+
    * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.163 2003/09/26 15:27:35 petere Exp $
    1212
    *
    1313
    *-------------------------------------------------------------------------
    1414
    */
    @@ -601,17 +601,17 @@ transformExpr(ParseState *pstate, Node *expr)
    601601
    if (opform->oprresult != BOOLOID)
    602602
    ereport(ERROR,
    603603
    (errcode(ERRCODE_DATATYPE_MISMATCH),
    604-
    errmsg("operator %s must return boolean, not type %s",
    604+
    errmsg("operator %s must return type boolean, not type %s",
    605605
    opname,
    606606
    format_type_be(opform->oprresult)),
    607-
    errhint("The operator of a quantified predicate subquery must return boolean.")));
    607+
    errhint("The operator of a quantified predicate subquery must return type boolean.")));
    608608

    609609
    if (get_func_retset(opform->oprcode))
    610610
    ereport(ERROR,
    611611
    (errcode(ERRCODE_DATATYPE_MISMATCH),
    612612
    errmsg("operator %s must not return a set",
    613613
    opname),
    614-
    errhint("The operator of a quantified predicate subquery must return boolean.")));
    614+
    errhint("The operator of a quantified predicate subquery must return type boolean.")));
    615615

    616616
    sublink->operOids = lappendo(sublink->operOids,
    617617
    oprid(optup));

    0 commit comments

    Comments
     (0)
    0