Wording cleanup for error messages. Also change can't -> cannot.

Standard English uses "may", "can", and "might" in different ways:

        may - permission, "You may borrow my rake."

        can - ability, "I can lift that log."

        might - possibility, "It might rain today."

Unfortunately, in conversational English, their use is often mixed, as
in, "You may use this variable to do X", when in fact, "can" is a better
choice.  Similarly, "It may crash" is better stated, "It might crash".
This commit is contained in:
Bruce Momjian 2007-02-01 19:10:30 +00:00
parent baaec74c5a
commit 8b4ff8b6a1
103 changed files with 274 additions and 274 deletions

View File

@ -31,7 +31,7 @@ autoinc(PG_FUNCTION_ARGS)
elog(ERROR, "not fired by trigger manager"); elog(ERROR, "not fired by trigger manager");
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "can't process STATEMENT events"); elog(ERROR, "cannot process STATEMENT events");
if (TRIGGER_FIRED_AFTER(trigdata->tg_event)) if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "must be fired before event"); elog(ERROR, "must be fired before event");
@ -42,7 +42,7 @@ autoinc(PG_FUNCTION_ARGS)
rettuple = trigdata->tg_newtuple; rettuple = trigdata->tg_newtuple;
else else
/* internal error */ /* internal error */
elog(ERROR, "can't process DELETE events"); elog(ERROR, "cannot process DELETE events");
rel = trigdata->tg_relation; rel = trigdata->tg_relation;
relname = SPI_getrelname(rel); relname = SPI_getrelname(rel);

View File

@ -1,7 +1,7 @@
/* /*
* insert_username.c * insert_username.c
* $Modified: Thu Oct 16 08:13:42 1997 by brook $ * $Modified: Thu Oct 16 08:13:42 1997 by brook $
* $PostgreSQL: pgsql/contrib/spi/insert_username.c,v 1.14 2006/05/30 22:12:13 tgl Exp $ * $PostgreSQL: pgsql/contrib/spi/insert_username.c,v 1.15 2007/02/01 19:10:23 momjian Exp $
* *
* insert user name in response to a trigger * insert user name in response to a trigger
* usage: insert_username (column_name) * usage: insert_username (column_name)
@ -37,7 +37,7 @@ insert_username(PG_FUNCTION_ARGS)
elog(ERROR, "insert_username: not fired by trigger manager"); elog(ERROR, "insert_username: not fired by trigger manager");
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "insert_username: can't process STATEMENT events"); elog(ERROR, "insert_username: cannot process STATEMENT events");
if (TRIGGER_FIRED_AFTER(trigdata->tg_event)) if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "insert_username: must be fired before event"); elog(ERROR, "insert_username: must be fired before event");
@ -48,7 +48,7 @@ insert_username(PG_FUNCTION_ARGS)
rettuple = trigdata->tg_newtuple; rettuple = trigdata->tg_newtuple;
else else
/* internal error */ /* internal error */
elog(ERROR, "insert_username: can't process DELETE events"); elog(ERROR, "insert_username: cannot process DELETE events");
rel = trigdata->tg_relation; rel = trigdata->tg_relation;
relname = SPI_getrelname(rel); relname = SPI_getrelname(rel);

View File

@ -1,7 +1,7 @@
/* /*
moddatetime.c moddatetime.c
$PostgreSQL: pgsql/contrib/spi/moddatetime.c,v 1.13 2006/05/30 22:12:13 tgl Exp $ $PostgreSQL: pgsql/contrib/spi/moddatetime.c,v 1.14 2007/02/01 19:10:23 momjian Exp $
What is this? What is this?
It is a function to be called from a trigger for the purpose of updating It is a function to be called from a trigger for the purpose of updating
@ -43,7 +43,7 @@ moddatetime(PG_FUNCTION_ARGS)
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "moddatetime: can't process STATEMENT events"); elog(ERROR, "moddatetime: cannot process STATEMENT events");
if (TRIGGER_FIRED_AFTER(trigdata->tg_event)) if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
/* internal error */ /* internal error */
@ -56,7 +56,7 @@ moddatetime(PG_FUNCTION_ARGS)
rettuple = trigdata->tg_newtuple; rettuple = trigdata->tg_newtuple;
else else
/* internal error */ /* internal error */
elog(ERROR, "moddatetime: can't process DELETE events"); elog(ERROR, "moddatetime: cannot process DELETE events");
rel = trigdata->tg_relation; rel = trigdata->tg_relation;
relname = SPI_getrelname(rel); relname = SPI_getrelname(rel);

View File

@ -77,7 +77,7 @@ check_primary_key(PG_FUNCTION_ARGS)
/* Should be called for ROW trigger */ /* Should be called for ROW trigger */
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "check_primary_key: can't process STATEMENT events"); elog(ERROR, "check_primary_key: cannot process STATEMENT events");
/* If INSERTion then must check Tuple to being inserted */ /* If INSERTion then must check Tuple to being inserted */
if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event)) if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
@ -86,7 +86,7 @@ check_primary_key(PG_FUNCTION_ARGS)
/* Not should be called for DELETE */ /* Not should be called for DELETE */
else if (TRIGGER_FIRED_BY_DELETE(trigdata->tg_event)) else if (TRIGGER_FIRED_BY_DELETE(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "check_primary_key: can't process DELETE events"); elog(ERROR, "check_primary_key: cannot process DELETE events");
/* If UPDATion the must check new Tuple, not old one */ /* If UPDATion the must check new Tuple, not old one */
else else
@ -277,12 +277,12 @@ check_foreign_key(PG_FUNCTION_ARGS)
/* Should be called for ROW trigger */ /* Should be called for ROW trigger */
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "check_foreign_key: can't process STATEMENT events"); elog(ERROR, "check_foreign_key: cannot process STATEMENT events");
/* Not should be called for INSERT */ /* Not should be called for INSERT */
if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event)) if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "check_foreign_key: can't process INSERT events"); elog(ERROR, "check_foreign_key: cannot process INSERT events");
/* Have to check tg_trigtuple - tuple being deleted */ /* Have to check tg_trigtuple - tuple being deleted */
trigtuple = trigdata->tg_trigtuple; trigtuple = trigdata->tg_trigtuple;

View File

@ -115,7 +115,7 @@ timetravel(PG_FUNCTION_ARGS)
/* Should be called for ROW trigger */ /* Should be called for ROW trigger */
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
elog(ERROR, "timetravel: can't process STATEMENT events"); elog(ERROR, "timetravel: cannot process STATEMENT events");
/* Should be called BEFORE */ /* Should be called BEFORE */
if (TRIGGER_FIRED_AFTER(trigdata->tg_event)) if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
@ -261,7 +261,7 @@ timetravel(PG_FUNCTION_ARGS)
elog(ERROR, "timetravel (%s): %s must be NOT NULL", relname, args[a_time_off]); elog(ERROR, "timetravel (%s): %s must be NOT NULL", relname, args[a_time_off]);
if (oldtimeon != newtimeon || oldtimeoff != newtimeoff) if (oldtimeon != newtimeon || oldtimeoff != newtimeoff)
elog(ERROR, "timetravel (%s): you can't change %s and/or %s columns (use set_timetravel)", elog(ERROR, "timetravel (%s): you cannot change %s and/or %s columns (use set_timetravel)",
relname, args[a_time_on], args[a_time_off]); relname, args[a_time_on], args[a_time_off]);
} }
if (oldtimeoff != NOEND_ABSTIME) if (oldtimeoff != NOEND_ABSTIME)

