database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-10 09:21:54 +03:00
Code

Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut 2006-10-06 17:14:01 +00:00
parent 378c79dc78
commit b9b4f10b5b
31 changed files with 115 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/access/gin/ginarrayproc.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/gin/ginarrayproc.c,v 1.6 2006/10/04 00:29:47 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/gin/ginarrayproc.c,v 1.7 2006/10/06 17:13:58 petere Exp $
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include "postgres.h" #include "postgres.h"
@ -27,7 +27,7 @@
if ( ARR_HASNULL(x) ) \ if ( ARR_HASNULL(x) ) \
ereport(ERROR, \ ereport(ERROR, \
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), \ (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), \
errmsg("array must not contain nulls"))); \ errmsg("array must not contain null values"))); \
} while(0) } while(0)

4
src/backend/access/gin/ginscan.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.6 2006/10/04 00:29:48 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.7 2006/10/06 17:13:58 petere Exp $
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -176,7 +176,7 @@ newScanKey(IndexScanDesc scan)
if (so->nkeys == 0) if (so->nkeys == 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("GIN index doesn't support search with void query"))); errmsg("GIN index does not support search with void query")));
pgstat_count_index_scan(&scan->xs_pgstat_info); pgstat_count_index_scan(&scan->xs_pgstat_info);
} }

