[ redirecting to -hackers ]
I wrote:
> David Fiedler <david.fido.fied...@gmail.com> writes:
>> I've stumbled across a code that used this condition, resulting in
>> unexpected behavior. I think it worths a note that catching 00000 is not
>> possible and that it results in a catch all handler.
> Hmph. The code thinks
> * OTHERS is represented as code 0 (which would map to '00000', but we
> * have no need to represent that as an exception condition).
> but it evidently didn't consider the possibility of a user writing
> '00000'. I'm more inclined to consider this a bug and change plpgsql
> to use something else internally to represent OTHERS. We could use
> -1, which AFAICS cannot be generated by MAKE_SQLSTATE.
Here's a patch for this. I'm unsure whether to change it in back
branches; is it conceivable that somebody is depending on WHEN
SQLSTATE '00000' mapping to WHEN OTHERS?
regards, tom lane
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index f36a244140e..6fdba95962d 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -2273,14 +2273,10 @@ plpgsql_parse_err_condition(char *condname)
* here.
*/
- /*
- * OTHERS is represented as code 0 (which would map to '00000', but we
- * have no need to represent that as an exception condition).
- */
if (strcmp(condname, "others") == 0)
{
new = palloc(sizeof(PLpgSQL_condition));
- new->sqlerrstate = 0;
+ new->sqlerrstate = PLPGSQL_OTHERS;
new->condname = condname;
new->next = NULL;
return new;
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index d4377ceecbf..aed75bc20eb 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -1603,7 +1603,7 @@ exception_matches_conditions(ErrorData *edata, PLpgSQL_condition *cond)
* assert-failure. If you're foolish enough, you can match those
* explicitly.
*/
- if (sqlerrstate == 0)
+ if (sqlerrstate == PLPGSQL_OTHERS)
{
if (edata->sqlerrcode != ERRCODE_QUERY_CANCELED &&
edata->sqlerrcode != ERRCODE_ASSERT_FAILURE)
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index aea0d0f98b2..b67847b5111 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -490,11 +490,14 @@ typedef struct PLpgSQL_stmt
*/
typedef struct PLpgSQL_condition
{
- int sqlerrstate; /* SQLSTATE code */
+ int sqlerrstate; /* SQLSTATE code, or PLPGSQL_OTHERS */
char *condname; /* condition name (for debugging) */
struct PLpgSQL_condition *next;
} PLpgSQL_condition;
+/* This value mustn't match any possible output of MAKE_SQLSTATE() */
+#define PLPGSQL_OTHERS (-1)
+
/*
* EXCEPTION block
*/