View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/contrib/tsearch2/dict_thesaurus.c,v 1.7 2006/12/26 14:54:24 teodor Exp $ */ /* $PostgreSQL: pgsql/contrib/tsearch2/dict_thesaurus.c,v 1.8 2007/02/01 19:10:23 momjian Exp $ */
/* /*
* thesaurus * thesaurus
@ -186,7 +186,7 @@ thesaurusRead(char *filename, DictThesaurus * d)
fh = fopen(to_absfilename(filename), "r"); fh = fopen(to_absfilename(filename), "r");
if (!fh) if (!fh)
elog(ERROR, "Thesaurus: can't open '%s' file", filename); elog(ERROR, "Thesaurus: cannot open '%s' file", filename);
while (fgets(str, sizeof(str), fh)) while (fgets(str, sizeof(str), fh))
{ {

View File

@ -859,7 +859,7 @@ tsearch2(PG_FUNCTION_ARGS)
trigdata = (TriggerData *) fcinfo->context; trigdata = (TriggerData *) fcinfo->context;
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "TSearch: Can't process STATEMENT events"); elog(ERROR, "TSearch: Cannot process STATEMENT events");
if (TRIGGER_FIRED_AFTER(trigdata->tg_event)) if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
/* internal error */ /* internal error */
elog(ERROR, "TSearch: Must be fired BEFORE event"); elog(ERROR, "TSearch: Must be fired BEFORE event");

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.79 2007/02/01 00:28:16 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.80 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="ecpg"> <chapter id="ecpg">
<title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title> <title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>
@ -522,7 +522,7 @@ EXEC SQL TYPE serial_t IS long;
<listitem> <listitem>
<para> <para>
You can declare pointers to the most common types. Note however that You can declare pointers to the most common types. Note however that
you can not use pointers as target variables of queries without you cannot use pointers as target variables of queries without
auto-allocation. See <xref linkend="ecpg-descriptors"> for more auto-allocation. See <xref linkend="ecpg-descriptors"> for more
information on auto-allocation. information on auto-allocation.
</para> </para>
@ -1084,7 +1084,7 @@ int PGTYPESnumeric_from_decimal(decimal *src, numeric *dst);
<literal>src</> points to into the numeric variable that <literal>src</> points to into the numeric variable that
<literal>dst</> points to. It returns 0 on success and -1 if an error <literal>dst</> points to. It returns 0 on success and -1 if an error
occurs. Since the decimal type is implemented as a limited version of occurs. Since the decimal type is implemented as a limited version of
the numeric type, overflow can not occur with this conversion. the numeric type, overflow cannot occur with this conversion.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -4548,7 +4548,7 @@ EXEC SQL DEFINE MYNUMBER 12;
EXEC SQL UPDATE Tbl SET col = MYNUMBER; EXEC SQL UPDATE Tbl SET col = MYNUMBER;
</programlisting> </programlisting>
then ecpg will already do the substitution and your C compiler will never then ecpg will already do the substitution and your C compiler will never
see any name or identifier <literal>MYNUMBER</>. Note that you can not use see any name or identifier <literal>MYNUMBER</>. Note that you cannot use
<literal>#define</literal> for a constant that you are going to use in an <literal>#define</literal> for a constant that you are going to use in an
embedded SQL query because in this case the embedded SQL precompiler is not embedded SQL query because in this case the embedded SQL precompiler is not
able to see this declaration. able to see this declaration.

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/gin.sgml,v 2.9 2007/01/31 20:56:17 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/gin.sgml,v 2.10 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="GIN"> <chapter id="GIN">
<title>GIN Indexes</title> <title>GIN Indexes</title>
@ -209,7 +209,7 @@
<acronym>GIN</acronym> will emit an error. Depending on the operator, <acronym>GIN</acronym> will emit an error. Depending on the operator,
a void query might match all, some, or none of the indexed values (for a void query might match all, some, or none of the indexed values (for
example, every array contains the empty array, but does not overlap the example, every array contains the empty array, but does not overlap the
empty array), and <acronym>GIN</acronym> can't determine the correct empty array), and <acronym>GIN</acronym> cannot determine the correct
answer, nor produce a full-index-scan result if it could determine that answer, nor produce a full-index-scan result if it could determine that
that was correct. that was correct.
</para> </para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.280 2007/02/01 00:28:17 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.281 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="installation"> <chapter id="installation">
<title><![%standalone-include[<productname>PostgreSQL</>]]> <title><![%standalone-include[<productname>PostgreSQL</>]]>
@ -1040,7 +1040,7 @@ su - postgres
<listitem> <listitem>
<para> <para>
Enables <firstterm>assertion</> checks in the server, which test for Enables <firstterm>assertion</> checks in the server, which test for
many <quote>can't happen</> conditions. This is invaluable for many <quote>cannot happen</> conditions. This is invaluable for
code development purposes, but the tests slow things down a little. code development purposes, but the tests slow things down a little.
Also, having the tests turned on won't necessarily enhance the Also, having the tests turned on won't necessarily enhance the
stability of your server! The assertion checks are not categorized stability of your server! The assertion checks are not categorized

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.43 2007/01/31 20:56:17 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/lobj.sgml,v 1.44 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="largeObjects"> <chapter id="largeObjects">
<title id="largeObjects-title">Large Objects</title> <title id="largeObjects-title">Large Objects</title>
@ -437,7 +437,7 @@ importFile(PGconn *conn, char *filename)
fd = open(filename, O_RDONLY, 0666); fd = open(filename, O_RDONLY, 0666);
if (fd &lt; 0) if (fd &lt; 0)
{ /* error */ { /* error */
fprintf(stderr, &quot;can't open unix file %s\n&quot;, filename); fprintf(stderr, &quot;cannot open unix file %s\n&quot;, filename);
} }
/* /*
@ -445,7 +445,7 @@ importFile(PGconn *conn, char *filename)
*/ */
lobjId = lo_creat(conn, INV_READ | INV_WRITE); lobjId = lo_creat(conn, INV_READ | INV_WRITE);
if (lobjId == 0) if (lobjId == 0)
fprintf(stderr, &quot;can't create large object\n&quot;); fprintf(stderr, &quot;cannot create large object\n&quot;);
lobj_fd = lo_open(conn, lobjId, INV_WRITE); lobj_fd = lo_open(conn, lobjId, INV_WRITE);
@ -476,7 +476,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd = lo_open(conn, lobjId, INV_READ); lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd &lt; 0) if (lobj_fd &lt; 0)
{ {
fprintf(stderr, &quot;can't open large object %d\n&quot;, fprintf(stderr, &quot;cannot open large object %d\n&quot;,
lobjId); lobjId);
} }
@ -508,7 +508,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd = lo_open(conn, lobjId, INV_WRITE); lobj_fd = lo_open(conn, lobjId, INV_WRITE);
if (lobj_fd &lt; 0) if (lobj_fd &lt; 0)
{ {
fprintf(stderr, &quot;can't open large object %d\n&quot;, fprintf(stderr, &quot;cannot open large object %d\n&quot;,
lobjId); lobjId);
} }
@ -550,7 +550,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
lobj_fd = lo_open(conn, lobjId, INV_READ); lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd &lt; 0) if (lobj_fd &lt; 0)
{ {
fprintf(stderr, &quot;can't open large object %d\n&quot;, fprintf(stderr, &quot;cannot open large object %d\n&quot;,
lobjId); lobjId);
} }
@ -560,7 +560,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
fd = open(filename, O_CREAT | O_WRONLY, 0666); fd = open(filename, O_CREAT | O_WRONLY, 0666);
if (fd &lt; 0) if (fd &lt; 0)
{ /* error */ { /* error */
fprintf(stderr, &quot;can't open unix file %s\n&quot;, fprintf(stderr, &quot;cannot open unix file %s\n&quot;,
filename); filename);
} }

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.69 2007/02/01 00:28:17 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/maintenance.sgml,v 1.70 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="maintenance"> <chapter id="maintenance">
<title>Routine Database Maintenance Tasks</title> <title>Routine Database Maintenance Tasks</title>
@ -296,7 +296,7 @@
wraparound</>: the XID counter wraps around to zero, and all of a sudden wraparound</>: the XID counter wraps around to zero, and all of a sudden
transactions that were in the past appear to be in the future &mdash; which transactions that were in the past appear to be in the future &mdash; which
means their outputs become invisible. In short, catastrophic data loss. means their outputs become invisible. In short, catastrophic data loss.
(Actually the data is still there, but that's cold comfort if you can't (Actually the data is still there, but that's cold comfort if you cannot
get at it.) To avoid this, it is necessary to vacuum every table get at it.) To avoid this, it is necessary to vacuum every table
in every database at least once every two billion transactions. in every database at least once every two billion transactions.
</para> </para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/perform.sgml,v 1.62 2007/02/01 00:28:17 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/perform.sgml,v 1.63 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="performance-tips"> <chapter id="performance-tips">
<title>Performance Tips</title> <title>Performance Tips</title>
@ -437,7 +437,7 @@ EXPLAIN ANALYZE SELECT * FROM tenk1 t1, tenk2 t2 WHERE t1.unique1 &lt; 100 AND t
<para> <para>
It is worth noting that <command>EXPLAIN</> results should not be extrapolated It is worth noting that <command>EXPLAIN</> results should not be extrapolated
to situations other than the one you are actually testing; for example, to situations other than the one you are actually testing; for example,
results on a toy-sized table can't be assumed to apply to large tables. results on a toy-sized table cannot be assumed to apply to large tables.
The planner's cost estimates are not linear and so it might choose The planner's cost estimates are not linear and so it might choose
a different plan for a larger or smaller table. An extreme example a different plan for a larger or smaller table. An extreme example
is that on a table that only occupies one disk page, you'll nearly is that on a table that only occupies one disk page, you'll nearly

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.62 2007/02/01 00:28:17 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.63 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="plperl"> <chapter id="plperl">
<title>PL/Perl - Perl Procedural Language</title> <title>PL/Perl - Perl Procedural Language</title>
@ -397,7 +397,7 @@ CREATE OR REPLACE FUNCTION lotsa_md5 (INTEGER) RETURNS SETOF foo_type AS $$
my $t = localtime; my $t = localtime;
elog(NOTICE, "opening file $file at $t" ); elog(NOTICE, "opening file $file at $t" );
open my $fh, '&lt;', $file # ooh, it's a file access! open my $fh, '&lt;', $file # ooh, it's a file access!
or elog(ERROR, "can't open $file for reading: $!"); or elog(ERROR, "cannot open $file for reading: $!");
my @words = &lt;$fh&gt;; my @words = &lt;$fh&gt;;
close $fh; close $fh;
$t = localtime; $t = localtime;
@ -541,7 +541,7 @@ CREATE OR REPLACE FUNCTION set_var(name text, val text) RETURNS text AS $$
if ($_SHARED{$_[0]} = $_[1]) { if ($_SHARED{$_[0]} = $_[1]) {
return 'ok'; return 'ok';
} else { } else {
return "can't set shared variable $_[0] to $_[1]"; return "cannot set shared variable $_[0] to $_[1]";
} }
$$ LANGUAGE plperl; $$ LANGUAGE plperl;

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/queries.sgml,v 1.43 2007/02/01 00:28:17 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/queries.sgml,v 1.44 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="queries"> <chapter id="queries">
<title>Queries</title> <title>Queries</title>
@ -591,7 +591,7 @@ FROM (SELECT * FROM table1) AS alias_name
<para> <para>
This example is equivalent to <literal>FROM table1 AS This example is equivalent to <literal>FROM table1 AS
alias_name</literal>. More interesting cases, which can't be alias_name</literal>. More interesting cases, which cannot be
reduced to a plain join, arise when the subquery involves reduced to a plain join, arise when the subquery involves
grouping or aggregation. grouping or aggregation.
</para> </para>

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.72 2007/01/31 23:26:03 momjian Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/create_function.sgml,v 1.73 2007/02/01 19:10:24 momjian Exp $
--> -->
<refentry id="SQL-CREATEFUNCTION"> <refentry id="SQL-CREATEFUNCTION">
@ -61,7 +61,7 @@ CREATE [ OR REPLACE ] FUNCTION
Also, <command>CREATE OR REPLACE FUNCTION</command> will not let Also, <command>CREATE OR REPLACE FUNCTION</command> will not let
you change the return type of an existing function. To do that, you change the return type of an existing function. To do that,
you must drop and recreate the function. (When using <literal>OUT</> you must drop and recreate the function. (When using <literal>OUT</>
parameters, that means you can't change the names or types of any parameters, that means you cannot change the names or types of any
<literal>OUT</> parameters except by dropping the function.) <literal>OUT</> parameters except by dropping the function.)
</para> </para>

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.50 2007/02/01 00:28:18 momjian Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/create_rule.sgml,v 1.51 2007/02/01 19:10:24 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -138,7 +138,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
Any <acronym>SQL</acronym> conditional expression (returning Any <acronym>SQL</acronym> conditional expression (returning
<type>boolean</type>). The condition expression cannot refer <type>boolean</type>). The condition expression cannot refer
to any tables except <literal>NEW</> and <literal>OLD</>, and to any tables except <literal>NEW</> and <literal>OLD</>, and
can not contain aggregate functions. cannot contain aggregate functions.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.46 2007/01/31 23:26:03 momjian Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/create_trigger.sgml,v 1.47 2007/02/01 19:10:24 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -71,7 +71,7 @@ CREATE TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTE
</para> </para>
<para> <para>
<command>SELECT</command> does not modify any rows so you can not <command>SELECT</command> does not modify any rows so you cannot
create <command>SELECT</command> triggers. Rules and views are more create <command>SELECT</command> triggers. Rules and views are more
appropriate in such cases. appropriate in such cases.
</para> </para>

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.39 2007/01/31 23:26:04 momjian Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/initdb.sgml,v 1.40 2007/02/01 19:10:24 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -79,7 +79,7 @@ PostgreSQL documentation
locale and character set encoding. The collation order locale and character set encoding. The collation order
(<literal>LC_COLLATE</>) and character set classes (<literal>LC_COLLATE</>) and character set classes
(<literal>LC_CTYPE</>, e.g. upper, lower, digit) are fixed for all (<literal>LC_CTYPE</>, e.g. upper, lower, digit) are fixed for all
databases and can not be changed. Collation orders other than databases and cannot be changed. Collation orders other than
<literal>C</> or <literal>POSIX</> also have a performance penalty. <literal>C</> or <literal>POSIX</> also have a performance penalty.
For these reasons it is important to choose the right locale when For these reasons it is important to choose the right locale when
running <command>initdb</command>. The remaining locale categories running <command>initdb</command>. The remaining locale categories
@ -266,7 +266,7 @@ PostgreSQL documentation
By default, when <command>initdb</command> By default, when <command>initdb</command>
determines that an error prevented it from completely creating the database determines that an error prevented it from completely creating the database
cluster, it removes any files it might have created before discovering cluster, it removes any files it might have created before discovering
that it can't finish the job. This option inhibits tidying-up and is that it cannot finish the job. This option inhibits tidying-up and is
thus useful for debugging. thus useful for debugging.
</para> </para>
</listitem> </listitem>

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/notify.sgml,v 1.29 2007/01/31 23:26:04 momjian Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/notify.sgml,v 1.30 2007/02/01 19:10:24 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -64,7 +64,7 @@ NOTIFY <replaceable class="PARAMETER">name</replaceable>
to a particular table, a useful programming technique is to put the to a particular table, a useful programming technique is to put the
<command>NOTIFY</command> in a rule that is triggered by table updates. <command>NOTIFY</command> in a rule that is triggered by table updates.
In this way, notification happens automatically when the table is changed, In this way, notification happens automatically when the table is changed,
and the application programmer can't accidentally forget to do it. and the application programmer cannot accidentally forget to do it.
</para> </para>
<para> <para>

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.182 2007/02/01 00:28:19 momjian Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.183 2007/02/01 19:10:24 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -543,7 +543,7 @@ PostgreSQL documentation
determined at compile time. determined at compile time.
Since the database server uses the same default, you will not have Since the database server uses the same default, you will not have
to specify the port in most cases. The default user name is your to specify the port in most cases. The default user name is your
Unix user name, as is the default database name. Note that you can't Unix user name, as is the default database name. Note that you cannot
just connect to any database under any user name. Your database just connect to any database under any user name. Your database
administrator should have informed you about your access rights. administrator should have informed you about your access rights.
</para> </para>

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/rollback_to.sgml,v 1.8 2006/09/16 00:30:20 momjian Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/rollback_to.sgml,v 1.9 2007/02/01 19:10:24 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -82,7 +82,7 @@ ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</re
left it pointing to (that is, <command>FETCH</> is not rolled back). left it pointing to (that is, <command>FETCH</> is not rolled back).
Closing a cursor is not undone by rolling back, either. Closing a cursor is not undone by rolling back, either.
A cursor whose execution causes a transaction to abort is put in a A cursor whose execution causes a transaction to abort is put in a
can't-execute state, so while the transaction can be restored using cannot-execute state, so while the transaction can be restored using
<command>ROLLBACK TO SAVEPOINT</>, the cursor can no longer be used. <command>ROLLBACK TO SAVEPOINT</>, the cursor can no longer be used.
</para> </para>
</refsect1> </refsect1>

View File