50
src/backend/access/transam/twophase.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.24 2006/10/04 00:29:49 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.25 2006/10/06 17:13:58 petere Exp $
* *
* NOTES * NOTES
* Each global transaction is associated with a global transaction * Each global transaction is associated with a global transaction
@ -866,7 +866,7 @@ EndPrepare(GlobalTransaction gxact)
if (fd < 0) if (fd < 0)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not create twophase state file \"%s\": %m", errmsg("could not create two-phase state file \"%s\": %m",
path))); path)));
/* Write data to file, and calculate CRC as we pass over it */ /* Write data to file, and calculate CRC as we pass over it */
@ -880,7 +880,7 @@ EndPrepare(GlobalTransaction gxact)
close(fd); close(fd);
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not write twophase state file: %m"))); errmsg("could not write two-phase state file: %m")));
} }
} }
@ -897,7 +897,7 @@ EndPrepare(GlobalTransaction gxact)
close(fd); close(fd);
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not write twophase state file: %m"))); errmsg("could not write two-phase state file: %m")));
} }
/* Back up to prepare for rewriting the CRC */ /* Back up to prepare for rewriting the CRC */
@ -906,7 +906,7 @@ EndPrepare(GlobalTransaction gxact)
close(fd); close(fd);
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not seek in twophase state file: %m"))); errmsg("could not seek in two-phase state file: %m")));
} }
/* /*
@ -946,13 +946,13 @@ EndPrepare(GlobalTransaction gxact)
close(fd); close(fd);
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not write twophase state file: %m"))); errmsg("could not write two-phase state file: %m")));
} }
if (close(fd) != 0) if (close(fd) != 0)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not close twophase state file: %m"))); errmsg("could not close two-phase state file: %m")));
/* /*
* Mark the prepared transaction as valid. As soon as xact.c marks MyProc * Mark the prepared transaction as valid. As soon as xact.c marks MyProc
@ -1022,7 +1022,7 @@ ReadTwoPhaseFile(TransactionId xid)
{ {
ereport(WARNING, ereport(WARNING,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not open twophase state file \"%s\": %m", errmsg("could not open two-phase state file \"%s\": %m",
path))); path)));
return NULL; return NULL;
} }
@ -1036,7 +1036,7 @@ ReadTwoPhaseFile(TransactionId xid)
close(fd); close(fd);
ereport(WARNING, ereport(WARNING,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not stat twophase state file \"%s\": %m", errmsg("could not stat two-phase state file \"%s\": %m",
path))); path)));
return NULL; return NULL;
} }
@ -1067,7 +1067,7 @@ ReadTwoPhaseFile(TransactionId xid)
close(fd); close(fd);
ereport(WARNING, ereport(WARNING,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not read twophase state file \"%s\": %m", errmsg("could not read two-phase state file \"%s\": %m",
path))); path)));
pfree(buf); pfree(buf);
return NULL; return NULL;
@ -1128,7 +1128,7 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
if (buf == NULL) if (buf == NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATA_CORRUPTED), (errcode(ERRCODE_DATA_CORRUPTED),
errmsg("twophase state file for transaction %u is corrupt", errmsg("two-phase state file for transaction %u is corrupt",
xid))); xid)));
/* /*
@ -1250,7 +1250,7 @@ RemoveTwoPhaseFile(TransactionId xid, bool giveWarning)
if (errno != ENOENT || giveWarning) if (errno != ENOENT || giveWarning)
ereport(WARNING, ereport(WARNING,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not remove twophase state file \"%s\": %m", errmsg("could not remove two-phase state file \"%s\": %m",
path))); path)));
} }
@ -1279,7 +1279,7 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)
if (fd < 0) if (fd < 0)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not recreate twophase state file \"%s\": %m", errmsg("could not recreate two-phase state file \"%s\": %m",
path))); path)));
/* Write content and CRC */ /* Write content and CRC */
@ -1288,14 +1288,14 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)
close(fd); close(fd);
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not write twophase state file: %m"))); errmsg("could not write two-phase state file: %m")));
} }
if (write(fd, &statefile_crc, sizeof(pg_crc32)) != sizeof(pg_crc32)) if (write(fd, &statefile_crc, sizeof(pg_crc32)) != sizeof(pg_crc32))
{ {
close(fd); close(fd);
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not write twophase state file: %m"))); errmsg("could not write two-phase state file: %m")));
} }
/* /*
@ -1307,13 +1307,13 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)
close(fd); close(fd);
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not fsync twophase state file: %m"))); errmsg("could not fsync two-phase state file: %m")));
} }
if (close(fd) != 0) if (close(fd) != 0)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not close twophase state file: %m"))); errmsg("could not close two-phase state file: %m")));
} }
/* /*
@ -1390,7 +1390,7 @@ CheckPointTwoPhase(XLogRecPtr redo_horizon)
} }
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not open twophase state file \"%s\": %m", errmsg("could not open two-phase state file \"%s\": %m",
path))); path)));
} }
@ -1399,14 +1399,14 @@ CheckPointTwoPhase(XLogRecPtr redo_horizon)
close(fd); close(fd);
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not fsync twophase state file \"%s\": %m", errmsg("could not fsync two-phase state file \"%s\": %m",
path))); path)));
} }
if (close(fd) != 0) if (close(fd) != 0)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not close twophase state file \"%s\": %m", errmsg("could not close two-phase state file \"%s\": %m",
path))); path)));
} }
@ -1462,7 +1462,7 @@ PrescanPreparedTransactions(void)
if (TransactionIdFollowsOrEquals(xid, origNextXid)) if (TransactionIdFollowsOrEquals(xid, origNextXid))
{ {
ereport(WARNING, ereport(WARNING,
(errmsg("removing future twophase state file \"%s\"", (errmsg("removing future two-phase state file \"%s\"",
clde->d_name))); clde->d_name)));
RemoveTwoPhaseFile(xid, true); RemoveTwoPhaseFile(xid, true);
continue; continue;
@ -1478,7 +1478,7 @@ PrescanPreparedTransactions(void)
if (buf == NULL) if (buf == NULL)
{ {
ereport(WARNING, ereport(WARNING,
(errmsg("removing corrupt twophase state file \"%s\"", (errmsg("removing corrupt two-phase state file \"%s\"",
clde->d_name))); clde->d_name)));
RemoveTwoPhaseFile(xid, true); RemoveTwoPhaseFile(xid, true);
continue; continue;
@ -1489,7 +1489,7 @@ PrescanPreparedTransactions(void)
if (!TransactionIdEquals(hdr->xid, xid)) if (!TransactionIdEquals(hdr->xid, xid))
{ {
ereport(WARNING, ereport(WARNING,
(errmsg("removing corrupt twophase state file \"%s\"", (errmsg("removing corrupt two-phase state file \"%s\"",
clde->d_name))); clde->d_name)));
RemoveTwoPhaseFile(xid, true); RemoveTwoPhaseFile(xid, true);
pfree(buf); pfree(buf);
@ -1566,7 +1566,7 @@ RecoverPreparedTransactions(void)
if (TransactionIdDidCommit(xid) || TransactionIdDidAbort(xid)) if (TransactionIdDidCommit(xid) || TransactionIdDidAbort(xid))
{ {
ereport(WARNING, ereport(WARNING,
(errmsg("removing stale twophase state file \"%s\"", (errmsg("removing stale two-phase state file \"%s\"",
clde->d_name))); clde->d_name)));
RemoveTwoPhaseFile(xid, true); RemoveTwoPhaseFile(xid, true);
continue; continue;
@ -1577,7 +1577,7 @@ RecoverPreparedTransactions(void)
if (buf == NULL) if (buf == NULL)
{ {
ereport(WARNING, ereport(WARNING,
(errmsg("removing corrupt twophase state file \"%s\"", (errmsg("removing corrupt two-phase state file \"%s\"",
clde->d_name))); clde->d_name)));
RemoveTwoPhaseFile(xid, true); RemoveTwoPhaseFile(xid, true);
continue; continue;

6
src/backend/access/transam/xlog.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.250 2006/10/04 00:29:49 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.251 2006/10/06 17:13:58 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -6421,7 +6421,7 @@ pg_switch_xlog(PG_FUNCTION_ARGS)
if (!superuser()) if (!superuser())
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
(errmsg("must be superuser to switch xlog files")))); (errmsg("must be superuser to switch transaction log files"))));
switchpoint = RequestXLogSwitch(); switchpoint = RequestXLogSwitch();
@ -6529,7 +6529,7 @@ pg_xlogfile_name_offset(PG_FUNCTION_ARGS)
if (sscanf(locationstr, "%X/%X", &uxlogid, &uxrecoff) != 2) if (sscanf(locationstr, "%X/%X", &uxlogid, &uxrecoff) != 2)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("could not parse xlog location \"%s\"", errmsg("could not parse transaction log location \"%s\"",
locationstr))); locationstr)));
locationpoint.xlogid = uxlogid; locationpoint.xlogid = uxlogid;

6
src/backend/commands/copy.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.272 2006/10/04 00:29:50 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.273 2006/10/06 17:13:58 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -872,7 +872,7 @@ DoCopy(const CopyStmt *stmt)
strchr(cstate->null_print, '\n') != NULL) strchr(cstate->null_print, '\n') != NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("COPY null cannot use newline or carriage return"))); errmsg("COPY null representation cannot use newline or carriage return")));
/* Disallow backslash in non-CSV mode */ /* Disallow backslash in non-CSV mode */
if (!cstate->csv_mode && strchr(cstate->delim, '\\') != NULL) if (!cstate->csv_mode && strchr(cstate->delim, '\\') != NULL)
@ -1549,7 +1549,7 @@ copy_in_error_callback(void *arg)
else if (cstate->cur_attname) else if (cstate->cur_attname)
{ {
/* error is relevant to a particular column, value is NULL */ /* error is relevant to a particular column, value is NULL */
errcontext("COPY %s, line %d, column %s: NULL input", errcontext("COPY %s, line %d, column %s: null input",
cstate->cur_relname, cstate->cur_lineno, cstate->cur_relname, cstate->cur_lineno,
cstate->cur_attname); cstate->cur_attname);
} }

