summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/examples/testlo.c14
-rw-r--r--src/test/regress/expected/alter_table.out2
-rw-r--r--src/test/regress/expected/create_view.out4
-rw-r--r--src/test/regress/expected/geometry.out2
-rw-r--r--src/test/regress/expected/horology.out2
-rw-r--r--src/test/regress/expected/privileges.out2
-rw-r--r--src/test/regress/expected/rangefuncs.out2
-rw-r--r--src/test/regress/expected/time.out2
-rw-r--r--src/test/regress/expected/timetz.out2
-rw-r--r--src/test/regress/expected/transactions.out6
-rw-r--r--src/test/regress/expected/triggers.out2
-rw-r--r--src/test/regress/pg_regress.c6
-rw-r--r--src/test/regress/regress.c8
-rw-r--r--src/test/thread/thread_test.c4
14 files changed, 29 insertions, 29 deletions
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index 9f1eb55a233..d65908ec0e6 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -8,7 +8,7 @@
*
*
* 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);
if (fd < 0)
{ /* 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);
if (lobjId == 0)
- fprintf(stderr, "can't create large object");
+ fprintf(stderr, "cannot create large object");
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);
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);
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);
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);
buf = malloc(len + 1);
@@ -160,7 +160,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
*/
lobj_fd = lo_open(conn, lobjId, INV_READ);
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
@@ -168,7 +168,7 @@ exportFile(PGconn *conn, Oid lobjId, char *filename)
fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (fd < 0)
{ /* error */
- fprintf(stderr, "can't open unix file\"%s\"",
+ fprintf(stderr, "cannot open unix file\"%s\"",
filename);
}
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 8776cb90737..a1a61f710cf 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -1315,7 +1315,7 @@ alter table anothertab alter column atcol1 drop default;
alter table anothertab alter column atcol1 type boolean
using case when atcol1 % 2 = 0 then true else false end; -- fails
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 alter column atcol1 type boolean
using case when atcol1 % 2 = 0 then true else false end;
diff --git a/src/test/regress/expected/create_view.out b/src/test/regress/expected/create_view.out
index 79eed2b7a6e..0ef4bffe0b5 100644
--- a/src/test/regress/expected/create_view.out
+++ b/src/test/regress/expected/create_view.out
@@ -78,11 +78,11 @@ CREATE VIEW temp_view_test.v2 AS SELECT * FROM base_table;
-- should fail
CREATE VIEW temp_view_test.v3_temp AS SELECT * FROM temp_table;
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
CREATE SCHEMA test_schema
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
-- should also be temporary
-- should be non-temp
diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out
index f307788cf14..e90952cc2f4 100644
--- a/src/test/regress/expected/geometry.out
+++ b/src/test/regress/expected/geometry.out
@@ -107,7 +107,7 @@ SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
ERROR: operator does not exist: lseg # point
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
SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
FROM LSEG_TBL l, POINT_TBL p;
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index f8cc66492ce..fb4f33ed6b1 100644
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -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
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
--
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index 5404969c608..bcb2ea54aed 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -235,7 +235,7 @@ REVOKE ALL PRIVILEGES ON LANGUAGE sql FROM PUBLIC;
GRANT USAGE ON LANGUAGE sql TO regressuser1; -- ok
GRANT USAGE ON LANGUAGE c TO PUBLIC; -- fail
ERROR: language "c" is not trusted
-HINT: Only superusers may use untrusted languages.
+HINT: Only superusers can use untrusted languages.
SET SESSION AUTHORIZATION regressuser1;
GRANT USAGE ON LANGUAGE sql TO regressuser2; -- fail
WARNING: no privileges were granted for "sql"
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
index 000d4e36c52..8abc323a70e 100644
--- a/src/test/regress/expected/rangefuncs.out
+++ b/src/test/regress/expected/rangefuncs.out
@@ -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;
-- supposed to fail with ERROR
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
select * from foo2 where f2 in (select f2 from foot(foo2.fooid) z where z.fooid = foo2.fooid) ORDER BY 1,2;
fooid | f2
diff --git a/src/test/regress/expected/time.out b/src/test/regress/expected/time.out
index dce09d0790a..6e21828cf7c 100644
--- a/src/test/regress/expected/time.out
+++ b/src/test/regress/expected/time.out
@@ -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
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.
diff --git a/src/test/regress/expected/timetz.out b/src/test/regress/expected/timetz.out
index 5fdda250cc2..44e8b25b301 100644
--- a/src/test/regress/expected/timetz.out
+++ b/src/test/regress/expected/timetz.out
@@ -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
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.
diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out
index 8d3be84d63d..c8fe0522bfe 100644
--- a/src/test/regress/expected/transactions.out
+++ b/src/test/regress/expected/transactions.out
@@ -285,11 +285,11 @@ SELECT a FROM savepoints WHERE a BETWEEN 18 AND 22;
DROP TABLE savepoints;
-- only in a transaction block:
SAVEPOINT one;
-ERROR: SAVEPOINT may only be used in transaction blocks
+ERROR: SAVEPOINT can only be used in transaction blocks
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;
-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
BEGIN;
SAVEPOINT one;
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index 1af4d9e2890..a7990a5e189 100644
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -241,7 +241,7 @@ select set_ttdummy(1);
-- we want to correct some "date"
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
-- try in this way
select set_ttdummy(0);
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 3da5ccf7d71..b06dd1bf2ca 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* 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("LANG");
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__)
putenv("LANG=en");
#endif
@@ -1486,7 +1486,7 @@ help(void)
printf(_(" --multibyte=ENCODING use ENCODING as the multibyte encoding\n"));
printf(_(" --outputdir=DIR place output files in DIR (default \".\")\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(_(" --temp-install=DIR create a temporary installation in DIR\n"));
printf(_(" --no-locale use C locale\n"));
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index e8ff412af3c..551b157a169 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -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"
@@ -483,11 +483,11 @@ ttdummy(PG_FUNCTION_ARGS)
if (!CALLED_AS_TRIGGER(fcinfo))
elog(ERROR, "ttdummy: not fired by trigger manager");
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))
elog(ERROR, "ttdummy: must be fired before 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))
newtuple = trigdata->tg_newtuple;
@@ -541,7 +541,7 @@ ttdummy(PG_FUNCTION_ARGS)
elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[1]);
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]);
if (newoff != TTDUMMY_INFINITY)
diff --git a/src/test/thread/thread_test.c b/src/test/thread/thread_test.c
index 88d5dcf244d..9e6f5183b91 100644
--- a/src/test/thread/thread_test.c
+++ b/src/test/thread/thread_test.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/test/thread/thread_test.c,v 1.3 2007/01/05 22:20:04 momjian Exp $
+ * $PostgreSQL: pgsql/src/test/thread/thread_test.c,v 1.4 2007/02/01 19:10:30 momjian Exp $
*
* This program tests to see if your standard libc functions use
* pthread_setspecific()/pthread_getspecific() to be thread-safe.
@@ -187,7 +187,7 @@ main(int argc, char *argv[])
#if !defined(HAVE_GETADDRINFO) && !defined(HAVE_GETHOSTBYNAME_R)
if (gethostname(myhostname, MAXHOSTNAMELEN) != 0)
{
- fprintf(stderr, "Can not get local hostname **\nexiting\n");
+ fprintf(stderr, "Cannot get local hostname **\nexiting\n");
exit(1);
}
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-22 04:52:11 +0000