OK, some of these syntax errors should be given other codes.

diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index f58d56a4eabed9dd664f55da7305a52942886e6b..0ad43d6cb7a536a53c40733848ef459516e7416d 100644 (file)
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -713,7 +713,7 @@ ExecMakeFunctionResult(FuncExprState *fcache,
                                *isDone = ExprEndResult;
                        else
                                ereport(ERROR,
-                                               (errcode(ERRCODE_SYNTAX_ERROR),
+                                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                                 errmsg("set-valued function called in context that cannot accept a set")));
                        return (Datum) 0;
                }
@@ -757,7 +757,7 @@ ExecMakeFunctionResult(FuncExprState *fcache,
                 */
                if (isDone == NULL)
                        ereport(ERROR,
-                                       (errcode(ERRCODE_SYNTAX_ERROR),
+                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                         errmsg("set-valued function called in context that cannot accept a set")));
 
                /*
@@ -944,7 +944,7 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
                /* We don't allow sets in the arguments of the table function */
                if (argDone != ExprSingleResult)
                        ereport(ERROR,
-                                       (errcode(ERRCODE_SYNTAX_ERROR),
+                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                         errmsg("set-valued function called in context that cannot accept a set")));
 
                /*
@@ -2955,7 +2955,7 @@ ExecTargetList(List *targetlist,
                        /* We have a set-valued expression in the tlist */
                        if (isDone == NULL)
                                ereport(ERROR,
-                                               (errcode(ERRCODE_SYNTAX_ERROR),
+                                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                                 errmsg("set-valued function called in context that cannot accept a set")));
                        if (itemIsDone[resind] == ExprMultipleResult)
                        {

diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index c60bb0ebacb10449082a646e9d02ab2c4d5f6991..3eca61a4a3b41e627f7ebb5f83b4e1cf9aebfbaa 100644 (file)
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -574,7 +574,7 @@ fmgr_sql(PG_FUNCTION_ARGS)
                                rsi->isDone = ExprEndResult;
                        else
                                ereport(ERROR,
-                                               (errcode(ERRCODE_SYNTAX_ERROR),
+                                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                                 errmsg("set-valued function called in context that cannot accept a set")));
                        fcinfo->isnull = true;
                        result = (Datum) 0;
@@ -613,7 +613,7 @@ fmgr_sql(PG_FUNCTION_ARGS)
                        rsi->isDone = ExprMultipleResult;
                else
                        ereport(ERROR,
-                                       (errcode(ERRCODE_SYNTAX_ERROR),
+                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                         errmsg("set-valued function called in context that cannot accept a set")));
 
                /*

diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 1c1519834c72a08a765720aa1863b18142c168b2..d4a4f97d9f4a180aa3621e35eaf1b1637eb98692 100644 (file)
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -776,8 +776,8 @@ aclremove(PG_FUNCTION_ARGS)
                if (dst == 0)
                {                                               /* start */
                        ereport(ERROR,
-                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                        errmsg("cannot remove the world ACL")));
+                                       (errcode(ERRCODE_DATA_EXCEPTION),
+                                        errmsg("aclitem for public may not be removed")));
                }
                else if (dst == old_num - 1)
                {                                               /* end */
@@ -846,7 +846,7 @@ makeaclitem(PG_FUNCTION_ARGS)
        else if (u_grantee != 0 && g_grantee != 0)
        {
                ereport(ERROR,
-                               (errcode(ERRCODE_SYNTAX_ERROR),
+                               (errcode(ERRCODE_DATA_EXCEPTION),
                                 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 3d61629f8be5b7329c39b7b8f087a7da8279da98..38104536c343215f47b773a6b2f33cbde3650b39 100644 (file)
--- a/src/backend/utils/adt/array_userfuncs.c
+++ b/src/backend/utils/adt/array_userfuncs.c
@@ -95,7 +95,7 @@ array_push(PG_FUNCTION_ARGS)
                indx = 1;
        else
                ereport(ERROR,
-                               (errcode(ERRCODE_SYNTAX_ERROR),
+                               (errcode(ERRCODE_DATA_EXCEPTION),
                                 errmsg("argument must be empty or one-dimensional array")));
 
        /*

diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 240c36ea7c0725c723451a6c5b341d389a6f1780..440783764ae2969eb8d28e59cd5670d9ac3b6676 100644 (file)
--- 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_SYNTAX_ERROR),
+                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                 errmsg("set-valued function called in context that "
                                                "cannot accept a set")));
 

diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 97cfa391746edde47a7b40e5d8982c15c7f7819a..2a3b7d0f34de83344c9183f6d88abbfa81a904ab 100644 (file)
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -1097,10 +1097,7 @@ pg_get_constraintdef_worker(Oid constraintId, int prettyFlags)
                                break;
                        }
                default:
-                       ereport(ERROR,
-                                       (errcode(ERRCODE_INTERNAL_ERROR),
-                                        errmsg("invalid constraint type \"%c\"",
-                                                       conForm->contype)));
+                       elog(ERROR, "invalid constraint type \"%c\"", conForm->contype);
                        break;
        }
 

diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index e3171e5dac13f2cd17952dd16fc0e5e4f199a658..7deb4b38fcf4db3c1eb90f5a2b103749fe259a94 100644 (file)
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -203,7 +203,7 @@ seteval(PG_FUNCTION_ARGS)
                        rsi->isDone = isDone;
                else
                        ereport(ERROR,
-                                       (errcode(ERRCODE_SYNTAX_ERROR),
+                                       (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                         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 7b84b0010ba68d6677b0bd1677082fb9412359aa..a199b46e64275268c0192f28f162339447fac213 100644 (file)
--- a/src/backend/utils/adt/varbit.c
+++ b/src/backend/utils/adt/varbit.c
@@ -901,7 +901,7 @@ bitand(PG_FUNCTION_ARGS)
        bitlen2 = VARBITLEN(arg2);
        if (bitlen1 != bitlen2)
                ereport(ERROR,
-                               (errcode(ERRCODE_SYNTAX_ERROR),
+                               (errcode(ERRCODE_STRING_DATA_LENGTH_MISMATCH),
                                 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_SYNTAX_ERROR),
+                               (errcode(ERRCODE_STRING_DATA_LENGTH_MISMATCH),
                                 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_SYNTAX_ERROR),
+                               (errcode(ERRCODE_STRING_DATA_LENGTH_MISMATCH),
                                 errmsg("cannot XOR bit strings of different sizes")));
 
        len = VARSIZE(arg1);

diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index 5d3cdbae006fe015188e2ed35b06c6844f6c3328..bb4391f46b95b50656fe35ecacbe8caa395ba142 100644 (file)
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -34,7 +34,7 @@ init_MultiFuncCall(PG_FUNCTION_ARGS)
         */
        if (fcinfo->resultinfo == NULL || !IsA(fcinfo->resultinfo, ReturnSetInfo))
                ereport(ERROR,
-                               (errcode(ERRCODE_SYNTAX_ERROR),
+                               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
                                 errmsg("set-valued function called in context that cannot accept a set")));
 
        if (fcinfo->flinfo->fn_extra == NULL)