4
src/backend/commands/define.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/define.c,v 1.98 2006/10/04 00:29:51 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/define.c,v 1.99 2006/10/06 17:13:58 petere Exp $
* *
* DESCRIPTION * DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the * The "DefineFoo" routines take the parse tree and pick out the
@ -163,7 +163,7 @@ defGetBoolean(DefElem *def)
} }
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("%s requires a boolean value", errmsg("%s requires a Boolean value",
def->defname))); def->defname)));
return false; /* keep compiler quiet */ return false; /* keep compiler quiet */
} }

4
src/backend/commands/functioncmds.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.79 2006/10/04 00:29:51 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.80 2006/10/06 17:13:58 petere Exp $
* *
* DESCRIPTION * DESCRIPTION
* These routines take the parse tree and pick out the * These routines take the parse tree and pick out the
@ -1402,7 +1402,7 @@ DropCast(DropCastStmt *stmt)
TypeNameToString(stmt->targettype)))); TypeNameToString(stmt->targettype))));
else else
ereport(NOTICE, ereport(NOTICE,
(errmsg("cast from type %s to type %s does not exist ... skipping", (errmsg("cast from type %s to type %s does not exist, skipping",
TypeNameToString(stmt->sourcetype), TypeNameToString(stmt->sourcetype),
TypeNameToString(stmt->targettype)))); TypeNameToString(stmt->targettype))));

6
src/backend/commands/sequence.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.140 2006/10/04 00:29:51 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.141 2006/10/06 17:13:58 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1209,11 +1209,11 @@ process_owned_by(Relation seqrel, List *owned_by)
if (seqrel->rd_rel->relowner != tablerel->rd_rel->relowner) if (seqrel->rd_rel->relowner != tablerel->rd_rel->relowner)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("sequence must have same owner as table it is owned by"))); errmsg("sequence must have same owner as table it is linked to")));
if (RelationGetNamespace(seqrel) != RelationGetNamespace(tablerel)) if (RelationGetNamespace(seqrel) != RelationGetNamespace(tablerel))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("sequence must be in same schema as table it is owned by"))); errmsg("sequence must be in same schema as table it is linked to")));
/* Now, fetch the attribute number from the system cache */ /* Now, fetch the attribute number from the system cache */
attnum = get_attnum(RelationGetRelid(tablerel), attrname); attnum = get_attnum(RelationGetRelid(tablerel), attrname);