@ -1,5 +1,5 @@
<!-- <!--
$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.98 2007/02/01 00:28:19 momjian Exp $ $PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.99 2007/02/01 19:10:25 momjian Exp $
PostgreSQL documentation PostgreSQL documentation
--> -->
@ -892,8 +892,8 @@ FOR SHARE [ OF <replaceable class="parameter">table_name</replaceable> [, ...] ]
<para> <para>
<literal>FOR UPDATE</literal> and <literal>FOR SHARE</literal> cannot be <literal>FOR UPDATE</literal> and <literal>FOR SHARE</literal> cannot be
used in contexts where returned rows can't be clearly identified with used in contexts where returned rows cannot be clearly identified with
individual table rows; for example they can't be used with aggregation. individual table rows; for example they cannot be used with aggregation.
</para> </para>
<caution> <caution>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.495 2007/02/01 07:00:32 neilc Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.496 2007/02/01 19:10:24 momjian Exp $ -->
<!-- <!--
Typical markup: Typical markup:
@ -16382,7 +16382,7 @@ Jdbc cleanups(Peter)
Show backend status on ps command line(only works on some platforms)(Bruce) Show backend status on ps command line(only works on some platforms)(Bruce)
Pg_hba.conf now has a sameuser option in the database field Pg_hba.conf now has a sameuser option in the database field
Make lo_unlink take oid param, not int4 Make lo_unlink take oid param, not int4
New DISABLE_COMPLEX_MACRO for compilers that can't handle our macros(Bruce) New DISABLE_COMPLEX_MACRO for compilers that cannot handle our macros(Bruce)
Libpgtcl now handles NOTIFY as a Tcl event, need not send dummy queries(Tom) Libpgtcl now handles NOTIFY as a Tcl event, need not send dummy queries(Tom)
libpgtcl cleanups(Tom) libpgtcl cleanups(Tom)
Add -error option to libpgtcl's pg_result command(Tom) Add -error option to libpgtcl's pg_result command(Tom)
@ -16737,7 +16737,7 @@ Better identify tcl and tk libs and includes(Bruce)
places where subselects provide a better solution for your queries. I places where subselects provide a better solution for your queries. I
think you will find that there are more uses for subselects than you might think you will find that there are more uses for subselects than you might
think. Vadim has put us on the big SQL map with subselects, and fully think. Vadim has put us on the big SQL map with subselects, and fully
functional ones too. The only thing you can't do with subselects is to functional ones too. The only thing you cannot do with subselects is to
use them in the target list. use them in the target list.
</para> </para>
<para> <para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.50 2007/02/01 00:28:18 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.51 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="rules"> <chapter id="rules">
<title>The Rule System</title> <title>The Rule System</title>
@ -1078,7 +1078,7 @@ INSERT INTO shoelace_log VALUES (
FROM shoelace_data *NEW*, shoelace_data *OLD*; FROM shoelace_data *NEW*, shoelace_data *OLD*;
</programlisting> </programlisting>
(This looks a little strange since you can't normally write (This looks a little strange since you cannot normally write
<literal>INSERT ... VALUES ... FROM</>. The <literal>FROM</> <literal>INSERT ... VALUES ... FROM</>. The <literal>FROM</>
clause here is just to indicate that there are range-table entries clause here is just to indicate that there are range-table entries
in the query tree for <literal>*NEW*</> and <literal>*OLD*</>. in the query tree for <literal>*NEW*</> and <literal>*OLD*</>.

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/sources.sgml,v 2.23 2007/02/01 00:28:18 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/sources.sgml,v 2.24 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="source"> <chapter id="source">
<title>PostgreSQL Coding Conventions</title> <title>PostgreSQL Coding Conventions</title>
@ -95,7 +95,7 @@ ereport(ERROR,
func_signature_string(funcname, nargs, func_signature_string(funcname, nargs,
actual_arg_types)), actual_arg_types)),
errhint("Unable to choose a best candidate function. " errhint("Unable to choose a best candidate function. "
"You may need to add explicit typecasts."))); "You might need to add explicit typecasts.")));
</programlisting> </programlisting>
This illustrates the use of format codes to embed run-time values into This illustrates the use of format codes to embed run-time values into
a message text. Also, an optional <quote>hint</> message is provided. a message text. Also, an optional <quote>hint</> message is provided.
@ -145,7 +145,7 @@ ereport(ERROR,
<function>errmsg_internal(const char *msg, ...)</function> is the same as <function>errmsg_internal(const char *msg, ...)</function> is the same as
<function>errmsg</>, except that the message string will not be <function>errmsg</>, except that the message string will not be
included in the internationalization message dictionary. included in the internationalization message dictionary.
This should be used for <quote>can't happen</> cases that are probably This should be used for <quote>cannot happen</> cases that are probably
not worth expending translation effort on. not worth expending translation effort on.
</para> </para>
</listitem> </listitem>
@ -224,7 +224,7 @@ ereport(level, (errmsg_internal("format string", ...)));
Therefore, <function>elog</> should be used only for internal errors and Therefore, <function>elog</> should be used only for internal errors and
low-level debug logging. Any message that is likely to be of interest to low-level debug logging. Any message that is likely to be of interest to
ordinary users should go through <function>ereport</>. Nonetheless, ordinary users should go through <function>ereport</>. Nonetheless,
there are enough internal <quote>can't happen</> error checks in the there are enough internal <quote>cannot happen</> error checks in the
system that <function>elog</> is still widely used; it is preferred for system that <function>elog</> is still widely used; it is preferred for
those messages for its notational simplicity. those messages for its notational simplicity.
</para> </para>
@ -528,7 +528,7 @@ BETTER: could not open file %s (I/O failure)
not helpful information. If the error text doesn't make as much sense not helpful information. If the error text doesn't make as much sense
without the function name, reword it. without the function name, reword it.
<programlisting> <programlisting>
BAD: pg_atoi: error in "z": can't parse "z" BAD: pg_atoi: error in "z": cannot parse "z"
BETTER: invalid input syntax for integer: "z" BETTER: invalid input syntax for integer: "z"
</programlisting> </programlisting>
</para> </para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.51 2007/02/01 00:28:18 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.52 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="spi"> <chapter id="spi">
<title>Server Programming Interface</title> <title>Server Programming Interface</title>
@ -2954,7 +2954,7 @@ INSERT INTO a SELECT * FROM a;
(either an ordinary function or a trigger) follow one or the (either an ordinary function or a trigger) follow one or the
other of the above rules depending on the read/write flag passed other of the above rules depending on the read/write flag passed
to SPI. Commands executed in read-only mode follow the first to SPI. Commands executed in read-only mode follow the first
rule: they can't see changes of the calling command. Commands executed rule: they cannot see changes of the calling command. Commands executed
in read-write mode follow the second rule: they can see all changes made in read-write mode follow the second rule: they can see all changes made
so far. so far.
</para> </para>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/sql.sgml,v 1.44 2007/01/31 20:56:19 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/sql.sgml,v 1.45 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="sql-intro"> <chapter id="sql-intro">
<title>SQL</title> <title>SQL</title>
@ -1557,7 +1557,7 @@ SELECT *
<para> <para>
If we want to know the highest average part price among all our If we want to know the highest average part price among all our
suppliers, we can't write MAX(AVG(PRICE)), but we can write: suppliers, we cannot write MAX(AVG(PRICE)), but we can write:
<programlisting> <programlisting>
SELECT MAX(subtable.avgprice) SELECT MAX(subtable.avgprice)

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.113 2007/02/01 00:28:18 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.114 2007/02/01 19:10:24 momjian Exp $ -->
<chapter id="sql-syntax"> <chapter id="sql-syntax">
<title>SQL Syntax</title> <title>SQL Syntax</title>
@ -1425,7 +1425,7 @@ CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable>
</synopsis> </synopsis>
However, this only works for types whose names are also valid as However, this only works for types whose names are also valid as
function names. For example, <literal>double precision</literal> function names. For example, <literal>double precision</literal>
can't be used this way, but the equivalent <literal>float8</literal> cannot be used this way, but the equivalent <literal>float8</literal>
can. Also, the names <literal>interval</>, <literal>time</>, and can. Also, the names <literal>interval</>, <literal>time</>, and
<literal>timestamp</> can only be used in this fashion if they are <literal>timestamp</> can only be used in this fashion if they are
double-quoted, because of syntactic conflicts. Therefore, the use of double-quoted, because of syntactic conflicts. Therefore, the use of

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.50 2007/01/31 21:03:37 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/typeconv.sgml,v 1.51 2007/02/01 19:10:24 momjian Exp $ -->
<chapter Id="typeconv"> <chapter Id="typeconv">
<title>Type Conversion</title> <title>Type Conversion</title>
@ -447,10 +447,10 @@ try a similar case with <literal>~</>, we get:
SELECT ~ '20' AS "negation"; SELECT ~ '20' AS "negation";
ERROR: operator is not unique: ~ "unknown" ERROR: operator is not unique: ~ "unknown"
HINT: Could not choose a best candidate operator. You may need to add explicit HINT: Could not choose a best candidate operator. You might need to add explicit
type casts. type casts.
</screen> </screen>
This happens because the system can't decide which of the several This happens because the system cannot decide which of the several
possible <literal>~</> operators should be preferred. We can help possible <literal>~</> operators should be preferred. We can help
it out with an explicit cast: it out with an explicit cast:
<screen> <screen>

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.124 2007/02/01 00:28:18 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.125 2007/02/01 19:10:24 momjian Exp $ -->
<sect1 id="xfunc"> <sect1 id="xfunc">
<title>User-Defined Functions</title> <title>User-Defined Functions</title>
@ -114,7 +114,7 @@
Besides <command>SELECT</command> queries, the commands can include data Besides <command>SELECT</command> queries, the commands can include data
modification queries (<command>INSERT</command>, modification queries (<command>INSERT</command>,
<command>UPDATE</command>, and <command>DELETE</command>), as well as <command>UPDATE</command>, and <command>DELETE</command>), as well as
other SQL commands. (The only exception is that you can't put other SQL commands. (The only exception is that you cannot put
<command>BEGIN</>, <command>COMMIT</>, <command>ROLLBACK</>, or <command>BEGIN</>, <command>COMMIT</>, <command>ROLLBACK</>, or
<command>SAVEPOINT</> commands into a <acronym>SQL</acronym> function.) <command>SAVEPOINT</> commands into a <acronym>SQL</acronym> function.)
However, the final command However, the final command

View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/xoper.sgml,v 1.40 2007/02/01 00:28:18 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/xoper.sgml,v 1.41 2007/02/01 19:10:24 momjian Exp $ -->
<sect1 id="xoper"> <sect1 id="xoper">
<title>User-Defined Operators</title> <title>User-Defined Operators</title>
@ -355,7 +355,7 @@ table1.column1 OP table2.column2
Care should be exercised when preparing a hash function, because there Care should be exercised when preparing a hash function, because there
are machine-dependent ways in which it might fail to do the right thing. are machine-dependent ways in which it might fail to do the right thing.
For example, if your data type is a structure in which there might be For example, if your data type is a structure in which there might be
uninteresting pad bits, you can't simply pass the whole structure to uninteresting pad bits, you cannot simply pass the whole structure to
<function>hash_any</>. (Unless you write your other operators and <function>hash_any</>. (Unless you write your other operators and
functions to ensure that the unused bits are always zero, which is the functions to ensure that the unused bits are always zero, which is the
recommended strategy.) recommended strategy.)

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/gist/gistxlog.c,v 1.25 2007/01/05 22:19:22 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.26 2007/02/01 19:10:25 momjian Exp $
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include "postgres.h" #include "postgres.h"
@ -687,7 +687,7 @@ gistContinueInsert(gistIncompleteInsert *insert)
} }
if (ntodelete == 0) if (ntodelete == 0)
elog(PANIC, "gistContinueInsert: can't find pointer to page(s)"); elog(PANIC, "gistContinueInsert: cannot find pointer to page(s)");
/* /*
* we check space with subtraction only first tuple to delete, * we check space with subtraction only first tuple to delete,

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.41 2007/01/05 22:19:22 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.42 2007/02/01 19:10:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -99,7 +99,7 @@ _hash_dropscan(IndexScanDesc scan)
last = chk; last = chk;
if (chk == NULL) if (chk == NULL)
elog(ERROR, "hash scan list trashed; can't find 0x%p", (void *) scan); elog(ERROR, "hash scan list trashed; cannot find 0x%p", (void *) scan);
if (last == NULL) if (last == NULL)
HashScans = chk->hashsl_next; HashScans = chk->hashsl_next;

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/nbtree/nbtxlog.c,v 1.40 2007/01/05 22:19:23 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.41 2007/02/01 19:10:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -142,7 +142,7 @@ _bt_restore_page(Page page, char *from, int len)
itemsz = MAXALIGN(itemsz); itemsz = MAXALIGN(itemsz);
if (PageAddItem(page, (Item) from, itemsz, if (PageAddItem(page, (Item) from, itemsz,
FirstOffsetNumber, LP_USED) == InvalidOffsetNumber) FirstOffsetNumber, LP_USED) == InvalidOffsetNumber)
elog(PANIC, "_bt_restore_page: can't add item to page"); elog(PANIC, "_bt_restore_page: cannot add item to page");
from += itemsz; from += itemsz;
} }
} }

View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.231 2007/01/05 22:19:23 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.232 2007/02/01 19:10:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2582,7 +2582,7 @@ RequireTransactionChain(void *stmtNode, const char *stmtType)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION), (errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
/* translator: %s represents an SQL statement name */ /* translator: %s represents an SQL statement name */
errmsg("%s may only be used in transaction blocks", errmsg("%s can only be used in transaction blocks",
stmtType))); stmtType)));
} }

