proposal: PL/Pythonu - function ereport

commit 2593493f583f06a784b5d0b56f5efa04e62ad07a
Author: Pavel Stehule <pavel.stehule@gooddata.com>
Date:   Thu Oct 8 20:51:17 2015 +0200

    initial

diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
index 1f52af7..76d8b2c 100644
--- a/src/pl/plpython/expected/plpython_error.out
+++ b/src/pl/plpython/expected/plpython_error.out
@@ -422,3 +422,59 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+CREATE FUNCTION nested_error_ereport() RETURNS text
+	AS
+'def fun1():
+	raise plpy.ereport(plpy.ERROR, "boom")
+
+def fun2():
+	fun1()
+
+def fun3():
+	fun2()
+
+fun3()
+return "not reached"
+'
+	LANGUAGE plpythonu;
+SELECT nested_error_ereport();
+ERROR:  plpy.SPIError: boom
+CONTEXT:  Traceback (most recent call last):
+  PL/Python function "nested_error_ereport", line 10, in <module>
+    fun3()
+  PL/Python function "nested_error_ereport", line 8, in fun3
+    fun2()
+  PL/Python function "nested_error_ereport", line 5, in fun2
+    fun1()
+  PL/Python function "nested_error_ereport", line 2, in fun1
+    raise plpy.ereport(plpy.ERROR, "boom")
+PL/Python function "nested_error_ereport"
+CREATE FUNCTION ereport_test()
+RETURNS void AS $$
+  plpy.ereport(plpy.NOTICE, "some notice")
+$$ LANGUAGE plpythonu;
+SELECT ereport_test();
+NOTICE:  some notice
+ ereport_test 
+--------------
+ 
+(1 row)
+
+\set VERBOSITY verbose
+CREATE OR REPLACE FUNCTION ereport_test()
+RETURNS void AS $$
+  plpy.ereport(plpy.NOTICE, "some notice", "some detail", "any hint", schema='schema_yy', table='table_xx', column='column_zz')
+$$ LANGUAGE plpythonu;
+SELECT ereport_test();
+NOTICE:  00000: some notice
+DETAIL:  some detail
+HINT:  any hint
+SCHEMA NAME:  schema_yy
+TABLE NAME:  table_xx
+COLUMN NAME:  column_zz
+LOCATION:  PLy_ereport, plpy_plpymodule.c:428
+ ereport_test 
+--------------
+ 
+(1 row)
+
diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
index 7b76faf..cceb5b8 100644
--- a/src/pl/plpython/expected/plpython_test.out
+++ b/src/pl/plpython/expected/plpython_test.out
@@ -43,9 +43,9 @@ contents.sort()
 return ", ".join(contents)
 $$ LANGUAGE plpythonu;
 select module_contents();
-                                                                               module_contents                                                                                
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- Error, Fatal, SPIError, cursor, debug, error, execute, fatal, info, log, notice, prepare, quote_ident, quote_literal, quote_nullable, spiexceptions, subtransaction, warning
+                                                                                                         module_contents                                                                                                         
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ DEBUG, ERROR, Error, Fatal, INFO, LOG, NOTICE, SPIError, WARNING, cursor, debug, ereport, error, execute, fatal, info, log, notice, prepare, quote_ident, quote_literal, quote_nullable, spiexceptions, subtransaction, warning
 (1 row)
 
 CREATE FUNCTION elog_test() RETURNS void
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index 15406d6..6825732 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -21,9 +21,10 @@ PyObject   *PLy_exc_fatal = NULL;
 PyObject   *PLy_exc_spi_error = NULL;
 
 
-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 **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);
 
 
@@ -51,12 +52,19 @@ PLy_elog(int elevel, const char *fmt,...)
 	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);
+			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_fatal))
 			elevel = FATAL;
 	}
@@ -103,7 +111,12 @@ PLy_elog(int elevel, const char *fmt,...)
 				 (tb_depth > 0 && tbmsg) ? errcontext("%s", tbmsg) : 0,
 				 (hint) ? errhint("%s", hint) : 0,
 				 (query) ? internalerrquery(query) : 0,
-				 (position) ? internalerrposition(position) : 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();
 	{
@@ -132,7 +145,7 @@ PLy_elog(int elevel, const char *fmt,...)
  * tbmsg (both as palloc'd strings) and the traceback depth in
  * tb_depth.
  */
-static void
+void
 PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth)
 {
 	PyObject   *e,
@@ -365,7 +378,9 @@ PLy_get_spi_sqlerrcode(PyObject *exc, int *sqlerrcode)
  * 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)
+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;
 
@@ -373,7 +388,9 @@ PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hin
 
 	if (spidata != NULL)
 	{
-		PyArg_ParseTuple(spidata, "izzzi", sqlerrcode, detail, hint, query, position);
+		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
+						    schema_name, table_name, column_name,
+						    datatype_name, constraint_name);
 	}
 	else
 	{
diff --git a/src/pl/plpython/plpy_elog.h b/src/pl/plpython/plpy_elog.h
index 94725c2..29a0d9b 100644
--- a/src/pl/plpython/plpy_elog.h
+++ b/src/pl/plpython/plpy_elog.h
@@ -17,4 +17,6 @@ extern void PLy_exception_set(PyObject *exc, const char *fmt,...) pg_attribute_p
 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_traceback(char **xmsg, char **tbmsg, int *tb_depth);
+
 #endif   /* PLPY_ELOG_H */
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index a44b7fb..7bc775c 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -23,7 +23,7 @@
 
 HTAB	   *PLy_spi_exceptions = NULL;
 
-
+static void PLy_add_constants(PyObject *plpy);
 static void PLy_add_exceptions(PyObject *plpy);
 static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
 
@@ -35,6 +35,7 @@ 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_ereport(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);
@@ -64,6 +65,7 @@ static PyMethodDef PLy_methods[] = {
 	{"warning", PLy_warning, METH_VARARGS, NULL},
 	{"error", PLy_error, METH_VARARGS, NULL},
 	{"fatal", PLy_fatal, METH_VARARGS, NULL},
+	{"ereport", (PyCFunction) PLy_ereport, METH_VARARGS | METH_KEYWORDS, NULL},
 
 	/*
 	 * create a stored plan
@@ -133,6 +135,7 @@ PyInit_plpy(void)
 	if (m == NULL)
 		return NULL;
 
+	PLy_add_constants(m);
 	PLy_add_exceptions(m);
 
 	return m;
@@ -163,6 +166,7 @@ PLy_init_plpy(void)
 	/* for Python 3 we initialized the exceptions in PyInit_plpy */
 #else
 	plpy = Py_InitModule("plpy", PLy_methods);
+	PLy_add_constants(plpy);
 	PLy_add_exceptions(plpy);
 #endif
 
@@ -181,6 +185,21 @@ PLy_init_plpy(void)
 		PLy_elog(ERROR, "could not import \"plpy\" module");
 }
 
+#define PYMODULE_ADD_CONSTANT(m, name, value) \
+if (PyModule_AddIntConstant(m, name, value) != 0) \
+	PLy_elog(ERROR, "could not import \"plpy\" constant")
+
+static void
+PLy_add_constants(PyObject *plpy)
+{
+	PYMODULE_ADD_CONSTANT(plpy, "DEBUG", DEBUG2);
+	PYMODULE_ADD_CONSTANT(plpy, "LOG", LOG);
+	PYMODULE_ADD_CONSTANT(plpy, "INFO", INFO);
+	PYMODULE_ADD_CONSTANT(plpy, "NOTICE", NOTICE);
+	PYMODULE_ADD_CONSTANT(plpy, "WARNING", WARNING);
+	PYMODULE_ADD_CONSTANT(plpy, "ERROR", ERROR);
+}
+
 static void
 PLy_add_exceptions(PyObject *plpy)
 {
@@ -316,6 +335,118 @@ PLy_fatal(PyObject *self, PyObject *args)
 }
 
 static PyObject *
+PLy_ereport(PyObject *self, PyObject *args, PyObject *kw)
+{
+	int level;
+	int sqlstate = 0;
+	const char *sqlstatestr = NULL;
+	const char *message = NULL;
+	const char *detail = NULL;
+	const char *hint = NULL;
+	const char *column = NULL;
+	const char *constraint = NULL;
+	const char *datatype = NULL;
+	const char *table = NULL;
+	const char *schema = NULL;
+	MemoryContext oldcontext ;
+
+	static char *kwlist[] = { "level","message", "detail", "hint",
+				  "sqlstate",
+				  "schema","table", "column",
+				  "datatype", "constraint",
+				  NULL };
+
+	if (!PyArg_ParseTupleAndKeywords(args, kw, "i|ssssssssssss", kwlist,
+			 &level, &message, &detail, &hint,
+			 &sqlstatestr,
+			 &schema, &table, &column,
+			 &datatype, &constraint))
+		return NULL;
+
+	switch (level)
+	{
+		case DEBUG2:
+		case LOG:
+		case INFO:
+		case NOTICE:
+		case WARNING:
+		case ERROR:
+			break;
+		default:
+			PLy_elog(ERROR, "ereport level is not valid in plpy.ereport");
+	}
+
+	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_spi_exception_set(PLy_exc_spi_error, edata);
+		FreeErrorData(edata);
+		return NULL;
+	}
+	PG_END_TRY();
+
+	Py_INCREF(Py_None);
+	return Py_None;
+
+}
+
+static PyObject *
 PLy_quote_literal(PyObject *self, PyObject *args)
 {
 	const char *str;
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index d0e255f..4f143d6 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -30,7 +30,6 @@
 static PyObject *PLy_spi_execute_query(char *query, long limit);
 static PyObject *PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit);
 static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status);
-static void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
 
 
 /* prepare(query="select * from foo")
@@ -532,7 +531,7 @@ PLy_spi_subtransaction_abort(MemoryContext oldcontext, ResourceOwner oldowner)
  * Raise a SPIError, passing in it more error details, like the
  * internal query and error position.
  */
-static void
+void
 PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
 {
 	PyObject   *args = NULL;
@@ -548,8 +547,10 @@ PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
 	if (!spierror)
 		goto failure;
 
-	spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
-							edata->internalquery, edata->internalpos);
+	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/plpy_spi.h b/src/pl/plpython/plpy_spi.h
index b042794..e9a5991 100644
--- a/src/pl/plpython/plpy_spi.h
+++ b/src/pl/plpython/plpy_spi.h
@@ -22,4 +22,7 @@ extern void PLy_spi_subtransaction_begin(MemoryContext oldcontext, ResourceOwner
 extern void PLy_spi_subtransaction_commit(MemoryContext oldcontext, ResourceOwner oldowner);
 extern void PLy_spi_subtransaction_abort(MemoryContext oldcontext, ResourceOwner oldowner);
 
+/* set spi exception */
+extern void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
+
 #endif   /* PLPY_SPI_H */
diff --git a/src/pl/plpython/sql/plpython_error.sql b/src/pl/plpython/sql/plpython_error.sql
index d0df7e6..45c6b25 100644
--- a/src/pl/plpython/sql/plpython_error.sql
+++ b/src/pl/plpython/sql/plpython_error.sql
@@ -328,3 +328,38 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+
+
+CREATE FUNCTION nested_error_ereport() RETURNS text
+	AS
+'def fun1():
+	raise plpy.ereport(plpy.ERROR, "boom")
+
+def fun2():
+	fun1()
+
+def fun3():
+	fun2()
+
+fun3()
+return "not reached"
+'
+	LANGUAGE plpythonu;
+
+SELECT nested_error_ereport();
+
+CREATE FUNCTION ereport_test()
+RETURNS void AS $$
+  plpy.ereport(plpy.NOTICE, "some notice")
+$$ LANGUAGE plpythonu;
+
+SELECT ereport_test();
+
+\set VERBOSITY verbose
+
+CREATE OR REPLACE FUNCTION ereport_test()
+RETURNS void AS $$
+  plpy.ereport(plpy.NOTICE, "some notice", "some detail", "any hint", schema='schema_yy', table='table_xx', column='column_zz')
+$$ LANGUAGE plpythonu;
+
+SELECT ereport_test();

diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..c9b5e69
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN division_by_zero THEN
*** 408,413 ****
--- 408,420 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ ERROR:  spiexceptions.DivisionByZero: None
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "plpy_raise_spiexception", line 2, in <module>
+     raise plpy.spiexceptions.DivisionByZero()
+ PL/Python function "plpy_raise_spiexception"
+ SQL statement "SELECT plpy_raise_spiexception()"
+ PL/pgSQL function inline_code_block line 3 at SQL statement
  /* setting a custom sqlstate should be handled
   */
  CREATE FUNCTION plpy_raise_spiexception_override() RETURNS void AS $$
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 429,487 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ ERROR:  spiexceptions.DivisionByZero: None
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "plpy_raise_spiexception_override", line 4, in <module>
+     raise exc
+ PL/Python function "plpy_raise_spiexception_override"
+ SQL statement "SELECT plpy_raise_spiexception_override()"
+ PL/pgSQL function inline_code_block line 3 at SQL statement
+ CREATE FUNCTION nested_error_ereport() RETURNS text
+ 	AS
+ 'def fun1():
+ 	raise plpy.SPIError("HiHi");
+ 
+ def fun2():
+ 	fun1()
+ 
+ def fun3():
+ 	fun2()
+ 
+ fun3()
+ return "not reached"
+ '
+ 	LANGUAGE plpythonu;
+ SELECT nested_error_ereport();
+ ERROR:  plpy.SPIError: HiHi
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "nested_error_ereport", line 10, in <module>
+     fun3()
+   PL/Python function "nested_error_ereport", line 8, in fun3
+     fun2()
+   PL/Python function "nested_error_ereport", line 5, in fun2
+     fun1()
+   PL/Python function "nested_error_ereport", line 2, in fun1
+     raise plpy.SPIError("HiHi");
+ PL/Python function "nested_error_ereport"
+ \set VERBOSITY verbose
+ do $$
+ x = plpy.SPIError("pokus",hint = "some info", sqlstate='AA234'); raise x;
+ $$ language plpythonu;
+ ERROR:  AA234: plpy.SPIError: pokus
+ HINT:  some info
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     x = plpy.SPIError("pokus",hint = "some info", sqlstate='AA234'); raise x;
+ PL/Python anonymous code block
+ LOCATION:  PLy_elog, plpy_elog.c:119
+ do $$
+ raise plpy.SPIError("pokus",hint = "some info", sqlstate='AA234');
+ $$ language plpythonu;
+ ERROR:  AA234: plpy.SPIError: pokus
+ HINT:  some info
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError("pokus",hint = "some info", sqlstate='AA234');
+ PL/Python anonymous code block
+ LOCATION:  PLy_elog, plpy_elog.c:119
+ \set VERBOSITY default
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..6825732
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_fatal = NULL;
*** 21,29 ****
  PyObject   *PLy_exc_spi_error = NULL;
  
  
- 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);
  
  
--- 21,30 ----
  PyObject   *PLy_exc_spi_error = NULL;
  
  
  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 char *get_source_line(const char *src, int lineno);
  
  
*************** 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;
  	}
--- 52,70 ----
  	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_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();
  	{
--- 111,122 ----
  				 (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_elog(int elevel, const char *fmt,...
*** 132,138 ****
   * tbmsg (both as palloc'd strings) and the traceback depth in
   * tb_depth.
   */
! static void
  PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth)
  {
  	PyObject   *e,
--- 145,151 ----
   * tbmsg (both as palloc'd strings) and the traceback depth in
   * tb_depth.
   */
! void
  PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth)
  {
  	PyObject   *e,
*************** PLy_get_spi_sqlerrcode(PyObject *exc, in
*** 365,371 ****
   * 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;
  
--- 378,386 ----
   * 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
  	{
--- 388,396 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_elog.h b/src/pl/plpython/plpy_elog.h
new file mode 100644
index 94725c2..29a0d9b
*** 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_traceback(char **xmsg, char **tbmsg, int *tb_depth);
+ 
  #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..e8bf582
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
***************
*** 23,29 ****
  
  HTAB	   *PLy_spi_exceptions = NULL;
  
- 
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
  
--- 23,28 ----
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 38,45 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* class methods */
+ static PyObject *PLy_spi_error_init(PyObject *self, PyObject *args, PyObject *kw);
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 100,110 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_exc_spi_error_methods[] = {
+ 	{"__init__", (PyCFunction) PLy_spi_error_init, METH_KEYWORDS, NULL},
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** PLy_add_exceptions(PyObject *plpy)
*** 187,192 ****
--- 193,201 ----
  	PyObject   *excmod;
  	HASHCTL		hash_ctl;
  
+ 	PyObject   *spi_error_dict;
+ 	PyMethodDef	*method;
+ 
  #if PY_MAJOR_VERSION < 3
  	excmod = Py_InitModule("spiexceptions", PLy_exc_methods);
  #else
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,215 ****
  	 */
  	Py_INCREF(excmod);
  
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
--- 216,256 ----
  	 */
  	Py_INCREF(excmod);
  
+ 	spi_error_dict = PyDict_New();
+ 
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 
! 	/* generate constructor for plpy.SPIError class */
! 	for (method = PLy_exc_spi_error_methods; method->ml_name != NULL; method++)
! 	{
! 		PyObject   *func;
! 		PyObject   *meth;
! 
! 		func = PyCFunction_New(method, NULL);
! 		if (func == NULL)
! 			PLy_elog(ERROR, "could not import function \"%s\"", method->ml_name);
! 
! /*
!  * It is not probably correct, last parameter class is null, should be
!  * PLy_exc_spi_error, but I have to create class after dictionary
!  * setting :(.
!  */
! 		meth = PyMethod_New(func, NULL, NULL);
! 		if (meth == NULL)
! 			PLy_elog(ERROR, "could not import method \"%s\"", method->ml_name);
! 
! 		if (PyDict_SetItemString(spi_error_dict, method->ml_name, meth))
! 			PLy_elog(ERROR, "could public method \"%s\" in dictionary", method->ml_name);
! 
! 		Py_DECREF(meth);
! 		Py_DECREF(func);
! 	}
! 
! /*
!  * It doesn't work with empty spi_error_dic, so dictionary must be set first.
!  */
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, spi_error_dict);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
*************** PLy_add_exceptions(PyObject *plpy)
*** 223,228 ****
--- 264,271 ----
  	Py_INCREF(PLy_exc_spi_error);
  	PyModule_AddObject(plpy, "SPIError", PLy_exc_spi_error);
  
+ 	Py_DECREF(spi_error_dict);
+ 
  	memset(&hash_ctl, 0, sizeof(hash_ctl));
  	hash_ctl.keysize = sizeof(int);
  	hash_ctl.entrysize = sizeof(PLyExceptionEntry);
*************** PLy_fatal(PyObject *self, PyObject *args
*** 316,321 ****
--- 359,446 ----
  }
  
  static PyObject *
+ PLy_spi_error_init(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spierror = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	PyObject   *_self;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kw, "O|ssssssssssss", kwlist,
+ 			 &_self,
+ 			 &message, &detail, &hint,
+ 			 &sqlstatestr,
+ 			 &schema, &table, &column,
+ 			 &datatype, &constraint))
+ 		return NULL;
+ 
+ 	exc_args = Py_BuildValue("(s)", message);
+ 	if (!exc_args)
+ 		goto failure;
+ 
+ 	/* create a new SPI exception with the error message as the parameter */
+ 	if (PyObject_SetAttrString(_self, "args", exc_args) == -1)
+ 		goto failure;
+ 
+ 	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]);
+ 	}
+ 
+ 	spidata = Py_BuildValue("(izzzizzzzz)", sqlstate, detail, hint,
+ 					NULL, -1,
+ 					schema, table, column,
+ 					datatype, constraint);
+ 	if (!spidata)
+ 		goto failure;
+ 
+ 	if (PyObject_SetAttrString(_self, "spidata", spidata) == -1)
+ 		goto failure;
+ 
+ 	Py_DECREF(exc_args);
+ 	Py_DECREF(spidata);
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(args);
+ 	Py_XDECREF(spidata);
+ 
+ 	PLy_elog(ERROR, "could not create SPIError object");
+ 
+ 	return NULL;
+ }
+ 
+ static PyObject *
  PLy_quote_literal(PyObject *self, PyObject *args)
  {
  	const char *str;
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index d0e255f..4f143d6
*** a/src/pl/plpython/plpy_spi.c
--- b/src/pl/plpython/plpy_spi.c
***************
*** 30,36 ****
  static PyObject *PLy_spi_execute_query(char *query, long limit);
  static PyObject *PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit);
  static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status);
- static void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
  
  
  /* prepare(query="select * from foo")
--- 30,35 ----
*************** PLy_spi_subtransaction_abort(MemoryConte
*** 532,538 ****
   * Raise a SPIError, passing in it more error details, like the
   * internal query and error position.
   */
! static void
  PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
  {
  	PyObject   *args = NULL;
--- 531,537 ----
   * Raise a SPIError, passing in it more error details, like the
   * internal query and error position.
   */
! void
  PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
  {
  	PyObject   *args = NULL;
*************** PLy_spi_exception_set(PyObject *excclass
*** 548,555 ****
  	if (!spierror)
  		goto failure;
  
! 	spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
! 							edata->internalquery, edata->internalpos);
  	if (!spidata)
  		goto failure;
  
--- 547,556 ----
  	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/plpy_spi.h b/src/pl/plpython/plpy_spi.h
new file mode 100644
index b042794..e9a5991
*** a/src/pl/plpython/plpy_spi.h
--- b/src/pl/plpython/plpy_spi.h
*************** extern void PLy_spi_subtransaction_begin
*** 22,25 ****
--- 22,28 ----
  extern void PLy_spi_subtransaction_commit(MemoryContext oldcontext, ResourceOwner oldowner);
  extern void PLy_spi_subtransaction_abort(MemoryContext oldcontext, ResourceOwner oldowner);
  
+ /* set spi exception */
+ extern void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
+ 
  #endif   /* PLPY_SPI_H */
diff --git a/src/pl/plpython/sql/plpython_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..90da808
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,362 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ 
+ CREATE FUNCTION nested_error_ereport() RETURNS text
+ 	AS
+ 'def fun1():
+ 	raise plpy.SPIError("HiHi");
+ 
+ def fun2():
+ 	fun1()
+ 
+ def fun3():
+ 	fun2()
+ 
+ fun3()
+ return "not reached"
+ '
+ 	LANGUAGE plpythonu;
+ 
+ SELECT nested_error_ereport();
+ 
+ \set VERBOSITY verbose
+ 
+ do $$
+ x = plpy.SPIError("pokus",hint = "some info", sqlstate='AA234'); raise x;
+ $$ language plpythonu;
+ 
+ do $$
+ raise plpy.SPIError("pokus",hint = "some info", sqlstate='AA234');
+ $$ language plpythonu;
+ 
+ \set VERBOSITY default
+ 

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..bf468e1
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1205,1210 ****
--- 1205,1235 ----
      approximately the same functionality
     </para>
    </sect2>
+ 
+   <sect2 id="plpython-raising">
+    <title>Raising Errors</title>
+ 
+    <para>
+     The <literal>plpy</literal> module provides several possibilities to
+     to raise a exception:
+    </para>
+ 
+    <variablelist>
+     <varlistentry>
+      <term><literal><function>SPIError</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal></term>
+      <listitem>
+        <para>
+         The constructor of SPIError exception (class) supports keyword parameters. 
+ <programlisting>
+ DO $$
+   raise plpy.SPIError('custom message', hint = 'It is test only');
+ $$ LANGUAGE plpythonu;
+ </programlisting>
+        </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+   </sect2>
   </sect1>
  
   <sect1 id="plpython-subtransaction">
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..ac985c6
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,473 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* possibility to set all accessable fields in custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..a835af9
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_spi_error = NULL;
*** 23,29 ****
  
  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);
  
  
--- 23,32 ----
  
  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 char *get_source_line(const char *src, int lineno);
  
  
*************** 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;
  	}
--- 54,73 ----
  	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_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();
  	{
--- 114,126 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 382,390 ----
   * 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
  	{
--- 392,400 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..6881013
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** HTAB	   *PLy_spi_exceptions = NULL;
*** 26,31 ****
--- 26,32 ----
  
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+ static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
  
  /* module functions */
  static PyObject *PLy_debug(PyObject *self, PyObject *args);
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 40,48 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* methods */
+ static PyObject *PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+ 
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 103,113 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_spi_error_methods[] = {
+ 	{"__init__", (PyCFunction) PLy_spi_error__init__, METH_KEYWORDS, NULL},
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** static void
*** 185,190 ****
--- 194,200 ----
  PLy_add_exceptions(PyObject *plpy)
  {
  	PyObject   *excmod;
+ 	PyObject   *spi_error_dict;
  	HASHCTL		hash_ctl;
  
  #if PY_MAJOR_VERSION < 3
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,215 ****
  	 */
  	Py_INCREF(excmod);
  
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
--- 217,230 ----
  	 */
  	Py_INCREF(excmod);
  
+ 	/* prepare dictionary with __init__ method for SPIError class */
+ 	spi_error_dict = PyDict_New();
+ 	PLy_add_methods_to_dictionary(spi_error_dict, PLy_spi_error_methods);
+ 
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, spi_error_dict);
! 	Py_DECREF(spi_error_dict);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
*************** PLy_generate_spi_exceptions(PyObject *mo
*** 266,271 ****
--- 281,420 ----
  	}
  }
  
+ /*
+  * Returns dictionary with specified set of methods. It is used for
+  * definition __init__ method of SPIError class. That is necessary
+  * for keyword parameters support.
+  *
+  * SHOULD BE VERIFIED BEFORE MERGE: the function PyMethod_New is called without
+  * specified class (third parameter). I cannot to specify class there,
+  * because in this moment, this class doesn't exists. It is created
+  * via PyErr_NewException with last dict parameter. Late modifiction of
+  * used dictionary has zero effect on new class. So dictionary should be
+  * created before. Tested on Python 2.7.10.
+  */
+ static void
+ PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+ {
+ 	PyMethodDef	*method;
+ 
+ 	for (method = methods; method->ml_name != NULL; method++)
+ 	{
+ 		PyObject   *func;
+ 		PyObject   *meth;
+ 
+ 		func = PyCFunction_New(method, NULL);
+ 		if (func == NULL)
+ 			PLy_elog(ERROR, "could not import function \"%s\"", method->ml_name);
+ 
+ 		meth = PyMethod_New(func, NULL, NULL);
+ 		if (meth == NULL)
+ 			PLy_elog(ERROR, "could not import method \"%s\"", method->ml_name);
+ 
+ 		if (PyDict_SetItemString(dict, method->ml_name, meth))
+ 			PLy_elog(ERROR, "could public method \"%s\" in dictionary", method->ml_name);
+ 
+ 		Py_DECREF(meth);
+ 		Py_DECREF(func);
+ 	}
+ }
+ 
+ /*
+  * Init method for SPIError class.
+  *
+  * This constructor allows to enter all user fields in PostgreSQL exception.
+  * Keywords parameters are supported.
+  */
+ static PyObject *
+ PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	/*
+ 	 * don't try to overwrite default sqlstate field, when constructor
+ 	 * is called without any parameter. Important for predefined
+ 	 * spiexception.* exceptions.
+ 	 */
+ 	if (PyTuple_Size(args) > 1 || PyDict_Size(kw) >= 1)
+ 	{
+ 		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+ 						     kwlist, &self,
+ 							    &message, &detail, &hint,
+ 							    &sqlstatestr,
+ 							    &schema, &table, &column,
+ 							    &datatype, &constraint))
+ 			return NULL;
+ 
+ 		if (message != NULL)
+ 		{
+ 			exc_args = Py_BuildValue("(s)", message);
+ 			if (!exc_args)
+ 				goto failure;
+ 
+ 			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+ 				goto failure;
+ 		}
+ 
+ 		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]);
+ 		}
+ 
+ 		spidata = Py_BuildValue("(izzzizzzzz)",
+ 							    sqlstate, detail, hint,
+ 							    NULL, -1,
+ 							    schema, table, column,
+ 							    datatype, constraint);
+ 		if (!spidata)
+ 			goto failure;
+ 
+ 		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+ 			goto failure;
+ 
+ 		Py_XDECREF(exc_args);
+ 		Py_DECREF(spidata);
+ 	}
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(exc_args);
+ 	Py_XDECREF(spidata);
+ 
+ 	PLy_elog(ERROR, "could not create SPIError object");
+ 
+ 	return NULL;
+ }
+ 
  
  /*
   * the python interface to the elog function
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index d0e255f..4419099
*** a/src/pl/plpython/plpy_spi.c
--- b/src/pl/plpython/plpy_spi.c
*************** PLy_spi_exception_set(PyObject *excclass
*** 548,555 ****
  	if (!spierror)
  		goto failure;
  
! 	spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
! 							edata->internalquery, edata->internalpos);
  	if (!spidata)
  		goto failure;
  
--- 548,558 ----
  	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_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..2d859af
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,358 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ /* possibility to set all accessable fields in custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY default
+ 
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ 

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..bf468e1
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1205,1210 ****
--- 1205,1235 ----
      approximately the same functionality
     </para>
    </sect2>
+ 
+   <sect2 id="plpython-raising">
+    <title>Raising Errors</title>
+ 
+    <para>
+     The <literal>plpy</literal> module provides several possibilities to
+     to raise a exception:
+    </para>
+ 
+    <variablelist>
+     <varlistentry>
+      <term><literal><function>SPIError</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal></term>
+      <listitem>
+        <para>
+         The constructor of SPIError exception (class) supports keyword parameters. 
+ <programlisting>
+ DO $$
+   raise plpy.SPIError('custom message', hint = 'It is test only');
+ $$ LANGUAGE plpythonu;
+ </programlisting>
+        </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+   </sect2>
   </sect1>
  
   <sect1 id="plpython-subtransaction">
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..ac985c6
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,473 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* possibility to set all accessable fields in custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..a835af9
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_spi_error = NULL;
*** 23,29 ****
  
  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);
  
  
--- 23,32 ----
  
  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 char *get_source_line(const char *src, int lineno);
  
  
*************** 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;
  	}
--- 54,73 ----
  	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_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();
  	{
--- 114,126 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 382,390 ----
   * 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
  	{
--- 392,400 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..82e6c8f
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** HTAB	   *PLy_spi_exceptions = NULL;
*** 26,31 ****
--- 26,32 ----
  
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+ static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
  
  /* module functions */
  static PyObject *PLy_debug(PyObject *self, PyObject *args);
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 40,48 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* methods */
+ static PyObject *PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+ 
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 103,117 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_spi_error_methods[] = {
+ #if PY_MAJOR_VERSION < 3
+ 	{"__init__", (PyCFunction) PLy_spi_error__init__, METH_KEYWORDS, NULL},
+ #else
+ 	{"__init__", (PyCFunction) PLy_spi_error__init__, METH_VARARGS | METH_KEYWORDS, NULL},
+ #endif
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** static void
*** 185,190 ****
--- 198,204 ----
  PLy_add_exceptions(PyObject *plpy)
  {
  	PyObject   *excmod;
+ 	PyObject   *spi_error_dict;
  	HASHCTL		hash_ctl;
  
  #if PY_MAJOR_VERSION < 3
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,215 ****
  	 */
  	Py_INCREF(excmod);
  
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
--- 221,236 ----
  	 */
  	Py_INCREF(excmod);
  
+ 	/* prepare dictionary with __init__ method for SPIError class */
+ 	spi_error_dict = PyDict_New();
+ 	if (spi_error_dict == NULL)
+ 		PLy_elog(ERROR, "could not create dictionary for SPI exception");
+ 	PLy_add_methods_to_dictionary(spi_error_dict, PLy_spi_error_methods);
+ 
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, spi_error_dict);
! 	Py_DECREF(spi_error_dict);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
*************** PLy_generate_spi_exceptions(PyObject *mo
*** 266,271 ****
--- 287,424 ----
  	}
  }
  