8
src/backend/commands/tablecmds.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.203 2006/10/04 00:29:51 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.204 2006/10/06 17:13:59 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -6232,7 +6232,7 @@ MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel)
if (attribute->attnotnull && !childatt->attnotnull) if (attribute->attnotnull && !childatt->attnotnull)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("column \"%s\" in child table must be NOT NULL", errmsg("column \"%s\" in child table must be marked NOT NULL",
NameStr(attribute->attname)))); NameStr(attribute->attname))));
childatt->attinhcount++; childatt->attinhcount++;
@ -6254,7 +6254,7 @@ MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel)
*/ */
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("child table missing column \"%s\"", errmsg("child table is missing column \"%s\"",
NameStr(attribute->attname)))); NameStr(attribute->attname))));
} }
@ -6356,7 +6356,7 @@ MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel)
decompile_conbin(child_contuple, tupleDesc))) decompile_conbin(child_contuple, tupleDesc)))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("constraint definition for CHECK constraint \"%s\" doesn't match", errmsg("constraint definition for check constraint \"%s\" does not match",
NameStr(parent_con->conname)))); NameStr(parent_con->conname))));
/* /*

4
src/backend/executor/execQual.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.195 2006/10/04 00:29:52 momjian Exp $ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.196 2006/10/06 17:13:59 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -274,7 +274,7 @@ ExecEvalArrayRef(ArrayRefExprState *astate,
if (isAssignment) if (isAssignment)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("array subscript in assignment must not be NULL"))); errmsg("array subscript in assignment must not be null")));
*isNull = true; *isNull = true;
return (Datum) NULL; return (Datum) NULL;
} }

5
src/backend/libpq/auth.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.144 2006/10/04 00:29:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.145 2006/10/06 17:13:59 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -835,7 +835,8 @@ CheckLDAPAuth(Port *port)
if (_ldap_start_tls_sA == NULL) if (_ldap_start_tls_sA == NULL)
{ {
ereport(LOG, ereport(LOG,
(errmsg("could not load function _ldap_start_tls_sA in wldap32.dll. LDAP over SSL is not supported on this platform."))); (errmsg("could not load function _ldap_start_tls_sA in wldap32.dll"),
errdetail("LDAP over SSL is not supported on this platform.")));
return STATUS_ERROR; return STATUS_ERROR;
} }

10
src/backend/libpq/be-secure.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.73 2006/10/04 00:29:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.74 2006/10/06 17:13:59 petere Exp $
* *
* Since the server static private key ($DataDir/server.key) * Since the server static private key ($DataDir/server.key)
* will normally be stored unencrypted so that the database * will normally be stored unencrypted so that the database
@ -811,17 +811,17 @@ initialize_SSL(void)
X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL); X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
#else #else
ereport(LOG, ereport(LOG,
(errmsg("SSL Certificate Revocation List (CRL) file \"%s\" ignored", (errmsg("SSL certificate revocation list file \"%s\" ignored",
ROOT_CRL_FILE), ROOT_CRL_FILE),
errdetail("Installed SSL library does not support CRL."))); errdetail("SSL library does not support certificate revocation lists.")));
#endif #endif
else else
{ {
/* Not fatal - we do not require CRL */ /* Not fatal - we do not require CRL */
ereport(LOG, ereport(LOG,
(errmsg("SSL Certificate Revocation List (CRL) file \"%s\" not found, skipping: %s", (errmsg("SSL certificate revocation list file \"%s\" not found, skipping: %s",
ROOT_CRL_FILE, SSLerrmessage()), ROOT_CRL_FILE, SSLerrmessage()),
errdetail("Will not check certificates against CRL."))); errdetail("Certificates will not be checked against revocation list.")));
} }
} }