View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, 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.260 2007/01/05 22:19:23 momjian Exp $ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.261 2007/02/01 19:10:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -4670,8 +4670,8 @@ StartupXLOG(void)
ereport(LOG, ereport(LOG,
(errmsg("database system was interrupted while in recovery at log time %s", (errmsg("database system was interrupted while in recovery at log time %s",
str_time(ControlFile->checkPointCopy.time)), str_time(ControlFile->checkPointCopy.time)),
errhint("If this has occurred more than once some data may be corrupted" errhint("If this has occurred more than once some data might be corrupted"
" and you may need to choose an earlier recovery target."))); " and you might need to choose an earlier recovery target.")));
else if (ControlFile->state == DB_IN_PRODUCTION) else if (ControlFile->state == DB_IN_PRODUCTION)
ereport(LOG, ereport(LOG,
(errmsg("database system was interrupted; last known up at %s", (errmsg("database system was interrupted; last known up at %s",

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.135 2007/01/23 05:07:17 tgl Exp $ * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.136 2007/02/01 19:10:25 momjian Exp $
* *
* NOTES * NOTES
* See acl.h. * See acl.h.
@ -998,7 +998,7 @@ ExecGrant_Language(InternalGrant *istmt)
(errcode(ERRCODE_WRONG_OBJECT_TYPE), (errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("language \"%s\" is not trusted", errmsg("language \"%s\" is not trusted",
NameStr(pg_language_tuple->lanname)), NameStr(pg_language_tuple->lanname)),
errhint("Only superusers may use untrusted languages."))); errhint("Only superusers can use untrusted languages.")));
/* /*
* Get owner ID and working copy of existing ACL. If there's no ACL, * Get owner ID and working copy of existing ACL. If there's no ACL,

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/catalog/dependency.c,v 1.62 2007/01/05 22:19:24 momjian Exp $ * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.63 2007/02/01 19:10:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -607,7 +607,7 @@ recursiveDeletion(const ObjectAddress *object,
(errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST), (errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST),
errmsg("cannot drop %s because %s requires it", errmsg("cannot drop %s because %s requires it",
objDescription, otherObjDesc), objDescription, otherObjDesc),
errhint("You may drop %s instead.", errhint("You can drop %s instead.",
otherObjDesc))); otherObjDesc)));
} }

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.277 2007/01/25 02:17:26 momjian Exp $ * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.278 2007/02/01 19:10:25 momjian Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
@ -667,7 +667,7 @@ index_create(Oid heapRelationId,
/* Shouldn't have any expressions */ /* Shouldn't have any expressions */
if (indexInfo->ii_Expressions) if (indexInfo->ii_Expressions)
elog(ERROR, "constraints can't have index expressions"); elog(ERROR, "constraints cannot have index expressions");
conOid = CreateConstraintEntry(indexRelationName, conOid = CreateConstraintEntry(indexRelationName,
namespaceId, namespaceId,

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/catalog/namespace.c,v 1.90 2007/01/05 22:19:24 momjian Exp $ * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.91 2007/02/01 19:10:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -236,7 +236,7 @@ RangeVarGetCreationNamespace(const RangeVar *newRelation)
if (newRelation->schemaname) if (newRelation->schemaname)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_TABLE_DEFINITION), (errcode(ERRCODE_INVALID_TABLE_DEFINITION),
errmsg("temporary tables may not specify a schema name"))); errmsg("temporary tables cannot specify a schema name")));
/* Initialize temp namespace if first time through */ /* Initialize temp namespace if first time through */
if (!OidIsValid(myTempNamespace)) if (!OidIsValid(myTempNamespace))
InitTempTableNamespace(); InitTempTableNamespace();

View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.155 2007/01/05 22:19:25 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.156 2007/02/01 19:10:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -376,9 +376,9 @@ check_index_is_clusterable(Relation OldHeap, Oid indexOid, bool recheck)
errmsg("cannot cluster on index \"%s\" because access method does not handle null values", errmsg("cannot cluster on index \"%s\" because access method does not handle null values",
RelationGetRelationName(OldIndex)), RelationGetRelationName(OldIndex)),
recheck recheck
? errhint("You may be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table.", ? errhint("You might be able to work around this by marking column \"%s\" NOT NULL, or use ALTER TABLE ... SET WITHOUT CLUSTER to remove the cluster specification from the table.",
NameStr(OldHeap->rd_att->attrs[colno - 1]->attname)) NameStr(OldHeap->rd_att->attrs[colno - 1]->attname))
: errhint("You may be able to work around this by marking column \"%s\" NOT NULL.", : errhint("You might be able to work around this by marking column \"%s\" NOT NULL.",
NameStr(OldHeap->rd_att->attrs[colno - 1]->attname)))); NameStr(OldHeap->rd_att->attrs[colno - 1]->attname))));
} }
else if (colno < 0) else if (colno < 0)

View File

