diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml new file mode 100644 index 015bbad..7d31342 *** a/doc/src/sgml/plpython.sgml --- b/doc/src/sgml/plpython.sgml *************** $$ LANGUAGE plpythonu; *** 1341,1360 **** The plpy module also provides the functions ! plpy.debug(msg), ! plpy.log(msg), ! plpy.info(msg), ! plpy.notice(msg), ! plpy.warning(msg), ! plpy.error(msg), and ! plpy.fatal(msg).elogin PL/Python plpy.error and plpy.fatal actually raise a Python exception which, if uncaught, propagates out to the calling query, causing the current transaction or subtransaction to be aborted. raise plpy.Error(msg) and raise plpy.Fatal(msg) are ! equivalent to calling plpy.error and plpy.fatal, respectively. The other functions only generate messages of different --- 1341,1360 ---- The plpy module also provides the functions ! plpy.debug(exception_params), ! plpy.log(exception_params), ! plpy.info(exception_params), ! plpy.notice(exception_params), ! plpy.warning(exception_params), ! plpy.error(exception_params), and ! plpy.fatal(exception_params).elogin PL/Python plpy.error and plpy.fatal actually raise a Python exception which, if uncaught, propagates out to the calling query, causing the current transaction or subtransaction to be aborted. raise plpy.Error(msg) and raise plpy.Fatal(msg) are ! partial equivalent to calling plpy.error and plpy.fatal, respectively. The other functions only generate messages of different *************** $$ LANGUAGE plpythonu; *** 1367,1372 **** --- 1367,1397 ---- + + The exception_params are + [ message [, detail [, hint [, sqlstate [, schema [, table [, column [, datatype [, constraint ]]]]]]]]]. + These parameters kan be entered as keyword parameters. + The message, detail, hint + are automaticly casted to string, other should be string. + + + CREATE FUNCTION raise_custom_exception() RETURNS void AS $$ + plpy.error("custom exception message", detail = "some info about exception", hint = "hint for users") + $$ LANGUAGE plpythonu; + + postgres=# select raise_custom_exception(); + ERROR: XX000: plpy.Error: custom exception message + DETAIL: some info about exception + HINT: hint for users + CONTEXT: Traceback (most recent call last): + PL/Python function "raise_custom_exception", line 2, in <module> + plpy.error("custom exception message", detail = "some info about exception", hint = "hint for users") + PL/Python function "raise_custom_exception" + LOCATION: PLy_elog, plpy_elog.c:132 + + + + Another set of utility functions are plpy.quote_literal(string), plpy.quote_nullable(string), and diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out new file mode 100644 index f8270a7..10f497f *** a/src/pl/plpython/expected/plpython_test.out --- b/src/pl/plpython/expected/plpython_test.out *************** select module_contents(); *** 48,54 **** Error, Fatal, SPIError, cursor, debug, error, execute, fatal, info, log, notice, prepare, quote_ident, quote_literal, quote_nullable, spiexceptions, subtransaction, warning (1 row) ! CREATE FUNCTION elog_test() RETURNS void AS $$ plpy.debug('debug') plpy.log('log') --- 48,54 ---- Error, Fatal, SPIError, cursor, debug, error, execute, fatal, info, log, notice, prepare, quote_ident, quote_literal, quote_nullable, spiexceptions, subtransaction, warning (1 row) ! CREATE FUNCTION elog_test_basic() RETURNS void AS $$ plpy.debug('debug') plpy.log('log') *************** plpy.notice('notice') *** 60,66 **** plpy.warning('warning') plpy.error('error') $$ LANGUAGE plpythonu; ! SELECT elog_test(); INFO: info INFO: 37 INFO: () --- 60,66 ---- plpy.warning('warning') plpy.error('error') $$ LANGUAGE plpythonu; ! SELECT elog_test_basic(); INFO: info INFO: 37 INFO: () *************** NOTICE: notice *** 69,74 **** WARNING: warning ERROR: plpy.Error: error CONTEXT: Traceback (most recent call last): ! PL/Python function "elog_test", line 10, in plpy.error('error') PL/Python function "elog_test" --- 69,114 ---- WARNING: warning ERROR: plpy.Error: error CONTEXT: Traceback (most recent call last): ! PL/Python function "elog_test_basic", line 10, in plpy.error('error') + PL/Python function "elog_test_basic" + CREATE FUNCTION elog_test() RETURNS void + AS $$ + plpy.debug('debug', detail = 'some detail') + plpy.log('log', detail = 'some detail') + plpy.info('info', detail = 'some detail') + plpy.info() + plpy.info('the question', detail = 42); + plpy.info('This is message text.', + detail = 'This is detail text', + hint = 'This is hint text.', + sqlstate = 'XX000', + schema = 'any info about schema', + table = 'any info about table', + column = 'any info about column', + datatype = 'any info about datatype', + constraint = 'any info about constraint') + plpy.notice('notice', detail = 'some detail') + plpy.warning('warning', detail = 'some detail') + plpy.error('stop on error', detail = 'some detail', hint = 'some hint') + $$ LANGUAGE plpythonu; + SELECT elog_test(); + INFO: info + DETAIL: some detail + INFO: () + INFO: the question + DETAIL: 42 + INFO: This is message text. + DETAIL: This is detail text + HINT: This is hint text. + NOTICE: notice + DETAIL: some detail + WARNING: warning + DETAIL: some detail + ERROR: plpy.Error: stop on error + DETAIL: some detail + HINT: some hint + CONTEXT: Traceback (most recent call last): + PL/Python function "elog_test", line 18, in + plpy.error('stop on error', detail = 'some detail', hint = 'some hint') PL/Python function "elog_test" diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c new file mode 100644 index 15406d6..85121d5 *** a/src/pl/plpython/plpy_elog.c --- b/src/pl/plpython/plpy_elog.c *************** PyObject *PLy_exc_spi_error = NULL; *** 23,31 **** static void PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth); static void PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, ! char **hint, char **query, int *position); static char *get_source_line(const char *src, int lineno); /* * Emit a PG error or notice, together with any available info about --- 23,41 ---- static void PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth); static void PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, ! char **hint, char **query, int *position, ! char **schema_name, char **table_name, char **column_name, ! char **datatype_name, char **constraint_name); ! static void PLy_get_error_data(PyObject *exc, int *sqlerrcode, char **detail, ! char **hint, char **query, int *position, ! char **schema_name, char **table_name, char **column_name, ! char **datatype_name, char **constraint_name); static char *get_source_line(const char *src, int lineno); + static void get_string_attr(PyObject *obj, char *attrname, char **str); + static void get_int_attr(PyObject *obj, char *attrname, int *iv); + static bool set_string_attr(PyObject *obj, char *attrname, char *str); + static bool set_int_attr(PyObject *obj, char *attrname, int iv); /* * Emit a PG error or notice, together with any available info about *************** PLy_elog(int elevel, const char *fmt,... *** 51,62 **** char *hint = NULL; char *query = NULL; int position = 0; PyErr_Fetch(&exc, &val, &tb); if (exc != NULL) { if (PyErr_GivenExceptionMatches(val, PLy_exc_spi_error)) ! PLy_get_spi_error_data(val, &sqlerrcode, &detail, &hint, &query, &position); else if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal)) elevel = FATAL; } --- 61,83 ---- char *hint = NULL; char *query = NULL; int position = 0; + char *schema_name = NULL; + char *table_name = NULL; + char *column_name = NULL; + char *datatype_name = NULL; + char *constraint_name = NULL; PyErr_Fetch(&exc, &val, &tb); if (exc != NULL) { if (PyErr_GivenExceptionMatches(val, PLy_exc_spi_error)) ! PLy_get_spi_error_data(val, &sqlerrcode, &detail, &hint, &query, &position, ! &schema_name, &table_name, &column_name, ! &datatype_name, &constraint_name); ! else if (PyErr_GivenExceptionMatches(val, PLy_exc_error)) ! PLy_get_error_data(val, &sqlerrcode, &detail, &hint, &query, &position, ! &schema_name, &table_name, &column_name, ! &datatype_name, &constraint_name); else if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal)) elevel = FATAL; } *************** PLy_elog(int elevel, const char *fmt,... *** 103,109 **** (tb_depth > 0 && tbmsg) ? errcontext("%s", tbmsg) : 0, (hint) ? errhint("%s", hint) : 0, (query) ? internalerrquery(query) : 0, ! (position) ? internalerrposition(position) : 0)); } PG_CATCH(); { --- 124,135 ---- (tb_depth > 0 && tbmsg) ? errcontext("%s", tbmsg) : 0, (hint) ? errhint("%s", hint) : 0, (query) ? internalerrquery(query) : 0, ! (position) ? internalerrposition(position) : 0, ! (schema_name) ? err_generic_string(PG_DIAG_SCHEMA_NAME, schema_name) : 0, ! (table_name) ? err_generic_string(PG_DIAG_TABLE_NAME, table_name) : 0, ! (column_name) ? err_generic_string(PG_DIAG_COLUMN_NAME, column_name) : 0, ! (datatype_name) ? err_generic_string(PG_DIAG_DATATYPE_NAME, datatype_name) : 0, ! (constraint_name) ? err_generic_string(PG_DIAG_CONSTRAINT_NAME, constraint_name) : 0)); } PG_CATCH(); { *************** PLy_get_spi_sqlerrcode(PyObject *exc, in *** 360,371 **** Py_DECREF(sqlstate); } - /* * Extract the error data from a SPIError */ static void ! PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hint, char **query, int *position) { PyObject *spidata = NULL; --- 386,399 ---- Py_DECREF(sqlstate); } /* * Extract the error data from a SPIError */ static void ! PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, ! char **hint, char **query, int *position, ! char **schema_name, char **table_name, char **column_name, ! char **datatype_name, char **constraint_name) { PyObject *spidata = NULL; *************** PLy_get_spi_error_data(PyObject *exc, in *** 373,379 **** if (spidata != NULL) { ! PyArg_ParseTuple(spidata, "izzzi", sqlerrcode, detail, hint, query, position); } else { --- 401,409 ---- if (spidata != NULL) { ! PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position, ! schema_name, table_name, column_name, ! datatype_name, constraint_name); } else { *************** PLy_get_spi_error_data(PyObject *exc, in *** 390,395 **** --- 420,450 ---- } /* + * Extract the error data from an Error + */ + static void + PLy_get_error_data(PyObject *exc, int *sqlerrcode, char **detail, + char **hint, char **query, int *position, + char **schema_name, char **table_name, char **column_name, + char **datatype_name, char **constraint_name) + { + PLy_get_spi_sqlerrcode(exc, sqlerrcode); + + get_string_attr(exc, "detail", detail); + get_string_attr(exc, "hint", hint); + get_string_attr(exc, "query", query); + get_int_attr(exc, "position", position); + get_string_attr(exc, "schema_name", schema_name); + get_string_attr(exc, "table_name", table_name); + get_string_attr(exc, "column_name", column_name); + get_string_attr(exc, "datatype_name", datatype_name); + get_string_attr(exc, "constraint_name", constraint_name); + + PyErr_Clear(); + /* no elog here, we simply won't report the errhint, errposition etc */ + } + + /* * Get the given source line as a palloc'd string */ static char * *************** PLy_exception_set_plural(PyObject *exc, *** 464,466 **** --- 519,652 ---- PyErr_SetString(exc, buf); } + + /* set exceptions from an ErrorData */ + void + PLy_exception_set_with_details(PyObject *excclass, ErrorData *edata) + { + PyObject *args = NULL; + PyObject *error = NULL; + + args = Py_BuildValue("(s)", edata->message); + if (!args) + goto failure; + + /* create a new exception with the error message as the parameter */ + error = PyObject_CallObject(excclass, args); + if (!error) + goto failure; + + if (!set_string_attr(error, "sqlstate", + unpack_sql_state(edata->sqlerrcode))) + goto failure; + + if (!set_string_attr(error, "detail", edata->detail)) + goto failure; + + if (!set_string_attr(error, "hint", edata->hint)) + goto failure; + + if (!set_string_attr(error, "query", edata->internalquery)) + goto failure; + + if (!set_int_attr(error, "position", edata->internalpos)) + goto failure; + + if (!set_string_attr(error, "schema_name", edata->schema_name)) + goto failure; + + if (!set_string_attr(error, "table_name", edata->table_name)) + goto failure; + + if (!set_string_attr(error, "column_name", edata->column_name)) + goto failure; + + if (!set_string_attr(error, "datatype_name", edata->datatype_name)) + goto failure; + + if (!set_string_attr(error, "constraint_name", edata->constraint_name)) + goto failure; + + PyErr_SetObject(excclass, error); + + Py_DECREF(args); + Py_DECREF(error); + + return; + + failure: + Py_XDECREF(args); + Py_XDECREF(error); + + elog(ERROR, "could not convert error to Python exception"); + } + + /* set value of string pointer on object field */ + static void + get_string_attr(PyObject *obj, char *attrname, char **str) + { + PyObject *val; + + val = PyObject_GetAttrString(obj, attrname); + if (val != NULL && val != Py_None) + { + *str = PyString_AsString(val); + Py_DECREF(val); + } + } + + /* same as previous for long */ + static void + get_int_attr(PyObject *obj, char *attrname, int *iv) + { + PyObject *val; + + val = PyObject_GetAttrString(obj, attrname); + if (val != NULL && val != Py_None) + { + *iv = (int) (PyInt_AsLong(val)); + Py_DECREF(val); + } + } + + /* returns true, when object's field was succesfully changed */ + static bool + set_string_attr(PyObject *obj, char *attrname, char *str) + { + int result; + PyObject *val; + + if (str != NULL) + { + val = PyString_FromString(str); + if (!val) + return false; + } + else + { + val = Py_None; + Py_INCREF(Py_None); + } + + result = PyObject_SetAttrString(obj, attrname, val); + Py_DECREF(val); + + return result != -1; + } + + /* same as previous for int */ + static bool + set_int_attr(PyObject *obj, char *attrname, int iv) + { + int result; + PyObject *val; + + val = PyInt_FromLong((long) iv); + if (!val) + return false; + + result = PyObject_SetAttrString(obj, attrname, val); + Py_DECREF(val); + + return result != -1; + } diff --git a/src/pl/plpython/plpy_elog.h b/src/pl/plpython/plpy_elog.h new file mode 100644 index 94725c2..5dd4ef7 *** a/src/pl/plpython/plpy_elog.h --- b/src/pl/plpython/plpy_elog.h *************** extern void PLy_exception_set(PyObject * *** 17,20 **** --- 17,22 ---- extern void PLy_exception_set_plural(PyObject *exc, const char *fmt_singular, const char *fmt_plural, unsigned long n,...) pg_attribute_printf(2, 5) pg_attribute_printf(3, 5); + extern void PLy_exception_set_with_details(PyObject *excclass, ErrorData *edata); + #endif /* PLPY_ELOG_H */ diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c new file mode 100644 index a44b7fb..8411588 *** a/src/pl/plpython/plpy_plpymodule.c --- b/src/pl/plpython/plpy_plpymodule.c *************** static void PLy_add_exceptions(PyObject *** 28,40 **** static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base); /* module functions */ ! static PyObject *PLy_debug(PyObject *self, PyObject *args); ! static PyObject *PLy_log(PyObject *self, PyObject *args); ! static PyObject *PLy_info(PyObject *self, PyObject *args); ! static PyObject *PLy_notice(PyObject *self, PyObject *args); ! static PyObject *PLy_warning(PyObject *self, PyObject *args); ! static PyObject *PLy_error(PyObject *self, PyObject *args); ! static PyObject *PLy_fatal(PyObject *self, PyObject *args); static PyObject *PLy_quote_literal(PyObject *self, PyObject *args); static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args); static PyObject *PLy_quote_ident(PyObject *self, PyObject *args); --- 28,40 ---- static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base); /* module functions */ ! static PyObject *PLy_debug(PyObject *self, PyObject *args, PyObject *kw); ! static PyObject *PLy_log(PyObject *self, PyObject *args, PyObject *kw); ! static PyObject *PLy_info(PyObject *self, PyObject *args, PyObject *kw); ! static PyObject *PLy_notice(PyObject *self, PyObject *args, PyObject *kw); ! static PyObject *PLy_warning(PyObject *self, PyObject *args, PyObject *kw); ! static PyObject *PLy_error(PyObject *self, PyObject *args, PyObject *kw); ! static PyObject *PLy_fatal(PyObject *self, PyObject *args, PyObject *kw); static PyObject *PLy_quote_literal(PyObject *self, PyObject *args); static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args); static PyObject *PLy_quote_ident(PyObject *self, PyObject *args); *************** static PyMethodDef PLy_methods[] = { *** 57,69 **** /* * logging methods */ ! {"debug", PLy_debug, METH_VARARGS, NULL}, ! {"log", PLy_log, METH_VARARGS, NULL}, ! {"info", PLy_info, METH_VARARGS, NULL}, ! {"notice", PLy_notice, METH_VARARGS, NULL}, ! {"warning", PLy_warning, METH_VARARGS, NULL}, ! {"error", PLy_error, METH_VARARGS, NULL}, ! {"fatal", PLy_fatal, METH_VARARGS, NULL}, /* * create a stored plan --- 57,69 ---- /* * logging methods */ ! {"debug", (PyCFunction) PLy_debug, METH_VARARGS|METH_KEYWORDS, NULL}, ! {"log", (PyCFunction) PLy_log, METH_VARARGS|METH_KEYWORDS, NULL}, ! {"info", (PyCFunction) PLy_info, METH_VARARGS|METH_KEYWORDS, NULL}, ! {"notice", (PyCFunction) PLy_notice, METH_VARARGS|METH_KEYWORDS, NULL}, ! {"warning", (PyCFunction) PLy_warning, METH_VARARGS|METH_KEYWORDS, NULL}, ! {"error", (PyCFunction) PLy_error, METH_VARARGS|METH_KEYWORDS, NULL}, ! {"fatal", (PyCFunction) PLy_fatal, METH_VARARGS|METH_KEYWORDS, NULL}, /* * create a stored plan *************** PLy_generate_spi_exceptions(PyObject *mo *** 271,318 **** * the python interface to the elog function * don't confuse these with PLy_elog */ ! static PyObject *PLy_output(volatile int, PyObject *, PyObject *); static PyObject * ! PLy_debug(PyObject *self, PyObject *args) { ! return PLy_output(DEBUG2, self, args); } static PyObject * ! PLy_log(PyObject *self, PyObject *args) { ! return PLy_output(LOG, self, args); } static PyObject * ! PLy_info(PyObject *self, PyObject *args) { ! return PLy_output(INFO, self, args); } static PyObject * ! PLy_notice(PyObject *self, PyObject *args) { ! return PLy_output(NOTICE, self, args); } static PyObject * ! PLy_warning(PyObject *self, PyObject *args) { ! return PLy_output(WARNING, self, args); } static PyObject * ! PLy_error(PyObject *self, PyObject *args) { ! return PLy_output(ERROR, self, args); } static PyObject * ! PLy_fatal(PyObject *self, PyObject *args) { ! return PLy_output(FATAL, self, args); } static PyObject * --- 271,319 ---- * the python interface to the elog function * don't confuse these with PLy_elog */ ! static PyObject *PLy_output_kw(volatile int level, PyObject *self, ! PyObject *args, PyObject *kw); static PyObject * ! PLy_debug(PyObject *self, PyObject *args, PyObject *kw) { ! return PLy_output_kw(DEBUG2, self, args, kw); } static PyObject * ! PLy_log(PyObject *self, PyObject *args, PyObject *kw) { ! return PLy_output_kw(LOG, self, args, kw); } static PyObject * ! PLy_info(PyObject *self, PyObject *args, PyObject *kw) { ! return PLy_output_kw(INFO, self, args, kw); } static PyObject * ! PLy_notice(PyObject *self, PyObject *args, PyObject *kw) { ! return PLy_output_kw(NOTICE, self, args, kw); } static PyObject * ! PLy_warning(PyObject *self, PyObject *args, PyObject *kw) { ! return PLy_output_kw(WARNING, self, args, kw); } static PyObject * ! PLy_error(PyObject *self, PyObject *args, PyObject *kw) { ! return PLy_output_kw(ERROR, self, args, kw); } static PyObject * ! PLy_fatal(PyObject *self, PyObject *args, PyObject *kw) { ! return PLy_output_kw(FATAL, self, args, kw); } static PyObject * *************** PLy_quote_ident(PyObject *self, PyObject *** 368,379 **** return ret; } static PyObject * ! PLy_output(volatile int level, PyObject *self, PyObject *args) { ! PyObject *volatile so; ! char *volatile sv; ! volatile MemoryContext oldcontext; if (PyTuple_Size(args) == 1) { --- 369,414 ---- return ret; } + /* enforce cast of object to string */ + static char * + object_to_string(PyObject *obj) + { + if (obj) + { + PyObject *so = PyObject_Str(obj); + + if (so != NULL && so != Py_None) + { + char *str; + + str = PyString_AsString(so); + Py_XDECREF(so); + + return str; + } + Py_XDECREF(so); + } + + return NULL; + } + static PyObject * ! PLy_output_kw(volatile int level, PyObject *self, PyObject *args, PyObject *kw) { ! int sqlstate = 0; ! char *volatile sqlstatestr = NULL; ! char *volatile message = NULL; ! char *volatile detail = NULL; ! char *volatile hint = NULL; ! char *volatile column = NULL; ! char *volatile constraint = NULL; ! char *volatile datatype = NULL; ! char *volatile table = NULL; ! char *volatile schema = NULL; ! MemoryContext oldcontext ; ! PyObject *key, *value; ! PyObject *volatile so; ! Py_ssize_t pos = 0; if (PyTuple_Size(args) == 1) { *************** PLy_output(volatile int level, PyObject *** 389,431 **** } else so = PyObject_Str(args); ! if (so == NULL || ((sv = PyString_AsString(so)) == NULL)) { level = ERROR; ! sv = dgettext(TEXTDOMAIN, "could not parse error message in plpy.elog"); } oldcontext = CurrentMemoryContext; PG_TRY(); { ! pg_verifymbstr(sv, strlen(sv), false); ! elog(level, "%s", sv); } PG_CATCH(); { ! ErrorData *edata; MemoryContextSwitchTo(oldcontext); edata = CopyErrorData(); FlushErrorState(); /* * Note: If sv came from PyString_AsString(), it points into storage * owned by so. So free so after using sv. */ Py_XDECREF(so); - /* Make Python raise the exception */ - PLy_exception_set(PLy_exc_error, "%s", edata->message); return NULL; } PG_END_TRY(); Py_XDECREF(so); - - /* - * return a legal object so the interpreter will continue on its merry way - */ Py_INCREF(Py_None); return Py_None; } --- 424,538 ---- } else so = PyObject_Str(args); ! if (so == NULL || ((message = PyString_AsString(so)) == NULL)) { level = ERROR; ! message = dgettext(TEXTDOMAIN, "could not parse error message in plpy.elog"); ! } ! ! if (kw != NULL && kw != Py_None) ! { ! while (PyDict_Next(kw, &pos, &key, &value)) ! { ! char *keyword = PyString_AsString(key); ! ! if (strcmp(keyword, "message") == 0) ! message = object_to_string(value); ! else if (strcmp(keyword, "detail") == 0) ! detail = object_to_string(value); ! else if (strcmp(keyword, "hint") == 0) ! hint = object_to_string(value); ! else if (strcmp(keyword, "sqlstate") == 0) ! sqlstatestr = object_to_string(value); ! else if (strcmp(keyword, "schema") == 0) ! schema = object_to_string(value); ! else if (strcmp(keyword, "table") == 0) ! table = object_to_string(value); ! else if (strcmp(keyword, "column") == 0) ! column = object_to_string(value); ! else if (strcmp(keyword, "datatype") == 0) ! datatype = object_to_string(value); ! else if (strcmp(keyword, "constraint") == 0) ! constraint = object_to_string(value); ! else ! PLy_elog(ERROR, "'%s' is an invalid keyword argument for this function", ! keyword); ! } ! } ! ! if (sqlstatestr != NULL) ! { ! if (strlen(sqlstatestr) != 5) ! PLy_elog(ERROR, "invalid SQLSTATE code"); ! ! if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5) ! PLy_elog(ERROR, "invalid SQLSTATE code"); ! ! sqlstate = MAKE_SQLSTATE(sqlstatestr[0], ! sqlstatestr[1], ! sqlstatestr[2], ! sqlstatestr[3], ! sqlstatestr[4]); } oldcontext = CurrentMemoryContext; PG_TRY(); { ! if (message != NULL) ! pg_verifymbstr(message, strlen(message), false); ! if (detail != NULL) ! pg_verifymbstr(detail, strlen(detail), false); ! if (hint != NULL) ! pg_verifymbstr(hint, strlen(hint), false); ! if (schema != NULL) ! pg_verifymbstr(schema, strlen(schema), false); ! if (table != NULL) ! pg_verifymbstr(table, strlen(table), false); ! if (column != NULL) ! pg_verifymbstr(column, strlen(column), false); ! if (datatype != NULL) ! pg_verifymbstr(datatype, strlen(datatype), false); ! if (constraint != NULL) ! pg_verifymbstr(constraint, strlen(constraint), false); ! ! ereport(level, ! ((sqlstate != 0) ? errcode(sqlstate) : 0, ! (message != NULL) ? errmsg_internal("%s", message) : 0, ! (detail != NULL) ? errdetail_internal("%s", detail) : 0, ! (hint != NULL) ? errhint("%s", hint) : 0, ! (column != NULL) ? ! err_generic_string(PG_DIAG_COLUMN_NAME, column) : 0, ! (constraint != NULL) ? ! err_generic_string(PG_DIAG_CONSTRAINT_NAME, constraint) : 0, ! (datatype != NULL) ? ! err_generic_string(PG_DIAG_DATATYPE_NAME, datatype) : 0, ! (table != NULL) ? ! err_generic_string(PG_DIAG_TABLE_NAME, table) : 0, ! (schema != NULL) ? ! err_generic_string(PG_DIAG_SCHEMA_NAME, schema) : 0)); } PG_CATCH(); { ! ErrorData *edata; MemoryContextSwitchTo(oldcontext); edata = CopyErrorData(); FlushErrorState(); + PLy_exception_set_with_details(PLy_exc_error, edata); + FreeErrorData(edata); + /* * Note: If sv came from PyString_AsString(), it points into storage * owned by so. So free so after using sv. */ Py_XDECREF(so); return NULL; } PG_END_TRY(); Py_XDECREF(so); Py_INCREF(Py_None); return Py_None; } diff --git a/src/pl/plpython/plpy_plpymodule.h b/src/pl/plpython/plpy_plpymodule.h new file mode 100644 index ee089b7..61e2c22 *** a/src/pl/plpython/plpy_plpymodule.h --- b/src/pl/plpython/plpy_plpymodule.h *************** *** 10,16 **** /* A hash table mapping sqlstates to exceptions, for speedy lookup */ extern HTAB *PLy_spi_exceptions; - #if PY_MAJOR_VERSION >= 3 PyMODINIT_FUNC PyInit_plpy(void); #endif --- 10,15 ---- diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c new file mode 100644 index 58e78ec..2b53b14 *** a/src/pl/plpython/plpy_spi.c --- b/src/pl/plpython/plpy_spi.c *************** PLy_spi_exception_set(PyObject *excclass *** 564,571 **** if (!spierror) goto failure; ! spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint, ! edata->internalquery, edata->internalpos); if (!spidata) goto failure; --- 564,573 ---- if (!spierror) goto failure; ! spidata= Py_BuildValue("(izzzizzzzz)", edata->sqlerrcode, edata->detail, edata->hint, ! edata->internalquery, edata->internalpos, ! edata->schema_name, edata->table_name, edata->column_name, ! edata->datatype_name, edata->constraint_name); if (!spidata) goto failure; diff --git a/src/pl/plpython/sql/plpython_test.sql b/src/pl/plpython/sql/plpython_test.sql new file mode 100644 index 3a76104..6e42ace *** a/src/pl/plpython/sql/plpython_test.sql --- b/src/pl/plpython/sql/plpython_test.sql *************** $$ LANGUAGE plpythonu; *** 36,43 **** select module_contents(); ! ! CREATE FUNCTION elog_test() RETURNS void AS $$ plpy.debug('debug') plpy.log('log') --- 36,42 ---- select module_contents(); ! CREATE FUNCTION elog_test_basic() RETURNS void AS $$ plpy.debug('debug') plpy.log('log') *************** plpy.warning('warning') *** 50,53 **** --- 49,76 ---- plpy.error('error') $$ LANGUAGE plpythonu; + SELECT elog_test_basic(); + + CREATE FUNCTION elog_test() RETURNS void + AS $$ + plpy.debug('debug', detail = 'some detail') + plpy.log('log', detail = 'some detail') + plpy.info('info', detail = 'some detail') + plpy.info() + plpy.info('the question', detail = 42); + plpy.info('This is message text.', + detail = 'This is detail text', + hint = 'This is hint text.', + sqlstate = 'XX000', + schema = 'any info about schema', + table = 'any info about table', + column = 'any info about column', + datatype = 'any info about datatype', + constraint = 'any info about constraint') + plpy.notice('notice', detail = 'some detail') + plpy.warning('warning', detail = 'some detail') + plpy.error('stop on error', detail = 'some detail', hint = 'some hint') + $$ LANGUAGE plpythonu; + SELECT elog_test(); +