4
src/backend/postmaster/bgwriter.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.28 2006/10/04 00:29:56 momjian Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.29 2006/10/06 17:13:59 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -437,7 +437,7 @@ BackgroundWriterMain(void)
*/ */
if ((switchpoint.xrecoff % XLogSegSize) != 0) if ((switchpoint.xrecoff % XLogSegSize) != 0)
ereport(DEBUG1, ereport(DEBUG1,
(errmsg("xlog switch forced (archive_timeout=%d)", (errmsg("transaction log switch forced (archive_timeout=%d)",
XLogArchiveTimeout))); XLogArchiveTimeout)));
/* /*

8
src/backend/rewrite/rewriteHandler.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.167 2006/10/04 00:29:56 momjian Exp $ * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.168 2006/10/06 17:13:59 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1653,21 +1653,21 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
case CMD_INSERT: case CMD_INSERT:
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot INSERT RETURNING on relation \"%s\"", errmsg("cannot perform INSERT RETURNING on relation \"%s\"",
RelationGetRelationName(rt_entry_relation)), RelationGetRelationName(rt_entry_relation)),
errhint("You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause."))); errhint("You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause.")));
break; break;
case CMD_UPDATE: case CMD_UPDATE:
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot UPDATE RETURNING on relation \"%s\"", errmsg("cannot perform UPDATE RETURNING on relation \"%s\"",
RelationGetRelationName(rt_entry_relation)), RelationGetRelationName(rt_entry_relation)),
errhint("You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause."))); errhint("You need an unconditional ON UPDATE DO INSTEAD rule with a RETURNING clause.")));
break; break;
case CMD_DELETE: case CMD_DELETE:
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot DELETE RETURNING on relation \"%s\"", errmsg("cannot perform DELETE RETURNING on relation \"%s\"",
RelationGetRelationName(rt_entry_relation)), RelationGetRelationName(rt_entry_relation)),
errhint("You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause."))); errhint("You need an unconditional ON DELETE DO INSTEAD rule with a RETURNING clause.")));
break; break;

4
src/backend/utils/adt/acl.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.135 2006/09/05 21:08:36 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.136 2006/10/06 17:13:59 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -379,7 +379,7 @@ check_acl(const Acl *acl)
if (ARR_HASNULL(acl)) if (ARR_HASNULL(acl))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("ACL arrays must not contain nulls"))); errmsg("ACL arrays must not contain null values")));
} }
/* /*

6
src/backend/utils/adt/arrayfuncs.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.133 2006/10/04 00:29:58 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.134 2006/10/06 17:13:59 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1984,7 +1984,7 @@ array_set(ArrayType *array,
if (isNull) if (isNull)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("cannot assign NULL to an element of a fixed-length array"))); errmsg("cannot assign null value to an element of a fixed-length array")));
newarray = (ArrayType *) palloc(arraytyplen); newarray = (ArrayType *) palloc(arraytyplen);
memcpy(newarray, array, arraytyplen); memcpy(newarray, array, arraytyplen);
@ -2944,7 +2944,7 @@ deconstruct_array(ArrayType *array,
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("NULL array element not allowed in this context"))); errmsg("null array element not allowed in this context")));
} }
else else
{ {

4
src/backend/utils/fmgr/dfmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.91 2006/10/04 00:30:01 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.92 2006/10/06 17:13:59 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -285,7 +285,7 @@ internal_load_library(const char *libname)
ereport(ERROR, ereport(ERROR,
(errmsg("incompatible library \"%s\": missing magic block", (errmsg("incompatible library \"%s\": missing magic block",
libname), libname),
errhint("Extension libraries are now required to use the PG_MODULE_MAGIC macro."))); errhint("Extension libraries are required to use the PG_MODULE_MAGIC macro.")));
} }
/* /*

4
src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.22 2006/10/04 00:30:02 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.23 2006/10/06 17:13:59 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -134,7 +134,7 @@ iso8859_to_utf8(PG_FUNCTION_ARGS)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INTERNAL_ERROR), (errcode(ERRCODE_INTERNAL_ERROR),
errmsg("unexpected encoding id %d for ISO-8859 charsets", encoding))); errmsg("unexpected encoding ID %d for ISO 8859 character sets", encoding)));
PG_RETURN_VOID(); PG_RETURN_VOID();
} }

4
src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c,v 1.6 2006/10/04 00:30:03 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c,v 1.7 2006/10/06 17:14:00 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -124,7 +124,7 @@ win_to_utf8(PG_FUNCTION_ARGS)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INTERNAL_ERROR), (errcode(ERRCODE_INTERNAL_ERROR),
errmsg("unexpected encoding id %d for WIN charsets", encoding))); errmsg("unexpected encoding ID %d for WIN character sets", encoding)));
PG_RETURN_VOID(); PG_RETURN_VOID();
} }

6
src/backend/utils/misc/guc.c
View File

@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.354 2006/10/04 00:30:03 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.355 2006/10/06 17:14:00 petere Exp $
* *
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
@ -894,7 +894,7 @@ static struct config_bool ConfigureNamesBool[] =
{"array_nulls", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS, {"array_nulls", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
gettext_noop("Enable input of NULL elements in arrays."), gettext_noop("Enable input of NULL elements in arrays."),
gettext_noop("When turned on, unquoted NULL in an array input " gettext_noop("When turned on, unquoted NULL in an array input "
"value means a NULL value; " "value means a null value; "
"otherwise it is taken literally.") "otherwise it is taken literally.")
}, },
&Array_nulls, &Array_nulls,
@ -1611,7 +1611,7 @@ static struct config_int ConfigureNamesInt[] =
{ {
{"gin_fuzzy_search_limit", PGC_USERSET, UNGROUPED, {"gin_fuzzy_search_limit", PGC_USERSET, UNGROUPED,
gettext_noop("Sets the maximum allowed result for exact search by gin."), gettext_noop("Sets the maximum allowed result for exact search by GIN."),
NULL, NULL,
0 0
}, },

4
src/backend/utils/misc/tzparser.c
View File

@ -13,7 +13,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/tzparser.c,v 1.2 2006/10/04 00:30:04 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/tzparser.c,v 1.3 2006/10/06 17:14:00 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -233,7 +233,7 @@ addToArray(tzEntry **base, int *arraysize, int n,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("time zone abbreviation \"%s\" is multiply defined", errmsg("time zone abbreviation \"%s\" is multiply defined",
entry->abbrev), entry->abbrev),
errdetail("Time zone file \"%s\", line %d conflicts with file \"%s\", line %d.", errdetail("Entry in time zone file \"%s\", line %d, conflicts with entry in file \"%s\", line %d.",
midptr->filename, midptr->lineno, midptr->filename, midptr->lineno,
entry->filename, entry->lineno))); entry->filename, entry->lineno)));
return -1; return -1;

9
src/bin/pg_dump/pg_dump.c
View File

@ -12,7 +12,7 @@
* by PostgreSQL * by PostgreSQL
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.450 2006/10/04 00:30:05 momjian Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.451 2006/10/06 17:14:00 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -617,7 +617,7 @@ main(int argc, char **argv)
if (schemaList != NULL && g_fout->remoteVersion < 70300) if (schemaList != NULL && g_fout->remoteVersion < 70300)
{ {
write_msg(NULL, "Postgres must be at least version 7.3 to use schema switches\n"); write_msg(NULL, "server version must be at least 7.3 to use schema switches\n");
exit_nicely(); exit_nicely();
} }
@ -893,11 +893,12 @@ help(const char *progname)
printf(_(" -a, --data-only dump only the data, not the schema\n")); printf(_(" -a, --data-only dump only the data, not the schema\n"));
printf(_(" -c, --clean clean (drop) schema prior to create\n")); printf(_(" -c, --clean clean (drop) schema prior to create\n"));
printf(_(" -C, --create include commands to create database in dump\n")); printf(_(" -C, --create include commands to create database in dump\n"));
printf(_(" -d, --inserts dump data as INSERT, rather than COPY, commands\n")); printf(_(" -d, --inserts dump data as INSERT commands, rather than COPY\n"));
printf(_(" -D, --column-inserts dump data as INSERT commands with column names\n")); printf(_(" -D, --column-inserts dump data as INSERT commands with column names\n"));
printf(_(" -E, --encoding=ENCODING dump the data in encoding ENCODING\n")); printf(_(" -E, --encoding=ENCODING dump the data in encoding ENCODING\n"));
printf(_(" -n, --schema=SCHEMA dump the named schema only\n")); printf(_(" -n, --schema=SCHEMA dump the named schema only\n"));
printf(_(" -N, --exclude-schema=SCHEMA do NOT dump the named schema\n")); printf(_(" -N, --exclude-schema=SCHEMA\n"
" do NOT dump the named schema\n"));
printf(_(" -o, --oids include OIDs in dump\n")); printf(_(" -o, --oids include OIDs in dump\n"));
printf(_(" -O, --no-owner skip restoration of object ownership\n" printf(_(" -O, --no-owner skip restoration of object ownership\n"
" in plain text format\n")); " in plain text format\n"));

7
src/bin/pg_dump/pg_restore.c
View File

@ -34,7 +34,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.81 2006/09/27 15:41:23 tgl Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.82 2006/10/06 17:14:00 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -396,9 +396,10 @@ usage(const char *progname)
" use SESSION AUTHORIZATION commands instead of\n" " use SESSION AUTHORIZATION commands instead of\n"
" OWNER TO commands\n")); " OWNER TO commands\n"));
printf(_(" -X no-data-for-failed-tables\n" printf(_(" -X no-data-for-failed-tables\n"
" do not restore data of tables which could not be\n" " do not restore data of tables that could not be\n"
" created\n")); " created\n"));
printf(_(" -1, --single-transaction restore as a single transaction\n")); printf(_(" -1, --single-transaction\n"
" restore as a single transaction\n"));
printf(_("\nConnection options:\n")); printf(_("\nConnection options:\n"));
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n")); printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));

10
src/bin/psql/command.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2006, PostgreSQL Global Development Group * Copyright (c) 2000-2006, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.173 2006/10/04 00:30:05 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.174 2006/10/06 17:14:00 petere Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "command.h" #include "command.h"
@ -1077,7 +1077,7 @@ do_connect(char *dbname, char *user, char *host, char *port)
/* pset.db is left unmodified */ /* pset.db is left unmodified */
if (o_conn) if (o_conn)
fputs(_("Previous connection kept.\n"), stderr); fputs(_("Previous connection kept\n"), stderr);
} }
else else
{ {
@ -1106,15 +1106,15 @@ do_connect(char *dbname, char *user, char *host, char *port)
{ {
printf(_("You are now connected to database \"%s\""), PQdb(pset.db)); printf(_("You are now connected to database \"%s\""), PQdb(pset.db));
if (param_is_newly_set(PQuser(o_conn), PQuser(pset.db)))
printf(_(" as user \"%s\""), PQuser(pset.db));
if (param_is_newly_set(PQhost(o_conn), PQhost(pset.db))) if (param_is_newly_set(PQhost(o_conn), PQhost(pset.db)))
printf(_(" on host \"%s\""), PQhost(pset.db)); printf(_(" on host \"%s\""), PQhost(pset.db));
if (param_is_newly_set(PQport(o_conn), PQport(pset.db))) if (param_is_newly_set(PQport(o_conn), PQport(pset.db)))
printf(_(" at port \"%s\""), PQport(pset.db)); printf(_(" at port \"%s\""), PQport(pset.db));
if (param_is_newly_set(PQuser(o_conn), PQuser(pset.db)))
printf(_(" as user \"%s\""), PQuser(pset.db));
printf(".\n"); printf(".\n");
} }

6
src/bin/psql/copy.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2006, PostgreSQL Global Development Group * Copyright (c) 2000-2006, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.69 2006/10/04 00:30:05 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.70 2006/10/06 17:14:00 petere Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
#include "copy.h" #include "copy.h"
@ -713,7 +713,7 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary)
/* got here with longjmp */ /* got here with longjmp */
/* Terminate data transfer */ /* Terminate data transfer */
PQputCopyEnd(conn, _("aborted by user cancel")); PQputCopyEnd(conn, _("canceled by user"));
/* Check command status and return to normal libpq state */ /* Check command status and return to normal libpq state */
res = PQgetResult(conn); res = PQgetResult(conn);
@ -840,7 +840,7 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary)
/* Terminate data transfer */ /* Terminate data transfer */
if (PQputCopyEnd(conn, if (PQputCopyEnd(conn,
OK ? NULL : _("aborted due to read failure")) <= 0) OK ? NULL : _("aborted because of read failure")) <= 0)
OK = false; OK = false;
/* Check command status and return to normal libpq state */ /* Check command status and return to normal libpq state */