@ -7,7 +7,7 @@
* Copyright (c) 1996-2007, PostgreSQL Global Development Group * Copyright (c) 1996-2007, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.95 2007/01/23 05:07:17 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.96 2007/02/01 19:10:25 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -584,7 +584,7 @@ CommentDatabase(List *qualname, char *comment)
if (list_length(qualname) != 1) if (list_length(qualname) != 1)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("database name may not be qualified"))); errmsg("database name cannot be qualified")));
database = strVal(linitial(qualname)); database = strVal(linitial(qualname));
/* /*
@ -632,7 +632,7 @@ CommentTablespace(List *qualname, char *comment)
if (list_length(qualname) != 1) if (list_length(qualname) != 1)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("tablespace name may not be qualified"))); errmsg("tablespace name cannot be qualified")));
tablespace = strVal(linitial(qualname)); tablespace = strVal(linitial(qualname));
oid = get_tablespace_oid(tablespace); oid = get_tablespace_oid(tablespace);
@ -669,7 +669,7 @@ CommentRole(List *qualname, char *comment)
if (list_length(qualname) != 1) if (list_length(qualname) != 1)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("role name may not be qualified"))); errmsg("role name cannot be qualified")));
role = strVal(linitial(qualname)); role = strVal(linitial(qualname));
oid = get_roleid_checked(role); oid = get_roleid_checked(role);
@ -702,7 +702,7 @@ CommentNamespace(List *qualname, char *comment)
if (list_length(qualname) != 1) if (list_length(qualname) != 1)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("schema name may not be qualified"))); errmsg("schema name cannot be qualified")));
namespace = strVal(linitial(qualname)); namespace = strVal(linitial(qualname));
oid = GetSysCacheOid(NAMESPACENAME, oid = GetSysCacheOid(NAMESPACENAME,
@ -1161,7 +1161,7 @@ CommentLanguage(List *qualname, char *comment)
if (list_length(qualname) != 1) if (list_length(qualname) != 1)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("language name may not be qualified"))); errmsg("language name cannot be qualified")));
language = strVal(linitial(qualname)); language = strVal(linitial(qualname));
oid = GetSysCacheOid(LANGNAME, oid = GetSysCacheOid(LANGNAME,

View File

@ -13,7 +13,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.190 2007/01/17 16:25:01 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.191 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -707,7 +707,7 @@ RenameDatabase(const char *oldname, const char *newname)
if (db_id == MyDatabaseId) if (db_id == MyDatabaseId)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("current database may not be renamed"))); errmsg("current database cannot be renamed")));
/* /*
* Make sure the database does not have active sessions. This is the same * Make sure the database does not have active sessions. This is the same

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.154 2007/01/25 04:35:10 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.155 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -315,7 +315,7 @@ DefineIndex(RangeVar *heapRelation,
if (list_length(rangetable) != 1 || getrelid(1, rangetable) != relationId) if (list_length(rangetable) != 1 || getrelid(1, rangetable) != relationId)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE), (errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
errmsg("index expressions and predicates may refer only to the table being indexed"))); errmsg("index expressions and predicates can refer only to the table being indexed")));
} }
/* /*

View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.53 2007/01/23 05:07:17 tgl Exp $ * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.54 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -508,7 +508,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
else if (!amstorage) else if (!amstorage)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("storage type may not be different from data type for access method \"%s\"", errmsg("storage type cannot be different from data type for access method \"%s\"",
stmt->amname))); stmt->amname)));
} }
@ -932,7 +932,7 @@ AlterOpFamilyAdd(List *opfamilyname, Oid amoid, Oid opfamilyoid,
case OPCLASS_ITEM_STORAGETYPE: case OPCLASS_ITEM_STORAGETYPE:
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("STORAGE may not be specified in ALTER OPERATOR FAMILY"))); errmsg("STORAGE cannot be specified in ALTER OPERATOR FAMILY")));
break; break;
default: default:
elog(ERROR, "unrecognized item type: %d", item->itemtype); elog(ERROR, "unrecognized item type: %d", item->itemtype);

View File

@ -14,7 +14,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.58 2007/01/05 22:19:26 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.59 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -88,7 +88,7 @@ PerformCursorOpen(DeclareCursorStmt *stmt, ParamListInfo params)
if (query->into) if (query->into)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_CURSOR_DEFINITION), (errcode(ERRCODE_INVALID_CURSOR_DEFINITION),
errmsg("DECLARE CURSOR may not specify INTO"))); errmsg("DECLARE CURSOR cannot specify INTO")));
if (query->rowMarks != NIL) if (query->rowMarks != NIL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.42 2007/01/05 22:19:26 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.43 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -159,7 +159,7 @@ RemoveSchema(List *names, DropBehavior behavior, bool missing_ok)
if (list_length(names) != 1) if (list_length(names) != 1)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("schema name may not be qualified"))); errmsg("schema name cannot be qualified")));
namespaceName = strVal(linitial(names)); namespaceName = strVal(linitial(names));
namespaceId = GetSysCacheOid(NAMESPACENAME, namespaceId = GetSysCacheOid(NAMESPACENAME,

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.142 2007/01/05 22:19:26 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.143 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1121,7 +1121,7 @@ init_params(List *options, bool isInit,
snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->min_value); snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->min_value);
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("START value (%s) can't be less than MINVALUE (%s)", errmsg("START value (%s) cannot be less than MINVALUE (%s)",
bufs, bufm))); bufs, bufm)));
} }
if (new->last_value > new->max_value) if (new->last_value > new->max_value)
@ -1133,7 +1133,7 @@ init_params(List *options, bool isInit,
snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->max_value); snprintf(bufm, sizeof(bufm), INT64_FORMAT, new->max_value);
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("START value (%s) can't be greater than MAXVALUE (%s)", errmsg("START value (%s) cannot be greater than MAXVALUE (%s)",
bufs, bufm))); bufs, bufm)));
} }

View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.41 2007/01/25 04:35:10 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.42 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -228,7 +228,7 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)
if (strchr(location, '\'')) if (strchr(location, '\''))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_NAME), (errcode(ERRCODE_INVALID_NAME),
errmsg("tablespace location may not contain single quotes"))); errmsg("tablespace location cannot contain single quotes")));
/* /*
* Allowing relative paths seems risky * Allowing relative paths seems risky

View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, 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/commands/user.c,v 1.175 2007/01/05 22:19:26 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.176 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1007,11 +1007,11 @@ RenameRole(const char *oldname, const char *newname)
if (roleid == GetSessionUserId()) if (roleid == GetSessionUserId())
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("session user may not be renamed"))); errmsg("session user cannot be renamed")));
if (roleid == GetOuterUserId()) if (roleid == GetOuterUserId())
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("current user may not be renamed"))); errmsg("current user cannot be renamed")));
/* make sure the new name doesn't exist */ /* make sure the new name doesn't exist */
if (SearchSysCacheExists(AUTHNAME, if (SearchSysCacheExists(AUTHNAME,

View File

@ -13,7 +13,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.343 2007/01/05 22:19:26 momjian Exp $ * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.344 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -905,7 +905,7 @@ vac_truncate_clog(TransactionId frozenXID)
{ {
ereport(WARNING, ereport(WARNING,
(errmsg("some databases have not been vacuumed in over 2 billion transactions"), (errmsg("some databases have not been vacuumed in over 2 billion transactions"),
errdetail("You may have already suffered transaction-wraparound data loss."))); errdetail("You might have already suffered transaction-wraparound data loss.")));
return; return;
} }
@ -1407,7 +1407,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
* release write lock before commit there.) * release write lock before commit there.)
*/ */
ereport(NOTICE, ereport(NOTICE,
(errmsg("relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- can't shrink relation", (errmsg("relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- cannot shrink relation",
relname, blkno, offnum, HeapTupleHeaderGetXmin(tuple.t_data)))); relname, blkno, offnum, HeapTupleHeaderGetXmin(tuple.t_data))));
do_shrinking = false; do_shrinking = false;
break; break;
@ -1420,7 +1420,7 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
* release write lock before commit there.) * release write lock before commit there.)
*/ */
ereport(NOTICE, ereport(NOTICE,
(errmsg("relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- can't shrink relation", (errmsg("relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- cannot shrink relation",
relname, blkno, offnum, HeapTupleHeaderGetXmax(tuple.t_data)))); relname, blkno, offnum, HeapTupleHeaderGetXmax(tuple.t_data))));
do_shrinking = false; do_shrinking = false;
break; break;
@ -1900,7 +1900,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
/* Quick exit if we have no vtlinks to search in */ /* Quick exit if we have no vtlinks to search in */
if (vacrelstats->vtlinks == NULL) if (vacrelstats->vtlinks == NULL)
{ {
elog(DEBUG2, "parent item in update-chain not found --- can't continue repair_frag"); elog(DEBUG2, "parent item in update-chain not found --- cannot continue repair_frag");
break; /* out of walk-along-page loop */ break; /* out of walk-along-page loop */
} }
@ -2040,7 +2040,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
if (vtlp == NULL) if (vtlp == NULL)
{ {
/* see discussion above */ /* see discussion above */
elog(DEBUG2, "parent item in update-chain not found --- can't continue repair_frag"); elog(DEBUG2, "parent item in update-chain not found --- cannot continue repair_frag");
chain_move_failed = true; chain_move_failed = true;
break; /* out of check-all-items loop */ break; /* out of check-all-items loop */
} }
@ -2075,7 +2075,7 @@ repair_frag(VRelStats *vacrelstats, Relation onerel,
HeapTupleHeaderGetXmin(tp.t_data)))) HeapTupleHeaderGetXmin(tp.t_data))))
{ {
ReleaseBuffer(Pbuf); ReleaseBuffer(Pbuf);
elog(DEBUG2, "too old parent tuple found --- can't continue repair_frag"); elog(DEBUG2, "too old parent tuple found --- cannot continue repair_frag");
chain_move_failed = true; chain_move_failed = true;
break; /* out of check-all-items loop */ break; /* out of check-all-items loop */
} }

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.209 2007/01/25 11:53:50 petere Exp $ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.210 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3465,7 +3465,7 @@ ExecInitExpr(Expr *node, PlanState *parent)
if (naggs != aggstate->numaggs) if (naggs != aggstate->numaggs)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR), (errcode(ERRCODE_GROUPING_ERROR),
errmsg("aggregate function calls may not be nested"))); errmsg("aggregate function calls cannot be nested")));
} }
else else
{ {

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.128 2007/01/20 20:45:39 tgl Exp $ * $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.129 2007/02/01 19:10:26 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -636,9 +636,9 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
* Otherwise the parser messed up. * Otherwise the parser messed up.
*/ */
if (!bms_is_subset(relids, qualscope)) if (!bms_is_subset(relids, qualscope))
elog(ERROR, "JOIN qualification may not refer to other relations"); elog(ERROR, "JOIN qualification cannot refer to other relations");
if (ojscope && !bms_is_subset(relids, ojscope)) if (ojscope && !bms_is_subset(relids, ojscope))
elog(ERROR, "JOIN qualification may not refer to other relations"); elog(ERROR, "JOIN qualification cannot refer to other relations");
/* /*
* If the clause is variable-free, our normal heuristic for pushing it * If the clause is variable-free, our normal heuristic for pushing it

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.231 2007/01/22 01:35:20 tgl Exp $ * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.232 2007/02/01 19:10:26 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -482,7 +482,7 @@ count_agg_clauses_walker(Node *node, AggClauseCounts *counts)
if (contain_agg_clause((Node *) aggref->args)) if (contain_agg_clause((Node *) aggref->args))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR), (errcode(ERRCODE_GROUPING_ERROR),
errmsg("aggregate function calls may not be nested"))); errmsg("aggregate function calls cannot be nested")));
/* /*
* Having checked that, we need not recurse into the argument. * Having checked that, we need not recurse into the argument.

View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, 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/parser/analyze.c,v 1.359 2007/01/12 19:34:41 momjian Exp $ * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.360 2007/02/01 19:10:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -646,7 +646,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt,
if (selectQuery->into) if (selectQuery->into)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("INSERT ... SELECT may not specify INTO"))); errmsg("INSERT ... SELECT cannot specify INTO")));
/* /*
* Make the source be a subquery in the INSERT's rangetable, and add * Make the source be a subquery in the INSERT's rangetable, and add
@ -1803,7 +1803,7 @@ transformIndexStmt(ParseState *pstate, IndexStmt *stmt)
if (expression_returns_set(ielem->expr)) if (expression_returns_set(ielem->expr))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("index expression may not return a set"))); errmsg("index expression cannot return a set")));
} }
} }
@ -1892,7 +1892,7 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt,
if (list_length(pstate->p_rtable) != 2) /* naughty, naughty... */ if (list_length(pstate->p_rtable) != 2) /* naughty, naughty... */
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("rule WHERE condition may not contain references to other relations"))); errmsg("rule WHERE condition cannot contain references to other relations")));
/* aggregates not allowed (but subselects are okay) */ /* aggregates not allowed (but subselects are okay) */
if (pstate->p_hasAggs) if (pstate->p_hasAggs)
@ -1967,7 +1967,7 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt,
stmt->whereClause != NULL) stmt->whereClause != NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE actions"))); errmsg("rules with WHERE conditions can only have SELECT, INSERT, UPDATE, or DELETE actions")));
/* /*
* If the action is INSERT...SELECT, OLD/NEW have been pushed down * If the action is INSERT...SELECT, OLD/NEW have been pushed down
@ -2003,11 +2003,11 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt,
if (has_old) if (has_old)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("ON SELECT rule may not use OLD"))); errmsg("ON SELECT rule cannot use OLD")));
if (has_new) if (has_new)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("ON SELECT rule may not use NEW"))); errmsg("ON SELECT rule cannot use NEW")));
break; break;
case CMD_UPDATE: case CMD_UPDATE:
/* both are OK */ /* both are OK */
@ -2016,13 +2016,13 @@ transformRuleStmt(ParseState *pstate, RuleStmt *stmt,
if (has_old) if (has_old)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("ON INSERT rule may not use OLD"))); errmsg("ON INSERT rule cannot use OLD")));
break; break;
case CMD_DELETE: case CMD_DELETE:
if (has_new) if (has_new)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION), (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("ON DELETE rule may not use NEW"))); errmsg("ON DELETE rule cannot use NEW")));
break; break;
default: default:
elog(ERROR, "unrecognized event type: %d", elog(ERROR, "unrecognized event type: %d",
@ -2663,7 +2663,7 @@ transformSetOperationTree(ParseState *pstate, SelectStmt *stmt)
if (contain_vars_of_level((Node *) selectQuery, 1)) if (contain_vars_of_level((Node *) selectQuery, 1))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE), (errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
errmsg("UNION/INTERSECT/EXCEPT member statement may not refer to other relations of same query level"))); errmsg("UNION/INTERSECT/EXCEPT member statement cannot refer to other relations of same query level")));
} }
/* /*
@ -2987,7 +2987,7 @@ transformReturningList(ParseState *pstate, List *returningList)
if (list_length(pstate->p_rtable) != length_rtable) if (list_length(pstate->p_rtable) != length_rtable)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("RETURNING may not contain references to other relations"))); errmsg("RETURNING cannot contain references to other relations")));
/* mark column origins */ /* mark column origins */
markTargetListOrigins(pstate, rlist); markTargetListOrigins(pstate, rlist);
@ -3206,7 +3206,7 @@ transformDeclareCursorStmt(ParseState *pstate, DeclareCursorStmt *stmt)
if (((Query *) stmt->query)->into) if (((Query *) stmt->query)->into)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_CURSOR_DEFINITION), (errcode(ERRCODE_INVALID_CURSOR_DEFINITION),
errmsg("DECLARE CURSOR may not specify INTO"))); errmsg("DECLARE CURSOR cannot specify INTO")));
return result; return result;
} }