+ /*
+  * Returns dictionary with specified set of methods. It is used for
+  * definition __init__ method of SPIError class. Our __init__ method
+  * supports keyword parameters and allows to set all available PostgreSQL
+  * Error fields.
+  */
+ static void
+ PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+ {
+ 	PyMethodDef	*method;
+ 
+ 	for (method = methods; method->ml_name != NULL; method++)
+ 	{
+ 		PyObject   *func;
+ 		PyObject   *meth;
+ 
+ 		func = PyCFunction_New(method, NULL);
+ 		if (func == NULL)
+ 			PLy_elog(ERROR, "could not import function \"%s\"", method->ml_name);
+ 
+ #if PY_MAJOR_VERSION < 3
+ 		meth = PyMethod_New(func, NULL, NULL);
+ #else
+ 		meth =  PyInstanceMethod_New(func);
+ #endif
+ 		if (meth == NULL)
+ 			PLy_elog(ERROR, "could not import method \"%s\"", method->ml_name);
+ 
+ 		if (PyDict_SetItemString(dict, method->ml_name, meth))
+ 			PLy_elog(ERROR, "could public method \"%s\" in dictionary", method->ml_name);
+ 
+ 		Py_DECREF(meth);
+ 		Py_DECREF(func);
+ 	}
+ }
+ 
+ /*
+  * Init method for SPIError class.
+  *
+  * This constructor allows to enter all user fields in PostgreSQL exception.
+  * Keywords parameters are supported.
+  */
+ static PyObject *
+ PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	/*
+ 	 * don't try to overwrite default sqlstate field, when constructor
+ 	 * is called without any parameter. Important for predefined
+ 	 * spiexception.* exceptions.
+ 	 */
+ 	if (PyTuple_Size(args) > 1 || PyDict_Size(kw) >= 1)
+ 	{
+ 		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+ 						     kwlist, &self,
+ 							    &message, &detail, &hint,
+ 							    &sqlstatestr,
+ 							    &schema, &table, &column,
+ 							    &datatype, &constraint))
+ 			return NULL;
+ 
+ 		if (message != NULL)
+ 		{
+ 			exc_args = Py_BuildValue("(s)", message);
+ 			if (!exc_args)
+ 				goto failure;
+ 
+ 			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+ 				goto failure;
+ 		}
+ 
+ 		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]);
+ 		}
+ 
+ 		spidata = Py_BuildValue("(izzzizzzzz)",
+ 							    sqlstate, detail, hint,
+ 							    NULL, -1,
+ 							    schema, table, column,
+ 							    datatype, constraint);
+ 		if (!spidata)
+ 			goto failure;
+ 
+ 		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+ 			goto failure;
+ 
+ 		Py_XDECREF(exc_args);
+ 		Py_DECREF(spidata);
+ 	}
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(exc_args);
+ 	Py_XDECREF(spidata);
+ 
+ 	PLy_elog(ERROR, "could not create SPIError object");
+ 
+ 	return NULL;
+ }
+ 
  
  /*
   * the python interface to the elog function
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index d0e255f..4419099
*** a/src/pl/plpython/plpy_spi.c
--- b/src/pl/plpython/plpy_spi.c
*************** PLy_spi_exception_set(PyObject *excclass
*** 548,555 ****
  	if (!spierror)
  		goto failure;
  
! 	spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
! 							edata->internalquery, edata->internalpos);
  	if (!spidata)
  		goto failure;
  
--- 548,558 ----
  	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_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..2d859af
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,358 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ /* possibility to set all accessable fields in custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY default
+ 
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ 

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..9333fbe
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1205,1210 ****
--- 1205,1235 ----
      approximately the same functionality
     </para>
    </sect2>
+ 
+   <sect2 id="plpython-raising">
+    <title>Raising Errors</title>
+ 
+    <para>
+     The <literal>plpy</literal> module provides several possibilities to
+     to raise a exception:
+    </para>
+ 
+    <variablelist>
+     <varlistentry>
+      <term><literal><function>SPIError</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal></term>
+      <listitem>
+        <para>
+        An SPIError instance can be constructed using keyword parameters.
+ <programlisting>
+ DO $$
+   raise plpy.SPIError('custom message', hint = 'It is test only');
+ $$ LANGUAGE plpythonu;
+ </programlisting>
+        </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+   </sect2>
   </sect1>
  
   <sect1 id="plpython-subtransaction">
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..435a5c2
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create SPIError object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..a835af9
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_spi_error = NULL;
*** 23,29 ****
  
  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);
  
  
--- 23,32 ----
  
  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 char *get_source_line(const char *src, int lineno);
  
  
*************** 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;
  	}
--- 54,73 ----
  	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_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();
  	{
--- 114,126 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 382,390 ----
   * 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
  	{
--- 392,400 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..c4b2ae8
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** HTAB	   *PLy_spi_exceptions = NULL;
*** 26,31 ****
--- 26,32 ----
  
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+ static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
  
  /* module functions */
  static PyObject *PLy_debug(PyObject *self, PyObject *args);
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 40,48 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* methods */
+ static PyObject *PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+ 
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 103,113 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_spi_error_methods[] = {
+ 	{"__init__", (PyCFunction) PLy_spi_error__init__, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** static void
*** 185,190 ****
--- 194,200 ----
  PLy_add_exceptions(PyObject *plpy)
  {
  	PyObject   *excmod;
+ 	PyObject   *spi_error_dict;
  	HASHCTL		hash_ctl;
  
  #if PY_MAJOR_VERSION < 3
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,215 ****
  	 */
  	Py_INCREF(excmod);
  
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
--- 217,232 ----
  	 */
  	Py_INCREF(excmod);
  
+ 	/* prepare dictionary with __init__ method for SPIError class */
+ 	spi_error_dict = PyDict_New();
+ 	if (spi_error_dict == NULL)
+ 		PLy_elog(ERROR, "could not create dictionary for SPIError");
+ 	PLy_add_methods_to_dictionary(spi_error_dict, PLy_spi_error_methods);
+ 
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, spi_error_dict);
! 	Py_DECREF(spi_error_dict);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
*************** PLy_generate_spi_exceptions(PyObject *mo
*** 266,271 ****
--- 283,437 ----
  	}
  }
  
+ /*
+  * Returns dictionary with specified set of methods. It is used for
+  * definition __init__ method of SPIError class. Our __init__ method
+  * supports keyword parameters and allows to set all available PostgreSQL
+  * Error fields.
+  */
+ static void
+ PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+ {
+ 	PyMethodDef	*method;
+ 
+ 	for (method = methods; method->ml_name != NULL; method++)
+ 	{
+ 		PyObject   *func;
+ 		PyObject   *meth;
+ 
+ 		func = PyCFunction_New(method, NULL);
+ 		if (func == NULL)
+ 			PLy_elog(ERROR, "could not create function wrapper for \"%s\"", method->ml_name);
+ 
+ #if PY_MAJOR_VERSION < 3
+ 		meth = PyMethod_New(func, NULL, NULL);
+ #else
+ 		meth =  PyInstanceMethod_New(func);
+ #endif
+ 		if (meth == NULL)
+ 		{
+ 			Py_DECREF(func);
+ 			PLy_elog(ERROR, "could not create method wrapper for \"%s\"", method->ml_name);
+ 		}
+ 
+ 		if (PyDict_SetItemString(dict, method->ml_name, meth))
+ 		{
+ 			Py_DECREF(func);
+ 			Py_DECREF(meth);
+ 			PLy_elog(ERROR, "could not add method \"%s\" to class dictionary", method->ml_name);
+ 		}
+ 
+ 		Py_DECREF(func);
+ 		Py_DECREF(meth);
+ 	}
+ }
+ 
+ /*
+  * Init method for SPIError class.
+  *
+  * This constructor allows to enter all user fields in PostgreSQL exception.
+  * Keywords parameters are supported.
+  */
+ static PyObject *
+ PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	bool	sqlstate_is_invalid = false;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	/*
+ 	 * don't try to overwrite default sqlstate field, when constructor
+ 	 * is called without any parameter. Important for predefined
+ 	 * spiexception.* exceptions.
+ 	 */
+ 	if (PyTuple_Size(args) > 1 || (kw != NULL && PyDict_Size(kw) >= 1))
+ 	{
+ 		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+ 						     kwlist, &self,
+ 							    &message, &detail, &hint,
+ 							    &sqlstatestr,
+ 							    &schema, &table, &column,
+ 							    &datatype, &constraint))
+ 			return NULL;
+ 
+ 		if (message != NULL)
+ 		{
+ 			exc_args = Py_BuildValue("(s)", message);
+ 			if (!exc_args)
+ 				goto failure;
+ 
+ 			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+ 				goto failure;
+ 		}
+ 
+ 		if (sqlstatestr != NULL)
+ 		{
+ 			if (strlen(sqlstatestr) != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			sqlstate = MAKE_SQLSTATE(sqlstatestr[0],
+ 								  sqlstatestr[1],
+ 								  sqlstatestr[2],
+ 								  sqlstatestr[3],
+ 								  sqlstatestr[4]);
+ 		}
+ 
+ 		spidata = Py_BuildValue("(izzzizzzzz)",
+ 							    sqlstate, detail, hint,
+ 							    NULL, -1,
+ 							    schema, table, column,
+ 							    datatype, constraint);
+ 		if (!spidata)
+ 			goto failure;
+ 
+ 		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+ 			goto failure;
+ 
+ 		Py_XDECREF(exc_args);
+ 		Py_DECREF(spidata);
+ 	}
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(exc_args);
+ 	Py_XDECREF(spidata);
+ 
+ 	if (sqlstate_is_invalid)
+ 		PLy_elog(ERROR, "could not create SPIError object (invalid SQLSTATE code)");
+ 	else
+ 		PLy_elog(ERROR, "could not create SPIError object");
+ 
+ 	return NULL;
+ }
+ 
  
  /*
   * the python interface to the elog function
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index d0e255f..4419099
*** a/src/pl/plpython/plpy_spi.c
--- b/src/pl/plpython/plpy_spi.c
*************** PLy_spi_exception_set(PyObject *excclass
*** 548,555 ****
  	if (!spierror)
  		goto failure;
  
! 	spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
! 							edata->internalquery, edata->internalpos);
  	if (!spidata)
  		goto failure;
  
--- 548,558 ----
  	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_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..1d1a049
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,365 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY default
+ 
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..10aeb35
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1205,1210 ****
--- 1205,1228 ----
      approximately the same functionality
     </para>
    </sect2>
+ 
+   <sect2 id="plpython-raising">
+    <title>Raising Errors</title>
+ 
+    <para>
+     A plpy.SPIError can be raised from PL/Python, the constructor accepts
+     keyword parameters:
+     <literal><function>plpy.SPIError</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal>.
+    </para>
+    <para>
+     An example of raising custom excation could be written as:
+ <programlisting>
+ DO $$
+   raise plpy.SPIError('custom message', hint = 'It is test only');
+ $$ LANGUAGE plpythonu;
+ </programlisting>
+    </para>
+   </sect2>
   </sect1>
  
   <sect1 id="plpython-subtransaction">
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..435a5c2
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create SPIError object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..a835af9
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_spi_error = NULL;
*** 23,29 ****
  
  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);
  
  
--- 23,32 ----
  
  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 char *get_source_line(const char *src, int lineno);
  
  
*************** 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;
  	}
--- 54,73 ----
  	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_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();
  	{
--- 114,126 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 382,390 ----
   * 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
  	{
--- 392,400 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..c4b2ae8
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** HTAB	   *PLy_spi_exceptions = NULL;
*** 26,31 ****
--- 26,32 ----
  
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+ static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
  
  /* module functions */
  static PyObject *PLy_debug(PyObject *self, PyObject *args);
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 40,48 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* methods */
+ static PyObject *PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+ 
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 103,113 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_spi_error_methods[] = {
+ 	{"__init__", (PyCFunction) PLy_spi_error__init__, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** static void
*** 185,190 ****
--- 194,200 ----
  PLy_add_exceptions(PyObject *plpy)
  {
  	PyObject   *excmod;
+ 	PyObject   *spi_error_dict;
  	HASHCTL		hash_ctl;
  
  #if PY_MAJOR_VERSION < 3
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,215 ****
  	 */
  	Py_INCREF(excmod);
  
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
--- 217,232 ----
  	 */
  	Py_INCREF(excmod);
  
+ 	/* prepare dictionary with __init__ method for SPIError class */
+ 	spi_error_dict = PyDict_New();
+ 	if (spi_error_dict == NULL)
+ 		PLy_elog(ERROR, "could not create dictionary for SPIError");
+ 	PLy_add_methods_to_dictionary(spi_error_dict, PLy_spi_error_methods);
+ 
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, spi_error_dict);
! 	Py_DECREF(spi_error_dict);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
*************** PLy_generate_spi_exceptions(PyObject *mo
*** 266,271 ****
--- 283,437 ----
  	}
  }
  
+ /*
+  * Returns dictionary with specified set of methods. It is used for
+  * definition __init__ method of SPIError class. Our __init__ method
+  * supports keyword parameters and allows to set all available PostgreSQL
+  * Error fields.
+  */
+ static void
+ PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+ {
+ 	PyMethodDef	*method;
+ 
+ 	for (method = methods; method->ml_name != NULL; method++)
+ 	{
+ 		PyObject   *func;
+ 		PyObject   *meth;
+ 
+ 		func = PyCFunction_New(method, NULL);
+ 		if (func == NULL)
+ 			PLy_elog(ERROR, "could not create function wrapper for \"%s\"", method->ml_name);
+ 
+ #if PY_MAJOR_VERSION < 3
+ 		meth = PyMethod_New(func, NULL, NULL);
+ #else
+ 		meth =  PyInstanceMethod_New(func);
+ #endif
+ 		if (meth == NULL)
+ 		{
+ 			Py_DECREF(func);
+ 			PLy_elog(ERROR, "could not create method wrapper for \"%s\"", method->ml_name);
+ 		}
+ 
+ 		if (PyDict_SetItemString(dict, method->ml_name, meth))
+ 		{
+ 			Py_DECREF(func);
+ 			Py_DECREF(meth);
+ 			PLy_elog(ERROR, "could not add method \"%s\" to class dictionary", method->ml_name);
+ 		}
+ 
+ 		Py_DECREF(func);
+ 		Py_DECREF(meth);
+ 	}
+ }
+ 
+ /*
+  * Init method for SPIError class.
+  *
+  * This constructor allows to enter all user fields in PostgreSQL exception.
+  * Keywords parameters are supported.
+  */
+ static PyObject *
+ PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	bool	sqlstate_is_invalid = false;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	/*
+ 	 * don't try to overwrite default sqlstate field, when constructor
+ 	 * is called without any parameter. Important for predefined
+ 	 * spiexception.* exceptions.
+ 	 */
+ 	if (PyTuple_Size(args) > 1 || (kw != NULL && PyDict_Size(kw) >= 1))
+ 	{
+ 		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+ 						     kwlist, &self,
+ 							    &message, &detail, &hint,
+ 							    &sqlstatestr,
+ 							    &schema, &table, &column,
+ 							    &datatype, &constraint))
+ 			return NULL;
+ 
+ 		if (message != NULL)
+ 		{
+ 			exc_args = Py_BuildValue("(s)", message);
+ 			if (!exc_args)
+ 				goto failure;
+ 
+ 			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+ 				goto failure;
+ 		}
+ 
+ 		if (sqlstatestr != NULL)
+ 		{
+ 			if (strlen(sqlstatestr) != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			sqlstate = MAKE_SQLSTATE(sqlstatestr[0],
+ 								  sqlstatestr[1],
+ 								  sqlstatestr[2],
+ 								  sqlstatestr[3],
+ 								  sqlstatestr[4]);
+ 		}
+ 
+ 		spidata = Py_BuildValue("(izzzizzzzz)",
+ 							    sqlstate, detail, hint,
+ 							    NULL, -1,
+ 							    schema, table, column,
+ 							    datatype, constraint);
+ 		if (!spidata)
+ 			goto failure;
+ 
+ 		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+ 			goto failure;
+ 
+ 		Py_XDECREF(exc_args);
+ 		Py_DECREF(spidata);
+ 	}
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(exc_args);
+ 	Py_XDECREF(spidata);
+ 
+ 	if (sqlstate_is_invalid)
+ 		PLy_elog(ERROR, "could not create SPIError object (invalid SQLSTATE code)");
+ 	else
+ 		PLy_elog(ERROR, "could not create SPIError object");
+ 
+ 	return NULL;
+ }
+ 
  
  /*
   * the python interface to the elog function
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index d0e255f..4419099
*** a/src/pl/plpython/plpy_spi.c
--- b/src/pl/plpython/plpy_spi.c
*************** PLy_spi_exception_set(PyObject *excclass
*** 548,555 ****
  	if (!spierror)
  		goto failure;
  
! 	spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
! 							edata->internalquery, edata->internalpos);
  	if (!spidata)
  		goto failure;
  
--- 548,558 ----
  	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_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..1d1a049
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,365 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY default
+ 
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;

diff --git a/src/pl/plpython/expected/plpython_error_5.out b/src/pl/plpython/expected/plpython_error_5.out
index 5ff46ca..8788bde 100644
--- a/src/pl/plpython/expected/plpython_error_5.out
+++ b/src/pl/plpython/expected/plpython_error_5.out
@@ -422,3 +422,65 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+/* the possibility to set fields of custom exception
+ */
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.')
+$$ LANGUAGE plpython3u;
+ERROR:  plpy.SPIError: This is message text.
+DETAIL:  This is detail text
+HINT:  This is hint text.
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 4, in <module>
+    hint = 'This is hint text.')
+PL/Python anonymous code block
+\set VERBOSITY verbose
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.',
+                    sqlstate = 'SILLY',
+                    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')
+$$ LANGUAGE plpython3u;
+ERROR:  SILLY: plpy.SPIError: This is message text.
+DETAIL:  This is detail text
+HINT:  This is hint text.
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 10, in <module>
+    constraint = 'any info about constraint')
+PL/Python anonymous code block
+SCHEMA NAME:  any info about schema
+TABLE NAME:  any info about table
+COLUMN NAME:  any info about column
+DATATYPE NAME:  any info about datatype
+CONSTRAINT NAME:  any info about constraint
+LOCATION:  PLy_elog, plpy_elog.c:122
+\set VERBOSITY default
+DO $$
+raise plpy.SPIError(detail = 'This is detail text')
+$$ LANGUAGE plpython3u;
+ERROR:  plpy.SPIError: 
+DETAIL:  This is detail text
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 2, in <module>
+    raise plpy.SPIError(detail = 'This is detail text')
+PL/Python anonymous code block
+DO $$
+raise plpy.SPIError();
+$$ LANGUAGE plpython3u;
+ERROR:  plpy.SPIError: 
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 2, in <module>
+    raise plpy.SPIError();
+PL/Python anonymous code block
+DO $$
+raise plpy.SPIError(sqlstate = 'wrong sql state');
+$$ LANGUAGE plpython3u;
+ERROR:  could not create SPIError object (invalid SQLSTATE code)
+CONTEXT:  PL/Python anonymous code block

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..51bc48e
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1205,1210 ****
--- 1205,1228 ----
      approximately the same functionality
     </para>
    </sect2>
+ 
+   <sect2 id="plpython-raising">
+    <title>Raising Errors</title>
+ 
+    <para>
+     A plpy.SPIError can be raised from PL/Python, the constructor accepts
+     keyword parameters:
+     <literal><function>plpy.SPIError</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal>.
+    </para>
+    <para>
+     An example of raising custom exception could be written as:
+ <programlisting>
+ DO $$
+   raise plpy.SPIError('custom message', hint = 'It is test only');
+ $$ LANGUAGE plpythonu;
+ </programlisting>
+    </para>
+   </sect2>
   </sect1>
  
   <sect1 id="plpython-subtransaction">
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..435a5c2
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create SPIError object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..a835af9
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_spi_error = NULL;
*** 23,29 ****
  
  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);
  
  
--- 23,32 ----
  
  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 char *get_source_line(const char *src, int lineno);
  
  
*************** 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;
  	}
--- 54,73 ----
  	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_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();
  	{
--- 114,126 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 382,390 ----
   * 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
  	{
--- 392,400 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..c4b2ae8
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** HTAB	   *PLy_spi_exceptions = NULL;
*** 26,31 ****
--- 26,32 ----
  
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+ static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
  
  /* module functions */
  static PyObject *PLy_debug(PyObject *self, PyObject *args);
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 40,48 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* methods */
+ static PyObject *PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+ 
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 103,113 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_spi_error_methods[] = {
+ 	{"__init__", (PyCFunction) PLy_spi_error__init__, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** static void
*** 185,190 ****
--- 194,200 ----
  PLy_add_exceptions(PyObject *plpy)
  {
  	PyObject   *excmod;
+ 	PyObject   *spi_error_dict;
  	HASHCTL		hash_ctl;
  
  #if PY_MAJOR_VERSION < 3
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,215 ****
  	 */
  	Py_INCREF(excmod);
  
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
--- 217,232 ----
  	 */
  	Py_INCREF(excmod);
  
+ 	/* prepare dictionary with __init__ method for SPIError class */
+ 	spi_error_dict = PyDict_New();
+ 	if (spi_error_dict == NULL)
+ 		PLy_elog(ERROR, "could not create dictionary for SPIError");
+ 	PLy_add_methods_to_dictionary(spi_error_dict, PLy_spi_error_methods);
+ 
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, spi_error_dict);
! 	Py_DECREF(spi_error_dict);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
*************** PLy_generate_spi_exceptions(PyObject *mo
*** 266,271 ****
--- 283,437 ----
  	}
  }
  
+ /*
+  * Returns dictionary with specified set of methods. It is used for
+  * definition __init__ method of SPIError class. Our __init__ method
+  * supports keyword parameters and allows to set all available PostgreSQL
+  * Error fields.
+  */
+ static void
+ PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+ {
+ 	PyMethodDef	*method;
+ 
+ 	for (method = methods; method->ml_name != NULL; method++)
+ 	{
+ 		PyObject   *func;
+ 		PyObject   *meth;
+ 
+ 		func = PyCFunction_New(method, NULL);
+ 		if (func == NULL)
+ 			PLy_elog(ERROR, "could not create function wrapper for \"%s\"", method->ml_name);
+ 
+ #if PY_MAJOR_VERSION < 3
+ 		meth = PyMethod_New(func, NULL, NULL);
+ #else
+ 		meth =  PyInstanceMethod_New(func);
+ #endif
+ 		if (meth == NULL)
+ 		{
+ 			Py_DECREF(func);
+ 			PLy_elog(ERROR, "could not create method wrapper for \"%s\"", method->ml_name);
+ 		}
+ 
+ 		if (PyDict_SetItemString(dict, method->ml_name, meth))
+ 		{
+ 			Py_DECREF(func);
+ 			Py_DECREF(meth);
+ 			PLy_elog(ERROR, "could not add method \"%s\" to class dictionary", method->ml_name);
+ 		}
+ 
+ 		Py_DECREF(func);
+ 		Py_DECREF(meth);
+ 	}
+ }
+ 
+ /*
+  * Init method for SPIError class.
+  *
+  * This constructor allows to enter all user fields in PostgreSQL exception.
+  * Keywords parameters are supported.
+  */
+ static PyObject *
+ PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	bool	sqlstate_is_invalid = false;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	/*
+ 	 * don't try to overwrite default sqlstate field, when constructor
+ 	 * is called without any parameter. Important for predefined
+ 	 * spiexception.* exceptions.
+ 	 */
+ 	if (PyTuple_Size(args) > 1 || (kw != NULL && PyDict_Size(kw) >= 1))
+ 	{
+ 		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+ 						     kwlist, &self,
+ 							    &message, &detail, &hint,
+ 							    &sqlstatestr,
+ 							    &schema, &table, &column,
+ 							    &datatype, &constraint))
+ 			return NULL;
+ 
+ 		if (message != NULL)
+ 		{
+ 			exc_args = Py_BuildValue("(s)", message);
+ 			if (!exc_args)
+ 				goto failure;
+ 
+ 			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+ 				goto failure;
+ 		}
+ 
+ 		if (sqlstatestr != NULL)
+ 		{
+ 			if (strlen(sqlstatestr) != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			sqlstate = MAKE_SQLSTATE(sqlstatestr[0],
+ 								  sqlstatestr[1],
+ 								  sqlstatestr[2],
+ 								  sqlstatestr[3],
+ 								  sqlstatestr[4]);
+ 		}
+ 
+ 		spidata = Py_BuildValue("(izzzizzzzz)",
+ 							    sqlstate, detail, hint,
+ 							    NULL, -1,
+ 							    schema, table, column,
+ 							    datatype, constraint);
+ 		if (!spidata)
+ 			goto failure;
+ 
+ 		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+ 			goto failure;
+ 
+ 		Py_XDECREF(exc_args);
+ 		Py_DECREF(spidata);
+ 	}
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(exc_args);
+ 	Py_XDECREF(spidata);
+ 
+ 	if (sqlstate_is_invalid)
+ 		PLy_elog(ERROR, "could not create SPIError object (invalid SQLSTATE code)");
+ 	else
+ 		PLy_elog(ERROR, "could not create SPIError object");
+ 
+ 	return NULL;
+ }
+ 
  
  /*
   * the python interface to the elog function
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index 58e78ec..4d2b903
*** 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,574 ----
  	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_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..1d1a049
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,365 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY default
+ 
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;

commit f3ab75afe0d9b31118d461a346e3c56ceb09c238
Author: Pavel Stehule <pavel.stehule@gooddata.com>
Date:   Sat Oct 17 20:11:56 2015 +0200

    inital

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index 015bbad..51bc48e 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1205,6 +1205,24 @@ $$ LANGUAGE plpythonu;
     approximately the same functionality
    </para>
   </sect2>
+
+  <sect2 id="plpython-raising">
+   <title>Raising Errors</title>
+
+   <para>
+    A plpy.SPIError can be raised from PL/Python, the constructor accepts
+    keyword parameters:
+    <literal><function>plpy.SPIError</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal>.
+   </para>
+   <para>
+    An example of raising custom exception could be written as:
+<programlisting>
+DO $$
+  raise plpy.SPIError('custom message', hint = 'It is test only');
+$$ LANGUAGE plpythonu;
+</programlisting>
+   </para>
+  </sect2>
  </sect1>
 
  <sect1 id="plpython-subtransaction">
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
index 1f52af7..435a5c2 100644
--- a/src/pl/plpython/expected/plpython_error.out
+++ b/src/pl/plpython/expected/plpython_error.out
@@ -422,3 +422,65 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+/* the possibility to set fields of custom exception
+ */
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.')
+$$ LANGUAGE plpythonu;
+ERROR:  plpy.SPIError: This is message text.
+DETAIL:  This is detail text
+HINT:  This is hint text.
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 4, in <module>
+    hint = 'This is hint text.')
+PL/Python anonymous code block
+\set VERBOSITY verbose
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.',
+                    sqlstate = 'SILLY',
+                    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')
+$$ LANGUAGE plpythonu;
+ERROR:  SILLY: plpy.SPIError: This is message text.
+DETAIL:  This is detail text
+HINT:  This is hint text.
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 10, in <module>
+    constraint = 'any info about constraint')
+PL/Python anonymous code block
+SCHEMA NAME:  any info about schema
+TABLE NAME:  any info about table
+COLUMN NAME:  any info about column
+DATATYPE NAME:  any info about datatype
+CONSTRAINT NAME:  any info about constraint
+LOCATION:  PLy_elog, plpy_elog.c:122
+\set VERBOSITY default
+DO $$
+raise plpy.SPIError(detail = 'This is detail text')
+$$ LANGUAGE plpythonu;
+ERROR:  plpy.SPIError: 
+DETAIL:  This is detail text
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 2, in <module>
+    raise plpy.SPIError(detail = 'This is detail text')
+PL/Python anonymous code block
+DO $$
+raise plpy.SPIError();
+$$ LANGUAGE plpythonu;
+ERROR:  plpy.SPIError: 
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 2, in <module>
+    raise plpy.SPIError();
+PL/Python anonymous code block
+DO $$
+raise plpy.SPIError(sqlstate = 'wrong sql state');
+$$ LANGUAGE plpythonu;
+ERROR:  could not create SPIError object (invalid SQLSTATE code)
+CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_error_5.out b/src/pl/plpython/expected/plpython_error_5.out
index 5ff46ca..8788bde 100644
--- a/src/pl/plpython/expected/plpython_error_5.out
+++ b/src/pl/plpython/expected/plpython_error_5.out
@@ -422,3 +422,65 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+/* the possibility to set fields of custom exception
+ */
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.')
+$$ LANGUAGE plpython3u;
+ERROR:  plpy.SPIError: This is message text.
+DETAIL:  This is detail text
+HINT:  This is hint text.
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 4, in <module>
+    hint = 'This is hint text.')
+PL/Python anonymous code block
+\set VERBOSITY verbose
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.',
+                    sqlstate = 'SILLY',
+                    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')
+$$ LANGUAGE plpython3u;
+ERROR:  SILLY: plpy.SPIError: This is message text.
+DETAIL:  This is detail text
+HINT:  This is hint text.
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 10, in <module>
+    constraint = 'any info about constraint')
+PL/Python anonymous code block
+SCHEMA NAME:  any info about schema
+TABLE NAME:  any info about table
+COLUMN NAME:  any info about column
+DATATYPE NAME:  any info about datatype
+CONSTRAINT NAME:  any info about constraint
+LOCATION:  PLy_elog, plpy_elog.c:122
+\set VERBOSITY default
+DO $$
+raise plpy.SPIError(detail = 'This is detail text')
+$$ LANGUAGE plpython3u;
+ERROR:  plpy.SPIError: 
+DETAIL:  This is detail text
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 2, in <module>
+    raise plpy.SPIError(detail = 'This is detail text')
+PL/Python anonymous code block
+DO $$
+raise plpy.SPIError();
+$$ LANGUAGE plpython3u;
+ERROR:  plpy.SPIError: 
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 2, in <module>
+    raise plpy.SPIError();
+PL/Python anonymous code block
+DO $$
+raise plpy.SPIError(sqlstate = 'wrong sql state');
+$$ LANGUAGE plpython3u;
+ERROR:  could not create SPIError object (invalid SQLSTATE code)
+CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index 15406d6..a835af9 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -23,7 +23,10 @@ PyObject   *PLy_exc_spi_error = NULL;
 
 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 **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);
 
 
@@ -51,12 +54,20 @@ PLy_elog(int elevel, const char *fmt,...)
 	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);
+			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_fatal))
 			elevel = FATAL;
 	}
@@ -103,7 +114,13 @@ PLy_elog(int elevel, const char *fmt,...)
 				 (tb_depth > 0 && tbmsg) ? errcontext("%s", tbmsg) : 0,
 				 (hint) ? errhint("%s", hint) : 0,
 				 (query) ? internalerrquery(query) : 0,
-				 (position) ? internalerrposition(position) : 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();
 	{
@@ -365,7 +382,9 @@ PLy_get_spi_sqlerrcode(PyObject *exc, int *sqlerrcode)
  * 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)
+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;
 
@@ -373,7 +392,9 @@ PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hin
 
 	if (spidata != NULL)
 	{
-		PyArg_ParseTuple(spidata, "izzzi", sqlerrcode, detail, hint, query, position);
+		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
+						    schema_name, table_name, column_name,
+						    datatype_name, constraint_name);
 	}
 	else
 	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index a44b7fb..c4b2ae8 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -26,6 +26,7 @@ HTAB	   *PLy_spi_exceptions = NULL;
 
 static void PLy_add_exceptions(PyObject *plpy);
 static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
 
 /* module functions */
 static PyObject *PLy_debug(PyObject *self, PyObject *args);
@@ -39,6 +40,9 @@ 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);
 
+/* methods */
+static PyObject *PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+
 
 /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
 typedef struct ExceptionMap
@@ -99,6 +103,11 @@ static PyMethodDef PLy_exc_methods[] = {
 	{NULL, NULL, 0, NULL}
 };
 
+static PyMethodDef PLy_spi_error_methods[] = {
+	{"__init__", (PyCFunction) PLy_spi_error__init__, METH_VARARGS | METH_KEYWORDS, NULL},
+	{NULL, NULL, 0, NULL}
+};
+
 #if PY_MAJOR_VERSION >= 3
 static PyModuleDef PLy_module = {
 	PyModuleDef_HEAD_INIT,		/* m_base */
@@ -185,6 +194,7 @@ static void
 PLy_add_exceptions(PyObject *plpy)
 {
 	PyObject   *excmod;
+	PyObject   *spi_error_dict;
 	HASHCTL		hash_ctl;
 
 #if PY_MAJOR_VERSION < 3
@@ -207,9 +217,16 @@ PLy_add_exceptions(PyObject *plpy)
 	 */
 	Py_INCREF(excmod);
 
+	/* prepare dictionary with __init__ method for SPIError class */
+	spi_error_dict = PyDict_New();
+	if (spi_error_dict == NULL)
+		PLy_elog(ERROR, "could not create dictionary for SPIError");
+	PLy_add_methods_to_dictionary(spi_error_dict, PLy_spi_error_methods);
+
 	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
 	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
-	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
+	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, spi_error_dict);
+	Py_DECREF(spi_error_dict);
 
 	if (PLy_exc_error == NULL ||
 		PLy_exc_fatal == NULL ||
@@ -266,6 +283,155 @@ PLy_generate_spi_exceptions(PyObject *mod, PyObject *base)
 	}
 }
 