6
src/bin/psql/help.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2006, PostgreSQL Global Development Group * Copyright (c) 2000-2006, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.114 2006/07/15 03:35:21 tgl Exp $ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.115 2006/10/06 17:14:00 petere Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -75,7 +75,7 @@ usage(void)
#endif /* WIN32 */ #endif /* WIN32 */
} }
/* If this " is the start of the string then it ought to end there to fit in 80 columns >> " */ /* >>> If this " is the start of the string then it ought to end there to fit in 80 columns >> " */
printf(_("This is psql %s, the PostgreSQL interactive terminal.\n\n"), printf(_("This is psql %s, the PostgreSQL interactive terminal.\n\n"),
PG_VERSION); PG_VERSION);
puts(_("Usage:")); puts(_("Usage:"));
@ -89,7 +89,7 @@ usage(void)
printf(_(" -d DBNAME specify database name to connect to (default: \"%s\")\n"), env); printf(_(" -d DBNAME specify database name to connect to (default: \"%s\")\n"), env);
puts(_(" -c COMMAND run only single command (SQL or internal) and exit")); puts(_(" -c COMMAND run only single command (SQL or internal) and exit"));
puts(_(" -f FILENAME execute commands from file, then exit")); puts(_(" -f FILENAME execute commands from file, then exit"));
puts(_(" -1 (numeral) execute command file as a single transaction")); puts(_(" -1 (\"one\") execute command file as a single transaction"));
puts(_(" -l list available databases, then exit")); puts(_(" -l list available databases, then exit"));
puts(_(" -v NAME=VALUE set psql variable NAME to VALUE")); puts(_(" -v NAME=VALUE set psql variable NAME to VALUE"));
puts(_(" -X do not read startup file (~/.psqlrc)")); puts(_(" -X do not read startup file (~/.psqlrc)"));