View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.577 2007/01/25 11:53:51 petere Exp $ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.578 2007/02/01 19:10:27 momjian Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -2266,7 +2266,7 @@ CreateAsStmt:
if (n->into != NULL) if (n->into != NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("CREATE TABLE AS may not specify INTO"))); errmsg("CREATE TABLE AS cannot specify INTO")));
$4->istemp = $2; $4->istemp = $2;
n->into = $4; n->into = $4;
n->intoColNames = $5; n->intoColNames = $5;

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.76 2007/01/20 20:45:40 tgl Exp $ * $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.77 2007/02/01 19:10:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -70,7 +70,7 @@ transformAggregateCall(ParseState *pstate, Aggref *agg)
if (checkExprHasAggs((Node *) agg->args)) if (checkExprHasAggs((Node *) agg->args))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_GROUPING_ERROR), (errcode(ERRCODE_GROUPING_ERROR),
errmsg("aggregate function calls may not be nested"))); errmsg("aggregate function calls cannot be nested")));
} }
if (min_varlevel < 0) if (min_varlevel < 0)

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.163 2007/01/10 18:06:04 tgl Exp $ * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.164 2007/02/01 19:10:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -452,7 +452,7 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r)
if (query->into != NULL) if (query->into != NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR), (errcode(ERRCODE_SYNTAX_ERROR),
errmsg("subquery in FROM may not have SELECT INTO"))); errmsg("subquery in FROM cannot have SELECT INTO")));
/* /*
* The subquery cannot make use of any variables from FROM items created * The subquery cannot make use of any variables from FROM items created
@ -472,7 +472,7 @@ transformRangeSubselect(ParseState *pstate, RangeSubselect *r)
if (contain_vars_of_level((Node *) query, 1)) if (contain_vars_of_level((Node *) query, 1))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE), (errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
errmsg("subquery in FROM may not refer to other relations of same query level"))); errmsg("subquery in FROM cannot refer to other relations of same query level")));
} }
/* /*
@ -521,7 +521,7 @@ transformRangeFunction(ParseState *pstate, RangeFunction *r)
if (contain_vars_of_level(funcexpr, 0)) if (contain_vars_of_level(funcexpr, 0))
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_COLUMN_REFERENCE), (errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
errmsg("function expression in FROM may not refer to other relations of same query level"))); errmsg("function expression in FROM cannot refer to other relations of same query level")));
} }
/* /*

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.193 2007/01/31 21:03:37 momjian Exp $ * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.194 2007/02/01 19:10:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -213,7 +213,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
func_signature_string(funcname, nargs, func_signature_string(funcname, nargs,
actual_arg_types)), actual_arg_types)),
errhint("Could not choose a best candidate function. " errhint("Could not choose a best candidate function. "
"You may need to add explicit type casts."), "You might need to add explicit type casts."),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));
else else
ereport(ERROR, ereport(ERROR,
@ -222,7 +222,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
func_signature_string(funcname, nargs, func_signature_string(funcname, nargs,
actual_arg_types)), actual_arg_types)),
errhint("No function matches the given name and argument types. " errhint("No function matches the given name and argument types. "
"You may need to add explicit type casts."), "You might need to add explicit type casts."),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));
} }
@ -282,7 +282,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
if (retset) if (retset)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
errmsg("aggregates may not return sets"), errmsg("aggregates cannot return sets"),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));
} }

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.93 2007/01/31 21:03:37 momjian Exp $ * $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.94 2007/02/01 19:10:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -771,7 +771,7 @@ op_error(ParseState *pstate, List *op, char oprkind,
errmsg("operator is not unique: %s", errmsg("operator is not unique: %s",
op_signature_string(op, oprkind, arg1, arg2)), op_signature_string(op, oprkind, arg1, arg2)),
errhint("Could not choose a best candidate operator. " errhint("Could not choose a best candidate operator. "
"You may need to add explicit type casts."), "You might need to add explicit type casts."),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));
else else
ereport(ERROR, ereport(ERROR,
@ -779,7 +779,7 @@ op_error(ParseState *pstate, List *op, char oprkind,
errmsg("operator does not exist: %s", errmsg("operator does not exist: %s",
op_signature_string(op, oprkind, arg1, arg2)), op_signature_string(op, oprkind, arg1, arg2)),
errhint("No operator matches the given name and argument type(s). " errhint("No operator matches the given name and argument type(s). "
"You may need to add explicit type casts."), "You might need to add explicit type casts."),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));
} }

View File

@ -235,11 +235,11 @@ caterr(char *s)
strcat(errbuf, "to many errors"); strcat(errbuf, "to many errors");
break; break;
case L_ERROR_NOLIB: case L_ERROR_NOLIB:
strcat(errbuf, "can't load library"); strcat(errbuf, "cannot load library");
strcat(errbuf, p); strcat(errbuf, p);
break; break;
case L_ERROR_UNDEF: case L_ERROR_UNDEF:
strcat(errbuf, "can't find symbol"); strcat(errbuf, "cannot find symbol");
strcat(errbuf, p); strcat(errbuf, p);
break; break;
case L_ERROR_RLDBAD: case L_ERROR_RLDBAD:

View File

@ -28,7 +28,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.6 2005/10/15 02:49:24 momjian Exp $ * $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.7 2007/02/01 19:10:27 momjian Exp $
* *
*/ */
@ -691,7 +691,7 @@ pickss(struct vars * v, /* used only for debug flags */
} }
/* nobody's old enough?!? -- something's really wrong */ /* nobody's old enough?!? -- something's really wrong */
FDEBUG(("can't find victim to replace!\n")); FDEBUG(("cannot find victim to replace!\n"));
assert(NOTREACHED); assert(NOTREACHED);
ERR(REG_ASSERT); ERR(REG_ASSERT);
return d->ssets; return d->ssets;

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.116 2007/01/05 22:19:36 momjian Exp $ * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.117 2007/02/01 19:10:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -349,7 +349,7 @@ DefineQueryRewrite(RuleStmt *stmt)
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("could not convert table \"%s\" to a view because it has triggers", errmsg("could not convert table \"%s\" to a view because it has triggers",
event_obj->relname), event_obj->relname),
errhint("In particular, the table may not be involved in any foreign key relationships."))); errhint("In particular, the table cannot be involved in any foreign key relationships.")));
if (event_relation->rd_rel->relhasindex) if (event_relation->rd_rel->relhasindex)
ereport(ERROR, ereport(ERROR,

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.169 2007/01/05 22:19:36 momjian Exp $ * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.170 2007/02/01 19:10:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -790,7 +790,7 @@ process_matched_tle(TargetEntry *src_tle,
} }
else else
{ {
elog(ERROR, "can't happen"); elog(ERROR, "cannot happen");
newexpr = NULL; newexpr = NULL;
} }

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.214 2007/01/05 22:19:37 momjian Exp $ * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.215 2007/02/01 19:10:27 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2126,7 +2126,7 @@ AbortBufferIO(void)
buf->tag.rnode.spcNode, buf->tag.rnode.spcNode,
buf->tag.rnode.dbNode, buf->tag.rnode.dbNode,
buf->tag.rnode.relNode), buf->tag.rnode.relNode),
errdetail("Multiple failures --- write error may be permanent."))); errdetail("Multiple failures --- write error might be permanent.")));
} }
} }
TerminateBufferIO(buf, false, BM_IO_ERROR); TerminateBufferIO(buf, false, BM_IO_ERROR);

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.175 2007/01/05 22:19:38 momjian Exp $ * $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.176 2007/02/01 19:10:28 momjian Exp $
* *
* NOTES * NOTES
* A lock table is a shared memory hash table. When * A lock table is a shared memory hash table. When
@ -581,7 +581,7 @@ LockAcquire(const LOCKTAG *locktag,
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY), (errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of shared memory"), errmsg("out of shared memory"),
errhint("You may need to increase max_locks_per_transaction."))); errhint("You might need to increase max_locks_per_transaction.")));
} }
locallock->lock = lock; locallock->lock = lock;
@ -647,7 +647,7 @@ LockAcquire(const LOCKTAG *locktag,
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY), (errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of shared memory"), errmsg("out of shared memory"),
errhint("You may need to increase max_locks_per_transaction."))); errhint("You might need to increase max_locks_per_transaction.")));
} }
locallock->proclock = proclock; locallock->proclock = proclock;
@ -2272,7 +2272,7 @@ lock_twophase_recover(TransactionId xid, uint16 info,
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY), (errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of shared memory"), errmsg("out of shared memory"),
errhint("You may need to increase max_locks_per_transaction."))); errhint("You might need to increase max_locks_per_transaction.")));
} }
/* /*
@ -2337,7 +2337,7 @@ lock_twophase_recover(TransactionId xid, uint16 info,
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY), (errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of shared memory"), errmsg("out of shared memory"),
errhint("You may need to increase max_locks_per_transaction."))); errhint("You might need to increase max_locks_per_transaction.")));
} }
/* /*

View File

@ -9,7 +9,7 @@
* Author: Andreas Pflug <pgadmin@pse-consulting.de> * Author: Andreas Pflug <pgadmin@pse-consulting.de>
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.14 2007/01/05 22:19:40 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.15 2007/02/01 19:10:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -118,7 +118,7 @@ pg_read_file(PG_FUNCTION_ARGS)
if (bytes_to_read < 0) if (bytes_to_read < 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("requested length may not be negative"))); errmsg("requested length cannot be negative")));
/* not sure why anyone thought that int64 length was a good idea */ /* not sure why anyone thought that int64 length was a good idea */
if (bytes_to_read > (MaxAllocSize - VARHDRSZ)) if (bytes_to_read > (MaxAllocSize - VARHDRSZ))

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/int.c,v 1.77 2007/01/05 22:19:41 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/int.c,v 1.78 2007/02/01 19:10:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1397,7 +1397,7 @@ generate_series_step_int4(PG_FUNCTION_ARGS)
if (step == 0) if (step == 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("step size may not equal zero"))); errmsg("step size cannot equal zero")));
/* create a function context for cross-call persistence */ /* create a function context for cross-call persistence */
funcctx = SRF_FIRSTCALL_INIT(); funcctx = SRF_FIRSTCALL_INIT();

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/utils/adt/int8.c,v 1.63 2007/01/05 22:19:41 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/int8.c,v 1.64 2007/02/01 19:10:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1209,7 +1209,7 @@ generate_series_step_int8(PG_FUNCTION_ARGS)
if (step == 0) if (step == 0)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("step size may not equal zero"))); errmsg("step size cannot equal zero")));
/* create a function context for cross-call persistence */ /* create a function context for cross-call persistence */
funcctx = SRF_FIRSTCALL_INIT(); funcctx = SRF_FIRSTCALL_INIT();

View File

