Preserve SQLSTATE when an SPI error is propagated through PL/python

exception handler. This was a regression in 9.1, when the capability
to catch specific SPI errors was added, so backpatch to 9.1.

Mika Eloranta, with some editing by Jan Urbański.

diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
index dbf19fda9b9eaffb068bf829b7de4de138224bc1..bab07fbeb24b703696fbe9981f57ca8f266b2ebe 100644 (file)
--- a/src/pl/plpython/expected/plpython_error.out
+++ b/src/pl/plpython/expected/plpython_error.out
@@ -351,6 +351,28 @@ CONTEXT:  PL/Python function "specific_exception"
  
 (1 row)
 
+/* SPI errors in PL/Python functions should preserve the SQLSTATE value
+ */
+CREATE FUNCTION python_unique_violation() RETURNS void AS $$
+plpy.execute("insert into specific values (1)")
+plpy.execute("insert into specific values (1)")
+$$ LANGUAGE plpythonu;
+CREATE FUNCTION catch_python_unique_violation() RETURNS text AS $$
+begin
+    begin
+        perform python_unique_violation();
+    exception when unique_violation then
+        return 'ok';
+    end;
+    return 'not reached';
+end;
+$$ language plpgsql;
+SELECT catch_python_unique_violation();
+ catch_python_unique_violation 
+-------------------------------
+ ok
+(1 row)
+
 /* manually starting subtransactions - a bad idea
  */
 CREATE FUNCTION manual_subxact() RETURNS void AS $$

diff --git a/src/pl/plpython/expected/plpython_error_0.out b/src/pl/plpython/expected/plpython_error_0.out
index b2194ffccfb67c372e57c0331bbb7d55d1aaa72f..6cb2ed091bf43bd1964b01596f6f6713e7e3816e 100644 (file)
--- a/src/pl/plpython/expected/plpython_error_0.out
+++ b/src/pl/plpython/expected/plpython_error_0.out
@@ -351,6 +351,28 @@ CONTEXT:  PL/Python function "specific_exception"
  
 (1 row)
 
+/* SPI errors in PL/Python functions should preserve the SQLSTATE value
+ */
+CREATE FUNCTION python_unique_violation() RETURNS void AS $$
+plpy.execute("insert into specific values (1)")
+plpy.execute("insert into specific values (1)")
+$$ LANGUAGE plpythonu;
+CREATE FUNCTION catch_python_unique_violation() RETURNS text AS $$
+begin
+    begin
+        perform python_unique_violation();
+    exception when unique_violation then
+        return 'ok';
+    end;
+    return 'not reached';
+end;
+$$ language plpgsql;
+SELECT catch_python_unique_violation();
+ catch_python_unique_violation 
+-------------------------------
+ ok
+(1 row)
+
 /* manually starting subtransactions - a bad idea
  */
 CREATE FUNCTION manual_subxact() RETURNS void AS $$

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 2737e5863a4b856350aa3ebb71cc5efbc16c41c3..530b5f03521ff1bfbf679f82b8ec1619cd4055c7 100644 (file)
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -343,7 +343,7 @@ static char *PLy_procedure_name(PLyProcedure *);
 static void
 PLy_elog(int, const char *,...)
 __attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
-static void PLy_get_spi_error_data(PyObject *exc, char **detail, char **hint, char **query, int *position);
+static void PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hint, char **query, int *position);
 static void PLy_traceback(char **, char **, int *);
 
 static void *PLy_malloc(size_t);
@@ -4404,7 +4404,7 @@ PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
        if (!spierror)
                goto failure;
 
-       spidata = Py_BuildValue("(zzzi)", edata->detail, edata->hint,
+       spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
                                                        edata->internalquery, edata->internalpos);
        if (!spidata)
                goto failure;
@@ -4444,6 +4444,7 @@ PLy_elog(int elevel, const char *fmt,...)
                           *val,
                           *tb;
        const char *primary = NULL;
+       int        sqlerrcode = 0;
        char       *detail = NULL;
        char       *hint = NULL;
        char       *query = NULL;
@@ -4453,7 +4454,7 @@ PLy_elog(int elevel, const char *fmt,...)
        if (exc != NULL)
        {
                if (PyErr_GivenExceptionMatches(val, PLy_exc_spi_error))
-                       PLy_get_spi_error_data(val, &detail, &hint, &query, &position);
+                       PLy_get_spi_error_data(val, &sqlerrcode, &detail, &hint, &query, &position);
                else if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal))
                        elevel = FATAL;
        }
@@ -4494,7 +4495,8 @@ PLy_elog(int elevel, const char *fmt,...)
        PG_TRY();
        {
                ereport(elevel,
-                               (errmsg_internal("%s", primary ? primary : "no exception data"),
+                               (errcode(sqlerrcode ? sqlerrcode : ERRCODE_INTERNAL_ERROR),
+                                errmsg_internal("%s", primary ? primary : "no exception data"),
                                 (detail) ? errdetail_internal("%s", detail) : 0,
                                 (tb_depth > 0 && tbmsg) ? errcontext("%s", tbmsg) : 0,
                                 (hint) ? errhint("%s", hint) : 0,
@@ -4525,7 +4527,7 @@ PLy_elog(int elevel, const char *fmt,...)
  * Extract the error data from a SPIError
  */
 static void
-PLy_get_spi_error_data(PyObject *exc, char **detail, char **hint, char **query, int *position)
+PLy_get_spi_error_data(PyObject *exc, int* sqlerrcode, char **detail, char **hint, char **query, int *position)
 {
        PyObject   *spidata = NULL;
 
@@ -4533,7 +4535,7 @@ PLy_get_spi_error_data(PyObject *exc, char **detail, char **hint, char **query,
        if (!spidata)
                goto cleanup;
 
-       if (!PyArg_ParseTuple(spidata, "zzzi", detail, hint, query, position))
+       if (!PyArg_ParseTuple(spidata, "izzzi", sqlerrcode, detail, hint, query, position))
                goto cleanup;
 
 cleanup:

diff --git a/src/pl/plpython/sql/plpython_error.sql b/src/pl/plpython/sql/plpython_error.sql
index 4add6aaf05c90876d6b56fb855910112a3f6e343..502bbec38f45858b7d89d1294175a64ce37fb786 100644 (file)
--- a/src/pl/plpython/sql/plpython_error.sql
+++ b/src/pl/plpython/sql/plpython_error.sql
@@ -257,6 +257,26 @@ SELECT specific_exception(2);
 SELECT specific_exception(NULL);
 SELECT specific_exception(2);
 
+/* SPI errors in PL/Python functions should preserve the SQLSTATE value
+ */
+CREATE FUNCTION python_unique_violation() RETURNS void AS $$
+plpy.execute("insert into specific values (1)")
+plpy.execute("insert into specific values (1)")
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION catch_python_unique_violation() RETURNS text AS $$
+begin
+    begin
+        perform python_unique_violation();
+    exception when unique_violation then
+        return 'ok';
+    end;
+    return 'not reached';
+end;
+$$ language plpgsql;
+
+SELECT catch_python_unique_violation();
+
 /* manually starting subtransactions - a bad idea
  */
 CREATE FUNCTION manual_subxact() RETURNS void AS $$