22
src/interfaces/libpq/fe-connect.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.337 2006/10/04 00:30:12 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.338 2006/10/06 17:14:00 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2428,7 +2428,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
if (pg_strncasecmp(url, LDAP_URL, strlen(LDAP_URL)) != 0) if (pg_strncasecmp(url, LDAP_URL, strlen(LDAP_URL)) != 0)
{ {
printfPQExpBuffer(errorMessage, printfPQExpBuffer(errorMessage,
libpq_gettext("bad LDAP URL \"%s\": scheme must be ldap://\n"), purl); libpq_gettext("invalid LDAP URL \"%s\": scheme must be ldap://\n"), purl);
free(url); free(url);
return 3; return 3;
} }
@ -2443,7 +2443,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
if (p == NULL || *(p + 1) == '\0' || *(p + 1) == '?') if (p == NULL || *(p + 1) == '\0' || *(p + 1) == '?')
{ {
printfPQExpBuffer(errorMessage, libpq_gettext( printfPQExpBuffer(errorMessage, libpq_gettext(
"bad LDAP URL \"%s\": missing distinguished name\n"), purl); "invalid LDAP URL \"%s\": missing distinguished name\n"), purl);
free(url); free(url);
return 3; return 3;
} }
@ -2454,7 +2454,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
if ((p = strchr(dn, '?')) == NULL || *(p + 1) == '\0' || *(p + 1) == '?') if ((p = strchr(dn, '?')) == NULL || *(p + 1) == '\0' || *(p + 1) == '?')
{ {
printfPQExpBuffer(errorMessage, libpq_gettext( printfPQExpBuffer(errorMessage, libpq_gettext(
"bad LDAP URL \"%s\": must have exactly one attribute\n"), purl); "invalid LDAP URL \"%s\": must have exactly one attribute\n"), purl);
free(url); free(url);
return 3; return 3;
} }
@ -2464,8 +2464,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
/* scope */ /* scope */
if ((p = strchr(attrs[0], '?')) == NULL || *(p + 1) == '\0' || *(p + 1) == '?') if ((p = strchr(attrs[0], '?')) == NULL || *(p + 1) == '\0' || *(p + 1) == '?')
{ {
printfPQExpBuffer(errorMessage, libpq_gettext( printfPQExpBuffer(errorMessage, libpq_gettext("invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"), purl);
"bad LDAP URL \"%s\": must have search scope (base/one/sub)\n"), purl);
free(url); free(url);
return 3; return 3;
} }
@ -2476,7 +2475,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
if ((p = strchr(scopestr, '?')) == NULL || *(p + 1) == '\0' || *(p + 1) == '?') if ((p = strchr(scopestr, '?')) == NULL || *(p + 1) == '\0' || *(p + 1) == '?')
{ {
printfPQExpBuffer(errorMessage, printfPQExpBuffer(errorMessage,
libpq_gettext("bad LDAP URL \"%s\": no filter\n"), purl); libpq_gettext("invalid LDAP URL \"%s\": no filter\n"), purl);
free(url); free(url);
return 3; return 3;
} }
@ -2497,7 +2496,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
if (*portstr == '\0' || *endptr != '\0' || errno || lport < 0 || lport > 65535) if (*portstr == '\0' || *endptr != '\0' || errno || lport < 0 || lport > 65535)
{ {
printfPQExpBuffer(errorMessage, libpq_gettext( printfPQExpBuffer(errorMessage, libpq_gettext(
"bad LDAP URL \"%s\": invalid port number\n"), purl); "invalid LDAP URL \"%s\": invalid port number\n"), purl);
free(url); free(url);
return 3; return 3;
} }
@ -2508,7 +2507,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
if (strchr(attrs[0], ',') != NULL) if (strchr(attrs[0], ',') != NULL)
{ {
printfPQExpBuffer(errorMessage, libpq_gettext( printfPQExpBuffer(errorMessage, libpq_gettext(
"bad LDAP URL \"%s\": must have exactly one attribute\n"), purl); "invalid LDAP URL \"%s\": must have exactly one attribute\n"), purl);
free(url); free(url);
return 3; return 3;
} }
@ -2522,8 +2521,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
scope = LDAP_SCOPE_SUBTREE; scope = LDAP_SCOPE_SUBTREE;
else else
{ {
printfPQExpBuffer(errorMessage, libpq_gettext( printfPQExpBuffer(errorMessage, libpq_gettext("invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"), purl);
"bad LDAP URL \"%s\": must have search scope (base/one/sub)\n"), purl);
free(url); free(url);
return 3; return 3;
} }
@ -2532,7 +2530,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
if ((ld = ldap_init(hostname, port)) == NULL) if ((ld = ldap_init(hostname, port)) == NULL)
{ {
printfPQExpBuffer(errorMessage, printfPQExpBuffer(errorMessage,
libpq_gettext("error creating LDAP structure\n")); libpq_gettext("could not create LDAP structure\n"));
free(url); free(url);
return 3; return 3;
} }