@ -7,7 +7,7 @@
* Copyright (c) 2002-2007, PostgreSQL Global Development Group * Copyright (c) 2002-2007, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.32 2007/01/05 22:19:43 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.33 2007/02/01 19:10:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -99,7 +99,7 @@ init_MultiFuncCall(PG_FUNCTION_ARGS)
else else
{ {
/* second and subsequent calls */ /* second and subsequent calls */
elog(ERROR, "init_MultiFuncCall may not be called more than once"); elog(ERROR, "init_MultiFuncCall cannot be called more than once");
/* never reached, but keep compiler happy */ /* never reached, but keep compiler happy */
retval = NULL; retval = NULL;

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.160 2007/01/05 22:19:44 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.161 2007/02/01 19:10:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1079,7 +1079,7 @@ ValidatePgVersion(const char *path)
path), path),
errdetail("File \"%s\" does not contain valid data.", errdetail("File \"%s\" does not contain valid data.",
full_path), full_path),
errhint("You may need to initdb."))); errhint("You might need to initdb.")));
FreeFile(file); FreeFile(file);

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.371 2007/01/25 11:53:51 petere Exp $ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.372 2007/02/01 19:10:28 momjian Exp $
* *
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
@ -1196,7 +1196,7 @@ static struct config_int ConfigureNamesInt[] =
{ {
{"work_mem", PGC_USERSET, RESOURCES_MEM, {"work_mem", PGC_USERSET, RESOURCES_MEM,
gettext_noop("Sets the maximum memory to be used for query workspaces."), gettext_noop("Sets the maximum memory to be used for query workspaces."),
gettext_noop("This much memory may be used by each internal " gettext_noop("This much memory can be used by each internal "
"sort operation and hash table before switching to " "sort operation and hash table before switching to "
"temporary disk files."), "temporary disk files."),
GUC_UNIT_KB GUC_UNIT_KB
@ -2120,7 +2120,7 @@ static struct config_string ConfigureNamesString[] =
{ {
{"log_directory", PGC_SIGHUP, LOGGING_WHERE, {"log_directory", PGC_SIGHUP, LOGGING_WHERE,
gettext_noop("Sets the destination directory for log files."), gettext_noop("Sets the destination directory for log files."),
gettext_noop("May be specified as relative to the data directory " gettext_noop("Can be specified as relative to the data directory "
"or as absolute path."), "or as absolute path."),
GUC_SUPERUSER_ONLY GUC_SUPERUSER_ONLY
}, },

View File

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.130 2007/01/31 18:52:49 tgl Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.131 2007/02/01 19:10:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -876,7 +876,7 @@ check_encodings_match(int pg_enc, const char *ctype)
_("%s: warning: encoding mismatch\n"), progname); _("%s: warning: encoding mismatch\n"), progname);
fprintf(stderr, fprintf(stderr,
_("The encoding you selected (%s) and the encoding that the selected\n" _("The encoding you selected (%s) and the encoding that the selected\n"
"locale uses (%s) are not known to match. This may lead to\n" "locale uses (%s) are not known to match. This might lead to\n"
"misbehavior in various character string processing functions. To fix\n" "misbehavior in various character string processing functions. To fix\n"
"this situation, rerun %s and either do not specify an encoding\n" "this situation, rerun %s and either do not specify an encoding\n"
"explicitly, or choose a matching combination.\n"), "explicitly, or choose a matching combination.\n"),
@ -1052,7 +1052,7 @@ check_input(char *path)
else else
fprintf(stderr, fprintf(stderr,
_("%s: could not access file \"%s\": %s\n" _("%s: could not access file \"%s\": %s\n"
"This may mean you have a corrupted installation or identified\n" "This might mean you have a corrupted installation or identified\n"
"the wrong directory with the invocation option -L.\n"), "the wrong directory with the invocation option -L.\n"),
progname, path, strerror(errno)); progname, path, strerror(errno));
exit(1); exit(1);
@ -2580,7 +2580,7 @@ main(int argc, char *argv[])
if (pwprompt && pwfilename) if (pwprompt && pwfilename)
{ {
fprintf(stderr, _("%s: password prompt and password file may not be specified together\n"), progname); fprintf(stderr, _("%s: password prompt and password file cannot be specified together\n"), progname);
exit(1); exit(1);
} }

View File

@ -4,7 +4,7 @@
* *
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.76 2007/01/05 22:19:48 momjian Exp $ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.77 2007/02/01 19:10:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -522,7 +522,7 @@ do_start(void)
{ {
old_pid = get_pgpid(); old_pid = get_pgpid();
if (old_pid != 0) if (old_pid != 0)
write_stderr(_("%s: another server may be running; " write_stderr(_("%s: another server might be running; "
"trying to start server anyway\n"), "trying to start server anyway\n"),
progname); progname);
} }
@ -1443,7 +1443,7 @@ do_help(void)
printf(_(" -c, --core-files not applicable on this platform\n")); printf(_(" -c, --core-files not applicable on this platform\n"));
#endif #endif
printf(_("\nOptions for stop or restart:\n")); printf(_("\nOptions for stop or restart:\n"));
printf(_(" -m SHUTDOWN-MODE may be \"smart\", \"fast\", or \"immediate\"\n")); printf(_(" -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n"));
printf(_("\nShutdown modes are:\n")); printf(_("\nShutdown modes are:\n"));
printf(_(" smart quit after all clients have disconnected\n")); printf(_(" smart quit after all clients have disconnected\n"));

View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.140 2007/01/25 03:30:43 momjian Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.141 2007/02/01 19:10:28 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2701,7 +2701,7 @@ ReadHead(ArchiveHandle *AH)
(unsigned long) AH->intSize); (unsigned long) AH->intSize);
if (AH->intSize > sizeof(int)) if (AH->intSize > sizeof(int))
write_msg(modulename, "WARNING: archive was made on a machine with larger integers, some operations may fail\n"); write_msg(modulename, "WARNING: archive was made on a machine with larger integers, some operations might fail\n");
if (AH->version >= K_VERS_1_7) if (AH->version >= K_VERS_1_7)
AH->offSize = (*AH->ReadBytePtr) (AH); AH->offSize = (*AH->ReadBytePtr) (AH);

View File

@ -23,7 +23,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, 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/bin/pg_resetxlog/pg_resetxlog.c,v 1.55 2007/01/05 22:19:48 momjian Exp $ * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.56 2007/02/01 19:10:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -341,7 +341,7 @@ main(int argc, char *argv[])
if (ControlFile.state != DB_SHUTDOWNED && !force) if (ControlFile.state != DB_SHUTDOWNED && !force)
{ {
printf(_("The database server was not shut down cleanly.\n" printf(_("The database server was not shut down cleanly.\n"
"Resetting the transaction log may cause data to be lost.\n" "Resetting the transaction log might cause data to be lost.\n"
"If you want to proceed anyway, use -f to force reset.\n")); "If you want to proceed anyway, use -f to force reset.\n"));
exit(1); exit(1);
} }

View File

@ -3,7 +3,7 @@
* *
* Copyright (c) 2000-2007, PostgreSQL Global Development Group * Copyright (c) 2000-2007, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.139 2007/01/05 22:19:49 momjian Exp $ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.140 2007/02/01 19:10:29 momjian Exp $
*/ */
#include "postgres_fe.h" #include "postgres_fe.h"
@ -755,7 +755,7 @@ checkWin32Codepage(void)
if (wincp != concp) if (wincp != concp)
{ {
printf(_("Warning: Console code page (%u) differs from Windows code page (%u)\n" printf(_("Warning: Console code page (%u) differs from Windows code page (%u)\n"
" 8-bit characters may not work correctly. See psql reference\n" " 8-bit characters might not work correctly. See psql reference\n"
" page \"Notes for Windows users\" for details.\n\n"), " page \"Notes for Windows users\" for details.\n\n"),
concp, wincp); concp, wincp);
} }

View File

@ -1,5 +1,5 @@
/* /*
* $PostgreSQL: pgsql/src/include/regex/regerrs.h,v 1.3 2003/11/29 22:41:10 pgsql Exp $ * $PostgreSQL: pgsql/src/include/regex/regerrs.h,v 1.4 2007/02/01 19:10:29 momjian Exp $
*/ */
{ {
@ -59,7 +59,7 @@
}, },
{ {
REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug" REG_ASSERT, "REG_ASSERT", "\"cannot happen\" -- you found a bug"
}, },
{ {

View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.96 2007/01/12 10:00:13 meskes Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.97 2007/02/01 19:10:29 momjian Exp $ */
/* New main for ecpg, the PostgreSQL embedded SQL precompiler. */ /* New main for ecpg, the PostgreSQL embedded SQL precompiler. */
/* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */ /* (C) Michael Meskes <meskes@postgresql.org> Feb 5th, 1998 */
@ -39,7 +39,7 @@ help(const char *progname)
printf(" -c automatically generate C code from embedded SQL code;\n" printf(" -c automatically generate C code from embedded SQL code;\n"
" currently this works for EXEC SQL TYPE\n"); " currently this works for EXEC SQL TYPE\n");
printf(" -C MODE set compatibility mode;\n" printf(" -C MODE set compatibility mode;\n"
" MODE may be one of \"INFORMIX\", \"INFORMIX_SE\"\n"); " MODE can be one of \"INFORMIX\", \"INFORMIX_SE\"\n");
#ifdef YYDEBUG #ifdef YYDEBUG
printf(" -d generate parser debug output\n"); printf(" -d generate parser debug output\n");
#endif #endif
@ -49,7 +49,7 @@ help(const char *progname)
printf(" -I DIRECTORY search DIRECTORY for include files\n"); printf(" -I DIRECTORY search DIRECTORY for include files\n");
printf(" -o OUTFILE write result to OUTFILE\n"); printf(" -o OUTFILE write result to OUTFILE\n");
printf(" -r OPTION specify runtime behaviour;\n" printf(" -r OPTION specify runtime behaviour;\n"
" OPTION may only be \"no_indicator\"\n"); " OPTION can only be \"no_indicator\"\n");
printf(" -t turn on autocommit of transactions\n"); printf(" -t turn on autocommit of transactions\n");
printf(" --help show this help, then exit\n"); printf(" --help show this help, then exit\n");
printf(" --regression run in regression testing mode\n"); printf(" --regression run in regression testing mode\n");

View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.339 2006/10/23 08:00:48 meskes Exp $ */ /* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.340 2007/02/01 19:10:29 momjian Exp $ */
/* Copyright comment */ /* Copyright comment */
%{ %{
@ -1673,7 +1673,7 @@ CreateAsStmt: CREATE OptTemp TABLE qualified_name OptCreateAs OptWith OnCommitO
SelectStmt SelectStmt
{ {
if (FoundInto == 1) if (FoundInto == 1)
mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE / AS SELECT may not specify INTO"); mmerror(PARSE_ERROR, ET_ERROR, "CREATE TABLE / AS SELECT cannot specify INTO");
$$ = cat_str(10, make_str("create"), $2, make_str("table"), $4, $5, $6, $7, $8, make_str("as"), $11); $$ = cat_str(10, make_str("create"), $2, make_str("table"), $4, $5, $6, $7, $8, make_str("as"), $11);
} }

View File

@ -110,7 +110,7 @@ static struct WSErrorEntry
WSAEADDRINUSE, "Address already in use" WSAEADDRINUSE, "Address already in use"
}, },
{ {
WSAEADDRNOTAVAIL, "Can't assign requested address" WSAEADDRNOTAVAIL, "Cannot assign requested address"
}, },
{ {
WSAENETDOWN, "Network is down" WSAENETDOWN, "Network is down"
@ -137,10 +137,10 @@ static struct WSErrorEntry
WSAENOTCONN, "Socket is not connected" WSAENOTCONN, "Socket is not connected"
}, },
{ {
WSAESHUTDOWN, "Can't send after socket shutdown" WSAESHUTDOWN, "Cannot send after socket shutdown"
}, },
{ {
WSAETOOMANYREFS, "Too many references, can't splice" WSAETOOMANYREFS, "Too many references, cannot splice"
}, },
{ {
WSAETIMEDOUT, "Connection timed out" WSAETIMEDOUT, "Connection timed out"

View File

@ -1,7 +1,7 @@
/********************************************************************** /**********************************************************************
* plperl.c - perl as a procedural language for PostgreSQL * plperl.c - perl as a procedural language for PostgreSQL
* *
* $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.125 2007/01/27 16:46:21 adunstan Exp $ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.126 2007/02/01 19:10:29 momjian Exp $
* *
**********************************************************************/ **********************************************************************/
@ -350,7 +350,7 @@ check_interp(bool trusted)
else else
{ {
elog(ERROR, elog(ERROR,
"can not allocate second Perl interpreter on this platform"); "cannot allocate second Perl interpreter on this platform");
} }
@ -1538,7 +1538,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger)
free(prodesc); free(prodesc);
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("trigger functions may only be called " errmsg("trigger functions can only be called "
"as triggers"))); "as triggers")));
} }
else else

View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.96 2007/01/05 22:20:01 momjian Exp $ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.97 2007/02/01 19:10:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -478,7 +478,7 @@ decl_aliasitem : T_WORD
plpgsql_convert_ident(yytext, &name, 1); plpgsql_convert_ident(yytext, &name, 1);
if (name[0] != '$') if (name[0] != '$')
yyerror("only positional parameters may be aliased"); yyerror("only positional parameters can be aliased");
plpgsql_ns_setlocal(false); plpgsql_ns_setlocal(false);
nsi = plpgsql_ns_lookup(name, NULL); nsi = plpgsql_ns_lookup(name, NULL);

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.110 2007/01/30 22:05:12 tgl Exp $ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.111 2007/02/01 19:10:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -521,7 +521,7 @@ do_compile(FunctionCallInfo fcinfo,
else if (rettypeid == TRIGGEROID) else if (rettypeid == TRIGGEROID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("trigger functions may only be called as triggers"))); errmsg("trigger functions can only be called as triggers")));
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),

View File

