summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2007-12-27 13:02:48 +0000
committerPeter Eisentraut <peter_e@gmx.net>2007-12-27 13:02:48 +0000
commitf5f1355dc4dccea18ce9b8af14ea48038507409a (patch)
tree1013057d91bbefa721a9e1006f4c62d58b51bc68 /src/backend/utils/adt
parenta82cfcb9ee9b100f48e442e9017b1fae27caa7be (diff)
Wording improvements
Diffstat (limited to 'src/backend/utils/adt')
-rw-r--r--src/backend/utils/adt/tsquery.c4
-rw-r--r--src/backend/utils/adt/tsquery_cleanup.c4
-rw-r--r--src/backend/utils/adt/tsvector_op.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index 53ec74289a9..fd5dbf6b3ec 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.12 2007/11/28 21:56:30 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.13 2007/12/27 13:02:48 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -498,7 +498,7 @@ parse_tsquery(char *buf,
if (list_length(state.polstr) == 0)
{
ereport(NOTICE,
- (errmsg("tsearch query doesn't contain lexeme(s): \"%s\"",
+ (errmsg("text-search query doesn't contain lexemes: \"%s\"",
state.buffer)));
query = (TSQuery) palloc(HDRSIZETQ);
SET_VARSIZE(query, HDRSIZETQ);
diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index c58cce8f5e7..962ed689aed 100644
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.8 2007/11/28 21:56:30 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.9 2007/12/27 13:02:48 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -282,7 +282,7 @@ clean_fakeval(QueryItem *ptr, int *len)
if (result != V_UNKNOWN)
{
ereport(NOTICE,
- (errmsg("query contains only stopword(s) or doesn't contain lexeme(s), ignored")));
+ (errmsg("text-search query contains only stop words or doesn't contain lexemes, ignored")));
*len = 0;
return NULL;
}
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 6ca1c898332..4b3939ecb63 100644
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.10 2007/11/28 21:56:30 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.11 2007/12/27 13:02:48 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1324,7 +1324,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
if (config_attr_num == SPI_ERROR_NOATTRIBUTE)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_COLUMN),
- errmsg("config column \"%s\" does not exist",
+ errmsg("configuration column \"%s\" does not exist",
trigger->tgargs[1])));
if (SPI_gettypeid(rel->rd_att, config_attr_num) != REGCONFIGOID)
ereport(ERROR,
@@ -1336,7 +1336,7 @@ tsvector_update_trigger(PG_FUNCTION_ARGS, bool config_column)
if (isnull)
ereport(ERROR,
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
- errmsg("config column \"%s\" must not be NULL",
+ errmsg("configuration column \"%s\" must not be null",
trigger->tgargs[1])));
cfgId = DatumGetObjectId(datum);
}