4
src/interfaces/libpq/fe-secure.c
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.88 2006/10/04 00:30:13 momjian Exp $ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.89 2006/10/06 17:14:01 petere Exp $
* *
* NOTES * NOTES
* [ Most of these notes are wrong/obsolete, but perhaps not all ] * [ Most of these notes are wrong/obsolete, but perhaps not all ]
@ -808,7 +808,7 @@ initialize_SSL(PGconn *conn)
char *err = SSLerrmessage(); char *err = SSLerrmessage();
printfPQExpBuffer(&conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
libpq_gettext("Installed SSL library does not support CRL certificates, file \"%s\"\n"), libpq_gettext("SSL library does not support CRL certificates (file \"%s\")\n"),
fnbuf); fnbuf);
SSLerrfree(err); SSLerrfree(err);
return -1; return -1;

2
src/test/regress/expected/alter_table.out
View File

@ -328,7 +328,7 @@ ERROR: child table missing constraint matching parent table constraint "foo"
-- fail due to missing column -- fail due to missing column
alter table atacc3 rename test2 to testx; alter table atacc3 rename test2 to testx;
alter table atacc3 inherit atacc2; alter table atacc3 inherit atacc2;
ERROR: child table missing column "test2" ERROR: child table is missing column "test2"
-- fail due to mismatched data type -- fail due to mismatched data type
alter table atacc3 add test2 bool; alter table atacc3 add test2 bool;
alter table atacc3 add inherit atacc2; alter table atacc3 add inherit atacc2;

2
src/test/regress/expected/domain.out
View File

@ -137,7 +137,7 @@ ERROR: null value in column "col3" violates not-null constraint
CONTEXT: COPY nulltest, line 1: "a b \N d d" CONTEXT: COPY nulltest, line 1: "a b \N d d"
COPY nulltest FROM stdin; --fail COPY nulltest FROM stdin; --fail
ERROR: domain dcheck does not allow null values ERROR: domain dcheck does not allow null values
CONTEXT: COPY nulltest, line 1, column col5: NULL input CONTEXT: COPY nulltest, line 1, column col5: null input
-- Last row is bad -- Last row is bad
COPY nulltest FROM stdin; COPY nulltest FROM stdin;
ERROR: new row for relation "nulltest" violates check constraint "nulltest_col5_check" ERROR: new row for relation "nulltest" violates check constraint "nulltest_col5_check"

2
src/test/regress/expected/returning.out
View File

@ -200,7 +200,7 @@ CREATE RULE voo_i AS ON INSERT TO voo DO INSTEAD
INSERT INTO voo VALUES(11,'zit'); INSERT INTO voo VALUES(11,'zit');
-- fails: -- fails:
INSERT INTO voo VALUES(12,'zoo') RETURNING *, f1*2; INSERT INTO voo VALUES(12,'zoo') RETURNING *, f1*2;
ERROR: cannot INSERT RETURNING on relation "voo" ERROR: cannot perform INSERT RETURNING on relation "voo"
HINT: You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause. HINT: You need an unconditional ON INSERT DO INSTEAD rule with a RETURNING clause.
-- fails, incompatible list: -- fails, incompatible list:
CREATE OR REPLACE RULE voo_i AS ON INSERT TO voo DO INSTEAD CREATE OR REPLACE RULE voo_i AS ON INSERT TO voo DO INSTEAD