@ -1,7 +1,7 @@
/********************************************************************** /**********************************************************************
* plpython.c - python as a procedural language for PostgreSQL * plpython.c - python as a procedural language for PostgreSQL
* *
* $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.93 2007/01/28 19:36:46 adunstan Exp $ * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.94 2007/02/01 19:10:30 momjian Exp $
* *
********************************************************************* *********************************************************************
*/ */
@ -811,7 +811,7 @@ PLy_function_handler(FunctionCallInfo fcinfo, PLyProcedure * proc)
if (proc->setof == NULL) if (proc->setof == NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
errmsg("returned object can not be iterated"), errmsg("returned object cannot be iterated"),
errdetail("SETOF must be returned as iterable object"))); errdetail("SETOF must be returned as iterable object")));
} }
@ -1191,7 +1191,7 @@ PLy_procedure_create(FunctionCallInfo fcinfo, Oid tgreloid,
if (procStruct->prorettype == TRIGGEROID) if (procStruct->prorettype == TRIGGEROID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("trigger functions may only be called as triggers"))); errmsg("trigger functions can only be called as triggers")));
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@ -1731,7 +1731,7 @@ PLyMapping_ToTuple(PLyTypeInfo * info, PyObject * mapping)
so = PyObject_Str(value); so = PyObject_Str(value);
if (so == NULL) if (so == NULL)
PLy_elog(ERROR, "can't convert mapping type"); PLy_elog(ERROR, "cannot convert mapping type");
valuestr = PyString_AsString(so); valuestr = PyString_AsString(so);
values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc
@ -1820,7 +1820,7 @@ PLySequence_ToTuple(PLyTypeInfo * info, PyObject * sequence)
so = PyObject_Str(value); so = PyObject_Str(value);
if (so == NULL) if (so == NULL)
PLy_elog(ERROR, "can't convert sequence type"); PLy_elog(ERROR, "cannot convert sequence type");
valuestr = PyString_AsString(so); valuestr = PyString_AsString(so);
values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc
,valuestr ,valuestr
@ -1891,7 +1891,7 @@ PLyObject_ToTuple(PLyTypeInfo * info, PyObject * object)
so = PyObject_Str(value); so = PyObject_Str(value);
if (so == NULL) if (so == NULL)
PLy_elog(ERROR, "can't convert object type"); PLy_elog(ERROR, "cannot convert object type");
valuestr = PyString_AsString(so); valuestr = PyString_AsString(so);
values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc values[i] = InputFunctionCall(&info->out.r.atts[i].typfunc
,valuestr ,valuestr

View File

@ -2,7 +2,7 @@
* pltcl.c - PostgreSQL support for Tcl as * pltcl.c - PostgreSQL support for Tcl as
* procedural language (PL) * procedural language (PL)
* *
* $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.108 2006/10/04 00:30:14 momjian Exp $ * $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.109 2007/02/01 19:10:30 momjian Exp $
* *
**********************************************************************/ **********************************************************************/
@ -1061,7 +1061,7 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid)
free(prodesc); free(prodesc);
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("trigger functions may only be called as triggers"))); errmsg("trigger functions can only be called as triggers")));
} }
else else
{ {

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.28 2007/01/05 22:20:03 momjian Exp $ * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.29 2007/02/01 19:10:30 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -46,7 +46,7 @@ importFile(PGconn *conn, char *filename)
fd = open(filename, O_RDONLY, 0666); fd = open(filename, O_RDONLY, 0666);
if (fd < 0) if (fd < 0)
{ /* error */ { /* error */
fprintf(stderr, "can't open unix file\"%s\"\n", filename); fprintf(stderr, "cannot open unix file\"%s\"\n", filename);
} }
/* /*
@ -54,7 +54,7 @@ importFile(PGconn *conn, char *filename)
*/ */
lobjId = lo_creat(conn, INV_READ | INV_WRITE); lobjId = lo_creat(conn, INV_READ | INV_WRITE);
if (lobjId == 0) if (lobjId == 0)
fprintf(stderr, "can't create large object"); fprintf(stderr, "cannot create large object");
lobj_fd = lo_open(conn, lobjId, INV_WRITE); lobj_fd = lo_open(conn, lobjId, INV_WRITE);
@ -84,7 +84,7 @@ pickout(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd = lo_open(conn, lobjId, INV_READ); lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd < 0) if (lobj_fd < 0)
fprintf(stderr, "can't open large object %u", lobjId); fprintf(stderr, "cannot open large object %u", lobjId);
lo_lseek(conn, lobj_fd, start, SEEK_SET); lo_lseek(conn, lobj_fd, start, SEEK_SET);
buf = malloc(len + 1); buf = malloc(len + 1);
@ -115,7 +115,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
lobj_fd = lo_open(conn, lobjId, INV_WRITE); lobj_fd = lo_open(conn, lobjId, INV_WRITE);
if (lobj_fd < 0) if (lobj_fd < 0)
fprintf(stderr, "can't open large object %u", lobjId); fprintf(stderr, "cannot open large object %u", lobjId);
lo_lseek(conn, lobj_fd, start, SEEK_SET); lo_lseek(conn, lobj_fd, start, SEEK_SET);
buf = malloc(len + 1); buf = malloc(len + 1);
@ -160,7 +160,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
*/ */
lobj_fd = lo_open(conn, lobjId, INV_READ); lobj_fd = lo_open(conn, lobjId, INV_READ);
if (lobj_fd < 0) if (lobj_fd < 0)
fprintf(stderr, "can't open large object %u", lobjId); fprintf(stderr, "cannot open large object %u", lobjId);
/* /*
* open the file to be written to * open the file to be written to
@ -168,7 +168,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666); fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (fd < 0) if (fd < 0)
{ /* error */ { /* error */
fprintf(stderr, "can't open unix file\"%s\"", fprintf(stderr, "cannot open unix file\"%s\"",
filename); filename);
} }

View File

@ -1315,7 +1315,7 @@ alter table anothertab alter column atcol1 drop default;
alter table anothertab alter column atcol1 type boolean alter table anothertab alter column atcol1 type boolean
using case when atcol1 % 2 = 0 then true else false end; -- fails using case when atcol1 % 2 = 0 then true else false end; -- fails
ERROR: operator does not exist: boolean <= integer ERROR: operator does not exist: boolean <= integer
HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts. HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts.
alter table anothertab drop constraint anothertab_chk; alter table anothertab drop constraint anothertab_chk;
alter table anothertab alter column atcol1 type boolean alter table anothertab alter column atcol1 type boolean
using case when atcol1 % 2 = 0 then true else false end; using case when atcol1 % 2 = 0 then true else false end;

View File

@ -78,11 +78,11 @@ CREATE VIEW temp_view_test.v2 AS SELECT * FROM base_table;
-- should fail -- should fail
CREATE VIEW temp_view_test.v3_temp AS SELECT * FROM temp_table; CREATE VIEW temp_view_test.v3_temp AS SELECT * FROM temp_table;
NOTICE: view "v3_temp" will be a temporary view NOTICE: view "v3_temp" will be a temporary view
ERROR: temporary tables may not specify a schema name ERROR: temporary tables cannot specify a schema name
-- should fail -- should fail
CREATE SCHEMA test_schema CREATE SCHEMA test_schema
CREATE TEMP VIEW testview AS SELECT 1; CREATE TEMP VIEW testview AS SELECT 1;
ERROR: temporary tables may not specify a schema name ERROR: temporary tables cannot specify a schema name
-- joins: if any of the join relations are temporary, the view -- joins: if any of the join relations are temporary, the view
-- should also be temporary -- should also be temporary
-- should be non-temp -- should be non-temp

View File

@ -107,7 +107,7 @@ SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
ERROR: operator does not exist: lseg # point ERROR: operator does not exist: lseg # point
LINE 1: SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection LINE 1: SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
^ ^
HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts. HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts.
-- closest point -- closest point
SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
FROM LSEG_TBL l, POINT_TBL p; FROM LSEG_TBL l, POINT_TBL p;

View File

@ -306,7 +306,7 @@ SELECT date '1991-02-03' - time with time zone '04:05:06 UTC' AS "Subtract Time
ERROR: operator does not exist: date - time with time zone ERROR: operator does not exist: date - time with time zone
LINE 1: SELECT date '1991-02-03' - time with time zone '04:05:06 UTC... LINE 1: SELECT date '1991-02-03' - time with time zone '04:05:06 UTC...
^ ^
HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts. HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts.
-- --
-- timestamp, interval arithmetic -- timestamp, interval arithmetic
-- --

View File

@ -235,7 +235,7 @@ REVOKE ALL PRIVILEGES ON LANGUAGE sql FROM PUBLIC;
GRANT USAGE ON LANGUAGE sql TO regressuser1; -- ok GRANT USAGE ON LANGUAGE sql TO regressuser1; -- ok
GRANT USAGE ON LANGUAGE c TO PUBLIC; -- fail GRANT USAGE ON LANGUAGE c TO PUBLIC; -- fail
ERROR: language "c" is not trusted ERROR: language "c" is not trusted
HINT: Only superusers may use untrusted languages. HINT: Only superusers can use untrusted languages.
SET SESSION AUTHORIZATION regressuser1; SET SESSION AUTHORIZATION regressuser1;
GRANT USAGE ON LANGUAGE sql TO regressuser2; -- fail GRANT USAGE ON LANGUAGE sql TO regressuser2; -- fail
WARNING: no privileges were granted for "sql" WARNING: no privileges were granted for "sql"

View File

@ -19,7 +19,7 @@ INSERT INTO foo2 VALUES(1, 111);
CREATE FUNCTION foot(int) returns setof foo2 as 'SELECT * FROM foo2 WHERE fooid = $1;' LANGUAGE SQL; CREATE FUNCTION foot(int) returns setof foo2 as 'SELECT * FROM foo2 WHERE fooid = $1;' LANGUAGE SQL;
-- supposed to fail with ERROR -- supposed to fail with ERROR
select * from foo2, foot(foo2.fooid) z where foo2.f2 = z.f2; select * from foo2, foot(foo2.fooid) z where foo2.f2 = z.f2;
ERROR: function expression in FROM may not refer to other relations of same query level ERROR: function expression in FROM cannot refer to other relations of same query level
-- function in subselect -- function in subselect
select * from foo2 where f2 in (select f2 from foot(foo2.fooid) z where z.fooid = foo2.fooid) ORDER BY 1,2; select * from foo2 where f2 in (select f2 from foot(foo2.fooid) z where z.fooid = foo2.fooid) ORDER BY 1,2;
fooid | f2 fooid | f2

View File

@ -83,4 +83,4 @@ SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
ERROR: operator is not unique: time without time zone + time without time zone ERROR: operator is not unique: time without time zone + time without time zone
LINE 1: SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL; LINE 1: SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
^ ^
HINT: Could not choose a best candidate operator. You may need to add explicit type casts. HINT: Could not choose a best candidate operator. You might need to add explicit type casts.

View File

@ -90,4 +90,4 @@ SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TIMETZ_TBL;
ERROR: operator does not exist: time with time zone + time with time zone ERROR: operator does not exist: time with time zone + time with time zone
LINE 1: SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TI... LINE 1: SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TI...
^ ^
HINT: No operator matches the given name and argument type(s). You may need to add explicit type casts. HINT: No operator matches the given name and argument type(s). You might need to add explicit type casts.

View File

@ -285,11 +285,11 @@ SELECT a FROM savepoints WHERE a BETWEEN 18 AND 22;
DROP TABLE savepoints; DROP TABLE savepoints;
-- only in a transaction block: -- only in a transaction block:
SAVEPOINT one; SAVEPOINT one;
ERROR: SAVEPOINT may only be used in transaction blocks ERROR: SAVEPOINT can only be used in transaction blocks
ROLLBACK TO SAVEPOINT one; ROLLBACK TO SAVEPOINT one;
ERROR: ROLLBACK TO SAVEPOINT may only be used in transaction blocks ERROR: ROLLBACK TO SAVEPOINT can only be used in transaction blocks
RELEASE SAVEPOINT one; RELEASE SAVEPOINT one;
ERROR: RELEASE SAVEPOINT may only be used in transaction blocks ERROR: RELEASE SAVEPOINT can only be used in transaction blocks
-- Only "rollback to" allowed in aborted state -- Only "rollback to" allowed in aborted state
BEGIN; BEGIN;
SAVEPOINT one; SAVEPOINT one;

View File

@ -241,7 +241,7 @@ select set_ttdummy(1);
-- we want to correct some "date" -- we want to correct some "date"
update tttest set price_on = -1 where price_id = 1; update tttest set price_on = -1 where price_id = 1;
ERROR: ttdummy (tttest): you can't change price_on and/or price_off columns (use set_ttdummy) ERROR: ttdummy (tttest): you cannot change price_on and/or price_off columns (use set_ttdummy)
-- but this doesn't work -- but this doesn't work
-- try in this way -- try in this way
select set_ttdummy(0); select set_ttdummy(0);

View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2007, 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/test/regress/pg_regress.c,v 1.27 2007/01/19 21:21:13 alvherre Exp $ * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.28 2007/02/01 19:10:30 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -630,7 +630,7 @@ initialize_environment(void)
unsetenv("LC_ALL"); unsetenv("LC_ALL");
unsetenv("LANG"); unsetenv("LANG");
unsetenv("LANGUAGE"); unsetenv("LANGUAGE");
/* On Windows the default locale may not be English, so force it */ /* On Windows the default locale cannot be English, so force it */
#if defined(WIN32) || defined(__CYGWIN__) #if defined(WIN32) || defined(__CYGWIN__)
putenv("LANG=en"); putenv("LANG=en");
#endif #endif
@ -1486,7 +1486,7 @@ help(void)
printf(_(" --multibyte=ENCODING use ENCODING as the multibyte encoding\n")); printf(_(" --multibyte=ENCODING use ENCODING as the multibyte encoding\n"));
printf(_(" --outputdir=DIR place output files in DIR (default \".\")\n")); printf(_(" --outputdir=DIR place output files in DIR (default \".\")\n"));
printf(_(" --schedule=FILE use test ordering schedule from FILE\n")); printf(_(" --schedule=FILE use test ordering schedule from FILE\n"));
printf(_(" (may be used multiple times to concatenate)\n")); printf(_(" (can be used multiple times to concatenate)\n"));
printf(_(" --srcdir=DIR absolute path to source directory (for VPATH builds)\n")); printf(_(" --srcdir=DIR absolute path to source directory (for VPATH builds)\n"));
printf(_(" --temp-install=DIR create a temporary installation in DIR\n")); printf(_(" --temp-install=DIR create a temporary installation in DIR\n"));
printf(_(" --no-locale use C locale\n")); printf(_(" --no-locale use C locale\n"));

View File

@ -1,5 +1,5 @@
/* /*
* $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.68 2006/07/13 16:49:20 momjian Exp $ * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.69 2007/02/01 19:10:30 momjian Exp $
*/ */
#include "postgres.h" #include "postgres.h"
@ -483,11 +483,11 @@ ttdummy(PG_FUNCTION_ARGS)
if (!CALLED_AS_TRIGGER(fcinfo)) if (!CALLED_AS_TRIGGER(fcinfo))
elog(ERROR, "ttdummy: not fired by trigger manager"); elog(ERROR, "ttdummy: not fired by trigger manager");
if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event)) if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
elog(ERROR, "ttdummy: can't process STATEMENT events"); elog(ERROR, "ttdummy: cannot process STATEMENT events");
if (TRIGGER_FIRED_AFTER(trigdata->tg_event)) if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
elog(ERROR, "ttdummy: must be fired before event"); elog(ERROR, "ttdummy: must be fired before event");
if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event)) if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
elog(ERROR, "ttdummy: can't process INSERT event"); elog(ERROR, "ttdummy: cannot process INSERT event");
if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event)) if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
newtuple = trigdata->tg_newtuple; newtuple = trigdata->tg_newtuple;
@ -541,7 +541,7 @@ ttdummy(PG_FUNCTION_ARGS)
elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[1]); elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[1]);
if (oldon != newon || oldoff != newoff) if (oldon != newon || oldoff != newoff)
elog(ERROR, "ttdummy (%s): you can't change %s and/or %s columns (use set_ttdummy)", elog(ERROR, "ttdummy (%s): you cannot change %s and/or %s columns (use set_ttdummy)",
relname, args[0], args[1]); relname, args[0], args[1]);
if (newoff != TTDUMMY_INFINITY) if (newoff != TTDUMMY_INFINITY)

Some files were not shown because too many files have changed in this diff Show More