+/*
+ * Returns dictionary with specified set of methods. It is used for
+ * definition __init__ method of SPIError class. Our __init__ method
+ * supports keyword parameters and allows to set all available PostgreSQL
+ * Error fields.
+ */
+static void
+PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+{
+	PyMethodDef	*method;
+
+	for (method = methods; method->ml_name != NULL; method++)
+	{
+		PyObject   *func;
+		PyObject   *meth;
+
+		func = PyCFunction_New(method, NULL);
+		if (func == NULL)
+			PLy_elog(ERROR, "could not create function wrapper for \"%s\"", method->ml_name);
+
+#if PY_MAJOR_VERSION < 3
+		meth = PyMethod_New(func, NULL, NULL);
+#else
+		meth =  PyInstanceMethod_New(func);
+#endif
+		if (meth == NULL)
+		{
+			Py_DECREF(func);
+			PLy_elog(ERROR, "could not create method wrapper for \"%s\"", method->ml_name);
+		}
+
+		if (PyDict_SetItemString(dict, method->ml_name, meth))
+		{
+			Py_DECREF(func);
+			Py_DECREF(meth);
+			PLy_elog(ERROR, "could not add method \"%s\" to class dictionary", method->ml_name);
+		}
+
+		Py_DECREF(func);
+		Py_DECREF(meth);
+	}
+}
+
+/*
+ * Init method for SPIError class.
+ *
+ * This constructor allows to enter all user fields in PostgreSQL exception.
+ * Keywords parameters are supported.
+ */
+static PyObject *
+PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+{
+	int sqlstate = 0;
+	bool	sqlstate_is_invalid = false;
+	const char *sqlstatestr = NULL;
+	const char *message = NULL;
+	const char *detail = NULL;
+	const char *hint = NULL;
+	const char *column = NULL;
+	const char *constraint = NULL;
+	const char *datatype = NULL;
+	const char *table = NULL;
+	const char *schema = NULL;
+
+	PyObject   *exc_args = NULL;
+	PyObject   *spidata = NULL;
+
+	static char *kwlist[] = { "self", "message", "detail", "hint",
+				  "sqlstate",
+				  "schema","table", "column",
+				  "datatype", "constraint",
+				  NULL };
+
+	/*
+	 * don't try to overwrite default sqlstate field, when constructor
+	 * is called without any parameter. Important for predefined
+	 * spiexception.* exceptions.
+	 */
+	if (PyTuple_Size(args) > 1 || (kw != NULL && PyDict_Size(kw) >= 1))
+	{
+		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+						     kwlist, &self,
+							    &message, &detail, &hint,
+							    &sqlstatestr,
+							    &schema, &table, &column,
+							    &datatype, &constraint))
+			return NULL;
+
+		if (message != NULL)
+		{
+			exc_args = Py_BuildValue("(s)", message);
+			if (!exc_args)
+				goto failure;
+
+			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+				goto failure;
+		}
+
+		if (sqlstatestr != NULL)
+		{
+			if (strlen(sqlstatestr) != 5)
+			{
+				sqlstate_is_invalid = true;
+				goto failure;
+			}
+
+			if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5)
+			{
+				sqlstate_is_invalid = true;
+				goto failure;
+			}
+
+			sqlstate = MAKE_SQLSTATE(sqlstatestr[0],
+								  sqlstatestr[1],
+								  sqlstatestr[2],
+								  sqlstatestr[3],
+								  sqlstatestr[4]);
+		}
+
+		spidata = Py_BuildValue("(izzzizzzzz)",
+							    sqlstate, detail, hint,
+							    NULL, -1,
+							    schema, table, column,
+							    datatype, constraint);
+		if (!spidata)
+			goto failure;
+
+		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+			goto failure;
+
+		Py_XDECREF(exc_args);
+		Py_DECREF(spidata);
+	}
+
+	Py_INCREF(Py_None);
+	return Py_None;
+
+failure:
+	Py_XDECREF(exc_args);
+	Py_XDECREF(spidata);
+
+	if (sqlstate_is_invalid)
+		PLy_elog(ERROR, "could not create SPIError object (invalid SQLSTATE code)");
+	else
+		PLy_elog(ERROR, "could not create SPIError object");
+
+	return NULL;
+}
+
 
 /*
  * the python interface to the elog function
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index 58e78ec..4d2b903 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -564,8 +564,11 @@ PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
 	if (!spierror)
 		goto failure;
 
-	spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
-							edata->internalquery, edata->internalpos);
+	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_error.sql b/src/pl/plpython/sql/plpython_error.sql
index d0df7e6..1d1a049 100644
--- a/src/pl/plpython/sql/plpython_error.sql
+++ b/src/pl/plpython/sql/plpython_error.sql
@@ -328,3 +328,38 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+
+/* the possibility to set fields of custom exception
+ */
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.')
+$$ LANGUAGE plpythonu;
+
+\set VERBOSITY verbose
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.',
+                    sqlstate = 'SILLY',
+                    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')
+$$ LANGUAGE plpythonu;
+
+\set VERBOSITY default
+
+DO $$
+raise plpy.SPIError(detail = 'This is detail text')
+$$ LANGUAGE plpythonu;
+
+DO $$
+raise plpy.SPIError();
+$$ LANGUAGE plpythonu;
+
+DO $$
+raise plpy.SPIError(sqlstate = 'wrong sql state');
+$$ LANGUAGE plpythonu;

diff --git a/src/pl/plpython/expected/plpython_error_0.out b/src/pl/plpython/expected/plpython_error_0.out
index 5323906..19b1a9b 100644
--- a/src/pl/plpython/expected/plpython_error_0.out
+++ b/src/pl/plpython/expected/plpython_error_0.out
@@ -422,3 +422,65 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+/* the possibility to set fields of custom exception
+ */
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.')
+$$ LANGUAGE plpythonu;
+ERROR:  plpy.SPIError: This is message text.
+DETAIL:  This is detail text
+HINT:  This is hint text.
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 4, in <module>
+    hint = 'This is hint text.')
+PL/Python anonymous code block
+\set VERBOSITY verbose
+DO $$
+raise plpy.SPIError('This is message text.',
+                    detail = 'This is detail text',
+                    hint = 'This is hint text.',
+                    sqlstate = 'SILLY',
+                    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')
+$$ LANGUAGE plpythonu;
+ERROR:  SILLY: plpy.SPIError: This is message text.
+DETAIL:  This is detail text
+HINT:  This is hint text.
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 10, in <module>
+    constraint = 'any info about constraint')
+PL/Python anonymous code block
+SCHEMA NAME:  any info about schema
+TABLE NAME:  any info about table
+COLUMN NAME:  any info about column
+DATATYPE NAME:  any info about datatype
+CONSTRAINT NAME:  any info about constraint
+LOCATION:  PLy_elog, plpy_elog.c:122
+\set VERBOSITY default
+DO $$
+raise plpy.SPIError(detail = 'This is detail text')
+$$ LANGUAGE plpythonu;
+ERROR:  plpy.SPIError: unknown
+DETAIL:  This is detail text
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 2, in <module>
+    raise plpy.SPIError(detail = 'This is detail text')
+PL/Python anonymous code block
+DO $$
+raise plpy.SPIError();
+$$ LANGUAGE plpythonu;
+ERROR:  plpy.SPIError: unknown
+CONTEXT:  Traceback (most recent call last):
+  PL/Python anonymous code block, line 2, in <module>
+    raise plpy.SPIError();
+PL/Python anonymous code block
+DO $$
+raise plpy.SPIError(sqlstate = 'wrong sql state');
+$$ LANGUAGE plpythonu;
+ERROR:  could not create SPIError object (invalid SQLSTATE code)
+CONTEXT:  PL/Python anonymous code block

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..51bc48e
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1205,1210 ****
--- 1205,1228 ----
      approximately the same functionality
     </para>
    </sect2>
+ 
+   <sect2 id="plpython-raising">
+    <title>Raising Errors</title>
+ 
+    <para>
+     A plpy.SPIError can be raised from PL/Python, the constructor accepts
+     keyword parameters:
+     <literal><function>plpy.SPIError</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal>.
+    </para>
+    <para>
+     An example of raising custom exception could be written as:
+ <programlisting>
+ DO $$
+   raise plpy.SPIError('custom message', hint = 'It is test only');
+ $$ LANGUAGE plpythonu;
+ </programlisting>
+    </para>
+   </sect2>
   </sect1>
  
   <sect1 id="plpython-subtransaction">
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..435a5c2
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create SPIError object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_error_0.out b/src/pl/plpython/expected/plpython_error_0.out
new file mode 100644
index 5323906..19b1a9b
*** a/src/pl/plpython/expected/plpython_error_0.out
--- b/src/pl/plpython/expected/plpython_error_0.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: unknown
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: unknown
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create SPIError object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_error_5.out b/src/pl/plpython/expected/plpython_error_5.out
new file mode 100644
index 5ff46ca..8788bde
*** a/src/pl/plpython/expected/plpython_error_5.out
--- b/src/pl/plpython/expected/plpython_error_5.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpython3u;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.SPIError: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.SPIError: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpython3u;
+ ERROR:  could not create SPIError object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..a835af9
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_spi_error = NULL;
*** 23,29 ****
  
  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);
  
  
--- 23,32 ----
  
  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 char *get_source_line(const char *src, int lineno);
  
  
*************** 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;
  	}
