diff options
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/acl.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/array_userfuncs.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/adt/pgstatfuncs.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/ri_triggers.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/ruleutils.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/adt/sets.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/varbit.c | 8 |
7 files changed, 17 insertions, 17 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 8d5a675006b..8d3b582fe29 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.96 2003/08/17 19:58:05 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.97 2003/09/09 23:22:21 petere Exp $ * *------------------------------------------------------------------------- */ @@ -846,7 +846,7 @@ makeaclitem(PG_FUNCTION_ARGS) else if (u_grantee != 0 && g_grantee != 0) { ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + (errcode(ERRCODE_SYNTAX_ERROR), errmsg("cannot specify both user and group"))); } else if (u_grantee != 0) diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c index ced3233d218..e0f58fb0705 100644 --- a/src/backend/utils/adt/array_userfuncs.c +++ b/src/backend/utils/adt/array_userfuncs.c @@ -6,7 +6,7 @@ * Copyright (c) 2003, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/array_userfuncs.c,v 1.8 2003/08/17 23:43:26 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/array_userfuncs.c,v 1.9 2003/09/09 23:22:21 petere Exp $ * *------------------------------------------------------------------------- */ @@ -95,8 +95,8 @@ array_push(PG_FUNCTION_ARGS) indx = 1; else ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("input must be empty or one-dimensional array"))); + (errcode(ERRCODE_SYNTAX_ERROR), + errmsg("argument must be empty or one-dimensional array"))); /* * We arrange to look up info about element type only once per series diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 440783764ae..240c36ea7c0 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -187,7 +187,7 @@ pg_stat_get_backend_idset(PG_FUNCTION_ARGS) if (fcinfo->resultinfo == NULL || !IsA(fcinfo->resultinfo, ReturnSetInfo)) ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + (errcode(ERRCODE_SYNTAX_ERROR), errmsg("set-valued function called in context that " "cannot accept a set"))); diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 55a6944971e..e66c42f99bd 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -17,7 +17,7 @@ * * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.55 2003/08/17 19:58:05 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.56 2003/09/09 23:22:21 petere Exp $ * * ---------- */ @@ -3009,7 +3009,7 @@ ri_ReportViolation(RI_QueryKey *qkey, const char *constrname, if (spi_err) ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + (errcode(ERRCODE_INTERNAL_ERROR), errmsg("referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result", RelationGetRelationName(pk_rel), constrname, diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 5504251bc47..0d40c070f95 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3,7 +3,7 @@ * back to source text * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.152 2003/08/17 19:58:05 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.153 2003/09/09 23:22:21 petere Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -1098,8 +1098,8 @@ pg_get_constraintdef_worker(Oid constraintId, int prettyFlags) } default: ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("unsupported constraint type \"%c\"", + (errcode(ERRCODE_INTERNAL_ERROR), + errmsg("invalid constraint type \"%c\"", conForm->contype))); break; } diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c index 7f9e01ab54d..ccd6b2e7967 100644 --- a/src/backend/utils/adt/sets.c +++ b/src/backend/utils/adt/sets.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.58 2003/08/04 02:40:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.59 2003/09/09 23:22:21 petere Exp $ * *------------------------------------------------------------------------- */ @@ -203,7 +203,7 @@ seteval(PG_FUNCTION_ARGS) rsi->isDone = isDone; else ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + (errcode(ERRCODE_SYNTAX_ERROR), errmsg("set-valued function called in context that " "cannot accept a set"))); } diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index 891e88b5747..0c5ee10d1bf 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.34 2003/08/04 02:40:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.35 2003/09/09 23:22:21 petere Exp $ * *------------------------------------------------------------------------- */ @@ -901,7 +901,7 @@ bitand(PG_FUNCTION_ARGS) bitlen2 = VARBITLEN(arg2); if (bitlen1 != bitlen2) ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + (errcode(ERRCODE_SYNTAX_ERROR), errmsg("cannot AND bit strings of different sizes"))); len = VARSIZE(arg1); @@ -942,7 +942,7 @@ bitor(PG_FUNCTION_ARGS) bitlen2 = VARBITLEN(arg2); if (bitlen1 != bitlen2) ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + (errcode(ERRCODE_SYNTAX_ERROR), errmsg("cannot OR bit strings of different sizes"))); len = VARSIZE(arg1); result = (VarBit *) palloc(len); @@ -988,7 +988,7 @@ bitxor(PG_FUNCTION_ARGS) bitlen2 = VARBITLEN(arg2); if (bitlen1 != bitlen2) ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + (errcode(ERRCODE_SYNTAX_ERROR), errmsg("cannot XOR bit strings of different sizes"))); len = VARSIZE(arg1); |