--- 54,73 ----
  	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_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();
  	{
--- 114,126 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 382,390 ----
   * 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
  	{
--- 392,400 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..c4b2ae8
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** HTAB	   *PLy_spi_exceptions = NULL;
*** 26,31 ****
--- 26,32 ----
  
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+ static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
  
  /* module functions */
  static PyObject *PLy_debug(PyObject *self, PyObject *args);
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 40,48 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* methods */
+ static PyObject *PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+ 
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 103,113 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_spi_error_methods[] = {
+ 	{"__init__", (PyCFunction) PLy_spi_error__init__, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** static void
*** 185,190 ****
--- 194,200 ----
  PLy_add_exceptions(PyObject *plpy)
  {
  	PyObject   *excmod;
+ 	PyObject   *spi_error_dict;
  	HASHCTL		hash_ctl;
  
  #if PY_MAJOR_VERSION < 3
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,215 ****
  	 */
  	Py_INCREF(excmod);
  
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
--- 217,232 ----
  	 */
  	Py_INCREF(excmod);
  
+ 	/* prepare dictionary with __init__ method for SPIError class */
+ 	spi_error_dict = PyDict_New();
+ 	if (spi_error_dict == NULL)
+ 		PLy_elog(ERROR, "could not create dictionary for SPIError");
+ 	PLy_add_methods_to_dictionary(spi_error_dict, PLy_spi_error_methods);
+ 
  	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
  	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, spi_error_dict);
! 	Py_DECREF(spi_error_dict);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
*************** PLy_generate_spi_exceptions(PyObject *mo
*** 266,271 ****
--- 283,437 ----
  	}
  }
  
+ /*
+  * Returns dictionary with specified set of methods. It is used for
+  * definition __init__ method of SPIError class. Our __init__ method
+  * supports keyword parameters and allows to set all available PostgreSQL
+  * Error fields.
+  */
+ static void
+ PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+ {
+ 	PyMethodDef	*method;
+ 
+ 	for (method = methods; method->ml_name != NULL; method++)
+ 	{
+ 		PyObject   *func;
+ 		PyObject   *meth;
+ 
+ 		func = PyCFunction_New(method, NULL);
+ 		if (func == NULL)
+ 			PLy_elog(ERROR, "could not create function wrapper for \"%s\"", method->ml_name);
+ 
+ #if PY_MAJOR_VERSION < 3
+ 		meth = PyMethod_New(func, NULL, NULL);
+ #else
+ 		meth =  PyInstanceMethod_New(func);
+ #endif
+ 		if (meth == NULL)
+ 		{
+ 			Py_DECREF(func);
+ 			PLy_elog(ERROR, "could not create method wrapper for \"%s\"", method->ml_name);
+ 		}
+ 
+ 		if (PyDict_SetItemString(dict, method->ml_name, meth))
+ 		{
+ 			Py_DECREF(func);
+ 			Py_DECREF(meth);
+ 			PLy_elog(ERROR, "could not add method \"%s\" to class dictionary", method->ml_name);
+ 		}
+ 
+ 		Py_DECREF(func);
+ 		Py_DECREF(meth);
+ 	}
+ }
+ 
+ /*
+  * Init method for SPIError class.
+  *
+  * This constructor allows to enter all user fields in PostgreSQL exception.
+  * Keywords parameters are supported.
+  */
+ static PyObject *
+ PLy_spi_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	bool	sqlstate_is_invalid = false;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	/*
+ 	 * don't try to overwrite default sqlstate field, when constructor
+ 	 * is called without any parameter. Important for predefined
+ 	 * spiexception.* exceptions.
+ 	 */
+ 	if (PyTuple_Size(args) > 1 || (kw != NULL && PyDict_Size(kw) >= 1))
+ 	{
+ 		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+ 						     kwlist, &self,
+ 							    &message, &detail, &hint,
+ 							    &sqlstatestr,
+ 							    &schema, &table, &column,
+ 							    &datatype, &constraint))
+ 			return NULL;
+ 
+ 		if (message != NULL)
+ 		{
+ 			exc_args = Py_BuildValue("(s)", message);
+ 			if (!exc_args)
+ 				goto failure;
+ 
+ 			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+ 				goto failure;
+ 		}
+ 
+ 		if (sqlstatestr != NULL)
+ 		{
+ 			if (strlen(sqlstatestr) != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			sqlstate = MAKE_SQLSTATE(sqlstatestr[0],
+ 								  sqlstatestr[1],
+ 								  sqlstatestr[2],
+ 								  sqlstatestr[3],
+ 								  sqlstatestr[4]);
+ 		}
+ 
+ 		spidata = Py_BuildValue("(izzzizzzzz)",
+ 							    sqlstate, detail, hint,
+ 							    NULL, -1,
+ 							    schema, table, column,
+ 							    datatype, constraint);
+ 		if (!spidata)
+ 			goto failure;
+ 
+ 		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+ 			goto failure;
+ 
+ 		Py_XDECREF(exc_args);
+ 		Py_DECREF(spidata);
+ 	}
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(exc_args);
+ 	Py_XDECREF(spidata);
+ 
+ 	if (sqlstate_is_invalid)
+ 		PLy_elog(ERROR, "could not create SPIError object (invalid SQLSTATE code)");
+ 	else
+ 		PLy_elog(ERROR, "could not create SPIError object");
+ 
+ 	return NULL;
+ }
+ 
  
  /*
   * the python interface to the elog function
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index 58e78ec..4d2b903
*** 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,574 ----
  	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_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..1d1a049
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,365 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY default
+ 
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..51bc48e
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1205,1210 ****
--- 1205,1228 ----
      approximately the same functionality
     </para>
    </sect2>
+ 
+   <sect2 id="plpython-raising">
+    <title>Raising Errors</title>
+ 
+    <para>
+     A plpy.SPIError can be raised from PL/Python, the constructor accepts
+     keyword parameters:
+     <literal><function>plpy.SPIError</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal>.
+    </para>
+    <para>
+     An example of raising custom exception could be written as:
+ <programlisting>
+ DO $$
+   raise plpy.SPIError('custom message', hint = 'It is test only');
+ $$ LANGUAGE plpythonu;
+ </programlisting>
+    </para>
+   </sect2>
   </sect1>
  
   <sect1 id="plpython-subtransaction">
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..cb792eb
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create Error object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_error_0.out b/src/pl/plpython/expected/plpython_error_0.out
new file mode 100644
index 5323906..19b1a9b
*** a/src/pl/plpython/expected/plpython_error_0.out
--- b/src/pl/plpython/expected/plpython_error_0.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: unknown
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.SPIError: unknown
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create SPIError object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_error_5.out b/src/pl/plpython/expected/plpython_error_5.out
new file mode 100644
index 5ff46ca..8788bde
*** a/src/pl/plpython/expected/plpython_error_5.out
--- b/src/pl/plpython/expected/plpython_error_5.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.SPIError('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpython3u;
+ ERROR:  SILLY: plpy.SPIError: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.SPIError(detail = 'This is detail text')
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.SPIError: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError();
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.SPIError: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.SPIError();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.SPIError(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpython3u;
+ ERROR:  could not create SPIError object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..742b341
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_spi_error = NULL;
*** 22,29 ****
  
  
  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);
  
  
--- 22,32 ----
  
  
  static void PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth);
! 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);
  
  
*************** PLy_elog(int elevel, const char *fmt,...
*** 51,63 ****
  	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;
  	}
  	PyErr_Restore(exc, val, tb);
--- 54,74 ----
  	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_error))
! 			PLy_get_error_data(val, &sqlerrcode, &detail, &hint, &query, &position,
! 						&schema_name, &table_name, &column_name,
! 						&datatype_name, &constraint_name);
! 
! 		if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal))
  			elevel = FATAL;
  	}
  	PyErr_Restore(exc, val, tb);
*************** 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();
  	{
--- 114,126 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 382,390 ----
   * Extract the error data from a SPIError
   */
  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)
  {
  	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
  	{
--- 392,400 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..e8cdd80
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** HTAB	   *PLy_spi_exceptions = NULL;
*** 26,31 ****
--- 26,32 ----
  
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+ static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
  
  /* module functions */
  static PyObject *PLy_debug(PyObject *self, PyObject *args);
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 40,48 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* methods */
+ static PyObject *PLy_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+ 
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 103,113 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_error_methods[] = {
+ 	{"__init__", (PyCFunction) PLy_error__init__, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** static void
*** 185,190 ****
--- 194,200 ----
  PLy_add_exceptions(PyObject *plpy)
  {
  	PyObject   *excmod;
+ 	PyObject   *error_dict;
  	HASHCTL		hash_ctl;
  
  #if PY_MAJOR_VERSION < 3
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,215 ****
  	 */
  	Py_INCREF(excmod);
  
! 	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
! 	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
--- 217,232 ----
  	 */
  	Py_INCREF(excmod);
  
! 	/* prepare dictionary with __init__ method for SPIError class */
! 	error_dict = PyDict_New();
! 	if (error_dict == NULL)
! 		PLy_elog(ERROR, "could not create dictionary for Error class");
! 	PLy_add_methods_to_dictionary(error_dict, PLy_error_methods);
! 
! 	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, error_dict);
! 	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", PLy_exc_error, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", PLy_exc_error, NULL);
! 	Py_DECREF(error_dict);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
*************** PLy_generate_spi_exceptions(PyObject *mo
*** 266,271 ****
--- 283,437 ----
  	}
  }
  
+ /*
+  * Returns dictionary with specified set of methods. It is used for
+  * definition __init__ method of SPIError class. Our __init__ method
+  * supports keyword parameters and allows to set all available PostgreSQL
+  * Error fields.
+  */
+ static void
+ PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+ {
+ 	PyMethodDef	*method;
+ 
+ 	for (method = methods; method->ml_name != NULL; method++)
+ 	{
+ 		PyObject   *func;
+ 		PyObject   *meth;
+ 
+ 		func = PyCFunction_New(method, NULL);
+ 		if (func == NULL)
+ 			PLy_elog(ERROR, "could not create function wrapper for \"%s\"", method->ml_name);
+ 
+ #if PY_MAJOR_VERSION < 3
+ 		meth = PyMethod_New(func, NULL, NULL);
+ #else
+ 		meth =  PyInstanceMethod_New(func);
+ #endif
+ 		if (meth == NULL)
+ 		{
+ 			Py_DECREF(func);
+ 			PLy_elog(ERROR, "could not create method wrapper for \"%s\"", method->ml_name);
+ 		}
+ 
+ 		if (PyDict_SetItemString(dict, method->ml_name, meth))
+ 		{
+ 			Py_DECREF(func);
+ 			Py_DECREF(meth);
+ 			PLy_elog(ERROR, "could not add method \"%s\" to class dictionary", method->ml_name);
+ 		}
+ 
+ 		Py_DECREF(func);
+ 		Py_DECREF(meth);
+ 	}
+ }
+ 
+ /*
+  * Init method for SPIError class.
+  *
+  * This constructor allows to enter all user fields in PostgreSQL exception.
+  * Keywords parameters are supported.
+  */
+ static PyObject *
+ PLy_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	bool	sqlstate_is_invalid = false;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	/*
+ 	 * don't try to overwrite default sqlstate field, when constructor
+ 	 * is called without any parameter. Important for predefined
+ 	 * spiexception.* exceptions.
+ 	 */
+ 	if (PyTuple_Size(args) > 1 || (kw != NULL && PyDict_Size(kw) >= 1))
+ 	{
+ 		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+ 						     kwlist, &self,
+ 							    &message, &detail, &hint,
+ 							    &sqlstatestr,
+ 							    &schema, &table, &column,
+ 							    &datatype, &constraint))
+ 			return NULL;
+ 
+ 		if (message != NULL)
+ 		{
+ 			exc_args = Py_BuildValue("(s)", message);
+ 			if (!exc_args)
+ 				goto failure;
+ 
+ 			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+ 				goto failure;
+ 		}
+ 
+ 		if (sqlstatestr != NULL)
+ 		{
+ 			if (strlen(sqlstatestr) != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			sqlstate = MAKE_SQLSTATE(sqlstatestr[0],
+ 								  sqlstatestr[1],
+ 								  sqlstatestr[2],
+ 								  sqlstatestr[3],
+ 								  sqlstatestr[4]);
+ 		}
+ 
+ 		spidata = Py_BuildValue("(izzzizzzzz)",
+ 							    sqlstate, detail, hint,
+ 							    NULL, -1,
+ 							    schema, table, column,
+ 							    datatype, constraint);
+ 		if (!spidata)
+ 			goto failure;
+ 
+ 		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+ 			goto failure;
+ 
+ 		Py_XDECREF(exc_args);
+ 		Py_DECREF(spidata);
+ 	}
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(exc_args);
+ 	Py_XDECREF(spidata);
+ 
+ 	if (sqlstate_is_invalid)
+ 		PLy_elog(ERROR, "could not create Error object (invalid SQLSTATE code)");
+ 	else
+ 		PLy_elog(ERROR, "could not create Error object");
+ 
+ 	return NULL;
+ }
+ 
  
  /*
   * the python interface to the elog function
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index 58e78ec..4d2b903
*** 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,574 ----
  	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_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..4657ce6
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,365 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY default
+ 
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..ee6a42a
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1205,1210 ****
--- 1205,1228 ----
      approximately the same functionality
     </para>
    </sect2>
+ 
+   <sect2 id="plpython-raising">
+    <title>Raising Errors</title>
+ 
+    <para>
+     A plpy.Error can be raised from PL/Python, the constructor accepts
+     keyword parameters:
+     <literal><function>plpy.Error</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal>.
+    </para>
+    <para>
+     An example of raising custom exception could be written as:
+ <programlisting>
+ DO $$
+   raise plpy.Error('custom message', hint = 'It is test only');
+ $$ LANGUAGE plpythonu;
+ </programlisting>
+    </para>
+   </sect2>
   </sect1>
  
   <sect1 id="plpython-subtransaction">
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..cb792eb
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create Error object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_error_0.out b/src/pl/plpython/expected/plpython_error_0.out
new file mode 100644
index 5323906..3d83a53
*** a/src/pl/plpython/expected/plpython_error_0.out
--- b/src/pl/plpython/expected/plpython_error_0.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: unknown
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: unknown
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create Error object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_error_5.out b/src/pl/plpython/expected/plpython_error_5.out
new file mode 100644
index 5ff46ca..098e506
*** a/src/pl/plpython/expected/plpython_error_5.out
--- b/src/pl/plpython/expected/plpython_error_5.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpython3u;
+ ERROR:  SILLY: plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.Error: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.Error: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpython3u;
+ ERROR:  could not create Error object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..742b341
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_spi_error = NULL;
*** 22,29 ****
  
  
  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);
  
  
--- 22,32 ----
  
  
  static void PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth);
! 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);
  
  
*************** PLy_elog(int elevel, const char *fmt,...
*** 51,63 ****
  	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;
  	}
  	PyErr_Restore(exc, val, tb);
--- 54,74 ----
  	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_error))
! 			PLy_get_error_data(val, &sqlerrcode, &detail, &hint, &query, &position,
! 						&schema_name, &table_name, &column_name,
! 						&datatype_name, &constraint_name);
! 
! 		if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal))
  			elevel = FATAL;
  	}
  	PyErr_Restore(exc, val, tb);
*************** 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();
  	{
--- 114,126 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 382,390 ----
   * Extract the error data from a SPIError
   */
  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)
  {
  	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
  	{
--- 392,400 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..e8cdd80
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** HTAB	   *PLy_spi_exceptions = NULL;
*** 26,31 ****
--- 26,32 ----
  
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+ static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
  
  /* module functions */
  static PyObject *PLy_debug(PyObject *self, PyObject *args);
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 40,48 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* methods */
+ static PyObject *PLy_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+ 
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 103,113 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_error_methods[] = {
+ 	{"__init__", (PyCFunction) PLy_error__init__, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** static void
*** 185,190 ****
--- 194,200 ----
  PLy_add_exceptions(PyObject *plpy)
  {
  	PyObject   *excmod;
+ 	PyObject   *error_dict;
  	HASHCTL		hash_ctl;
  
  #if PY_MAJOR_VERSION < 3
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,215 ****
  	 */
  	Py_INCREF(excmod);
  
! 	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
! 	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
--- 217,232 ----
  	 */
  	Py_INCREF(excmod);
  
! 	/* prepare dictionary with __init__ method for SPIError class */
! 	error_dict = PyDict_New();
! 	if (error_dict == NULL)
! 		PLy_elog(ERROR, "could not create dictionary for Error class");
! 	PLy_add_methods_to_dictionary(error_dict, PLy_error_methods);
! 
! 	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, error_dict);
! 	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", PLy_exc_error, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", PLy_exc_error, NULL);
! 	Py_DECREF(error_dict);
  
  	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
*************** PLy_generate_spi_exceptions(PyObject *mo
*** 266,271 ****
--- 283,437 ----
  	}
  }
  
+ /*
+  * Returns dictionary with specified set of methods. It is used for
+  * definition __init__ method of SPIError class. Our __init__ method
+  * supports keyword parameters and allows to set all available PostgreSQL
+  * Error fields.
+  */
+ static void
+ PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+ {
+ 	PyMethodDef	*method;
+ 
+ 	for (method = methods; method->ml_name != NULL; method++)
+ 	{
+ 		PyObject   *func;
+ 		PyObject   *meth;
+ 
+ 		func = PyCFunction_New(method, NULL);
+ 		if (func == NULL)
+ 			PLy_elog(ERROR, "could not create function wrapper for \"%s\"", method->ml_name);
+ 
+ #if PY_MAJOR_VERSION < 3
+ 		meth = PyMethod_New(func, NULL, NULL);
+ #else
+ 		meth =  PyInstanceMethod_New(func);
+ #endif
+ 		if (meth == NULL)
+ 		{
+ 			Py_DECREF(func);
+ 			PLy_elog(ERROR, "could not create method wrapper for \"%s\"", method->ml_name);
+ 		}
+ 
+ 		if (PyDict_SetItemString(dict, method->ml_name, meth))
+ 		{
+ 			Py_DECREF(func);
+ 			Py_DECREF(meth);
+ 			PLy_elog(ERROR, "could not add method \"%s\" to class dictionary", method->ml_name);
+ 		}
+ 
+ 		Py_DECREF(func);
+ 		Py_DECREF(meth);
+ 	}
+ }
+ 
+ /*
+  * Init method for SPIError class.
+  *
+  * This constructor allows to enter all user fields in PostgreSQL exception.
+  * Keywords parameters are supported.
+  */
+ static PyObject *
+ PLy_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	bool	sqlstate_is_invalid = false;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	/*
+ 	 * don't try to overwrite default sqlstate field, when constructor
+ 	 * is called without any parameter. Important for predefined
+ 	 * spiexception.* exceptions.
+ 	 */
+ 	if (PyTuple_Size(args) > 1 || (kw != NULL && PyDict_Size(kw) >= 1))
+ 	{
+ 		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+ 						     kwlist, &self,
+ 							    &message, &detail, &hint,
+ 							    &sqlstatestr,
+ 							    &schema, &table, &column,
+ 							    &datatype, &constraint))
+ 			return NULL;
+ 
+ 		if (message != NULL)
+ 		{
+ 			exc_args = Py_BuildValue("(s)", message);
+ 			if (!exc_args)
+ 				goto failure;
+ 
+ 			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+ 				goto failure;
+ 		}
+ 
+ 		if (sqlstatestr != NULL)
+ 		{
+ 			if (strlen(sqlstatestr) != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			sqlstate = MAKE_SQLSTATE(sqlstatestr[0],
+ 								  sqlstatestr[1],
+ 								  sqlstatestr[2],
+ 								  sqlstatestr[3],
+ 								  sqlstatestr[4]);
+ 		}
+ 
+ 		spidata = Py_BuildValue("(izzzizzzzz)",
+ 							    sqlstate, detail, hint,
+ 							    NULL, -1,
+ 							    schema, table, column,
+ 							    datatype, constraint);
+ 		if (!spidata)
+ 			goto failure;
+ 
+ 		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+ 			goto failure;
+ 
+ 		Py_XDECREF(exc_args);
+ 		Py_DECREF(spidata);
+ 	}
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(exc_args);
+ 	Py_XDECREF(spidata);
+ 
+ 	if (sqlstate_is_invalid)
+ 		PLy_elog(ERROR, "could not create Error object (invalid SQLSTATE code)");
+ 	else
+ 		PLy_elog(ERROR, "could not create Error object");
+ 
+ 	return NULL;
+ }
+ 
  
  /*
   * the python interface to the elog function
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index 58e78ec..4d2b903
*** 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,574 ----
  	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_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..4657ce6
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,365 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY default
+ 
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..089b143
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1205,1210 ****
--- 1205,1228 ----
      approximately the same functionality
     </para>
    </sect2>
+ 
+   <sect2 id="plpython-raising">
+    <title>Raising Errors</title>
+ 
+    <para>
+     A plpy.Error can be raised from PL/Python, the constructor accepts
+     keyword parameters:
+     <literal><function>plpy.Error</function>([ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]])</literal>.
+    </para>
+    <para>
+     An example of raising custom exception could be written as:
+ <programlisting>
+ DO $$
+   raise plpy.Error('custom message', hint = 'It is test only');
+ $$ LANGUAGE plpythonu;
+ </programlisting>
+    </para>
+   </sect2>
   </sect1>
  
   <sect1 id="plpython-subtransaction">
*************** $$ LANGUAGE plpythonu;
*** 1367,1372 ****
--- 1385,1421 ----
    </para>
  
    <para>
+    The <literal>plpy</literal> module also provides the functions
+    <literal>plpy.raise_debug(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_log(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_info(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_notice(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_warning(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_error(<replaceable>args</>)</literal>, and
+    <literal>plpy.raise_fatal(<replaceable>args</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
+    <function>plpy.raise_error</function> and
+    <function>plpy.raise_fatal</function> actually raise a Python exception
+    which, if uncaught, propagates out to the calling query, causing
+    the current transaction or subtransaction to be aborted.
+    <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
+    <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
+    equivalent to calling
+    <function>plpy.raise_error</function> and
+    <function>plpy.raise_fatal</function>, respectively.
+    The other functions only generate messages of different
+    priority levels.
+    Whether messages of a particular priority are reported to the client,
+    written to the server log, or both is controlled by the
+    <xref linkend="guc-log-min-messages"> and
+    <xref linkend="guc-client-min-messages"> configuration
+    variables. See <xref linkend="runtime-config"> for more information.
+    These functions allows to using keyword parameters:
+    <literal>[ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]]</literal>.
+ 
+   </para>
+ 
+ 
+   <para>
     Another set of utility functions are
     <literal>plpy.quote_literal(<replaceable>string</>)</literal>,
     <literal>plpy.quote_nullable(<replaceable>string</>)</literal>, and
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index 1f52af7..cb792eb
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create Error object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_error_0.out b/src/pl/plpython/expected/plpython_error_0.out
new file mode 100644
index 5323906..3d83a53
*** a/src/pl/plpython/expected/plpython_error_0.out
--- b/src/pl/plpython/expected/plpython_error_0.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ ERROR:  SILLY: plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: unknown
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpythonu;
+ ERROR:  plpy.Error: unknown
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
+ ERROR:  could not create Error object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_error_5.out b/src/pl/plpython/expected/plpython_error_5.out
new file mode 100644
index 5ff46ca..098e506
*** a/src/pl/plpython/expected/plpython_error_5.out
--- b/src/pl/plpython/expected/plpython_error_5.out
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 422,424 ****
--- 422,486 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 4, in <module>
+     hint = 'This is hint text.')
+ PL/Python anonymous code block
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpython3u;
+ ERROR:  SILLY: plpy.Error: This is message text.
+ DETAIL:  This is detail text
+ HINT:  This is hint text.
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 10, in <module>
+     constraint = 'any info about constraint')
+ PL/Python anonymous code block
+ SCHEMA NAME:  any info about schema
+ TABLE NAME:  any info about table
+ COLUMN NAME:  any info about column
+ DATATYPE NAME:  any info about datatype
+ CONSTRAINT NAME:  any info about constraint
+ LOCATION:  PLy_elog, plpy_elog.c:122
+ \set VERBOSITY default
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.Error: 
+ DETAIL:  This is detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error(detail = 'This is detail text')
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpython3u;
+ ERROR:  plpy.Error: 
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python anonymous code block, line 2, in <module>
+     raise plpy.Error();
+ PL/Python anonymous code block
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpython3u;
+ ERROR:  could not create Error object (invalid SQLSTATE code)
+ CONTEXT:  PL/Python anonymous code block
diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
new file mode 100644
index 7b76faf..a63f699
*** a/src/pl/plpython/expected/plpython_test.out
--- b/src/pl/plpython/expected/plpython_test.out
*************** contents.sort()
*** 43,51 ****
  return ", ".join(contents)
  $$ LANGUAGE plpythonu;
  select module_contents();
!                                                                                module_contents                                                                                
! ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
!  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
--- 43,51 ----
  return ", ".join(contents)
  $$ LANGUAGE plpythonu;
  select module_contents();
!                                                                                                                                   module_contents                                                                                                                                   
! ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
!  BaseError, Error, Fatal, SPIError, cursor, debug, error, execute, fatal, info, log, notice, prepare, quote_ident, quote_literal, quote_nullable, raise_debug, raise_error, raise_fatal, raise_info, raise_log, raise_notice, raise_warning, spiexceptions, subtransaction, warning
  (1 row)
  
  CREATE FUNCTION elog_test() RETURNS void
*************** CONTEXT:  Traceback (most recent call la
*** 72,74 ****
--- 72,111 ----
    PL/Python function "elog_test", line 10, in <module>
      plpy.error('error')
  PL/Python function "elog_test"
+ CREATE FUNCTION elog_test2() RETURNS void
+ AS $$
+ plpy.raise_debug('debug','some detail')
+ plpy.raise_log('log','some detail')
+ plpy.raise_info('info','some detail')
+ plpy.raise_info()
+ plpy.raise_info('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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.raise_notice('notice','some detail')
+ plpy.raise_warning('warning','some detail')
+ plpy.raise_error('stop on error', 'some detail','some hint')
+ $$ LANGUAGE plpythonu;
+ SELECT elog_test2();
+ INFO:  info
+ DETAIL:  some detail
+ INFO:  missing error text
+ 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_test2", line 17, in <module>
+     plpy.raise_error('stop on error', 'some detail','some hint')
+ PL/Python function "elog_test2"
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..54594d2
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
***************
*** 15,29 ****
  #include "plpy_main.h"
  #include "plpy_procedure.h"
  
! 
  PyObject   *PLy_exc_error = NULL;
  PyObject   *PLy_exc_fatal = NULL;
  PyObject   *PLy_exc_spi_error = NULL;
  
  
  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);
  
  
--- 15,32 ----
  #include "plpy_main.h"
  #include "plpy_procedure.h"
  
! PyObject   *PLy_exc_base = NULL;
  PyObject   *PLy_exc_error = NULL;
  PyObject   *PLy_exc_fatal = NULL;
  PyObject   *PLy_exc_spi_error = NULL;
  
  
  static void PLy_traceback(char **xmsg, char **tbmsg, int *tb_depth);
! 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);
  
  
*************** PLy_elog(int elevel, const char *fmt,...
*** 51,63 ****
  	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;
  	}
  	PyErr_Restore(exc, val, tb);
--- 54,74 ----
  	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_base))
! 			PLy_get_error_data(val, &sqlerrcode, &detail, &hint, &query, &position,
! 						&schema_name, &table_name, &column_name,
! 						&datatype_name, &constraint_name);
! 
! 		if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal))
  			elevel = FATAL;
  	}
  	PyErr_Restore(exc, val, tb);
*************** 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();
  	{
--- 114,126 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 382,390 ----
   * Extract the error data from a SPIError
   */
  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)
  {
  	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
  	{
--- 392,400 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
*************** PLy_exception_set_plural(PyObject *exc,
*** 464,466 ****
--- 485,532 ----
  
  	PyErr_SetString(exc, buf);
  }
+ 
+ /*
+  * Raise a BaseError, passing in it more error details, like the
+  * internal query and error position.
+  */
+ void
+ PLy_base_exception_set(PyObject *excclass, ErrorData *edata)
+ {
+ 	PyObject   *args = NULL;
+ 	PyObject   *excpt = NULL;
+ 	PyObject   *excpt_data = NULL;
+ 
+ 	args = Py_BuildValue("(s)", edata->message);
+ 	if (!args)
+ 		goto failure;
+ 
+ 	/* create a new SPI exception with the error message as the parameter */
+ 	excpt = PyObject_CallObject(excclass, args);
+ 	if (!excpt)
+ 		goto failure;
+ 
+ 	excpt_data = 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 (!excpt_data)
+ 		goto failure;
+ 
+ 	if (PyObject_SetAttrString(excpt, "spidata", excpt_data) == -1)
+ 		goto failure;
+ 
+ 	PyErr_SetObject(excclass, excpt);
+ 
+ 	Py_DECREF(args);
+ 	Py_DECREF(excpt);
+ 	Py_DECREF(excpt_data);
+ 	return;
+ 
+ failure:
+ 	Py_XDECREF(args);
+ 	Py_XDECREF(excpt);
+ 	Py_XDECREF(excpt_data);
+ 	elog(ERROR, "could not convert PostgreSQL error to Python exception");
+ }
diff --git a/src/pl/plpython/plpy_elog.h b/src/pl/plpython/plpy_elog.h
new file mode 100644
index 94725c2..eccdd44
*** a/src/pl/plpython/plpy_elog.h
--- b/src/pl/plpython/plpy_elog.h
***************
*** 6,11 ****
--- 6,12 ----
  #define PLPY_ELOG_H
  
  /* global exception classes */
+ extern PyObject *PLy_exc_base;
  extern PyObject *PLy_exc_error;
  extern PyObject *PLy_exc_fatal;
  extern PyObject *PLy_exc_spi_error;
*************** extern void PLy_exception_set(PyObject *
*** 17,20 ****
--- 18,23 ----
  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_base_exception_set(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..d0bc519
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** HTAB	   *PLy_spi_exceptions = NULL;
*** 26,31 ****
--- 26,32 ----
  
  static void PLy_add_exceptions(PyObject *plpy);
  static void PLy_generate_spi_exceptions(PyObject *mod, PyObject *base);
+ static void PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods);
  
  /* module functions */
  static PyObject *PLy_debug(PyObject *self, PyObject *args);
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 40,57 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* module functions with keyword argument support */
+ static PyObject *PLy_raise_debug(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_log(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_info(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_notice(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_warning(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_error(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_fatal(PyObject *self, PyObject *args, PyObject *kw);
+ 
+ /* methods */
+ static PyObject *PLy_error__init__(PyObject *self, PyObject *args, PyObject *kw);
+ 
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_methods[] = {
*** 64,69 ****
--- 77,89 ----
  	{"warning", PLy_warning, METH_VARARGS, NULL},
  	{"error", PLy_error, METH_VARARGS, NULL},
  	{"fatal", PLy_fatal, METH_VARARGS, NULL},
+ 	{"raise_debug", (PyCFunction) PLy_raise_debug, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_log", (PyCFunction) PLy_raise_log, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_info", (PyCFunction) PLy_raise_info, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_notice", (PyCFunction) PLy_raise_notice, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_warning", (PyCFunction) PLy_raise_warning, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_error", (PyCFunction) PLy_raise_error, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_fatal", (PyCFunction) PLy_raise_fatal, METH_VARARGS | METH_KEYWORDS, NULL},
  
  	/*
  	 * create a stored plan
*************** static PyMethodDef PLy_methods[] = {
*** 86,92 ****
  	 * create the subtransaction context manager
  	 */
  	{"subtransaction", PLy_subtransaction_new, METH_NOARGS, NULL},
- 
  	/*
  	 * create a cursor
  	 */
--- 106,111 ----
*************** static PyMethodDef PLy_exc_methods[] = {
*** 99,104 ****
--- 118,128 ----
  	{NULL, NULL, 0, NULL}
  };
  
+ static PyMethodDef PLy_error_methods[] = {
+ 	{"__init__", (PyCFunction) PLy_error__init__, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{NULL, NULL, 0, NULL}
+ };
+ 
  #if PY_MAJOR_VERSION >= 3
  static PyModuleDef PLy_module = {
  	PyModuleDef_HEAD_INIT,		/* m_base */
*************** static void
*** 185,190 ****
--- 209,215 ----
  PLy_add_exceptions(PyObject *plpy)
  {
  	PyObject   *excmod;
+ 	PyObject   *error_dict;
  	HASHCTL		hash_ctl;
  
  #if PY_MAJOR_VERSION < 3
*************** PLy_add_exceptions(PyObject *plpy)
*** 207,220 ****
  	 */
  	Py_INCREF(excmod);
  
! 	PLy_exc_error = PyErr_NewException("plpy.Error", NULL, NULL);
! 	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", NULL, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", NULL, NULL);
  
! 	if (PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
  		PLy_exc_spi_error == NULL)
! 		PLy_elog(ERROR, "could not create the base SPI exceptions");
  
  	Py_INCREF(PLy_exc_error);
  	PyModule_AddObject(plpy, "Error", PLy_exc_error);
--- 232,260 ----
  	 */
  	Py_INCREF(excmod);
  
! 	/* prepare dictionary with __init__ method for SPIError class */
! 	error_dict = PyDict_New();
! 	if (error_dict == NULL)
! 		PLy_elog(ERROR, "could not create dictionary for BaseError class");
! 	PLy_add_methods_to_dictionary(error_dict, PLy_error_methods);
  
! 	/* create common ancestor for exception classes */
! 	PLy_exc_base = PyErr_NewException("plpy.BaseError", NULL, error_dict);
! 
! 	/* create all other builtin exception classes */
! 	PLy_exc_error = PyErr_NewException("plpy.Error", PLy_exc_base, NULL);
! 	PLy_exc_fatal = PyErr_NewException("plpy.Fatal", PLy_exc_base, NULL);
! 	PLy_exc_spi_error = PyErr_NewException("plpy.SPIError", PLy_exc_base, NULL);
! 	Py_DECREF(error_dict);
! 
! 	if (PLy_exc_base == NULL ||
! 		PLy_exc_error == NULL ||
  		PLy_exc_fatal == NULL ||
  		PLy_exc_spi_error == NULL)
! 		PLy_elog(ERROR, "could not create the plpy base exceptions");
! 
! 	Py_INCREF(PLy_exc_base);
! 	PyModule_AddObject(plpy, "BaseError", PLy_exc_base);
  
  	Py_INCREF(PLy_exc_error);
  	PyModule_AddObject(plpy, "Error", PLy_exc_error);
*************** PLy_generate_spi_exceptions(PyObject *mo
*** 266,277 ****
--- 306,467 ----
  	}
  }
  
+ /*
+  * Returns dictionary with specified set of methods. It is used for
+  * definition __init__ method of SPIError class. Our __init__ method
+  * supports keyword parameters and allows to set all available PostgreSQL
+  * Error fields.
+  */
+ static void
+ PLy_add_methods_to_dictionary(PyObject *dict, PyMethodDef *methods)
+ {
+ 	PyMethodDef	*method;
+ 
+ 	for (method = methods; method->ml_name != NULL; method++)
+ 	{
+ 		PyObject   *func;
+ 		PyObject   *meth;
+ 
+ 		func = PyCFunction_New(method, NULL);
+ 		if (func == NULL)
+ 			PLy_elog(ERROR, "could not create function wrapper for \"%s\"", method->ml_name);
+ 
+ #if PY_MAJOR_VERSION < 3
+ 		meth = PyMethod_New(func, NULL, NULL);
+ #else
+ 		meth =  PyInstanceMethod_New(func);
+ #endif
+ 		if (meth == NULL)
+ 		{
+ 			Py_DECREF(func);
+ 			PLy_elog(ERROR, "could not create method wrapper for \"%s\"", method->ml_name);
+ 		}
+ 
+ 		if (PyDict_SetItemString(dict, method->ml_name, meth))
+ 		{
+ 			Py_DECREF(func);
+ 			Py_DECREF(meth);
+ 			PLy_elog(ERROR, "could not add method \"%s\" to class dictionary", method->ml_name);
+ 		}
+ 
+ 		Py_DECREF(func);
+ 		Py_DECREF(meth);
+ 	}
+ }
+ 
+ /*
+  * Init method for SPIError class.
+  *
+  * This constructor allows to enter all user fields in PostgreSQL exception.
+  * Keywords parameters are supported.
+  */
+ static PyObject *
+ PLy_error__init__(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	bool	sqlstate_is_invalid = false;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 
+ 	PyObject   *exc_args = NULL;
+ 	PyObject   *spidata = NULL;
+ 
+ 	static char *kwlist[] = { "self", "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	/*
+ 	 * don't try to overwrite default sqlstate field, when constructor
+ 	 * is called without any parameter. Important for predefined
+ 	 * spiexception.* exceptions.
+ 	 */
+ 	if (PyTuple_Size(args) > 1 || (kw != NULL && PyDict_Size(kw) >= 1))
+ 	{
+ 		if (!PyArg_ParseTupleAndKeywords(args, kw, "O|sssssssss",
+ 						     kwlist, &self,
+ 							    &message, &detail, &hint,
+ 							    &sqlstatestr,
+ 							    &schema, &table, &column,
+ 							    &datatype, &constraint))
+ 			return NULL;
+ 
+ 		if (message != NULL)
+ 		{
+ 			exc_args = Py_BuildValue("(s)", message);
+ 			if (!exc_args)
+ 				goto failure;
+ 
+ 			if (PyObject_SetAttrString(self, "args", exc_args) == -1)
+ 				goto failure;
+ 		}
+ 
+ 		if (sqlstatestr != NULL)
+ 		{
+ 			if (strlen(sqlstatestr) != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			if (strspn(sqlstatestr, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ") != 5)
+ 			{
+ 				sqlstate_is_invalid = true;
+ 				goto failure;
+ 			}
+ 
+ 			sqlstate = MAKE_SQLSTATE(sqlstatestr[0],
+ 								  sqlstatestr[1],
+ 								  sqlstatestr[2],
+ 								  sqlstatestr[3],
+ 								  sqlstatestr[4]);
+ 		}
+ 
+ 		spidata = Py_BuildValue("(izzzizzzzz)",
+ 							    sqlstate, detail, hint,
+ 							    NULL, -1,
+ 							    schema, table, column,
+ 							    datatype, constraint);
+ 		if (!spidata)
+ 			goto failure;
+ 
+ 		if (PyObject_SetAttrString(self, "spidata", spidata) == -1)
+ 			goto failure;
+ 
+ 		Py_XDECREF(exc_args);
+ 		Py_DECREF(spidata);
+ 	}
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ 
+ failure:
+ 	Py_XDECREF(exc_args);
+ 	Py_XDECREF(spidata);
+ 
+ 	if (sqlstate_is_invalid)
+ 		PLy_elog(ERROR, "could not create Error object (invalid SQLSTATE code)");
+ 	else
+ 		PLy_elog(ERROR, "could not create Error object");
+ 
+ 	return NULL;
+ }
+ 
  
  /*
   * 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_output_kw(volatile int, PyObject *, PyObject *, PyObject *);
  
  static PyObject *
  PLy_debug(PyObject *self, PyObject *args)
*************** PLy_fatal(PyObject *self, PyObject *args
*** 316,321 ****
--- 506,553 ----
  }
  
  static PyObject *
+ PLy_raise_debug(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(DEBUG2, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_log(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(LOG, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_info(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(INFO, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_notice(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(NOTICE, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_warning(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(WARNING, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_error(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(ERROR, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_fatal(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(FATAL, self, args, kw);
+ }
+ 
+ static PyObject *
  PLy_quote_literal(PyObject *self, PyObject *args)
  {
  	const char *str;
*************** PLy_output(volatile int level, PyObject
*** 429,431 ****
--- 661,760 ----
  	Py_INCREF(Py_None);
  	return Py_None;
  }
+ 
+ static PyObject *
+ PLy_output_kw(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 	MemoryContext oldcontext ;
+ 
+ 	static char *kwlist[] = { "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kw, "|sssssssss", kwlist,
+ 			 &message, &detail, &hint,
+ 			 &sqlstatestr,
+ 			 &schema, &table, &column,
+ 			 &datatype, &constraint))
+ 		return NULL;
+ 
+ 	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_base_exception_set(PLy_exc_error, edata);
+ 		FreeErrorData(edata);
+ 		return NULL;
+ 	}
+ 	PG_END_TRY();
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ }
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index 58e78ec..8d4604b
*** a/src/pl/plpython/plpy_spi.c
--- b/src/pl/plpython/plpy_spi.c
***************
*** 30,36 ****
  static PyObject *PLy_spi_execute_query(char *query, long limit);
  static PyObject *PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit);
  static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status);
- static void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
  
  
  /* prepare(query="select * from foo")
--- 30,35 ----
*************** PLy_spi_subtransaction_abort(MemoryConte
*** 540,587 ****
  	Assert(entry != NULL);
  	exc = entry ? entry->exc : PLy_exc_spi_error;
  	/* Make Python raise the exception */
! 	PLy_spi_exception_set(exc, edata);
  	FreeErrorData(edata);
  }
- 
- /*
-  * Raise a SPIError, passing in it more error details, like the
-  * internal query and error position.
-  */
- static void
- PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
- {
- 	PyObject   *args = NULL;
- 	PyObject   *spierror = NULL;
- 	PyObject   *spidata = NULL;
- 
- 	args = Py_BuildValue("(s)", edata->message);
- 	if (!args)
- 		goto failure;
- 
- 	/* create a new SPI exception with the error message as the parameter */
- 	spierror = PyObject_CallObject(excclass, args);
- 	if (!spierror)
- 		goto failure;
- 
- 	spidata = Py_BuildValue("(izzzi)", edata->sqlerrcode, edata->detail, edata->hint,
- 							edata->internalquery, edata->internalpos);
- 	if (!spidata)
- 		goto failure;
- 
- 	if (PyObject_SetAttrString(spierror, "spidata", spidata) == -1)
- 		goto failure;
- 
- 	PyErr_SetObject(excclass, spierror);
- 
- 	Py_DECREF(args);
- 	Py_DECREF(spierror);
- 	Py_DECREF(spidata);
- 	return;
- 
- failure:
- 	Py_XDECREF(args);
- 	Py_XDECREF(spierror);
- 	Py_XDECREF(spidata);
- 	elog(ERROR, "could not convert SPI error to Python exception");
- }
--- 539,544 ----
  	Assert(entry != NULL);
  	exc = entry ? entry->exc : PLy_exc_spi_error;
  	/* Make Python raise the exception */
! 	PLy_base_exception_set(exc, edata);
  	FreeErrorData(edata);
  }
diff --git a/src/pl/plpython/sql/plpython_error.sql b/src/pl/plpython/sql/plpython_error.sql
new file mode 100644
index d0df7e6..4657ce6
*** a/src/pl/plpython/sql/plpython_error.sql
--- b/src/pl/plpython/sql/plpython_error.sql
*************** EXCEPTION WHEN SQLSTATE 'SILLY' THEN
*** 328,330 ****
--- 328,365 ----
  	-- NOOP
  END
  $$ LANGUAGE plpgsql;
+ 
+ /* the possibility to set fields of custom exception
+  */
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY verbose
+ DO $$
+ raise plpy.Error('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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')
+ $$ LANGUAGE plpythonu;
+ 
+ \set VERBOSITY default
+ 
+ DO $$
+ raise plpy.Error(detail = 'This is detail text')
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.Error();
+ $$ LANGUAGE plpythonu;
+ 
+ DO $$
+ raise plpy.Error(sqlstate = 'wrong sql state');
+ $$ LANGUAGE plpythonu;
diff --git a/src/pl/plpython/sql/plpython_test.sql b/src/pl/plpython/sql/plpython_test.sql
new file mode 100644
index c8d5ef5..5eac2f5
*** a/src/pl/plpython/sql/plpython_test.sql
--- b/src/pl/plpython/sql/plpython_test.sql
*************** plpy.error('error')
*** 51,53 ****
--- 51,75 ----
  $$ LANGUAGE plpythonu;
  
  SELECT elog_test();
+ 
+ CREATE FUNCTION elog_test2() RETURNS void
+ AS $$
+ plpy.raise_debug('debug','some detail')
+ plpy.raise_log('log','some detail')
+ plpy.raise_info('info','some detail')
+ plpy.raise_info()
+ plpy.raise_info('This is message text.',
+                     detail = 'This is detail text',
+                     hint = 'This is hint text.',
+                     sqlstate = 'SILLY',
+                     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.raise_notice('notice','some detail')
+ plpy.raise_warning('warning','some detail')
+ plpy.raise_error('stop on error', 'some detail','some hint')
+ $$ LANGUAGE plpythonu;
+ 
+ SELECT elog_test2();

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..705413e
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1367,1372 ****
--- 1367,1401 ----
    </para>
  
    <para>
+    The <literal>plpy</literal> module also provides the functions
+    <literal>plpy.raise_debug(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_log(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_info(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_notice(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_warning(<replaceable>args</>)</literal>,
+    <literal>plpy.raise_error(<replaceable>args</>)</literal>, and
+    <literal>plpy.raise_fatal(<replaceable>args</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
+    <function>plpy.raise_error</function> and
+    <function>plpy.raise_fatal</function> actually raise a Python exception
+    which, if uncaught, propagates out to the calling query, causing
+    the current transaction or subtransaction to be aborted.
+    <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
+    <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
+    equivalent to calling
+    <function>plpy.raise_error</function> and
+    <function>plpy.raise_fatal</function>, respectively.
+    The other functions only generate messages of different
+    priority levels.
+    Whether messages of a particular priority are reported to the client,
+    written to the server log, or both is controlled by the
+    <xref linkend="guc-log-min-messages"> and
+    <xref linkend="guc-client-min-messages"> configuration
+    variables. See <xref linkend="runtime-config"> for more information.
+    These functions allows to using keyword parameters:
+    <literal>[ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]]</literal>.
+   </para>
+ 
+   <para>
     Another set of utility functions are
     <literal>plpy.quote_literal(<replaceable>string</>)</literal>,
     <literal>plpy.quote_nullable(<replaceable>string</>)</literal>, and
diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
new file mode 100644
index 7b76faf..834b14a
*** a/src/pl/plpython/expected/plpython_test.out
--- b/src/pl/plpython/expected/plpython_test.out
*************** contents.sort()
*** 43,51 ****
  return ", ".join(contents)
  $$ LANGUAGE plpythonu;
  select module_contents();
!                                                                                module_contents                                                                                
! ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
!  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
--- 43,51 ----
  return ", ".join(contents)
  $$ LANGUAGE plpythonu;
  select module_contents();
!                                                                                                                              module_contents                                                                                                                             
! -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
!  Error, Fatal, SPIError, cursor, debug, error, execute, fatal, info, log, notice, prepare, quote_ident, quote_literal, quote_nullable, raise_debug, raise_error, raise_fatal, raise_info, raise_log, raise_notice, raise_warning, spiexceptions, subtransaction, warning
  (1 row)
  
  CREATE FUNCTION elog_test() RETURNS void
*************** CONTEXT:  Traceback (most recent call la
*** 72,74 ****
--- 72,111 ----
    PL/Python function "elog_test", line 10, in <module>
      plpy.error('error')
  PL/Python function "elog_test"
+ CREATE FUNCTION elog_test2() RETURNS void
+ AS $$
+ plpy.raise_debug('debug','some detail')
+ plpy.raise_log('log','some detail')
+ plpy.raise_info('info','some detail')
+ plpy.raise_info()
+ plpy.raise_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.raise_notice('notice','some detail')
+ plpy.raise_warning('warning','some detail')
+ plpy.raise_error('stop on error', 'some detail','some hint')
+ $$ LANGUAGE plpythonu;
+ SELECT elog_test2();
+ INFO:  info
+ DETAIL:  some detail
+ INFO:  missing error text
+ 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.SPIError: stop on error
+ DETAIL:  some detail
+ HINT:  some hint
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "elog_test2", line 17, in <module>
+     plpy.raise_error('stop on error', 'some detail','some hint')
+ PL/Python function "elog_test2"
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..aea79db
*** a/src/pl/plpython/plpy_elog.c
--- b/src/pl/plpython/plpy_elog.c
*************** PyObject   *PLy_exc_spi_error = NULL;
*** 22,29 ****
  
  
  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);
  
  
--- 22,30 ----
  
  
  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 char *get_source_line(const char *src, int lineno);
  
  
*************** PLy_elog(int elevel, const char *fmt,...
*** 51,63 ****
  	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;
  	}
  	PyErr_Restore(exc, val, tb);
--- 52,72 ----
  	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);
! 
! 		if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal))
  			elevel = FATAL;
  	}
  	PyErr_Restore(exc, val, tb);
*************** 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();
  	{
--- 112,124 ----
  				 (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
*** 365,371 ****
   * 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;
  
--- 380,388 ----
   * 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
  	{
--- 390,398 ----
  
  	if (spidata != NULL)
  	{
! 		PyArg_ParseTuple(spidata, "izzzizzzzz", sqlerrcode, detail, hint, query, position,
! 						    schema_name, table_name, column_name,
! 						    datatype_name, constraint_name);
  	}
  	else
  	{
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..a4cdada
*** a/src/pl/plpython/plpy_plpymodule.c
--- b/src/pl/plpython/plpy_plpymodule.c
*************** static PyObject *PLy_quote_literal(PyObj
*** 39,44 ****
--- 39,52 ----
  static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
  static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
  
+ /* module functions with keyword argument support */
+ static PyObject *PLy_raise_debug(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_log(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_info(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_notice(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_warning(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_error(PyObject *self, PyObject *args, PyObject *kw);
+ static PyObject *PLy_raise_fatal(PyObject *self, PyObject *args, PyObject *kw);
  
  /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
  typedef struct ExceptionMap
*************** static PyMethodDef PLy_methods[] = {
*** 66,71 ****
--- 74,90 ----
  	{"fatal", PLy_fatal, METH_VARARGS, NULL},
  
  	/*
+ 	 * rich login methods
+ 	 */
+ 	{"raise_debug", (PyCFunction) PLy_raise_debug, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_log", (PyCFunction) PLy_raise_log, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_info", (PyCFunction) PLy_raise_info, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_notice", (PyCFunction) PLy_raise_notice, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_warning", (PyCFunction) PLy_raise_warning, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_error", (PyCFunction) PLy_raise_error, METH_VARARGS | METH_KEYWORDS, NULL},
+ 	{"raise_fatal", (PyCFunction) PLy_raise_fatal, METH_VARARGS | METH_KEYWORDS, NULL},
+ 
+ 	/*
  	 * create a stored plan
  	 */
  	{"prepare", PLy_spi_prepare, METH_VARARGS, NULL},
*************** PLy_fatal(PyObject *self, PyObject *args
*** 315,320 ****
--- 334,386 ----
  	return PLy_output(FATAL, self, args);
  }
  
+ /*
+  * the Python interface for raise functions
+  */
+ static PyObject *PLy_output_kw(volatile int, PyObject *, PyObject *, PyObject *);
+ 
+ static PyObject *
+ PLy_raise_debug(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(DEBUG2, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_log(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(LOG, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_info(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(INFO, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_notice(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(NOTICE, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_warning(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(WARNING, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_error(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(ERROR, self, args, kw);
+ }
+ 
+ static PyObject *
+ PLy_raise_fatal(PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	return PLy_output_kw(FATAL, self, args, kw);
+ }
+ 
  static PyObject *
  PLy_quote_literal(PyObject *self, PyObject *args)
  {
*************** PLy_output(volatile int level, PyObject
*** 429,431 ****
--- 495,594 ----
  	Py_INCREF(Py_None);
  	return Py_None;
  }
+ 
+ static PyObject *
+ PLy_output_kw(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 	MemoryContext oldcontext ;
+ 
+ 	static char *kwlist[] = { "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kw, "|sssssssss", kwlist,
+ 			 &message, &detail, &hint,
+ 			 &sqlstatestr,
+ 			 &schema, &table, &column,
+ 			 &datatype, &constraint))
+ 		return NULL;
+ 
+ 	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_spi_exception_set(PLy_exc_spi_error, edata);
+ 		FreeErrorData(edata);
+ 		return NULL;
+ 	}
+ 	PG_END_TRY();
+ 
+ 	Py_INCREF(Py_None);
+ 	return Py_None;
+ }
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index 58e78ec..36ea728
*** a/src/pl/plpython/plpy_spi.c
--- b/src/pl/plpython/plpy_spi.c
***************
*** 30,36 ****
  static PyObject *PLy_spi_execute_query(char *query, long limit);
  static PyObject *PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit);
  static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status);
- static void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
  
  
  /* prepare(query="select * from foo")
--- 30,35 ----
*************** PLy_spi_subtransaction_abort(MemoryConte
*** 546,554 ****
  
  /*
   * Raise a SPIError, passing in it more error details, like the
!  * internal query and error position.
   */
! static void
  PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
  {
  	PyObject   *args = NULL;
--- 545,553 ----
  
  /*
   * Raise a SPIError, passing in it more error details, like the
!  * internal query and error position, sqlcode, detail, hint, ..
   */
! void
  PLy_spi_exception_set(PyObject *excclass, ErrorData *edata)
  {
  	PyObject   *args = NULL;
*************** 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;
  
--- 563,572 ----
  	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/plpy_spi.h b/src/pl/plpython/plpy_spi.h
new file mode 100644
index b042794..f9c54b8
*** a/src/pl/plpython/plpy_spi.h
--- b/src/pl/plpython/plpy_spi.h
*************** extern void PLy_spi_subtransaction_begin
*** 22,25 ****
--- 22,28 ----
  extern void PLy_spi_subtransaction_commit(MemoryContext oldcontext, ResourceOwner oldowner);
  extern void PLy_spi_subtransaction_abort(MemoryContext oldcontext, ResourceOwner oldowner);
  
+ /* raise and fill SPIError */
+ extern void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
+ 
  #endif   /* PLPY_SPI_H */
diff --git a/src/pl/plpython/sql/plpython_test.sql b/src/pl/plpython/sql/plpython_test.sql
new file mode 100644
index c8d5ef5..190ce23
*** a/src/pl/plpython/sql/plpython_test.sql
--- b/src/pl/plpython/sql/plpython_test.sql
*************** plpy.error('error')
*** 51,53 ****
--- 51,75 ----
  $$ LANGUAGE plpythonu;
  
  SELECT elog_test();
+ 
+ CREATE FUNCTION elog_test2() RETURNS void
+ AS $$
+ plpy.raise_debug('debug','some detail')
+ plpy.raise_log('log','some detail')
+ plpy.raise_info('info','some detail')
+ plpy.raise_info()
+ plpy.raise_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.raise_notice('notice','some detail')
+ plpy.raise_warning('warning','some detail')
+ plpy.raise_error('stop on error', 'some detail','some hint')
+ $$ LANGUAGE plpythonu;
+ 
+ SELECT elog_test2();

From eb17c7f733621bec5758a09737795d243306f360 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Thu, 28 Jan 2016 17:14:11 +0100
Subject: [PATCH 2/2] use plpy.Error to hold the data not plpy.SPIError

---
 src/pl/plpython/plpy_elog.c       | 83 +++++++++++++++++++++++++++++++++++++++
 src/pl/plpython/plpy_elog.h       |  2 +
 src/pl/plpython/plpy_plpymodule.c |  2 +-
 src/pl/plpython/plpy_spi.c        |  1 +
 src/pl/plpython/plpy_spi.h        |  3 --
 5 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index aea79db..80301c0 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -25,6 +25,9 @@ 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);
 
 
@@ -66,6 +69,11 @@ PLy_elog(int elevel, const char *fmt,...)
 						&schema_name, &table_name, &column_name,
 						&datatype_name, &constraint_name);
 
+		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);
+
 		if (PyErr_GivenExceptionMatches(val, PLy_exc_fatal))
 			elevel = FATAL;
 	}
@@ -409,6 +417,35 @@ PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hin
 }
 
 /*
+ * 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)
+{
+	PyObject   *err_detail = NULL;
+	PyObject   *err_hint = NULL;
+
+	err_detail = PyObject_GetAttrString(exc, "detail");
+	if (err_detail != NULL)
+	{
+		*detail = PyString_AsString(err_detail);
+		Py_DECREF(err_detail);
+	}
+
+	err_hint = PyObject_GetAttrString(exc, "hint");
+	if (err_hint != NULL)
+	{
+		*hint = PyString_AsString(err_hint);
+		Py_DECREF(err_hint);
+	}
+
+	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 *
@@ -451,6 +488,52 @@ get_source_line(const char *src, int lineno)
 	return pnstrdup(s, next - s);
 }
 
+void
+PLy_exception_set_with_details(PyObject *excclass, ErrorData *edata)
+{
+	PyObject   *args = NULL;
+	PyObject   *error = NULL;
+	PyObject   *err_detail = NULL;
+	PyObject   *err_hint = 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;
+
+	err_detail = PyString_FromString(edata->detail ? edata->detail : "");
+	if (!err_detail)
+		goto failure;
+
+	if (PyObject_SetAttrString(error, "detail", err_detail) == -1)
+		goto failure;
+
+	err_hint = PyString_FromString(edata->hint ? edata->hint : "");
+	if (!err_hint)
+		goto failure;
+
+	if (PyObject_SetAttrString(error, "hint", err_hint) == -1)
+		goto failure;
+
+	PyErr_SetObject(excclass, error);
+
+	Py_DECREF(args);
+	Py_DECREF(error);
+	Py_DECREF(err_detail);
+	Py_DECREF(err_hint);
+	return;
+
+failure:
+	Py_XDECREF(args);
+	Py_XDECREF(error);
+	Py_XDECREF(err_detail);
+	Py_XDECREF(err_hint);
+	elog(ERROR, "could not convert error to Python exception");
+}
 
 /* call PyErr_SetString with a vprint interface and translation support */
 void
diff --git a/src/pl/plpython/plpy_elog.h b/src/pl/plpython/plpy_elog.h
index 94725c2..5dd4ef7 100644
--- a/src/pl/plpython/plpy_elog.h
+++ b/src/pl/plpython/plpy_elog.h
@@ -17,4 +17,6 @@ extern void PLy_exception_set(PyObject *exc, const char *fmt,...) pg_attribute_p
 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
index f264746..3e7a20a 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -583,7 +583,7 @@ PLy_output_kw(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
 		edata = CopyErrorData();
 		FlushErrorState();
 
-		PLy_spi_exception_set(PLy_exc_spi_error, edata);
+		PLy_exception_set_with_details(PLy_exc_error, edata);
 		FreeErrorData(edata);
 		return NULL;
 	}
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index 36ea728..c1989c0 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -30,6 +30,7 @@
 static PyObject *PLy_spi_execute_query(char *query, long limit);
 static PyObject *PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit);
 static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status);
+static void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
 
 
 /* prepare(query="select * from foo")
diff --git a/src/pl/plpython/plpy_spi.h b/src/pl/plpython/plpy_spi.h
index f9c54b8..b042794 100644
--- a/src/pl/plpython/plpy_spi.h
+++ b/src/pl/plpython/plpy_spi.h
@@ -22,7 +22,4 @@ extern void PLy_spi_subtransaction_begin(MemoryContext oldcontext, ResourceOwner
 extern void PLy_spi_subtransaction_commit(MemoryContext oldcontext, ResourceOwner oldowner);
 extern void PLy_spi_subtransaction_abort(MemoryContext oldcontext, ResourceOwner oldowner);
 
-/* raise and fill SPIError */
-extern void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata);
-
 #endif   /* PLPY_SPI_H */
-- 
2.7.0

From 771b13afa07415cb124c84da46bd2787967b92e6 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Wed, 27 Jan 2016 15:40:05 +0100
Subject: [PATCH 1/2] fix comment

---
 src/pl/plpython/plpy_plpymodule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index a4cdada..f264746 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -74,7 +74,7 @@ static PyMethodDef PLy_methods[] = {
 	{"fatal", PLy_fatal, METH_VARARGS, NULL},
 
 	/*
-	 * rich login methods
+	 * rich logging methods
 	 */
 	{"raise_debug", (PyCFunction) PLy_raise_debug, METH_VARARGS | METH_KEYWORDS, NULL},
 	{"raise_log", (PyCFunction) PLy_raise_log, METH_VARARGS | METH_KEYWORDS, NULL},
-- 
2.7.0

From ad6ee8a5a436d7c765e1a800a8784027326fe3b5 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Tue, 2 Feb 2016 07:29:27 +0100
Subject: [PATCH 3/3] Improve docs

Write about the new preferred functions first and about the old ones
mention only how they behave differently and discourage their use.
---
 doc/src/sgml/plpython.sgml | 59 +++++++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 35 deletions(-)

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index 705413e..a215f0a 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1341,13 +1341,15 @@ $$ LANGUAGE plpythonu;
   <title>Utility Functions</title>
   <para>
    The <literal>plpy</literal> module also provides the functions
-   <literal>plpy.debug(<replaceable>msg</>)</literal>,
-   <literal>plpy.log(<replaceable>msg</>)</literal>,
-   <literal>plpy.info(<replaceable>msg</>)</literal>,
-   <literal>plpy.notice(<replaceable>msg</>)</literal>,
-   <literal>plpy.warning(<replaceable>msg</>)</literal>,
-   <literal>plpy.error(<replaceable>msg</>)</literal>, and
-   <literal>plpy.fatal(<replaceable>msg</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
+   <literal>plpy.raise_debug(<replaceable>*args, **kwargs</>)</literal>,
+   <literal>plpy.raise_log(<replaceable>*args, **kwargs</>)</literal>,
+   <literal>plpy.raise_info(<replaceable>*args, **kwargs</>)</literal>,
+   <literal>plpy.raise_notice(<replaceable>*args, **kwargs</>)</literal>,
+   <literal>plpy.raise_warning(<replaceable>*args, **kwargs</>)</literal>,
+   <literal>plpy.raise_error(<replaceable>*args, **kwargs</>)</literal>, and
+   <literal>plpy.raise_fatal(<replaceable>*args, **kwargs</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
+   They accept these positional or keyword arguments:
+   <literal><replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]</literal>.
    <function>plpy.error</function> and
    <function>plpy.fatal</function> actually raise a Python exception
    which, if uncaught, propagates out to the calling query, causing
@@ -1355,8 +1357,8 @@ $$ LANGUAGE plpythonu;
    <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
    <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
    equivalent to calling
-   <function>plpy.error</function> and
-   <function>plpy.fatal</function>, respectively.
+   <function>plpy.raise_error(<replaceable>msg</>)</function> and
+   <function>plpy.raise_fatal(<replaceable>msg</>)</function>, respectively.
    The other functions only generate messages of different
    priority levels.
    Whether messages of a particular priority are reported to the client,
@@ -1367,32 +1369,19 @@ $$ LANGUAGE plpythonu;
   </para>
 
   <para>
-   The <literal>plpy</literal> module also provides the functions
-   <literal>plpy.raise_debug(<replaceable>args</>)</literal>,
-   <literal>plpy.raise_log(<replaceable>args</>)</literal>,
-   <literal>plpy.raise_info(<replaceable>args</>)</literal>,
-   <literal>plpy.raise_notice(<replaceable>args</>)</literal>,
-   <literal>plpy.raise_warning(<replaceable>args</>)</literal>,
-   <literal>plpy.raise_error(<replaceable>args</>)</literal>, and
-   <literal>plpy.raise_fatal(<replaceable>args</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
-   <function>plpy.raise_error</function> and
-   <function>plpy.raise_fatal</function> actually raise a Python exception
-   which, if uncaught, propagates out to the calling query, causing
-   the current transaction or subtransaction to be aborted.
-   <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
-   <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
-   equivalent to calling
-   <function>plpy.raise_error</function> and
-   <function>plpy.raise_fatal</function>, respectively.
-   The other functions only generate messages of different
-   priority levels.
-   Whether messages of a particular priority are reported to the client,
-   written to the server log, or both is controlled by the
-   <xref linkend="guc-log-min-messages"> and
-   <xref linkend="guc-client-min-messages"> configuration
-   variables. See <xref linkend="runtime-config"> for more information.
-   These functions allows to using keyword parameters:
-   <literal>[ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]]</literal>.
+   For backward compatibility, the <literal>plpy</literal> module provides the
+   deprecated functions
+   <literal>plpy.debug(<replaceable>msg</>)</literal>,
+   <literal>plpy.log(<replaceable>msg</>)</literal>,
+   <literal>plpy.info(<replaceable>msg</>)</literal>,
+   <literal>plpy.notice(<replaceable>msg</>)</literal>,
+   <literal>plpy.warning(<replaceable>msg</>)</literal>,
+   <literal>plpy.error(<replaceable>msg</>)</literal>, and
+   <literal>plpy.fatal(<replaceable>msg</>)</literal>.
+   They work similarly to their raise counterparts except they only support
+   a <replaceable>message</replaceable> argument. If multiple arguments are
+   passed, they are bundled in a tuple whose string representation is sent
+   as <replaceable>message</replaceable>.
   </para>
 
   <para>
-- 
2.7.0

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..2bd9bcb
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1341,1360 ****
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>msg</>)</literal>,
!    <literal>plpy.log(<replaceable>msg</>)</literal>,
!    <literal>plpy.info(<replaceable>msg</>)</literal>,
!    <literal>plpy.notice(<replaceable>msg</>)</literal>,
!    <literal>plpy.warning(<replaceable>msg</>)</literal>,
!    <literal>plpy.error(<replaceable>msg</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>msg</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
     the current transaction or subtransaction to be aborted.
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
!    equivalent to calling
     <function>plpy.error</function> and
     <function>plpy.fatal</function>, respectively.
     The other functions only generate messages of different
--- 1341,1360 ----
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.log(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.info(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.notice(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.warning(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.error(<replaceable>exception_params</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>exception_params</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
     the current transaction or subtransaction to be aborted.
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
!    partial equivalent to calling
     <function>plpy.error</function> and
     <function>plpy.fatal</function>, respectively.
     The other functions only generate messages of different
*************** $$ LANGUAGE plpythonu;
*** 1367,1372 ****
--- 1367,1397 ----
    </para>
  
    <para>
+ 
+    The <replaceable>exception_params</> are
+    <literal>[ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]]</literal>.
+    These parameters kan be entered as keyword parameters.
+    The <replaceable>message</replaceable>, <replaceable>detail</replaceable>, <replaceable>hint</replaceable>
+    are automaticly casted to string, other should be string.
+ 
+ <programlisting>
+ CREATE FUNCTION raise_custom_exception() RETURNS void AS $$
+ plpy.error("custom exception message", "some info about exception", "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 &lt;module&gt;
+     plpy.error("custom exception message", "some info about exception", "hint for users")
+ PL/Python function "raise_custom_exception"
+ LOCATION:  PLy_elog, plpy_elog.c:132
+ </programlisting>
+   </para>
+ 
+   <para>
     Another set of utility functions are
     <literal>plpy.quote_literal(<replaceable>string</>)</literal>,
     <literal>plpy.quote_nullable(<replaceable>string</>)</literal>, and
diff --git a/src/pl/plpython/expected/plpython_spi.out b/src/pl/plpython/expected/plpython_spi.out
new file mode 100644
index e715ee5..3daf181
*** a/src/pl/plpython/expected/plpython_spi.out
--- b/src/pl/plpython/expected/plpython_spi.out
***************
*** 1,3 ****
--- 1,4 ----
+ --set plpythonu.legacy_custom_exception = true;
  --
  -- nested calls
  --
diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
new file mode 100644
index 7b76faf..bfe5c6f
*** a/src/pl/plpython/expected/plpython_test.out
--- b/src/pl/plpython/expected/plpython_test.out
*************** select module_contents();
*** 50,55 ****
--- 50,96 ----
  
  CREATE FUNCTION elog_test() RETURNS void
  AS $$
+ plpy.debug('debug','some detail')
+ plpy.log('log','some detail')
+ plpy.info('info','some detail')
+ plpy.info()
+ plpy.info('the question', 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','some detail')
+ plpy.warning('warning','some detail')
+ plpy.error('stop on error', 'some detail','some hint')
+ $$ LANGUAGE plpythonu;
+ SELECT elog_test();
+ INFO:  info
+ DETAIL:  some detail
+ INFO:  missing error text
+ 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 <module>
+     plpy.error('stop on error', 'some detail','some hint')
+ PL/Python function "elog_test"
+ set plpythonu.legacy_custom_exception=true;
+ CREATE FUNCTION elog_test_legacy() RETURNS void
+ AS $$
  plpy.debug('debug')
  plpy.log('log')
  plpy.info('info')
*************** plpy.notice('notice')
*** 60,66 ****
  plpy.warning('warning')
  plpy.error('error')
  $$ LANGUAGE plpythonu;
! SELECT elog_test();
  INFO:  info
  INFO:  37
  INFO:  ()
--- 101,107 ----
  plpy.warning('warning')
  plpy.error('error')
  $$ LANGUAGE plpythonu;
! SELECT elog_test_legacy();
  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 <module>
      plpy.error('error')
  PL/Python function "elog_test"
--- 110,127 ----
  WARNING:  warning
  ERROR:  plpy.Error: error
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "elog_test_legacy", line 10, in <module>
      plpy.error('error')
+ PL/Python function "elog_test_legacy"
+ SELECT elog_test();
+ INFO:  ('info', 'some detail')
+ INFO:  ()
+ INFO:  ('the question', 42)
+ INFO:  This is message text.
+ NOTICE:  ('notice', 'some detail')
+ WARNING:  ('warning', 'some detail')
+ ERROR:  plpy.Error: ('stop on error', 'some detail', 'some hint')
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "elog_test", line 18, in <module>
+     plpy.error('stop on error', 'some detail','some hint')
  PL/Python function "elog_test"
diff --git a/src/pl/plpython/expected/plpython_types.out b/src/pl/plpython/expected/plpython_types.out
new file mode 100644
index f0b6abd..e16bda0
*** a/src/pl/plpython/expected/plpython_types.out
--- b/src/pl/plpython/expected/plpython_types.out
***************
*** 1,3 ****
--- 1,4 ----
+ set plpythonu.legacy_custom_exception = true;
  --
  -- Test data type behavior
  --
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..4ec48c0
*** 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)
+ 	{
+ 		*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)
+ 	{
+ 		*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_main.c b/src/pl/plpython/plpy_main.c
new file mode 100644
index f950394..f74a062
*** a/src/pl/plpython/plpy_main.c
--- b/src/pl/plpython/plpy_main.c
*************** static int	plpython_version_bitmask = 0;
*** 70,75 ****
--- 70,77 ----
  /* initialize global variables */
  PyObject   *PLy_interp_globals = NULL;
  
+ bool plpythonu_legacy_custom_exception = false;
+ 
  /* this doesn't need to be global; use PLy_current_execution_context() */
  static PLyExecutionContext *PLy_execution_contexts = NULL;
  
*************** PLy_initialize(void)
*** 147,152 ****
--- 149,162 ----
  
  	PLy_execution_contexts = NULL;
  
+ 	DefineCustomBoolVariable("plpythonu.legacy_custom_exception",
+ 				  gettext_noop("Returns back a behave of function debug, log, info, ..."),
+ 							 NULL,
+ 							 &plpythonu_legacy_custom_exception,
+ 							 false,
+ 							 PGC_USERSET, 0,
+ 							 NULL, NULL, NULL);
+ 
  	inited = true;
  }
  
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..620cbe6
*** 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
*** 272,318 ****
   * 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 *
--- 272,330 ----
   * don't confuse these with PLy_elog
   */
  static PyObject *PLy_output(volatile int, PyObject *, PyObject *);
+ static PyObject *PLy_output_kw(volatile int level, PyObject *self,
+ 										  PyObject *args, PyObject *kw);
+ 
+ /* allow to switch between current and legacy design of following functions */
+ static PyObject *PLy_output_switch(volatile int level, PyObject *self,
+ 										  PyObject *args, PyObject *kw)
+ {
+ 	if (plpythonu_legacy_custom_exception)
+ 		return PLy_output(level, self, args);
+ 	else
+ 		return PLy_output_kw(level, self, args, kw);
+ }
  
  static PyObject *
! PLy_debug(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(DEBUG2, self, args, kw);
  }
  
  static PyObject *
! PLy_log(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(LOG, self, args, kw);
  }
  
  static PyObject *
! PLy_info(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(INFO, self, args, kw);
  }
  
  static PyObject *
! PLy_notice(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(NOTICE, self, args, kw);
  }
  
  static PyObject *
! PLy_warning(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(WARNING, self, args, kw);
  }
  
  static PyObject *
! PLy_error(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(ERROR, self, args, kw);
  }
  
  static PyObject *
! PLy_fatal(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(FATAL, self, args, kw);
  }
  
  static PyObject *
*************** PLy_output(volatile int level, PyObject
*** 429,431 ****
--- 441,561 ----
  	Py_INCREF(Py_None);
  	return Py_None;
  }
+ 
+ /* enforce cast of object to string */
+ static char *
+ object_to_string(PyObject *obj)
+ {
+ 	if (obj)
+ 	{
+ 		PyObject *str = PyObject_Str(obj);
+ 		return PyString_AsString(str);
+ 	}
+ 
+ 	return NULL;
+ }
+ 
+ static PyObject *
+ PLy_output_kw(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 	PyObject *o_message = NULL;
+ 	PyObject *o_detail = NULL;
+ 	PyObject *o_hint = NULL;
+ 	MemoryContext oldcontext ;
+ 
+ 	static char *kwlist[] = { "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kw, "|OOOssssss", kwlist,
+ 			 &o_message, &o_detail, &o_hint,
+ 			 &sqlstatestr,
+ 			 &schema, &table, &column,
+ 			 &datatype, &constraint))
+ 		return NULL;
+ 
+ 	/* enforce message, detail, hint to string */
+ 	message = object_to_string(o_message);
+ 	detail = object_to_string(o_detail);
+ 	hint = object_to_string(o_hint);
+ 
+ 	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);
+ 		return NULL;
+ 	}
+ 	PG_END_TRY();
+ 
+ 	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..fc76511
*** a/src/pl/plpython/plpy_plpymodule.h
--- b/src/pl/plpython/plpy_plpymodule.h
***************
*** 10,15 ****
--- 10,17 ----
  /* A hash table mapping sqlstates to exceptions, for speedy lookup */
  extern HTAB *PLy_spi_exceptions;
  
+ /* GUC */
+ extern bool plpythonu_legacy_custom_exception;
  
  #if PY_MAJOR_VERSION >= 3
  PyMODINIT_FUNC PyInit_plpy(void);
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_spi.sql b/src/pl/plpython/sql/plpython_spi.sql
new file mode 100644
index a882738..196385e
*** a/src/pl/plpython/sql/plpython_spi.sql
--- b/src/pl/plpython/sql/plpython_spi.sql
***************
*** 1,3 ****
--- 1,5 ----
+ --set plpythonu.legacy_custom_exception = true;
+ 
  --
  -- nested calls
  --
diff --git a/src/pl/plpython/sql/plpython_test.sql b/src/pl/plpython/sql/plpython_test.sql
new file mode 100644
index c8d5ef5..b724050
*** a/src/pl/plpython/sql/plpython_test.sql
--- b/src/pl/plpython/sql/plpython_test.sql
*************** $$ LANGUAGE plpythonu;
*** 36,44 ****
  
  select module_contents();
  
- 
  CREATE FUNCTION elog_test() RETURNS void
  AS $$
  plpy.debug('debug')
  plpy.log('log')
  plpy.info('info')
--- 36,68 ----
  
  select module_contents();
  
  CREATE FUNCTION elog_test() RETURNS void
  AS $$
+ plpy.debug('debug','some detail')
+ plpy.log('log','some detail')
+ plpy.info('info','some detail')
+ plpy.info()
+ plpy.info('the question', 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','some detail')
+ plpy.warning('warning','some detail')
+ plpy.error('stop on error', 'some detail','some hint')
+ $$ LANGUAGE plpythonu;
+ 
+ SELECT elog_test();
+ 
+ set plpythonu.legacy_custom_exception=true;
+ 
+ CREATE FUNCTION elog_test_legacy() RETURNS void
+ AS $$
  plpy.debug('debug')
  plpy.log('log')
  plpy.info('info')
*************** plpy.warning('warning')
*** 50,53 ****
--- 74,79 ----
  plpy.error('error')
  $$ LANGUAGE plpythonu;
  
+ SELECT elog_test_legacy();
+ 
  SELECT elog_test();
diff --git a/src/pl/plpython/sql/plpython_types.sql b/src/pl/plpython/sql/plpython_types.sql
new file mode 100644
index 19d920d..af9b8d7
*** a/src/pl/plpython/sql/plpython_types.sql
--- b/src/pl/plpython/sql/plpython_types.sql
***************
*** 1,3 ****
--- 1,5 ----
+ set plpythonu.legacy_custom_exception = true;
+ 
  --
  -- Test data type behavior
  --

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..2bd9bcb
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1341,1360 ****
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>msg</>)</literal>,
!    <literal>plpy.log(<replaceable>msg</>)</literal>,
!    <literal>plpy.info(<replaceable>msg</>)</literal>,
!    <literal>plpy.notice(<replaceable>msg</>)</literal>,
!    <literal>plpy.warning(<replaceable>msg</>)</literal>,
!    <literal>plpy.error(<replaceable>msg</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>msg</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
     the current transaction or subtransaction to be aborted.
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
!    equivalent to calling
     <function>plpy.error</function> and
     <function>plpy.fatal</function>, respectively.
     The other functions only generate messages of different
--- 1341,1360 ----
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.log(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.info(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.notice(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.warning(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.error(<replaceable>exception_params</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>exception_params</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
     the current transaction or subtransaction to be aborted.
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
!    partial equivalent to calling
     <function>plpy.error</function> and
     <function>plpy.fatal</function>, respectively.
     The other functions only generate messages of different
*************** $$ LANGUAGE plpythonu;
*** 1367,1372 ****
--- 1367,1397 ----
    </para>
  
    <para>
+ 
+    The <replaceable>exception_params</> are
+    <literal>[ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]]</literal>.
+    These parameters kan be entered as keyword parameters.
+    The <replaceable>message</replaceable>, <replaceable>detail</replaceable>, <replaceable>hint</replaceable>
+    are automaticly casted to string, other should be string.
+ 
+ <programlisting>
+ CREATE FUNCTION raise_custom_exception() RETURNS void AS $$
+ plpy.error("custom exception message", "some info about exception", "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 &lt;module&gt;
+     plpy.error("custom exception message", "some info about exception", "hint for users")
+ PL/Python function "raise_custom_exception"
+ LOCATION:  PLy_elog, plpy_elog.c:132
+ </programlisting>
+   </para>
+ 
+   <para>
     Another set of utility functions are
     <literal>plpy.quote_literal(<replaceable>string</>)</literal>,
     <literal>plpy.quote_nullable(<replaceable>string</>)</literal>, 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..ce0b3fc
*** a/src/pl/plpython/expected/plpython_test.out
--- b/src/pl/plpython/expected/plpython_test.out
*************** select module_contents();
*** 50,55 ****
--- 50,96 ----
  
  CREATE FUNCTION elog_test() RETURNS void
  AS $$
+ plpy.debug('debug','some detail')
+ plpy.log('log','some detail')
+ plpy.info('info','some detail')
+ plpy.info()
+ plpy.info('the question', 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','some detail')
+ plpy.warning('warning','some detail')
+ plpy.error('stop on error', 'some detail','some hint')
+ $$ LANGUAGE plpythonu;
+ SELECT elog_test();
+ INFO:  info
+ DETAIL:  some detail
+ INFO:  missing error text
+ 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 <module>
+     plpy.error('stop on error', 'some detail','some hint')
+ PL/Python function "elog_test"
+ set plpythonu.legacy_custom_exception=true;
+ CREATE FUNCTION elog_test_legacy() RETURNS void
+ AS $$
  plpy.debug('debug')
  plpy.log('log')
  plpy.info('info')
*************** plpy.notice('notice')
*** 60,66 ****
  plpy.warning('warning')
  plpy.error('error')
  $$ LANGUAGE plpythonu;
! SELECT elog_test();
  INFO:  info
  INFO:  37
  INFO:  ()
--- 101,107 ----
  plpy.warning('warning')
  plpy.error('error')
  $$ LANGUAGE plpythonu;
! SELECT elog_test_legacy();
  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 <module>
      plpy.error('error')
  PL/Python function "elog_test"
--- 110,127 ----
  WARNING:  warning
  ERROR:  plpy.Error: error
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "elog_test_legacy", line 10, in <module>
      plpy.error('error')
+ PL/Python function "elog_test_legacy"
+ SELECT elog_test();
+ INFO:  ('info', 'some detail')
+ INFO:  ()
+ INFO:  ('the question', 42)
+ INFO:  This is message text.
+ NOTICE:  ('notice', 'some detail')
+ WARNING:  ('warning', 'some detail')
+ ERROR:  plpy.Error: ('stop on error', 'some detail', 'some hint')
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "elog_test", line 18, in <module>
+     plpy.error('stop on error', 'some detail','some hint')
  PL/Python function "elog_test"
diff --git a/src/pl/plpython/expected/plpython_types.out b/src/pl/plpython/expected/plpython_types.out
new file mode 100644
index f0b6abd..24d8f51
*** a/src/pl/plpython/expected/plpython_types.out
--- b/src/pl/plpython/expected/plpython_types.out
***************
*** 5,11 ****
  -- Base/common types
  --
  CREATE FUNCTION test_type_conversion_bool(x bool) RETURNS bool AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool(true);
--- 5,11 ----
  -- Base/common types
  --
  CREATE FUNCTION test_type_conversion_bool(x bool) RETURNS bool AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool(true);
*************** elif n == 4:
*** 46,52 ****
     ret = []
  elif n == 5:
     ret = [0]
! plpy.info(ret, not not ret)
  return ret
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool_other(0);
--- 46,52 ----
     ret = []
  elif n == 5:
     ret = [0]
! plpy.info((ret, not not ret))
  return ret
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool_other(0);
*************** INFO:  ([0], True)
*** 92,98 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_char(x char) RETURNS char AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_char('a');
--- 92,98 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_char(x char) RETURNS char AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_char('a');
*************** INFO:  (None, <type 'NoneType'>)
*** 110,116 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int2(x int2) RETURNS int2 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int2(100::int2);
--- 110,116 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int2(x int2) RETURNS int2 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int2(100::int2);
*************** INFO:  (None, <type 'NoneType'>)
*** 135,141 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int4(x int4) RETURNS int4 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int4(100);
--- 135,141 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int4(x int4) RETURNS int4 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int4(100);
*************** INFO:  (None, <type 'NoneType'>)
*** 160,166 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int8(x int8) RETURNS int8 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int8(100);
--- 160,166 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int8(x int8) RETURNS int8 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int8(100);
*************** INFO:  (None, <type 'NoneType'>)
*** 194,200 ****
  CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$
  # print just the class name, not the type, to avoid differences
  # between decimal and cdecimal
! plpy.info(str(x), x.__class__.__name__)
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_numeric(100);
--- 194,200 ----
  CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$
  # print just the class name, not the type, to avoid differences
  # between decimal and cdecimal
! plpy.info((str(x), x.__class__.__name__))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_numeric(100);
*************** INFO:  ('None', 'NoneType')
*** 254,260 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_float4(x float4) RETURNS float4 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float4(100);
--- 254,260 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_float4(x float4) RETURNS float4 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float4(100);
*************** INFO:  (None, <type 'NoneType'>)
*** 286,292 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_float8(x float8) RETURNS float8 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float8(100);
--- 286,292 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_float8(x float8) RETURNS float8 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float8(100);
*************** INFO:  (100100100.654321, <type 'float'>
*** 325,331 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_oid(x oid) RETURNS oid AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_oid(100);
--- 325,331 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_oid(x oid) RETURNS oid AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_oid(100);
*************** INFO:  (None, <type 'NoneType'>)
*** 350,356 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_text(x text) RETURNS text AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_text('hello world');
--- 350,356 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_text(x text) RETURNS text AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_text('hello world');
*************** INFO:  (None, <type 'NoneType'>)
*** 368,374 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_bytea(x bytea) RETURNS bytea AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea('hello world');
--- 368,374 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_bytea(x bytea) RETURNS bytea AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea('hello world');
*************** CONTEXT:  while creating return value
*** 430,436 ****
  PL/Python function "test_type_conversion_booltrue"
  CREATE DOMAIN uint2 AS int2 CHECK (VALUE >= 0);
  CREATE FUNCTION test_type_conversion_uint2(x uint2, y int) RETURNS uint2 AS $$
! plpy.info(x, type(x))
  return y
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_uint2(100::uint2, 50);
--- 430,436 ----
  PL/Python function "test_type_conversion_booltrue"
  CREATE DOMAIN uint2 AS int2 CHECK (VALUE >= 0);
  CREATE FUNCTION test_type_conversion_uint2(x uint2, y int) RETURNS uint2 AS $$
! plpy.info((x, type(x)))
  return y
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_uint2(100::uint2, 50);
*************** CONTEXT:  while creating return value
*** 470,476 ****
  PL/Python function "test_type_conversion_nnint"
  CREATE DOMAIN bytea10 AS bytea CHECK (octet_length(VALUE) = 10 AND VALUE IS NOT NULL);
  CREATE FUNCTION test_type_conversion_bytea10(x bytea10, y bytea) RETURNS bytea10 AS $$
! plpy.info(x, type(x))
  return y
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea10('hello wold', 'hello wold');
--- 470,476 ----
  PL/Python function "test_type_conversion_nnint"
  CREATE DOMAIN bytea10 AS bytea CHECK (octet_length(VALUE) = 10 AND VALUE IS NOT NULL);
  CREATE FUNCTION test_type_conversion_bytea10(x bytea10, y bytea) RETURNS bytea10 AS $$
! plpy.info((x, type(x)))
  return y
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea10('hello wold', 'hello wold');
*************** PL/Python function "test_type_conversion
*** 498,504 ****
  -- Arrays
  --
  CREATE FUNCTION test_type_conversion_array_int4(x int4[]) RETURNS int4[] AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0, 100]);
--- 498,504 ----
  -- Arrays
  --
  CREATE FUNCTION test_type_conversion_array_int4(x int4[]) RETURNS int4[] AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0, 100]);
*************** ERROR:  cannot convert multidimensional
*** 541,547 ****
  DETAIL:  PL/Python only supports one-dimensional arrays.
  CONTEXT:  PL/Python function "test_type_conversion_array_int4"
  CREATE FUNCTION test_type_conversion_array_text(x text[]) RETURNS text[] AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_text(ARRAY['foo', 'bar']);
--- 541,547 ----
  DETAIL:  PL/Python only supports one-dimensional arrays.
  CONTEXT:  PL/Python function "test_type_conversion_array_int4"
  CREATE FUNCTION test_type_conversion_array_text(x text[]) RETURNS text[] AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_text(ARRAY['foo', 'bar']);
*************** INFO:  (['foo', 'bar'], <type 'list'>)
*** 552,558 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_array_bytea(x bytea[]) RETURNS bytea[] AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_bytea(ARRAY[E'\\xdeadbeef'::bytea, NULL]);
--- 552,558 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_array_bytea(x bytea[]) RETURNS bytea[] AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_bytea(ARRAY[E'\\xdeadbeef'::bytea, NULL]);
*************** PL/Python function "test_type_conversion
*** 617,623 ****
  --
  CREATE DOMAIN ordered_pair_domain AS integer[] CHECK (array_length(VALUE,1)=2 AND VALUE[1] < VALUE[2]);
  CREATE FUNCTION test_type_conversion_array_domain(x ordered_pair_domain) RETURNS ordered_pair_domain AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_domain(ARRAY[0, 100]::ordered_pair_domain);
--- 617,623 ----
  --
  CREATE DOMAIN ordered_pair_domain AS integer[] CHECK (array_length(VALUE,1)=2 AND VALUE[1] < VALUE[2]);
  CREATE FUNCTION test_type_conversion_array_domain(x ordered_pair_domain) RETURNS ordered_pair_domain AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_domain(ARRAY[0, 100]::ordered_pair_domain);
diff --git a/src/pl/plpython/expected/plpython_types_3.out b/src/pl/plpython/expected/plpython_types_3.out
new file mode 100644
index 56b78e1..f02c2a2
*** a/src/pl/plpython/expected/plpython_types_3.out
--- b/src/pl/plpython/expected/plpython_types_3.out
***************
*** 5,11 ****
  -- Base/common types
  --
  CREATE FUNCTION test_type_conversion_bool(x bool) RETURNS bool AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_bool(true);
--- 5,11 ----
  -- Base/common types
  --
  CREATE FUNCTION test_type_conversion_bool(x bool) RETURNS bool AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_bool(true);
*************** elif n == 4:
*** 46,52 ****
     ret = []
  elif n == 5:
     ret = [0]
! plpy.info(ret, not not ret)
  return ret
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_bool_other(0);
--- 46,52 ----
     ret = []
  elif n == 5:
     ret = [0]
! plpy.info((ret, not not ret))
  return ret
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_bool_other(0);
*************** INFO:  ([0], True)
*** 92,98 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_char(x char) RETURNS char AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_char('a');
--- 92,98 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_char(x char) RETURNS char AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_char('a');
*************** INFO:  (None, <class 'NoneType'>)
*** 110,116 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int2(x int2) RETURNS int2 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_int2(100::int2);
--- 110,116 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int2(x int2) RETURNS int2 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_int2(100::int2);
*************** INFO:  (None, <class 'NoneType'>)
*** 135,141 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int4(x int4) RETURNS int4 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_int4(100);
--- 135,141 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int4(x int4) RETURNS int4 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_int4(100);
*************** INFO:  (None, <class 'NoneType'>)
*** 160,166 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int8(x int8) RETURNS int8 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_int8(100);
--- 160,166 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_int8(x int8) RETURNS int8 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_int8(100);
*************** INFO:  (None, <class 'NoneType'>)
*** 194,200 ****
  CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$
  # print just the class name, not the type, to avoid differences
  # between decimal and cdecimal
! plpy.info(str(x), x.__class__.__name__)
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_numeric(100);
--- 194,200 ----
  CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$
  # print just the class name, not the type, to avoid differences
  # between decimal and cdecimal
! plpy.info((str(x), x.__class__.__name__))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_numeric(100);
*************** INFO:  ('None', 'NoneType')
*** 254,260 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_float4(x float4) RETURNS float4 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_float4(100);
--- 254,260 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_float4(x float4) RETURNS float4 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_float4(100);
*************** INFO:  (None, <class 'NoneType'>)
*** 286,292 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_float8(x float8) RETURNS float8 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_float8(100);
--- 286,292 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_float8(x float8) RETURNS float8 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_float8(100);
*************** INFO:  (100100100.654321, <class 'float'
*** 325,331 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_oid(x oid) RETURNS oid AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_oid(100);
--- 325,331 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_oid(x oid) RETURNS oid AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_oid(100);
*************** INFO:  (None, <class 'NoneType'>)
*** 350,356 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_text(x text) RETURNS text AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_text('hello world');
--- 350,356 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_text(x text) RETURNS text AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_text('hello world');
*************** INFO:  (None, <class 'NoneType'>)
*** 368,374 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_bytea(x bytea) RETURNS bytea AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_bytea('hello world');
--- 368,374 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_bytea(x bytea) RETURNS bytea AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_bytea('hello world');
*************** CONTEXT:  while creating return value
*** 430,436 ****
  PL/Python function "test_type_conversion_booltrue"
  CREATE DOMAIN uint2 AS int2 CHECK (VALUE >= 0);
  CREATE FUNCTION test_type_conversion_uint2(x uint2, y int) RETURNS uint2 AS $$
! plpy.info(x, type(x))
  return y
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_uint2(100::uint2, 50);
--- 430,436 ----
  PL/Python function "test_type_conversion_booltrue"
  CREATE DOMAIN uint2 AS int2 CHECK (VALUE >= 0);
  CREATE FUNCTION test_type_conversion_uint2(x uint2, y int) RETURNS uint2 AS $$
! plpy.info((x, type(x)))
  return y
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_uint2(100::uint2, 50);
*************** CONTEXT:  while creating return value
*** 470,476 ****
  PL/Python function "test_type_conversion_nnint"
  CREATE DOMAIN bytea10 AS bytea CHECK (octet_length(VALUE) = 10 AND VALUE IS NOT NULL);
  CREATE FUNCTION test_type_conversion_bytea10(x bytea10, y bytea) RETURNS bytea10 AS $$
! plpy.info(x, type(x))
  return y
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_bytea10('hello wold', 'hello wold');
--- 470,476 ----
  PL/Python function "test_type_conversion_nnint"
  CREATE DOMAIN bytea10 AS bytea CHECK (octet_length(VALUE) = 10 AND VALUE IS NOT NULL);
  CREATE FUNCTION test_type_conversion_bytea10(x bytea10, y bytea) RETURNS bytea10 AS $$
! plpy.info((x, type(x)))
  return y
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_bytea10('hello wold', 'hello wold');
*************** PL/Python function "test_type_conversion
*** 498,504 ****
  -- Arrays
  --
  CREATE FUNCTION test_type_conversion_array_int4(x int4[]) RETURNS int4[] AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0, 100]);
--- 498,504 ----
  -- Arrays
  --
  CREATE FUNCTION test_type_conversion_array_int4(x int4[]) RETURNS int4[] AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0, 100]);
*************** ERROR:  cannot convert multidimensional
*** 541,547 ****
  DETAIL:  PL/Python only supports one-dimensional arrays.
  CONTEXT:  PL/Python function "test_type_conversion_array_int4"
  CREATE FUNCTION test_type_conversion_array_text(x text[]) RETURNS text[] AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_array_text(ARRAY['foo', 'bar']);
--- 541,547 ----
  DETAIL:  PL/Python only supports one-dimensional arrays.
  CONTEXT:  PL/Python function "test_type_conversion_array_int4"
  CREATE FUNCTION test_type_conversion_array_text(x text[]) RETURNS text[] AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_array_text(ARRAY['foo', 'bar']);
*************** INFO:  (['foo', 'bar'], <class 'list'>)
*** 552,558 ****
  (1 row)
  
  CREATE FUNCTION test_type_conversion_array_bytea(x bytea[]) RETURNS bytea[] AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_array_bytea(ARRAY[E'\\xdeadbeef'::bytea, NULL]);
--- 552,558 ----
  (1 row)
  
  CREATE FUNCTION test_type_conversion_array_bytea(x bytea[]) RETURNS bytea[] AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_array_bytea(ARRAY[E'\\xdeadbeef'::bytea, NULL]);
*************** PL/Python function "test_type_conversion
*** 617,623 ****
  --
  CREATE DOMAIN ordered_pair_domain AS integer[] CHECK (array_length(VALUE,1)=2 AND VALUE[1] < VALUE[2]);
  CREATE FUNCTION test_type_conversion_array_domain(x ordered_pair_domain) RETURNS ordered_pair_domain AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_array_domain(ARRAY[0, 100]::ordered_pair_domain);
--- 617,623 ----
  --
  CREATE DOMAIN ordered_pair_domain AS integer[] CHECK (array_length(VALUE,1)=2 AND VALUE[1] < VALUE[2]);
  CREATE FUNCTION test_type_conversion_array_domain(x ordered_pair_domain) RETURNS ordered_pair_domain AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpython3u;
  SELECT * FROM test_type_conversion_array_domain(ARRAY[0, 100]::ordered_pair_domain);
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_main.c b/src/pl/plpython/plpy_main.c
new file mode 100644
index f950394..f74a062
*** a/src/pl/plpython/plpy_main.c
--- b/src/pl/plpython/plpy_main.c
*************** static int	plpython_version_bitmask = 0;
*** 70,75 ****
--- 70,77 ----
  /* initialize global variables */
  PyObject   *PLy_interp_globals = NULL;
  
+ bool plpythonu_legacy_custom_exception = false;
+ 
  /* this doesn't need to be global; use PLy_current_execution_context() */
  static PLyExecutionContext *PLy_execution_contexts = NULL;
  
*************** PLy_initialize(void)
*** 147,152 ****
--- 149,162 ----
  
  	PLy_execution_contexts = NULL;
  
+ 	DefineCustomBoolVariable("plpythonu.legacy_custom_exception",
+ 				  gettext_noop("Returns back a behave of function debug, log, info, ..."),
+ 							 NULL,
+ 							 &plpythonu_legacy_custom_exception,
+ 							 false,
+ 							 PGC_USERSET, 0,
+ 							 NULL, NULL, NULL);
+ 
  	inited = true;
  }
  
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
new file mode 100644
index a44b7fb..dba4895
*** 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
*** 272,318 ****
   * 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 *
--- 272,330 ----
   * don't confuse these with PLy_elog
   */
  static PyObject *PLy_output(volatile int, PyObject *, PyObject *);
+ static PyObject *PLy_output_kw(volatile int level, PyObject *self,
+ 										  PyObject *args, PyObject *kw);
+ 
+ /* allow to switch between current and legacy design of following functions */
+ static PyObject *PLy_output_switch(volatile int level, PyObject *self,
+ 										  PyObject *args, PyObject *kw)
+ {
+ 	if (plpythonu_legacy_custom_exception)
+ 		return PLy_output(level, self, args);
+ 	else
+ 		return PLy_output_kw(level, self, args, kw);
+ }
  
  static PyObject *
! PLy_debug(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(DEBUG2, self, args, kw);
  }
  
  static PyObject *
! PLy_log(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(LOG, self, args, kw);
  }
  
  static PyObject *
! PLy_info(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(INFO, self, args, kw);
  }
  
  static PyObject *
! PLy_notice(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(NOTICE, self, args, kw);
  }
  
  static PyObject *
! PLy_warning(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(WARNING, self, args, kw);
  }
  
  static PyObject *
! PLy_error(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(ERROR, self, args, kw);
  }
  
  static PyObject *
! PLy_fatal(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output_switch(FATAL, self, args, kw);
  }
  
  static PyObject *
*************** PLy_output(volatile int level, PyObject
*** 429,431 ****
--- 441,574 ----
  	Py_INCREF(Py_None);
  	return Py_None;
  }
+ 
+ /* enforce cast of object to string */
+ static char *
+ object_to_string(PyObject *obj)
+ {
+ 	if (obj)
+ 	{
+ 		PyObject *str = PyObject_Str(obj);
+ 		if (str != NULL && str != Py_None)
+ 			return PyString_AsString(str);
+ 	}
+ 
+ 	return NULL;
+ }
+ 
+ static PyObject *
+ PLy_output_kw(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
+ {
+ 	int sqlstate = 0;
+ 	const char *sqlstatestr = NULL;
+ 	const char *message = NULL;
+ 	const char *detail = NULL;
+ 	const char *hint = NULL;
+ 	const char *column = NULL;
+ 	const char *constraint = NULL;
+ 	const char *datatype = NULL;
+ 	const char *table = NULL;
+ 	const char *schema = NULL;
+ 	PyObject *o_sqlstatestr = NULL;
+ 	PyObject *o_message = NULL;
+ 	PyObject *o_detail = NULL;
+ 	PyObject *o_hint = NULL;
+ 	PyObject *o_column = NULL;
+ 	PyObject *o_table = NULL;
+ 	PyObject *o_schema = NULL;
+ 	PyObject *o_constraint = NULL;
+ 	PyObject *o_datatype = NULL;
+ 	MemoryContext oldcontext ;
+ 
+ 	static char *kwlist[] = { "message", "detail", "hint",
+ 				  "sqlstate",
+ 				  "schema","table", "column",
+ 				  "datatype", "constraint",
+ 				  NULL };
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kw, "|OOOOOOOOO", kwlist,
+ 			 &o_message, &o_detail, &o_hint,
+ 			 &o_sqlstatestr,
+ 			 &o_schema, &o_table, &o_column,
+ 			 &o_datatype, &o_constraint))
+ 		return NULL;
+ 
+ 	/* enforce message, detail, hint to string */
+ 	sqlstatestr = object_to_string(o_sqlstatestr);
+ 	message = object_to_string(o_message);
+ 	detail = object_to_string(o_detail);
+ 	hint = object_to_string(o_hint);
+ 	column = object_to_string(o_column);
+ 	table = object_to_string(o_table);
+ 	schema = object_to_string(o_schema);
+ 	datatype = object_to_string(o_datatype);
+ 	constraint = object_to_string(o_constraint);
+ 
+ 	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);
+ 		return NULL;
+ 	}
+ 	PG_END_TRY();
+ 
+ 	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..fc76511
*** a/src/pl/plpython/plpy_plpymodule.h
--- b/src/pl/plpython/plpy_plpymodule.h
***************
*** 10,15 ****
--- 10,17 ----
  /* A hash table mapping sqlstates to exceptions, for speedy lookup */
  extern HTAB *PLy_spi_exceptions;
  
+ /* GUC */
+ extern bool plpythonu_legacy_custom_exception;
  
  #if PY_MAJOR_VERSION >= 3
  PyMODINIT_FUNC PyInit_plpy(void);
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..eeed93c
*** a/src/pl/plpython/sql/plpython_test.sql
--- b/src/pl/plpython/sql/plpython_test.sql
*************** $$ LANGUAGE plpythonu;
*** 36,44 ****
  
  select module_contents();
  
- 
  CREATE FUNCTION elog_test() RETURNS void
  AS $$
  plpy.debug('debug')
  plpy.log('log')
  plpy.info('info')
--- 36,68 ----
  
  select module_contents();
  
  CREATE FUNCTION elog_test() RETURNS void
  AS $$
+ plpy.debug('debug','some detail')
+ plpy.log('log','some detail')
+ plpy.info('info','some detail')
+ plpy.info()
+ plpy.info('the question', 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','some detail')
+ plpy.warning('warning','some detail')
+ plpy.error('stop on error', 'some detail','some hint')
+ $$ LANGUAGE plpythonu;
+ 
+ SELECT elog_test();
+ 
+ set plpythonu.legacy_custom_exception=true;
+ 
+ CREATE FUNCTION elog_test_legacy() RETURNS void
+ AS $$
  plpy.debug('debug')
  plpy.log('log')
  plpy.info('info')
*************** plpy.warning('warning')
*** 50,53 ****
--- 74,79 ----
  plpy.error('error')
  $$ LANGUAGE plpythonu;
  
+ SELECT elog_test_legacy();
+ 
  SELECT elog_test();
diff --git a/src/pl/plpython/sql/plpython_types.sql b/src/pl/plpython/sql/plpython_types.sql
new file mode 100644
index 19d920d..db6ff87
*** a/src/pl/plpython/sql/plpython_types.sql
--- b/src/pl/plpython/sql/plpython_types.sql
***************
*** 7,13 ****
  --
  
  CREATE FUNCTION test_type_conversion_bool(x bool) RETURNS bool AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 7,13 ----
  --
  
  CREATE FUNCTION test_type_conversion_bool(x bool) RETURNS bool AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** elif n == 4:
*** 33,39 ****
     ret = []
  elif n == 5:
     ret = [0]
! plpy.info(ret, not not ret)
  return ret
  $$ LANGUAGE plpythonu;
  
--- 33,39 ----
     ret = []
  elif n == 5:
     ret = [0]
! plpy.info((ret, not not ret))
  return ret
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_bool_
*** 46,52 ****
  
  
  CREATE FUNCTION test_type_conversion_char(x char) RETURNS char AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 46,52 ----
  
  
  CREATE FUNCTION test_type_conversion_char(x char) RETURNS char AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_char(
*** 55,61 ****
  
  
  CREATE FUNCTION test_type_conversion_int2(x int2) RETURNS int2 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 55,61 ----
  
  
  CREATE FUNCTION test_type_conversion_int2(x int2) RETURNS int2 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_int2(
*** 65,71 ****
  
  
  CREATE FUNCTION test_type_conversion_int4(x int4) RETURNS int4 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 65,71 ----
  
  
  CREATE FUNCTION test_type_conversion_int4(x int4) RETURNS int4 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_int4(
*** 75,81 ****
  
  
  CREATE FUNCTION test_type_conversion_int8(x int8) RETURNS int8 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 75,81 ----
  
  
  CREATE FUNCTION test_type_conversion_int8(x int8) RETURNS int8 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_int8(
*** 88,94 ****
  CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$
  # print just the class name, not the type, to avoid differences
  # between decimal and cdecimal
! plpy.info(str(x), x.__class__.__name__)
  return x
  $$ LANGUAGE plpythonu;
  
--- 88,94 ----
  CREATE FUNCTION test_type_conversion_numeric(x numeric) RETURNS numeric AS $$
  # print just the class name, not the type, to avoid differences
  # between decimal and cdecimal
! plpy.info((str(x), x.__class__.__name__))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_numer
*** 103,109 ****
  
  
  CREATE FUNCTION test_type_conversion_float4(x float4) RETURNS float4 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 103,109 ----
  
  
  CREATE FUNCTION test_type_conversion_float4(x float4) RETURNS float4 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_float
*** 114,120 ****
  
  
  CREATE FUNCTION test_type_conversion_float8(x float8) RETURNS float8 AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 114,120 ----
  
  
  CREATE FUNCTION test_type_conversion_float8(x float8) RETURNS float8 AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_float
*** 126,132 ****
  
  
  CREATE FUNCTION test_type_conversion_oid(x oid) RETURNS oid AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 126,132 ----
  
  
  CREATE FUNCTION test_type_conversion_oid(x oid) RETURNS oid AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_oid(n
*** 136,142 ****
  
  
  CREATE FUNCTION test_type_conversion_text(x text) RETURNS text AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 136,142 ----
  
  
  CREATE FUNCTION test_type_conversion_text(x text) RETURNS text AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_text(
*** 145,151 ****
  
  
  CREATE FUNCTION test_type_conversion_bytea(x bytea) RETURNS bytea AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 145,151 ----
  
  
  CREATE FUNCTION test_type_conversion_bytea(x bytea) RETURNS bytea AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_boolt
*** 188,194 ****
  CREATE DOMAIN uint2 AS int2 CHECK (VALUE >= 0);
  
  CREATE FUNCTION test_type_conversion_uint2(x uint2, y int) RETURNS uint2 AS $$
! plpy.info(x, type(x))
  return y
  $$ LANGUAGE plpythonu;
  
--- 188,194 ----
  CREATE DOMAIN uint2 AS int2 CHECK (VALUE >= 0);
  
  CREATE FUNCTION test_type_conversion_uint2(x uint2, y int) RETURNS uint2 AS $$
! plpy.info((x, type(x)))
  return y
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_nnint
*** 211,217 ****
  CREATE DOMAIN bytea10 AS bytea CHECK (octet_length(VALUE) = 10 AND VALUE IS NOT NULL);
  
  CREATE FUNCTION test_type_conversion_bytea10(x bytea10, y bytea) RETURNS bytea10 AS $$
! plpy.info(x, type(x))
  return y
  $$ LANGUAGE plpythonu;
  
--- 211,217 ----
  CREATE DOMAIN bytea10 AS bytea CHECK (octet_length(VALUE) = 10 AND VALUE IS NOT NULL);
  
  CREATE FUNCTION test_type_conversion_bytea10(x bytea10, y bytea) RETURNS bytea10 AS $$
! plpy.info((x, type(x)))
  return y
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_bytea
*** 227,233 ****
  --
  
  CREATE FUNCTION test_type_conversion_array_int4(x int4[]) RETURNS int4[] AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 227,233 ----
  --
  
  CREATE FUNCTION test_type_conversion_array_int4(x int4[]) RETURNS int4[] AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_array
*** 240,246 ****
  
  
  CREATE FUNCTION test_type_conversion_array_text(x text[]) RETURNS text[] AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 240,246 ----
  
  
  CREATE FUNCTION test_type_conversion_array_text(x text[]) RETURNS text[] AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_array
*** 248,254 ****
  
  
  CREATE FUNCTION test_type_conversion_array_bytea(x bytea[]) RETURNS bytea[] AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 248,254 ----
  
  
  CREATE FUNCTION test_type_conversion_array_bytea(x bytea[]) RETURNS bytea[] AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  
*************** SELECT * FROM test_type_conversion_array
*** 302,308 ****
  CREATE DOMAIN ordered_pair_domain AS integer[] CHECK (array_length(VALUE,1)=2 AND VALUE[1] < VALUE[2]);
  
  CREATE FUNCTION test_type_conversion_array_domain(x ordered_pair_domain) RETURNS ordered_pair_domain AS $$
! plpy.info(x, type(x))
  return x
  $$ LANGUAGE plpythonu;
  
--- 302,308 ----
  CREATE DOMAIN ordered_pair_domain AS integer[] CHECK (array_length(VALUE,1)=2 AND VALUE[1] < VALUE[2]);
  
  CREATE FUNCTION test_type_conversion_array_domain(x ordered_pair_domain) RETURNS ordered_pair_domain AS $$
! plpy.info((x, type(x)))
  return x
  $$ LANGUAGE plpythonu;
  

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 ****
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>msg</>)</literal>,
!    <literal>plpy.log(<replaceable>msg</>)</literal>,
!    <literal>plpy.info(<replaceable>msg</>)</literal>,
!    <literal>plpy.notice(<replaceable>msg</>)</literal>,
!    <literal>plpy.warning(<replaceable>msg</>)</literal>,
!    <literal>plpy.error(<replaceable>msg</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>msg</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
     the current transaction or subtransaction to be aborted.
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
!    equivalent to calling
     <function>plpy.error</function> and
     <function>plpy.fatal</function>, respectively.
     The other functions only generate messages of different
--- 1341,1360 ----
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.log(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.info(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.notice(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.warning(<replaceable>exception_params</>)</literal>,
!    <literal>plpy.error(<replaceable>exception_params</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>exception_params</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
     the current transaction or subtransaction to be aborted.
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
!    partial equivalent to calling
     <function>plpy.error</function> and
     <function>plpy.fatal</function>, respectively.
     The other functions only generate messages of different
*************** $$ LANGUAGE plpythonu;
*** 1367,1372 ****
--- 1367,1397 ----
    </para>
  
    <para>
+ 
+    The <replaceable>exception_params</> are
+    <literal>[ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]]</literal>.
+    These parameters kan be entered as keyword parameters.
+    The <replaceable>message</replaceable>, <replaceable>detail</replaceable>, <replaceable>hint</replaceable>
+    are automaticly casted to string, other should be string.
+ 
+ <programlisting>
+ 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 &lt;module&gt;
+     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
+ </programlisting>
+   </para>
+ 
+   <para>
     Another set of utility functions are
     <literal>plpy.quote_literal(<replaceable>string</>)</literal>,
     <literal>plpy.quote_nullable(<replaceable>string</>)</literal>, 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 <module>
      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 <module>
      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 <module>
+     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();
+ 

From 6ab1d7a8dd1f4df4402c726441bb6f36bb5e2f54 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Thu, 25 Feb 2016 07:02:18 +0100
Subject: [PATCH] Doc improvements

---
 doc/src/sgml/plpython.sgml | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index 7d31342..4ed34d6 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1341,22 +1341,23 @@ $$ LANGUAGE plpythonu;
   <title>Utility Functions</title>
   <para>
    The <literal>plpy</literal> module also provides the functions
-   <literal>plpy.debug(<replaceable>exception_params</>)</literal>,
-   <literal>plpy.log(<replaceable>exception_params</>)</literal>,
-   <literal>plpy.info(<replaceable>exception_params</>)</literal>,
-   <literal>plpy.notice(<replaceable>exception_params</>)</literal>,
-   <literal>plpy.warning(<replaceable>exception_params</>)</literal>,
-   <literal>plpy.error(<replaceable>exception_params</>)</literal>, and
-   <literal>plpy.fatal(<replaceable>exception_params</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
+   <literal>plpy.debug(<replaceable>msg, **kwargs</>)</literal>,
+   <literal>plpy.log(<replaceable>msg, **kwargs</>)</literal>,
+   <literal>plpy.info(<replaceable>msg, **kwargs</>)</literal>,
+   <literal>plpy.notice(<replaceable>msg, **kwargs</>)</literal>,
+   <literal>plpy.warning(<replaceable>msg, **kwargs</>)</literal>,
+   <literal>plpy.error(<replaceable>msg, **kwargs</>)</literal>, and
+   <literal>plpy.fatal(<replaceable>msg, **kwargs</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
    <function>plpy.error</function> and
    <function>plpy.fatal</function> actually raise a Python exception
    which, if uncaught, propagates out to the calling query, causing
    the current transaction or subtransaction to be aborted.
    <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
    <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
-   partial equivalent to calling
-   <function>plpy.error</function> and
-   <function>plpy.fatal</function>, respectively.
+   equivalent to calling
+   <literal>plpy.error(<replaceable>msg</>)</literal> and
+   <literal>plpy.fatal(<replaceable>msg</>)</literal>, respectively but
+   the <literal>raise</literal> form does not allow passing keyword arguments.
    The other functions only generate messages of different
    priority levels.
    Whether messages of a particular priority are reported to the client,
@@ -1368,11 +1369,14 @@ $$ LANGUAGE plpythonu;
 
   <para>
 
-   The <replaceable>exception_params</> are
-   <literal>[ <replaceable>message</replaceable> [, <replaceable>detail</replaceable> [, <replaceable>hint</replaceable> [, <replaceable>sqlstate</replaceable>  [, <replaceable>schema</replaceable>  [, <replaceable>table</replaceable>  [, <replaceable>column</replaceable>  [, <replaceable>datatype</replaceable>  [, <replaceable>constraint</replaceable> ]]]]]]]]]</literal>.
-   These parameters kan be entered as keyword parameters.
-   The <replaceable>message</replaceable>, <replaceable>detail</replaceable>, <replaceable>hint</replaceable>
-   are automaticly casted to string, other should be string.
+   The <replaceable>msg</> argument is given as a positional argument.  For
+   backward compatibility, more than one positional argument can be given. In
+   that case, the string representation of the tuple of positional arguments
+   becomes the message reported to the client.
+   The following keyword-only arguments are accepted:
+   <literal><replaceable>detail</replaceable>, <replaceable>hint</replaceable>, <replaceable>sqlstate</replaceable>, <replaceable>schema</replaceable>, <replaceable>table</replaceable>, <replaceable>column</replaceable>, <replaceable>datatype</replaceable> , <replaceable>constraint</replaceable></literal>.
+   The string representation of the objects passed as keyword-only arguments
+   is used to enrich the messages reported to the client. For example:
 
 <programlisting>
 CREATE FUNCTION raise_custom_exception() RETURNS void AS $$
-- 
2.7.1

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..4ed34d6
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1341,1353 ****
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>msg</>)</literal>,
!    <literal>plpy.log(<replaceable>msg</>)</literal>,
!    <literal>plpy.info(<replaceable>msg</>)</literal>,
!    <literal>plpy.notice(<replaceable>msg</>)</literal>,
!    <literal>plpy.warning(<replaceable>msg</>)</literal>,
!    <literal>plpy.error(<replaceable>msg</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>msg</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
--- 1341,1353 ----
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.log(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.info(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.notice(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.warning(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.error(<replaceable>msg, **kwargs</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>msg, **kwargs</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
*************** $$ LANGUAGE plpythonu;
*** 1355,1362 ****
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
     equivalent to calling
!    <function>plpy.error</function> and
!    <function>plpy.fatal</function>, respectively.
     The other functions only generate messages of different
     priority levels.
     Whether messages of a particular priority are reported to the client,
--- 1355,1363 ----
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
     equivalent to calling
!    <literal>plpy.error(<replaceable>msg</>)</literal> and
!    <literal>plpy.fatal(<replaceable>msg</>)</literal>, respectively but
!    the <literal>raise</literal> form does not allow passing keyword arguments.
     The other functions only generate messages of different
     priority levels.
     Whether messages of a particular priority are reported to the client,
*************** $$ LANGUAGE plpythonu;
*** 1367,1372 ****
--- 1368,1401 ----
    </para>
  
    <para>
+ 
+    The <replaceable>msg</> argument is given as a positional argument.  For
+    backward compatibility, more than one positional argument can be given. In
+    that case, the string representation of the tuple of positional arguments
+    becomes the message reported to the client.
+    The following keyword-only arguments are accepted:
+    <literal><replaceable>detail</replaceable>, <replaceable>hint</replaceable>, <replaceable>sqlstate</replaceable>, <replaceable>schema</replaceable>, <replaceable>table</replaceable>, <replaceable>column</replaceable>, <replaceable>datatype</replaceable> , <replaceable>constraint</replaceable></literal>.
+    The string representation of the objects passed as keyword-only arguments
+    is used to enrich the messages reported to the client. For example:
+ 
+ <programlisting>
+ 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 &lt;module&gt;
+     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
+ </programlisting>
+   </para>
+ 
+   <para>
     Another set of utility functions are
     <literal>plpy.quote_literal(<replaceable>string</>)</literal>,
     <literal>plpy.quote_nullable(<replaceable>string</>)</literal>, 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..c385256
*** 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 <module>
      plpy.error('error')
  PL/Python function "elog_test"
--- 69,255 ----
  WARNING:  warning
  ERROR:  plpy.Error: error
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "elog_test_basic", line 10, in <module>
      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 <module>
+     plpy.error('stop on error', detail = 'some detail', hint = 'some hint')
  PL/Python function "elog_test"
+ do $$ plpy.info('other types', detail = (10,20)) $$ LANGUAGE plpythonu;
+ INFO:  other types
+ DETAIL:  (10, 20)
+ do $$
+ import time;
+ from datetime import date
+ plpy.info('other types', detail = date(2016,2,26))
+ $$ LANGUAGE plpythonu;
+ INFO:  other types
+ DETAIL:  2016-02-26
+ do $$
+ basket = ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
+ plpy.info('other types', detail = basket)
+ $$ LANGUAGE plpythonu;
+ INFO:  other types
+ DETAIL:  ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
+ -- should fail
+ do $$ plpy.info('wrong sqlstate', sqlstate='54444A') $$ LANGUAGE plpythonu;
+ ERROR:  invalid SQLSTATE code
+ CONTEXT:  PL/Python anonymous code block
+ do $$ plpy.info('unsupported argument', blabla='fooboo') $$ LANGUAGE plpythonu;
+ ERROR:  'blabla' is an invalid keyword argument for this function
+ CONTEXT:  PL/Python anonymous code block
+ -- raise exception i n python, handle exception in plgsql
+ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT NULL, _hint text DEFAULT NULL,
+ 						_sqlstate text DEFAULT NULL,
+ 						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
+ 						_datatype text DEFAULT NULL, _constraint text DEFAULT NULL)
+ RETURNS void AS $$
+ kwargs = { "message":_message, "detail":_detail, "hint":_hint,
+ 			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
+ 			"column":_column, "datatype":_datatype, "constraint":_constraint }
+ # ignore None values
+ plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ $$ LANGUAGE plpythonu;
+ SELECT raise_exception('hello', 'world');
+ ERROR:  plpy.Error: hello
+ DETAIL:  world
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "raise_exception", line 6, in <module>
+     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ PL/Python function "raise_exception"
+ SELECT raise_exception('message text', 'detail text', _sqlstate => 'YY333');
+ ERROR:  plpy.Error: message text
+ DETAIL:  detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "raise_exception", line 6, in <module>
+     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ PL/Python function "raise_exception"
+ SELECT raise_exception(_message => 'message text',
+ 						_detail => 'detail text',
+ 						_hint => 'hint text',
+ 						_sqlstate => 'XX555',
+ 						_schema => 'schema text',
+ 						_table => 'table text',
+ 						_column => 'column text',
+ 						_datatype => 'datatype text',
+ 						_constraint => 'constraint text');
+ ERROR:  plpy.Error: message text
+ DETAIL:  detail text
+ HINT:  hint text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "raise_exception", line 6, in <module>
+     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ PL/Python function "raise_exception"
+ SELECT raise_exception(_message => 'message text',
+ 						_hint => 'hint text',
+ 						_schema => 'schema text',
+ 						_column => 'column text',
+ 						_constraint => 'constraint text');
+ ERROR:  plpy.Error: message text
+ HINT:  hint text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "raise_exception", line 6, in <module>
+     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ PL/Python function "raise_exception"
+ DO $$
+ DECLARE
+   __message text;
+   __detail text;
+   __hint text;
+   __sqlstate text;
+   __schema_name text;
+   __table_name text;
+   __column_name text;
+   __datatype text;
+   __constraint text;
+ BEGIN
+   BEGIN
+     PERFORM raise_exception(_message => 'message text',
+                             _detail => 'detail text',
+                             _hint => 'hint text',
+                             _sqlstate => 'XX555',
+                             _schema => 'schema text',
+                             _table => 'table text',
+                             _column => 'column text',
+                             _datatype => 'datatype text',
+                             _constraint => 'constraint text');
+   EXCEPTION WHEN SQLSTATE 'XX555' THEN
+     GET STACKED DIAGNOSTICS __message = MESSAGE_TEXT,
+                             __detail = PG_EXCEPTION_DETAIL,
+                             __hint = PG_EXCEPTION_HINT,
+                             __sqlstate = RETURNED_SQLSTATE,
+                             __schema_name = SCHEMA_NAME,
+                             __table_name = TABLE_NAME,
+                             __column_name = COLUMN_NAME,
+                             __datatype = PG_DATATYPE_NAME,
+                             __constraint = CONSTRAINT_NAME;
+     RAISE NOTICE 'handled exception'
+        USING DETAIL = format('message:(%s), detail:(%s), hint: (%s), sqlstate: (%s), '
+                              'schema:(%s), table:(%s), column:(%s), datatype:(%s), constraint:(%s)',
+                              __message, __detail, __hint, __sqlstate, __schema_name,
+                              __table_name, __column_name, __datatype, __constraint);
+   END;
+ END;
+ $$;
+ NOTICE:  handled exception
+ DETAIL:  message:(plpy.Error: message text), detail:(detail text), hint: (hint text), sqlstate: (XX555), schema:(schema text), table:(table text), column:(column text), datatype:(datatype text), constraint:(constraint text)
+ -- the displayed context is different between Python2 and Python3,
+ -- but for this test is not important.
+ \set SHOW_CONTEXT never
+ do $$
+ try:
+ 	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table=> 'users_tab', _datatype => 'user_type')")
+ except Exception as e:
+ 	plpy.info(e.spidata)
+ 	raise e
+ $$ LANGUAGE plpythonu;
+ INFO:  (119577128, None, 'some hint', None, 0, None, 'users_tab', None, 'user_type', None)
+ ERROR:  plpy.SPIError: plpy.Error: my message
+ HINT:  some hint
+ do $$
+ try:
+   plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
+ except Exception as e:
+   plpy.info('sqlstate: {0}, hint: {1}, tablename: {2}, datatype: {3}'.format(e.sqlstate, e.hint, e.table_name, e.datatype_name))
+   raise e
+ $$ LANGUAGE plpythonu;
+ INFO:  sqlstate: XX987, hint: some hint, tablename: users_tab, datatype: user_type
+ ERROR:  plpy.Error: my message
+ HINT:  some hint
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..7554840
*** 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,39 ----
  
  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 **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 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;
  	}
--- 59,81 ----
  	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,
! 						&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();
  	{
--- 122,133 ----
  				 (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_traceback(char **xmsg, char **tbmsg,
*** 340,346 ****
   * Extract error code from SPIError's sqlstate attribute.
   */
  static void
! PLy_get_spi_sqlerrcode(PyObject *exc, int *sqlerrcode)
  {
  	PyObject   *sqlstate;
  	char	   *buffer;
--- 364,370 ----
   * Extract error code from SPIError's sqlstate attribute.
   */
  static void
! PLy_get_sqlerrcode(PyObject *exc, int *sqlerrcode)
  {
  	PyObject   *sqlstate;
  	char	   *buffer;
*************** 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;
  
--- 384,397 ----
  	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
  	{
--- 399,407 ----
  
  	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
*** 381,387 ****
  		 * If there's no spidata, at least set the sqlerrcode. This can happen
  		 * if someone explicitly raises a SPI exception from Python code.
  		 */
! 		PLy_get_spi_sqlerrcode(exc, sqlerrcode);
  	}
  
  	PyErr_Clear();
--- 409,415 ----
  		 * If there's no spidata, at least set the sqlerrcode. This can happen
  		 * if someone explicitly raises a SPI exception from Python code.
  		 */
! 		PLy_get_sqlerrcode(exc, sqlerrcode);
  	}
  
  	PyErr_Clear();
*************** PLy_get_spi_error_data(PyObject *exc, in
*** 390,395 ****
--- 418,446 ----
  }
  
  /*
+  * Extract the error data from an Error.
+  * Note: position and query fields are not used in Python Error exception ever.
+  */
+ static void
+ PLy_get_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hint,
+ 			char **schema_name, char **table_name, char **column_name,
+ 			char **datatype_name, char **constraint_name)
+ {
+ 	PLy_get_sqlerrcode(exc, sqlerrcode);
+ 
+ 	get_string_attr(exc, "detail", detail);
+ 	get_string_attr(exc, "hint", hint);
+ 	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 ****
--- 515,634 ----
  
  	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");
+ }
+ 
+ /* get string value of 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 = pstrdup(PyString_AsString(val));
+ 	}
+ 	Py_XDECREF(val);
+ }
+ 
+ /* set a string field of object, returns true when the change was success */
+ 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..0ad8611
*** 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(volatile int level, PyObject *self,
! 										  PyObject *args, PyObject *kw);
  
  static PyObject *
! PLy_debug(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(DEBUG2, self, args, kw);
  }
  
  static PyObject *
! PLy_log(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(LOG, self, args, kw);
  }
  
  static PyObject *
! PLy_info(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(INFO, self, args, kw);
  }
  
  static PyObject *
! PLy_notice(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(NOTICE, self, args, kw);
  }
  
  static PyObject *
! PLy_warning(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(WARNING, self, args, kw);
  }
  
  static PyObject *
! PLy_error(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(ERROR, self, args, kw);
  }
  
  static PyObject *
! PLy_fatal(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(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,413 ----
  	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)
+ 		{
+ 			char *str;
+ 
+ 			str = pstrdup(PyString_AsString(so));
+ 			Py_DECREF(so);
+ 
+ 			return str;
+ 		}
+ 	}
+ 
+ 	return NULL;
+ }
+ 
  static PyObject *
! PLy_output(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,428 ****
  	}
  	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
  	 */
--- 423,533 ----
  	}
  	else
  		so = PyObject_Str(args);
! 
! 	if (so == NULL || ((message = pstrdup(PyString_AsString(so))) == NULL))
  	{
  		level = ERROR;
! 		message = dgettext(TEXTDOMAIN, "could not parse error message in plpy.elog");
! 	}
! 
! 	Py_XDECREF(so);
! 
! 	if (kw != NULL)
! 	{
! 		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);
  
  		return NULL;
  	}
  	PG_END_TRY();
  
  	/*
  	 * return a legal object so the interpreter will continue on its merry way
  	 */
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index 58e78ec..6cdbd23
*** a/src/pl/plpython/plpy_spi.c
--- b/src/pl/plpython/plpy_spi.c
*************** PLy_spi_subtransaction_abort(MemoryConte
*** 536,543 ****
  	/* Look up the correct exception */
  	entry = hash_search(PLy_spi_exceptions, &(edata->sqlerrcode),
  						HASH_FIND, NULL);
! 	/* We really should find it, but just in case have a fallback */
! 	Assert(entry != NULL);
  	exc = entry ? entry->exc : PLy_exc_spi_error;
  	/* Make Python raise the exception */
  	PLy_spi_exception_set(exc, edata);
--- 536,542 ----
  	/* Look up the correct exception */
  	entry = hash_search(PLy_spi_exceptions, &(edata->sqlerrcode),
  						HASH_FIND, NULL);
! 	/* Now, the exception with custom code can come */
  	exc = entry ? entry->exc : PLy_exc_spi_error;
  	/* Make Python raise the exception */
  	PLy_spi_exception_set(exc, edata);
*************** 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;
  
--- 563,572 ----
  	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..6f59cab
*** 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,184 ----
  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();
+ 
+ do $$ plpy.info('other types', detail = (10,20)) $$ LANGUAGE plpythonu;
+ 
+ do $$
+ import time;
+ from datetime import date
+ plpy.info('other types', detail = date(2016,2,26))
+ $$ LANGUAGE plpythonu;
+ 
+ do $$
+ basket = ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
+ plpy.info('other types', detail = basket)
+ $$ LANGUAGE plpythonu;
+ 
+ -- should fail
+ do $$ plpy.info('wrong sqlstate', sqlstate='54444A') $$ LANGUAGE plpythonu;
+ do $$ plpy.info('unsupported argument', blabla='fooboo') $$ LANGUAGE plpythonu;
+ 
+ -- raise exception i n python, handle exception in plgsql
+ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT NULL, _hint text DEFAULT NULL,
+ 						_sqlstate text DEFAULT NULL,
+ 						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
+ 						_datatype text DEFAULT NULL, _constraint text DEFAULT NULL)
+ RETURNS void AS $$
+ kwargs = { "message":_message, "detail":_detail, "hint":_hint,
+ 			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
+ 			"column":_column, "datatype":_datatype, "constraint":_constraint }
+ # ignore None values
+ plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ $$ LANGUAGE plpythonu;
+ 
+ SELECT raise_exception('hello', 'world');
+ SELECT raise_exception('message text', 'detail text', _sqlstate => 'YY333');
+ SELECT raise_exception(_message => 'message text',
+ 						_detail => 'detail text',
+ 						_hint => 'hint text',
+ 						_sqlstate => 'XX555',
+ 						_schema => 'schema text',
+ 						_table => 'table text',
+ 						_column => 'column text',
+ 						_datatype => 'datatype text',
+ 						_constraint => 'constraint text');
+ 
+ SELECT raise_exception(_message => 'message text',
+ 						_hint => 'hint text',
+ 						_schema => 'schema text',
+ 						_column => 'column text',
+ 						_constraint => 'constraint text');
+ 
+ DO $$
+ DECLARE
+   __message text;
+   __detail text;
+   __hint text;
+   __sqlstate text;
+   __schema_name text;
+   __table_name text;
+   __column_name text;
+   __datatype text;
+   __constraint text;
+ BEGIN
+   BEGIN
+     PERFORM raise_exception(_message => 'message text',
+                             _detail => 'detail text',
+                             _hint => 'hint text',
+                             _sqlstate => 'XX555',
+                             _schema => 'schema text',
+                             _table => 'table text',
+                             _column => 'column text',
+                             _datatype => 'datatype text',
+                             _constraint => 'constraint text');
+   EXCEPTION WHEN SQLSTATE 'XX555' THEN
+     GET STACKED DIAGNOSTICS __message = MESSAGE_TEXT,
+                             __detail = PG_EXCEPTION_DETAIL,
+                             __hint = PG_EXCEPTION_HINT,
+                             __sqlstate = RETURNED_SQLSTATE,
+                             __schema_name = SCHEMA_NAME,
+                             __table_name = TABLE_NAME,
+                             __column_name = COLUMN_NAME,
+                             __datatype = PG_DATATYPE_NAME,
+                             __constraint = CONSTRAINT_NAME;
+     RAISE NOTICE 'handled exception'
+        USING DETAIL = format('message:(%s), detail:(%s), hint: (%s), sqlstate: (%s), '
+                              'schema:(%s), table:(%s), column:(%s), datatype:(%s), constraint:(%s)',
+                              __message, __detail, __hint, __sqlstate, __schema_name,
+                              __table_name, __column_name, __datatype, __constraint);
+   END;
+ END;
+ $$;
+ 
+ -- the displayed context is different between Python2 and Python3,
+ -- but for this test is not important.
+ \set SHOW_CONTEXT never
+ 
+ do $$
+ try:
+ 	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table=> 'users_tab', _datatype => 'user_type')")
+ except Exception as e:
+ 	plpy.info(e.spidata)
+ 	raise e
+ $$ LANGUAGE plpythonu;
+ 
+ do $$
+ try:
+   plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
+ except Exception as e:
+   plpy.info('sqlstate: {0}, hint: {1}, tablename: {2}, datatype: {3}'.format(e.sqlstate, e.hint, e.table_name, e.datatype_name))
+   raise e
+ $$ LANGUAGE plpythonu;

From 3f2493554c5575b06ffab2eee379cde86eacbbd3 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Mon, 29 Feb 2016 07:10:41 +0100
Subject: [PATCH 1/5] Comment improvements

---
 src/pl/plpython/expected/plpython_test.out | 4 ++--
 src/pl/plpython/plpy_spi.c                 | 4 +++-
 src/pl/plpython/sql/plpython_test.sql      | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
index c385256..4817022 100644
--- a/src/pl/plpython/expected/plpython_test.out
+++ b/src/pl/plpython/expected/plpython_test.out
@@ -135,7 +135,7 @@ CONTEXT:  PL/Python anonymous code block
 do $$ plpy.info('unsupported argument', blabla='fooboo') $$ LANGUAGE plpythonu;
 ERROR:  'blabla' is an invalid keyword argument for this function
 CONTEXT:  PL/Python anonymous code block
--- raise exception i n python, handle exception in plgsql
+-- raise exception in python, handle exception in plgsql
 CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT NULL, _hint text DEFAULT NULL,
 						_sqlstate text DEFAULT NULL,
 						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
@@ -231,7 +231,7 @@ $$;
 NOTICE:  handled exception
 DETAIL:  message:(plpy.Error: message text), detail:(detail text), hint: (hint text), sqlstate: (XX555), schema:(schema text), table:(table text), column:(column text), datatype:(datatype text), constraint:(constraint text)
 -- the displayed context is different between Python2 and Python3,
--- but for this test is not important.
+-- but that's not important for this test
 \set SHOW_CONTEXT never
 do $$
 try:
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index 6cdbd23..2d9892f 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -536,7 +536,9 @@ PLy_spi_subtransaction_abort(MemoryContext oldcontext, ResourceOwner oldowner)
 	/* Look up the correct exception */
 	entry = hash_search(PLy_spi_exceptions, &(edata->sqlerrcode),
 						HASH_FIND, NULL);
-	/* Now, the exception with custom code can come */
+	/* This could be a custom error code, if that's the case fallback to
+	 * SPIError
+	 */
 	exc = entry ? entry->exc : PLy_exc_spi_error;
 	/* Make Python raise the exception */
 	PLy_spi_exception_set(exc, edata);
diff --git a/src/pl/plpython/sql/plpython_test.sql b/src/pl/plpython/sql/plpython_test.sql
index 6f59cab..5b39330 100644
--- a/src/pl/plpython/sql/plpython_test.sql
+++ b/src/pl/plpython/sql/plpython_test.sql
@@ -91,7 +91,7 @@ $$ LANGUAGE plpythonu;
 do $$ plpy.info('wrong sqlstate', sqlstate='54444A') $$ LANGUAGE plpythonu;
 do $$ plpy.info('unsupported argument', blabla='fooboo') $$ LANGUAGE plpythonu;
 
--- raise exception i n python, handle exception in plgsql
+-- raise exception in python, handle exception in plgsql
 CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT NULL, _hint text DEFAULT NULL,
 						_sqlstate text DEFAULT NULL,
 						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
@@ -164,7 +164,7 @@ END;
 $$;
 
 -- the displayed context is different between Python2 and Python3,
--- but for this test is not important.
+-- but that's not important for this test
 \set SHOW_CONTEXT never
 
 do $$
-- 
2.7.1

From ff7d51361044330d98188527eb9d7b1a10b5e1c3 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Mon, 29 Feb 2016 07:20:11 +0100
Subject: [PATCH 2/5] Fix tests for Python 2.4

format doesn't exist so use % formatting and use the old except syntax
regress-python3-mangle.mk automatically transforms these into
Exception as e for Python3
---
 src/pl/plpython/expected/plpython_test.out | 6 +++---
 src/pl/plpython/sql/plpython_test.sql      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
index 4817022..8a55ee2 100644
--- a/src/pl/plpython/expected/plpython_test.out
+++ b/src/pl/plpython/expected/plpython_test.out
@@ -236,7 +236,7 @@ DETAIL:  message:(plpy.Error: message text), detail:(detail text), hint: (hint t
 do $$
 try:
 	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table=> 'users_tab', _datatype => 'user_type')")
-except Exception as e:
+except Exception, e:
 	plpy.info(e.spidata)
 	raise e
 $$ LANGUAGE plpythonu;
@@ -246,8 +246,8 @@ HINT:  some hint
 do $$
 try:
   plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
-except Exception as e:
-  plpy.info('sqlstate: {0}, hint: {1}, tablename: {2}, datatype: {3}'.format(e.sqlstate, e.hint, e.table_name, e.datatype_name))
+except Exception, e:
+  plpy.info('sqlstate: %s, hint: %s, tablename: %s, datatype: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
   raise e
 $$ LANGUAGE plpythonu;
 INFO:  sqlstate: XX987, hint: some hint, tablename: users_tab, datatype: user_type
diff --git a/src/pl/plpython/sql/plpython_test.sql b/src/pl/plpython/sql/plpython_test.sql
index 5b39330..9bbeb34 100644
--- a/src/pl/plpython/sql/plpython_test.sql
+++ b/src/pl/plpython/sql/plpython_test.sql
@@ -170,7 +170,7 @@ $$;
 do $$
 try:
 	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table=> 'users_tab', _datatype => 'user_type')")
-except Exception as e:
+except Exception, e:
 	plpy.info(e.spidata)
 	raise e
 $$ LANGUAGE plpythonu;
@@ -178,7 +178,7 @@ $$ LANGUAGE plpythonu;
 do $$
 try:
   plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
-except Exception as e:
-  plpy.info('sqlstate: {0}, hint: {1}, tablename: {2}, datatype: {3}'.format(e.sqlstate, e.hint, e.table_name, e.datatype_name))
+except Exception, e:
+  plpy.info('sqlstate: %s, hint: %s, tablename: %s, datatype: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
   raise e
 $$ LANGUAGE plpythonu;
-- 
2.7.1

From ae42652add3d9fa4aee64c2cb77fbde206ee87e4 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Mon, 29 Feb 2016 07:28:05 +0100
Subject: [PATCH 3/5] Pass message only as positional argument

---
 src/pl/plpython/expected/plpython_test.out | 14 +++++++-------
 src/pl/plpython/plpy_plpymodule.c          |  4 +---
 src/pl/plpython/sql/plpython_test.sql      |  6 +++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
index 8a55ee2..83e4fc6 100644
--- a/src/pl/plpython/expected/plpython_test.out
+++ b/src/pl/plpython/expected/plpython_test.out
@@ -141,25 +141,25 @@ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT N
 						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
 						_datatype text DEFAULT NULL, _constraint text DEFAULT NULL)
 RETURNS void AS $$
-kwargs = { "message":_message, "detail":_detail, "hint":_hint,
+kwargs = { "detail":_detail, "hint":_hint,
 			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
 			"column":_column, "datatype":_datatype, "constraint":_constraint }
 # ignore None values
-plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+plpy.error(_message, **dict((k, v) for k, v in iter(kwargs.items()) if v))
 $$ LANGUAGE plpythonu;
 SELECT raise_exception('hello', 'world');
 ERROR:  plpy.Error: hello
 DETAIL:  world
 CONTEXT:  Traceback (most recent call last):
   PL/Python function "raise_exception", line 6, in <module>
-    plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+    plpy.error(_message, **dict((k, v) for k, v in iter(kwargs.items()) if v))
 PL/Python function "raise_exception"
 SELECT raise_exception('message text', 'detail text', _sqlstate => 'YY333');
 ERROR:  plpy.Error: message text
 DETAIL:  detail text
 CONTEXT:  Traceback (most recent call last):
   PL/Python function "raise_exception", line 6, in <module>
-    plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+    plpy.error(_message, **dict((k, v) for k, v in iter(kwargs.items()) if v))
 PL/Python function "raise_exception"
 SELECT raise_exception(_message => 'message text',
 						_detail => 'detail text',
@@ -175,7 +175,7 @@ DETAIL:  detail text
 HINT:  hint text
 CONTEXT:  Traceback (most recent call last):
   PL/Python function "raise_exception", line 6, in <module>
-    plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+    plpy.error(_message, **dict((k, v) for k, v in iter(kwargs.items()) if v))
 PL/Python function "raise_exception"
 SELECT raise_exception(_message => 'message text',
 						_hint => 'hint text',
@@ -186,7 +186,7 @@ ERROR:  plpy.Error: message text
 HINT:  hint text
 CONTEXT:  Traceback (most recent call last):
   PL/Python function "raise_exception", line 6, in <module>
-    plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+    plpy.error(_message, **dict((k, v) for k, v in iter(kwargs.items()) if v))
 PL/Python function "raise_exception"
 DO $$
 DECLARE
@@ -245,7 +245,7 @@ ERROR:  plpy.SPIError: plpy.Error: my message
 HINT:  some hint
 do $$
 try:
-  plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
+  plpy.error('my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
 except Exception, e:
   plpy.info('sqlstate: %s, hint: %s, tablename: %s, datatype: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
   raise e
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index 0ad8611..6573778 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -438,9 +438,7 @@ PLy_output(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
 		{
 			char *keyword = PyString_AsString(key);
 
-			if (strcmp(keyword, "message") == 0)
-				message = object_to_string(value);
-			else if (strcmp(keyword, "detail") == 0)
+			if (strcmp(keyword, "detail") == 0)
 				detail = object_to_string(value);
 			else if (strcmp(keyword, "hint") == 0)
 				hint = object_to_string(value);
diff --git a/src/pl/plpython/sql/plpython_test.sql b/src/pl/plpython/sql/plpython_test.sql
index 9bbeb34..d56a635 100644
--- a/src/pl/plpython/sql/plpython_test.sql
+++ b/src/pl/plpython/sql/plpython_test.sql
@@ -97,11 +97,11 @@ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT N
 						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
 						_datatype text DEFAULT NULL, _constraint text DEFAULT NULL)
 RETURNS void AS $$
-kwargs = { "message":_message, "detail":_detail, "hint":_hint,
+kwargs = { "detail":_detail, "hint":_hint,
 			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
 			"column":_column, "datatype":_datatype, "constraint":_constraint }
 # ignore None values
-plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+plpy.error(_message, **dict((k, v) for k, v in iter(kwargs.items()) if v))
 $$ LANGUAGE plpythonu;
 
 SELECT raise_exception('hello', 'world');
@@ -177,7 +177,7 @@ $$ LANGUAGE plpythonu;
 
 do $$
 try:
-  plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
+  plpy.error('my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
 except Exception, e:
   plpy.info('sqlstate: %s, hint: %s, tablename: %s, datatype: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
   raise e
-- 
2.7.1

From 8fb4510e426b9635b47e97dfcddb0b174da12128 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Mon, 29 Feb 2016 07:29:37 +0100
Subject: [PATCH 4/5] Get rid of setting unused "position"

We can then also remove the unused for anything else set_int_attr
---
 src/pl/plpython/plpy_elog.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index 7554840..a92c291 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -33,7 +33,6 @@ static char *get_source_line(const char *src, int lineno);
 
 static void get_string_attr(PyObject *obj, char *attrname, char **str);
 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
@@ -545,9 +544,6 @@ PLy_exception_set_with_details(PyObject *excclass, ErrorData *edata)
 	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;
 
@@ -616,19 +612,3 @@ set_string_attr(PyObject *obj, char *attrname, char *str)
 	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;
-}
-- 
2.7.1

From 6a9e774f87ac4077aeef1cbfd9781e7e773a88a8 Mon Sep 17 00:00:00 2001
From: Catalin Iacob <iacobcatalin@gmail.com>
Date: Mon, 29 Feb 2016 17:10:09 +0100
Subject: [PATCH 5/5] Improve comments

---
 src/pl/plpython/plpy_elog.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index a92c291..8e8db5d 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -418,7 +418,8 @@ PLy_get_spi_error_data(PyObject *exc, int *sqlerrcode, char **detail,
 
 /*
  * Extract the error data from an Error.
- * Note: position and query fields are not used in Python Error exception ever.
+ * Note: position and query attributes are never set for Error so, unlike
+ * PLy_get_spi_error_data, this function doesn't return them.
  */
 static void
 PLy_get_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hint,
@@ -515,7 +516,7 @@ PLy_exception_set_plural(PyObject *exc,
 	PyErr_SetString(exc, buf);
 }
 
-/* set exceptions from an ErrorData */
+/* set attributes of the given exception to details from ErrorData */
 void
 PLy_exception_set_with_details(PyObject *excclass, ErrorData *edata)
 {
@@ -573,7 +574,7 @@ failure:
 	elog(ERROR, "could not convert error to Python exception");
 }
 
-/* get string value of object field */
+/* get string value of an object attribute */
 static void
 get_string_attr(PyObject *obj, char *attrname, char **str)
 {
@@ -587,7 +588,9 @@ get_string_attr(PyObject *obj, char *attrname, char **str)
 	Py_XDECREF(val);
 }
 
-/* set a string field of object, returns true when the change was success */
+/* set an object attribute to a string value, returns true when the set was
+ * successful
+ */
 static bool
 set_string_attr(PyObject *obj, char *attrname, char *str)
 {
-- 
2.7.1

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
new file mode 100644
index 015bbad..4ed34d6
*** a/doc/src/sgml/plpython.sgml
--- b/doc/src/sgml/plpython.sgml
*************** $$ LANGUAGE plpythonu;
*** 1341,1353 ****
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>msg</>)</literal>,
!    <literal>plpy.log(<replaceable>msg</>)</literal>,
!    <literal>plpy.info(<replaceable>msg</>)</literal>,
!    <literal>plpy.notice(<replaceable>msg</>)</literal>,
!    <literal>plpy.warning(<replaceable>msg</>)</literal>,
!    <literal>plpy.error(<replaceable>msg</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>msg</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
--- 1341,1353 ----
    <title>Utility Functions</title>
    <para>
     The <literal>plpy</literal> module also provides the functions
!    <literal>plpy.debug(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.log(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.info(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.notice(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.warning(<replaceable>msg, **kwargs</>)</literal>,
!    <literal>plpy.error(<replaceable>msg, **kwargs</>)</literal>, and
!    <literal>plpy.fatal(<replaceable>msg, **kwargs</>)</literal>.<indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
     <function>plpy.error</function> and
     <function>plpy.fatal</function> actually raise a Python exception
     which, if uncaught, propagates out to the calling query, causing
*************** $$ LANGUAGE plpythonu;
*** 1355,1362 ****
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
     equivalent to calling
!    <function>plpy.error</function> and
!    <function>plpy.fatal</function>, respectively.
     The other functions only generate messages of different
     priority levels.
     Whether messages of a particular priority are reported to the client,
--- 1355,1363 ----
     <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
     <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
     equivalent to calling
!    <literal>plpy.error(<replaceable>msg</>)</literal> and
!    <literal>plpy.fatal(<replaceable>msg</>)</literal>, respectively but
!    the <literal>raise</literal> form does not allow passing keyword arguments.
     The other functions only generate messages of different
     priority levels.
     Whether messages of a particular priority are reported to the client,
*************** $$ LANGUAGE plpythonu;
*** 1367,1372 ****
--- 1368,1401 ----
    </para>
  
    <para>
+ 
+    The <replaceable>msg</> argument is given as a positional argument.  For
+    backward compatibility, more than one positional argument can be given. In
+    that case, the string representation of the tuple of positional arguments
+    becomes the message reported to the client.
+    The following keyword-only arguments are accepted:
+    <literal><replaceable>detail</replaceable>, <replaceable>hint</replaceable>, <replaceable>sqlstate</replaceable>, <replaceable>schema</replaceable>, <replaceable>table</replaceable>, <replaceable>column</replaceable>, <replaceable>datatype</replaceable> , <replaceable>constraint</replaceable></literal>.
+    The string representation of the objects passed as keyword-only arguments
+    is used to enrich the messages reported to the client. For example:
+ 
+ <programlisting>
+ 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 &lt;module&gt;
+     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
+ </programlisting>
+   </para>
+ 
+   <para>
     Another set of utility functions are
     <literal>plpy.quote_literal(<replaceable>string</>)</literal>,
     <literal>plpy.quote_nullable(<replaceable>string</>)</literal>, 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..05caba1
*** 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 <module>
      plpy.error('error')
  PL/Python function "elog_test"
--- 69,261 ----
  WARNING:  warning
  ERROR:  plpy.Error: error
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "elog_test_basic", line 10, in <module>
      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 <module>
+     plpy.error('stop on error', detail = 'some detail', hint = 'some hint')
  PL/Python function "elog_test"
+ do $$ plpy.info('other types', detail = (10,20)) $$ LANGUAGE plpythonu;
+ INFO:  other types
+ DETAIL:  (10, 20)
+ do $$
+ import time;
+ from datetime import date
+ plpy.info('other types', detail = date(2016,2,26))
+ $$ LANGUAGE plpythonu;
+ INFO:  other types
+ DETAIL:  2016-02-26
+ do $$
+ basket = ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
+ plpy.info('other types', detail = basket)
+ $$ LANGUAGE plpythonu;
+ INFO:  other types
+ DETAIL:  ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
+ -- should fail
+ do $$ plpy.info('wrong sqlstate', sqlstate='54444A') $$ LANGUAGE plpythonu;
+ ERROR:  invalid SQLSTATE code
+ CONTEXT:  PL/Python anonymous code block
+ do $$ plpy.info('unsupported argument', blabla='fooboo') $$ LANGUAGE plpythonu;
+ ERROR:  'blabla' is an invalid keyword argument for this function
+ CONTEXT:  PL/Python anonymous code block
+ do $$ plpy.info('first message', message='second message') $$ LANGUAGE plpythonu;
+ ERROR:  the message is already specified
+ CONTEXT:  PL/Python anonymous code block
+ do $$ plpy.info('first message', 'second message', message='third message') $$ LANGUAGE plpythonu;
+ ERROR:  the message is already specified
+ CONTEXT:  PL/Python anonymous code block
+ -- raise exception in python, handle exception in plgsql
+ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT NULL, _hint text DEFAULT NULL,
+ 						_sqlstate text DEFAULT NULL,
+ 						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
+ 						_datatype text DEFAULT NULL, _constraint text DEFAULT NULL)
+ RETURNS void AS $$
+ kwargs = { "message":_message, "detail":_detail, "hint":_hint,
+ 			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
+ 			"column":_column, "datatype":_datatype, "constraint":_constraint }
+ # ignore None values
+ plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ $$ LANGUAGE plpythonu;
+ SELECT raise_exception('hello', 'world');
+ ERROR:  plpy.Error: hello
+ DETAIL:  world
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "raise_exception", line 6, in <module>
+     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ PL/Python function "raise_exception"
+ SELECT raise_exception('message text', 'detail text', _sqlstate => 'YY333');
+ ERROR:  plpy.Error: message text
+ DETAIL:  detail text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "raise_exception", line 6, in <module>
+     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ PL/Python function "raise_exception"
+ SELECT raise_exception(_message => 'message text',
+ 						_detail => 'detail text',
+ 						_hint => 'hint text',
+ 						_sqlstate => 'XX555',
+ 						_schema => 'schema text',
+ 						_table => 'table text',
+ 						_column => 'column text',
+ 						_datatype => 'datatype text',
+ 						_constraint => 'constraint text');
+ ERROR:  plpy.Error: message text
+ DETAIL:  detail text
+ HINT:  hint text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "raise_exception", line 6, in <module>
+     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ PL/Python function "raise_exception"
+ SELECT raise_exception(_message => 'message text',
+ 						_hint => 'hint text',
+ 						_schema => 'schema text',
+ 						_column => 'column text',
+ 						_constraint => 'constraint text');
+ ERROR:  plpy.Error: message text
+ HINT:  hint text
+ CONTEXT:  Traceback (most recent call last):
+   PL/Python function "raise_exception", line 6, in <module>
+     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ PL/Python function "raise_exception"
+ DO $$
+ DECLARE
+   __message text;
+   __detail text;
+   __hint text;
+   __sqlstate text;
+   __schema_name text;
+   __table_name text;
+   __column_name text;
+   __datatype text;
+   __constraint text;
+ BEGIN
+   BEGIN
+     PERFORM raise_exception(_message => 'message text',
+                             _detail => 'detail text',
+                             _hint => 'hint text',
+                             _sqlstate => 'XX555',
+                             _schema => 'schema text',
+                             _table => 'table text',
+                             _column => 'column text',
+                             _datatype => 'datatype text',
+                             _constraint => 'constraint text');
+   EXCEPTION WHEN SQLSTATE 'XX555' THEN
+     GET STACKED DIAGNOSTICS __message = MESSAGE_TEXT,
+                             __detail = PG_EXCEPTION_DETAIL,
+                             __hint = PG_EXCEPTION_HINT,
+                             __sqlstate = RETURNED_SQLSTATE,
+                             __schema_name = SCHEMA_NAME,
+                             __table_name = TABLE_NAME,
+                             __column_name = COLUMN_NAME,
+                             __datatype = PG_DATATYPE_NAME,
+                             __constraint = CONSTRAINT_NAME;
+     RAISE NOTICE 'handled exception'
+        USING DETAIL = format('message:(%s), detail:(%s), hint: (%s), sqlstate: (%s), '
+                              'schema:(%s), table:(%s), column:(%s), datatype:(%s), constraint:(%s)',
+                              __message, __detail, __hint, __sqlstate, __schema_name,
+                              __table_name, __column_name, __datatype, __constraint);
+   END;
+ END;
+ $$;
+ NOTICE:  handled exception
+ DETAIL:  message:(plpy.Error: message text), detail:(detail text), hint: (hint text), sqlstate: (XX555), schema:(schema text), table:(table text), column:(column text), datatype:(datatype text), constraint:(constraint text)
+ -- the displayed context is different between Python2 and Python3,
+ -- but that's not important for this test
+ \set SHOW_CONTEXT never
+ do $$
+ try:
+ 	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table=> 'users_tab', _datatype => 'user_type')")
+ except Exception, e:
+ 	plpy.info(e.spidata)
+ 	raise e
+ $$ LANGUAGE plpythonu;
+ INFO:  (119577128, None, 'some hint', None, 0, None, 'users_tab', None, 'user_type', None)
+ ERROR:  plpy.SPIError: plpy.Error: my message
+ HINT:  some hint
+ do $$
+ try:
+   plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
+ except Exception, e:
+   plpy.info('sqlstate: %s, hint: %s, tablename: %s, datatype: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
+   raise e
+ $$ LANGUAGE plpythonu;
+ INFO:  sqlstate: XX987, hint: some hint, tablename: users_tab, datatype: user_type
+ ERROR:  plpy.Error: my message
+ HINT:  some hint
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
new file mode 100644
index 15406d6..8e8db5d
*** 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,38 ----
  
  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 **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 bool set_string_attr(PyObject *obj, char *attrname, char *str);
  
  /*
   * 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;
  	}
--- 58,80 ----
  	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,
! 						&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();
  	{
--- 121,132 ----
  				 (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_traceback(char **xmsg, char **tbmsg,
*** 340,346 ****
   * Extract error code from SPIError's sqlstate attribute.
   */
  static void
! PLy_get_spi_sqlerrcode(PyObject *exc, int *sqlerrcode)
  {
  	PyObject   *sqlstate;
  	char	   *buffer;
--- 363,369 ----
   * Extract error code from SPIError's sqlstate attribute.
   */
  static void
! PLy_get_sqlerrcode(PyObject *exc, int *sqlerrcode)
  {
  	PyObject   *sqlstate;
  	char	   *buffer;
*************** 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;
  
--- 383,396 ----
  	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
  	{
--- 398,406 ----
  
  	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
*** 381,387 ****
  		 * If there's no spidata, at least set the sqlerrcode. This can happen
  		 * if someone explicitly raises a SPI exception from Python code.
  		 */
! 		PLy_get_spi_sqlerrcode(exc, sqlerrcode);
  	}
  
  	PyErr_Clear();
--- 408,414 ----
  		 * If there's no spidata, at least set the sqlerrcode. This can happen
  		 * if someone explicitly raises a SPI exception from Python code.
  		 */
! 		PLy_get_sqlerrcode(exc, sqlerrcode);
  	}
  
  	PyErr_Clear();
*************** PLy_get_spi_error_data(PyObject *exc, in
*** 390,395 ****
--- 417,446 ----
  }
  
  /*
+  * Extract the error data from an Error.
+  * Note: position and query attributes are never set for Error so, unlike
+  * PLy_get_spi_error_data, this function doesn't return them.
+  */
+ static void
+ PLy_get_error_data(PyObject *exc, int *sqlerrcode, char **detail, char **hint,
+ 			char **schema_name, char **table_name, char **column_name,
+ 			char **datatype_name, char **constraint_name)
+ {
+ 	PLy_get_sqlerrcode(exc, sqlerrcode);
+ 
+ 	get_string_attr(exc, "detail", detail);
+ 	get_string_attr(exc, "hint", hint);
+ 	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 ****
--- 515,617 ----
  
  	PyErr_SetString(exc, buf);
  }
+ 
+ /* set attributes of the given exception to details from 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_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");
+ }
+ 
+ /* get string value of an object attribute */
+ 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 = pstrdup(PyString_AsString(val));
+ 	}
+ 	Py_XDECREF(val);
+ }
+ 
+ /* set an object attribute to a string value, returns true when the set was
+  * successful
+  */
+ 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;
+ }
+ 
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..f136e8e
*** 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(volatile int level, PyObject *self,
! 										  PyObject *args, PyObject *kw);
  
  static PyObject *
! PLy_debug(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(DEBUG2, self, args, kw);
  }
  
  static PyObject *
! PLy_log(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(LOG, self, args, kw);
  }
  
  static PyObject *
! PLy_info(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(INFO, self, args, kw);
  }
  
  static PyObject *
! PLy_notice(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(NOTICE, self, args, kw);
  }
  
  static PyObject *
! PLy_warning(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(WARNING, self, args, kw);
  }
  
  static PyObject *
! PLy_error(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(ERROR, self, args, kw);
  }
  
  static PyObject *
! PLy_fatal(PyObject *self, PyObject *args, PyObject *kw)
  {
! 	return PLy_output(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,413 ----
  	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)
+ 		{
+ 			char *str;
+ 
+ 			str = pstrdup(PyString_AsString(so));
+ 			Py_DECREF(so);
+ 
+ 			return str;
+ 		}
+ 	}
+ 
+ 	return NULL;
+ }
+ 
  static PyObject *
! PLy_output(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,428 ****
  	}
  	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
  	 */
--- 423,540 ----
  	}
  	else
  		so = PyObject_Str(args);
! 
! 	if (so == NULL || ((message = pstrdup(PyString_AsString(so))) == NULL))
  	{
  		level = ERROR;
! 		message = dgettext(TEXTDOMAIN, "could not parse error message in plpy.elog");
! 	}
! 
! 	Py_XDECREF(so);
! 
! 	if (kw != NULL)
! 	{
! 		while (PyDict_Next(kw, &pos, &key, &value))
! 		{
! 			char *keyword = PyString_AsString(key);
! 
! 			if (strcmp(keyword, "message") == 0)
! 			{
! 				/* the message should not be overwriten */
! 				if (PyTuple_Size(args) != 0)
! 					PLy_elog(ERROR, "the message is already specified");
! 
! 				pfree(message);
! 				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);
  
  		return NULL;
  	}
  	PG_END_TRY();
  
  	/*
  	 * return a legal object so the interpreter will continue on its merry way
  	 */
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
new file mode 100644
index 58e78ec..2d9892f
*** a/src/pl/plpython/plpy_spi.c
--- b/src/pl/plpython/plpy_spi.c
*************** PLy_spi_subtransaction_abort(MemoryConte
*** 536,543 ****
  	/* Look up the correct exception */
  	entry = hash_search(PLy_spi_exceptions, &(edata->sqlerrcode),
  						HASH_FIND, NULL);
! 	/* We really should find it, but just in case have a fallback */
! 	Assert(entry != NULL);
  	exc = entry ? entry->exc : PLy_exc_spi_error;
  	/* Make Python raise the exception */
  	PLy_spi_exception_set(exc, edata);
--- 536,544 ----
  	/* Look up the correct exception */
  	entry = hash_search(PLy_spi_exceptions, &(edata->sqlerrcode),
  						HASH_FIND, NULL);
! 	/* This could be a custom error code, if that's the case fallback to
! 	 * SPIError
! 	 */
  	exc = entry ? entry->exc : PLy_exc_spi_error;
  	/* Make Python raise the exception */
  	PLy_spi_exception_set(exc, edata);
*************** 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;
  
--- 565,574 ----
  	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..6e5b535
*** 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,186 ----
  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();
+ 
+ do $$ plpy.info('other types', detail = (10,20)) $$ LANGUAGE plpythonu;
+ 
+ do $$
+ import time;
+ from datetime import date
+ plpy.info('other types', detail = date(2016,2,26))
+ $$ LANGUAGE plpythonu;
+ 
+ do $$
+ basket = ['apple', 'orange', 'apple', 'pear', 'orange', 'banana']
+ plpy.info('other types', detail = basket)
+ $$ LANGUAGE plpythonu;
+ 
+ -- should fail
+ do $$ plpy.info('wrong sqlstate', sqlstate='54444A') $$ LANGUAGE plpythonu;
+ do $$ plpy.info('unsupported argument', blabla='fooboo') $$ LANGUAGE plpythonu;
+ do $$ plpy.info('first message', message='second message') $$ LANGUAGE plpythonu;
+ do $$ plpy.info('first message', 'second message', message='third message') $$ LANGUAGE plpythonu;
+ 
+ -- raise exception in python, handle exception in plgsql
+ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT NULL, _hint text DEFAULT NULL,
+ 						_sqlstate text DEFAULT NULL,
+ 						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
+ 						_datatype text DEFAULT NULL, _constraint text DEFAULT NULL)
+ RETURNS void AS $$
+ kwargs = { "message":_message, "detail":_detail, "hint":_hint,
+ 			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
+ 			"column":_column, "datatype":_datatype, "constraint":_constraint }
+ # ignore None values
+ plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
+ $$ LANGUAGE plpythonu;
+ 
+ SELECT raise_exception('hello', 'world');
+ SELECT raise_exception('message text', 'detail text', _sqlstate => 'YY333');
+ SELECT raise_exception(_message => 'message text',
+ 						_detail => 'detail text',
+ 						_hint => 'hint text',
+ 						_sqlstate => 'XX555',
+ 						_schema => 'schema text',
+ 						_table => 'table text',
+ 						_column => 'column text',
+ 						_datatype => 'datatype text',
+ 						_constraint => 'constraint text');
+ 
+ SELECT raise_exception(_message => 'message text',
+ 						_hint => 'hint text',
+ 						_schema => 'schema text',
+ 						_column => 'column text',
+ 						_constraint => 'constraint text');
+ 
+ DO $$
+ DECLARE
+   __message text;
+   __detail text;
+   __hint text;
+   __sqlstate text;
+   __schema_name text;
+   __table_name text;
+   __column_name text;
+   __datatype text;
+   __constraint text;
+ BEGIN
+   BEGIN
+     PERFORM raise_exception(_message => 'message text',
+                             _detail => 'detail text',
+                             _hint => 'hint text',
+                             _sqlstate => 'XX555',
+                             _schema => 'schema text',
+                             _table => 'table text',
+                             _column => 'column text',
+                             _datatype => 'datatype text',
+                             _constraint => 'constraint text');
+   EXCEPTION WHEN SQLSTATE 'XX555' THEN
+     GET STACKED DIAGNOSTICS __message = MESSAGE_TEXT,
+                             __detail = PG_EXCEPTION_DETAIL,
+                             __hint = PG_EXCEPTION_HINT,
+                             __sqlstate = RETURNED_SQLSTATE,
+                             __schema_name = SCHEMA_NAME,
+                             __table_name = TABLE_NAME,
+                             __column_name = COLUMN_NAME,
+                             __datatype = PG_DATATYPE_NAME,
+                             __constraint = CONSTRAINT_NAME;
+     RAISE NOTICE 'handled exception'
+        USING DETAIL = format('message:(%s), detail:(%s), hint: (%s), sqlstate: (%s), '
+                              'schema:(%s), table:(%s), column:(%s), datatype:(%s), constraint:(%s)',
+                              __message, __detail, __hint, __sqlstate, __schema_name,
+                              __table_name, __column_name, __datatype, __constraint);
+   END;
+ END;
+ $$;
+ 
+ -- the displayed context is different between Python2 and Python3,
+ -- but that's not important for this test
+ \set SHOW_CONTEXT never
+ 
+ do $$
+ try:
+ 	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table=> 'users_tab', _datatype => 'user_type')")
+ except Exception, e:
+ 	plpy.info(e.spidata)
+ 	raise e
+ $$ LANGUAGE plpythonu;
+ 
+ do $$
+ try:
+   plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
+ except Exception, e:
+   plpy.info('sqlstate: %s, hint: %s, tablename: %s, datatype: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
+   raise e
+ $$ LANGUAGE plpythonu;

diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
new file mode 100644
index 05caba1..bc7707d
*** a/src/pl/plpython/expected/plpython_test.out
--- b/src/pl/plpython/expected/plpython_test.out
*************** RETURNS void AS $$
*** 150,171 ****
  kwargs = { "message":_message, "detail":_detail, "hint":_hint,
  			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
  			"column":_column, "datatype":_datatype, "constraint":_constraint }
! # ignore None values
! plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
  $$ LANGUAGE plpythonu;
  SELECT raise_exception('hello', 'world');
  ERROR:  plpy.Error: hello
  DETAIL:  world
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "raise_exception", line 6, in <module>
!     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
  PL/Python function "raise_exception"
  SELECT raise_exception('message text', 'detail text', _sqlstate => 'YY333');
  ERROR:  plpy.Error: message text
  DETAIL:  detail text
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "raise_exception", line 6, in <module>
!     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
  PL/Python function "raise_exception"
  SELECT raise_exception(_message => 'message text',
  						_detail => 'detail text',
--- 150,175 ----
  kwargs = { "message":_message, "detail":_detail, "hint":_hint,
  			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
  			"column":_column, "datatype":_datatype, "constraint":_constraint }
! # ignore None values - should to work on Python2.3
! dict = {}
! for k in kwargs:
! 	if kwargs[k] is not None:
! 		dict[k] = kwargs[k]
! plpy.error(**dict)
  $$ LANGUAGE plpythonu;
  SELECT raise_exception('hello', 'world');
  ERROR:  plpy.Error: hello
  DETAIL:  world
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "raise_exception", line 10, in <module>
!     plpy.error(**dict)
  PL/Python function "raise_exception"
  SELECT raise_exception('message text', 'detail text', _sqlstate => 'YY333');
  ERROR:  plpy.Error: message text
  DETAIL:  detail text
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "raise_exception", line 10, in <module>
!     plpy.error(**dict)
  PL/Python function "raise_exception"
  SELECT raise_exception(_message => 'message text',
  						_detail => 'detail text',
*************** ERROR:  plpy.Error: message text
*** 180,187 ****
  DETAIL:  detail text
  HINT:  hint text
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "raise_exception", line 6, in <module>
!     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
  PL/Python function "raise_exception"
  SELECT raise_exception(_message => 'message text',
  						_hint => 'hint text',
--- 184,191 ----
  DETAIL:  detail text
  HINT:  hint text
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "raise_exception", line 10, in <module>
!     plpy.error(**dict)
  PL/Python function "raise_exception"
  SELECT raise_exception(_message => 'message text',
  						_hint => 'hint text',
*************** SELECT raise_exception(_message => 'mess
*** 191,198 ****
  ERROR:  plpy.Error: message text
  HINT:  hint text
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "raise_exception", line 6, in <module>
!     plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
  PL/Python function "raise_exception"
  DO $$
  DECLARE
--- 195,202 ----
  ERROR:  plpy.Error: message text
  HINT:  hint text
  CONTEXT:  Traceback (most recent call last):
!   PL/Python function "raise_exception", line 10, in <module>
!     plpy.error(**dict)
  PL/Python function "raise_exception"
  DO $$
  DECLARE
diff --git a/src/pl/plpython/sql/plpython_test.sql b/src/pl/plpython/sql/plpython_test.sql
new file mode 100644
index 6e5b535..294f2dd
*** a/src/pl/plpython/sql/plpython_test.sql
--- b/src/pl/plpython/sql/plpython_test.sql
*************** RETURNS void AS $$
*** 102,109 ****
  kwargs = { "message":_message, "detail":_detail, "hint":_hint,
  			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
  			"column":_column, "datatype":_datatype, "constraint":_constraint }
! # ignore None values
! plpy.error(**dict((k, v) for k, v in iter(kwargs.items()) if v))
  $$ LANGUAGE plpythonu;
  
  SELECT raise_exception('hello', 'world');
--- 102,113 ----
  kwargs = { "message":_message, "detail":_detail, "hint":_hint,
  			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
  			"column":_column, "datatype":_datatype, "constraint":_constraint }
! # ignore None values - should to work on Python2.3
! dict = {}
! for k in kwargs:
! 	if kwargs[k] is not None:
! 		dict[k] = kwargs[k]
! plpy.error(**dict)
  $$ LANGUAGE plpythonu;
  
  SELECT raise_exception('hello', 'world');

From 1622e74f695fbcee4d9ade1c8736001d3adc6b64 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 10 Jun 2016 14:38:20 -0400
Subject: [PATCH] PL/Python: Rename new keyword arguments of plpy.error() etc.

Rename schema -> schema_name etc. to remaining consistent with C API and
PL/pgSQL.
---
 doc/src/sgml/plpython.sgml                    |  6 +--
 src/pl/plpython/expected/plpython_ereport.out | 66 ++++++++++++-------------
 src/pl/plpython/plpy_plpymodule.c             | 70 +++++++++++++--------------
 src/pl/plpython/sql/plpython_ereport.sql      | 62 ++++++++++++------------
 4 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index cff66a2..abc11a9 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1374,9 +1374,9 @@ <title>Utility Functions</title>
    The following keyword-only arguments are accepted:
    <literal>
    <replaceable>detail</replaceable>, <replaceable>hint</replaceable>,
-   <replaceable>sqlstate</replaceable>, <replaceable>schema</replaceable>,
-   <replaceable>table</replaceable>, <replaceable>column</replaceable>,
-   <replaceable>datatype</replaceable> , <replaceable>constraint</replaceable>
+   <replaceable>sqlstate</replaceable>, <replaceable>schema_name</replaceable>,
+   <replaceable>table_name</replaceable>, <replaceable>column_name</replaceable>,
+   <replaceable>datatype_name</replaceable> , <replaceable>constraint_name</replaceable>
    </literal>.
    The string representation of the objects passed as keyword-only arguments
    is used to enrich the messages reported to the client. For example:
diff --git a/src/pl/plpython/expected/plpython_ereport.out b/src/pl/plpython/expected/plpython_ereport.out
index 8a6dfe4..e32b672 100644
--- a/src/pl/plpython/expected/plpython_ereport.out
+++ b/src/pl/plpython/expected/plpython_ereport.out
@@ -9,11 +9,11 @@ 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')
+                    schema_name = 'any info about schema',
+                    table_name = 'any info about table',
+                    column_name = 'any info about column',
+                    datatype_name = 'any info about datatype',
+                    constraint_name = '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')
@@ -70,12 +70,12 @@ CONTEXT:  PL/Python anonymous code block
 -- raise exception in python, handle exception in plgsql
 CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT NULL, _hint text DEFAULT NULL,
 						_sqlstate text DEFAULT NULL,
-						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
-						_datatype text DEFAULT NULL, _constraint text DEFAULT NULL)
+						_schema_name text DEFAULT NULL, _table_name text DEFAULT NULL, _column_name text DEFAULT NULL,
+						_datatype_name text DEFAULT NULL, _constraint_name text DEFAULT NULL)
 RETURNS void AS $$
 kwargs = { "message":_message, "detail":_detail, "hint":_hint,
-			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
-			"column":_column, "datatype":_datatype, "constraint":_constraint }
+			"sqlstate":_sqlstate, "schema_name":_schema_name, "table_name":_table_name,
+			"column_name":_column_name, "datatype_name":_datatype_name, "constraint_name":_constraint_name }
 # ignore None values - should work on Python2.3
 dict = {}
 for k in kwargs:
@@ -101,11 +101,11 @@ SELECT raise_exception(_message => 'message text',
 						_detail => 'detail text',
 						_hint => 'hint text',
 						_sqlstate => 'XX555',
-						_schema => 'schema text',
-						_table => 'table text',
-						_column => 'column text',
-						_datatype => 'datatype text',
-						_constraint => 'constraint text');
+						_schema_name => 'schema text',
+						_table_name => 'table text',
+						_column_name => 'column text',
+						_datatype_name => 'datatype text',
+						_constraint_name => 'constraint text');
 ERROR:  plpy.Error: message text
 DETAIL:  detail text
 HINT:  hint text
@@ -115,9 +115,9 @@ CONTEXT:  Traceback (most recent call last):
 PL/Python function "raise_exception"
 SELECT raise_exception(_message => 'message text',
 						_hint => 'hint text',
-						_schema => 'schema text',
-						_column => 'column text',
-						_constraint => 'constraint text');
+						_schema_name => 'schema text',
+						_column_name => 'column text',
+						_constraint_name => 'constraint text');
 ERROR:  plpy.Error: message text
 HINT:  hint text
 CONTEXT:  Traceback (most recent call last):
@@ -133,19 +133,19 @@ DECLARE
   __schema_name text;
   __table_name text;
   __column_name text;
-  __datatype text;
-  __constraint text;
+  __datatype_name text;
+  __constraint_name text;
 BEGIN
   BEGIN
     PERFORM raise_exception(_message => 'message text',
                             _detail => 'detail text',
                             _hint => 'hint text',
                             _sqlstate => 'XX555',
-                            _schema => 'schema text',
-                            _table => 'table text',
-                            _column => 'column text',
-                            _datatype => 'datatype text',
-                            _constraint => 'constraint text');
+                            _schema_name => 'schema text',
+                            _table_name => 'table text',
+                            _column_name => 'column text',
+                            _datatype_name => 'datatype text',
+                            _constraint_name => 'constraint text');
   EXCEPTION WHEN SQLSTATE 'XX555' THEN
     GET STACKED DIAGNOSTICS __message = MESSAGE_TEXT,
                             __detail = PG_EXCEPTION_DETAIL,
@@ -154,24 +154,24 @@ BEGIN
                             __schema_name = SCHEMA_NAME,
                             __table_name = TABLE_NAME,
                             __column_name = COLUMN_NAME,
-                            __datatype = PG_DATATYPE_NAME,
-                            __constraint = CONSTRAINT_NAME;
+                            __datatype_name = PG_DATATYPE_NAME,
+                            __constraint_name = CONSTRAINT_NAME;
     RAISE NOTICE 'handled exception'
        USING DETAIL = format('message:(%s), detail:(%s), hint: (%s), sqlstate: (%s), '
-                             'schema:(%s), table:(%s), column:(%s), datatype:(%s), constraint:(%s)',
+                             'schema_name:(%s), table_name:(%s), column_name:(%s), datatype_name:(%s), constraint_name:(%s)',
                              __message, __detail, __hint, __sqlstate, __schema_name,
-                             __table_name, __column_name, __datatype, __constraint);
+                             __table_name, __column_name, __datatype_name, __constraint_name);
   END;
 END;
 $$;
 NOTICE:  handled exception
-DETAIL:  message:(plpy.Error: message text), detail:(detail text), hint: (hint text), sqlstate: (XX555), schema:(schema text), table:(table text), column:(column text), datatype:(datatype text), constraint:(constraint text)
+DETAIL:  message:(plpy.Error: message text), detail:(detail text), hint: (hint text), sqlstate: (XX555), schema_name:(schema text), table_name:(table text), column_name:(column text), datatype_name:(datatype text), constraint_name:(constraint text)
 -- the displayed context is different between Python2 and Python3,
 -- but that's not important for this test
 \set SHOW_CONTEXT never
 do $$
 try:
-	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table=> 'users_tab', _datatype => 'user_type')")
+	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table_name => 'users_tab', _datatype_name => 'user_type')")
 except Exception, e:
 	plpy.info(e.spidata)
 	raise e
@@ -181,11 +181,11 @@ ERROR:  plpy.SPIError: plpy.Error: my message
 HINT:  some hint
 do $$
 try:
-  plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
+  plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table_name = 'users_tab', datatype_name = 'user_type')
 except Exception, e:
-  plpy.info('sqlstate: %s, hint: %s, tablename: %s, datatype: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
+  plpy.info('sqlstate: %s, hint: %s, table_name: %s, datatype_name: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
   raise e
 $$ LANGUAGE plpythonu;
-INFO:  sqlstate: XX987, hint: some hint, tablename: users_tab, datatype: user_type
+INFO:  sqlstate: XX987, hint: some hint, table_name: users_tab, datatype_name: user_type
 ERROR:  plpy.Error: my message
 HINT:  some hint
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index 9725fce..1fcb28b 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -399,11 +399,11 @@ PLy_output(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
 	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;
+	char	   *volatile column_name = NULL;
+	char	   *volatile constraint_name = NULL;
+	char	   *volatile datatype_name = NULL;
+	char	   *volatile table_name = NULL;
+	char	   *volatile schema_name = NULL;
 	volatile MemoryContext oldcontext;
 	PyObject   *key,
 			   *value;
@@ -456,16 +456,16 @@ PLy_output(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
 				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 if (strcmp(keyword, "schema_name") == 0)
+				schema_name = object_to_string(value);
+			else if (strcmp(keyword, "table_name") == 0)
+				table_name = object_to_string(value);
+			else if (strcmp(keyword, "column_name") == 0)
+				column_name = object_to_string(value);
+			else if (strcmp(keyword, "datatype_name") == 0)
+				datatype_name = object_to_string(value);
+			else if (strcmp(keyword, "constraint_name") == 0)
+				constraint_name = object_to_string(value);
 			else
 				PLy_elog(ERROR, "'%s' is an invalid keyword argument for this function",
 						 keyword);
@@ -496,32 +496,32 @@ PLy_output(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
 			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);
+		if (schema_name != NULL)
+			pg_verifymbstr(schema_name, strlen(schema_name), false);
+		if (table_name != NULL)
+			pg_verifymbstr(table_name, strlen(table_name), false);
+		if (column_name != NULL)
+			pg_verifymbstr(column_name, strlen(column_name), false);
+		if (datatype_name != NULL)
+			pg_verifymbstr(datatype_name, strlen(datatype_name), false);
+		if (constraint_name != NULL)
+			pg_verifymbstr(constraint_name, strlen(constraint_name), 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));
+				 (column_name != NULL) ?
+				 err_generic_string(PG_DIAG_COLUMN_NAME, column_name) : 0,
+				 (constraint_name != NULL) ?
+				 err_generic_string(PG_DIAG_CONSTRAINT_NAME, constraint_name) : 0,
+				 (datatype_name != NULL) ?
+				 err_generic_string(PG_DIAG_DATATYPE_NAME, datatype_name) : 0,
+				 (table_name != NULL) ?
+				 err_generic_string(PG_DIAG_TABLE_NAME, table_name) : 0,
+				 (schema_name != NULL) ?
+				 err_generic_string(PG_DIAG_SCHEMA_NAME, schema_name) : 0));
 	}
 	PG_CATCH();
 	{
diff --git a/src/pl/plpython/sql/plpython_ereport.sql b/src/pl/plpython/sql/plpython_ereport.sql
index 8303e15..19b14c6 100644
--- a/src/pl/plpython/sql/plpython_ereport.sql
+++ b/src/pl/plpython/sql/plpython_ereport.sql
@@ -9,11 +9,11 @@ CREATE FUNCTION elog_test() RETURNS void
                     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')
+                    schema_name = 'any info about schema',
+                    table_name = 'any info about table',
+                    column_name = 'any info about column',
+                    datatype_name = 'any info about datatype',
+                    constraint_name = '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')
@@ -43,12 +43,12 @@ CREATE FUNCTION elog_test() RETURNS void
 -- raise exception in python, handle exception in plgsql
 CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT NULL, _hint text DEFAULT NULL,
 						_sqlstate text DEFAULT NULL,
-						_schema text DEFAULT NULL, _table text DEFAULT NULL, _column text DEFAULT NULL,
-						_datatype text DEFAULT NULL, _constraint text DEFAULT NULL)
+						_schema_name text DEFAULT NULL, _table_name text DEFAULT NULL, _column_name text DEFAULT NULL,
+						_datatype_name text DEFAULT NULL, _constraint_name text DEFAULT NULL)
 RETURNS void AS $$
 kwargs = { "message":_message, "detail":_detail, "hint":_hint,
-			"sqlstate":_sqlstate, "schema":_schema, "table":_table,
-			"column":_column, "datatype":_datatype, "constraint":_constraint }
+			"sqlstate":_sqlstate, "schema_name":_schema_name, "table_name":_table_name,
+			"column_name":_column_name, "datatype_name":_datatype_name, "constraint_name":_constraint_name }
 # ignore None values - should work on Python2.3
 dict = {}
 for k in kwargs:
@@ -63,17 +63,17 @@ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT N
 						_detail => 'detail text',
 						_hint => 'hint text',
 						_sqlstate => 'XX555',
-						_schema => 'schema text',
-						_table => 'table text',
-						_column => 'column text',
-						_datatype => 'datatype text',
-						_constraint => 'constraint text');
+						_schema_name => 'schema text',
+						_table_name => 'table text',
+						_column_name => 'column text',
+						_datatype_name => 'datatype text',
+						_constraint_name => 'constraint text');
 
 SELECT raise_exception(_message => 'message text',
 						_hint => 'hint text',
-						_schema => 'schema text',
-						_column => 'column text',
-						_constraint => 'constraint text');
+						_schema_name => 'schema text',
+						_column_name => 'column text',
+						_constraint_name => 'constraint text');
 
 DO $$
 DECLARE
@@ -84,19 +84,19 @@ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT N
   __schema_name text;
   __table_name text;
   __column_name text;
-  __datatype text;
-  __constraint text;
+  __datatype_name text;
+  __constraint_name text;
 BEGIN
   BEGIN
     PERFORM raise_exception(_message => 'message text',
                             _detail => 'detail text',
                             _hint => 'hint text',
                             _sqlstate => 'XX555',
-                            _schema => 'schema text',
-                            _table => 'table text',
-                            _column => 'column text',
-                            _datatype => 'datatype text',
-                            _constraint => 'constraint text');
+                            _schema_name => 'schema text',
+                            _table_name => 'table text',
+                            _column_name => 'column text',
+                            _datatype_name => 'datatype text',
+                            _constraint_name => 'constraint text');
   EXCEPTION WHEN SQLSTATE 'XX555' THEN
     GET STACKED DIAGNOSTICS __message = MESSAGE_TEXT,
                             __detail = PG_EXCEPTION_DETAIL,
@@ -105,13 +105,13 @@ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT N
                             __schema_name = SCHEMA_NAME,
                             __table_name = TABLE_NAME,
                             __column_name = COLUMN_NAME,
-                            __datatype = PG_DATATYPE_NAME,
-                            __constraint = CONSTRAINT_NAME;
+                            __datatype_name = PG_DATATYPE_NAME,
+                            __constraint_name = CONSTRAINT_NAME;
     RAISE NOTICE 'handled exception'
        USING DETAIL = format('message:(%s), detail:(%s), hint: (%s), sqlstate: (%s), '
-                             'schema:(%s), table:(%s), column:(%s), datatype:(%s), constraint:(%s)',
+                             'schema_name:(%s), table_name:(%s), column_name:(%s), datatype_name:(%s), constraint_name:(%s)',
                              __message, __detail, __hint, __sqlstate, __schema_name,
-                             __table_name, __column_name, __datatype, __constraint);
+                             __table_name, __column_name, __datatype_name, __constraint_name);
   END;
 END;
 $$;
@@ -122,7 +122,7 @@ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT N
 
 do $$
 try:
-	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table=> 'users_tab', _datatype => 'user_type')")
+	plpy.execute("select raise_exception(_message => 'my message', _sqlstate => 'XX987', _hint => 'some hint', _table_name => 'users_tab', _datatype_name => 'user_type')")
 except Exception, e:
 	plpy.info(e.spidata)
 	raise e
@@ -130,8 +130,8 @@ CREATE OR REPLACE FUNCTION raise_exception(_message text, _detail text DEFAULT N
 
 do $$
 try:
-  plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table = 'users_tab', datatype = 'user_type')
+  plpy.error(message  = 'my message', sqlstate = 'XX987', hint = 'some hint', table_name = 'users_tab', datatype_name = 'user_type')
 except Exception, e:
-  plpy.info('sqlstate: %s, hint: %s, tablename: %s, datatype: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
+  plpy.info('sqlstate: %s, hint: %s, table_name: %s, datatype_name: %s' % (e.sqlstate, e.hint, e.table_name, e.datatype_name))
   raise e
 $$ LANGUAGE plpythonu;
-- 
2.8.3