PL/pgSQL, RAISE and error context

*** a/src/interfaces/libpq/fe-protocol3.c
--- b/src/interfaces/libpq/fe-protocol3.c
***************
*** 914,922 **** pqGetErrorNotice3(PGconn *conn, bool isError)
  		val = PQresultErrorField(res, PG_DIAG_INTERNAL_QUERY);
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("QUERY:  %s\n"), val);
! 		val = PQresultErrorField(res, PG_DIAG_CONTEXT);
! 		if (val)
! 			appendPQExpBuffer(&workBuf, libpq_gettext("CONTEXT:  %s\n"), val);
  	}
  	if (conn->verbosity == PQERRORS_VERBOSE)
  	{
--- 914,926 ----
  		val = PQresultErrorField(res, PG_DIAG_INTERNAL_QUERY);
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("QUERY:  %s\n"), val);
! 
! 		if (isError || conn->verbosity == PQERRORS_VERBOSE)
! 		{
! 			val = PQresultErrorField(res, PG_DIAG_CONTEXT);
! 			if (val)
! 				appendPQExpBuffer(&workBuf, libpq_gettext("CONTEXT:  %s\n"), val);
! 		}
  	}
  	if (conn->verbosity == PQERRORS_VERBOSE)
  	{
*** a/src/pl/plpgsql/src/pl_exec.c
--- b/src/pl/plpgsql/src/pl_exec.c
***************
*** 39,46 ****
  #include "utils/typcache.h"
  
  
- static const char *const raise_skip_msg = "RAISE";
- 
  typedef struct
  {
  	int			nargs;			/* number of arguments */
--- 39,44 ----
***************
*** 868,875 **** plpgsql_exec_error_callback(void *arg)
  	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) arg;
  
  	/* if we are doing RAISE, don't report its location */
- 	if (estate->err_text == raise_skip_msg)
- 		return;
  
  	if (estate->err_text != NULL)
  	{
--- 866,871 ----
***************
*** 3032,3038 **** exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
  	/*
  	 * Throw the error (may or may not come back)
  	 */
- 	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
  
  	ereport(stmt->elog_level,
  			(err_code ? errcode(err_code) : 0,
--- 3028,3033 ----

*** a/doc/src/sgml/libpq.sgml
--- b/doc/src/sgml/libpq.sgml
***************
*** 5418,5423 **** int PQsetClientEncoding(PGconn *<replaceable>conn</replaceable>, const char *<re
--- 5418,5424 ----
  typedef enum
  {
      PQERRORS_TERSE,
+     PQERRORS_COMPACT,
      PQERRORS_DEFAULT,
      PQERRORS_VERBOSE
  } PGVerbosity;
***************
*** 5430,5439 **** PGVerbosity PQsetErrorVerbosity(PGconn *conn, PGVerbosity verbosity);
        returned messages include severity, primary text, and position only;
        this will normally fit on a single line.  The default mode produces
        messages that include the above plus any detail, hint, or context
!       fields (these might span multiple lines).  The <firstterm>VERBOSE</>
!       mode includes all available fields.  Changing the verbosity does not
!       affect the messages available from already-existing
!       <structname>PGresult</> objects, only subsequently-created ones.
       </para>
      </listitem>
     </varlistentry>
--- 5431,5442 ----
        returned messages include severity, primary text, and position only;
        this will normally fit on a single line.  The default mode produces
        messages that include the above plus any detail, hint, or context
!       fields (these might span multiple lines).  The COMPACT mode is otherwise
!       the same as the default, except the context field will be omitted for
!       non-error messages.  The <firstterm>VERBOSE</> mode includes all
!       available fields.  Changing the verbosity does not affect the messages
!       available from already-existing <structname>PGresult</> objects, only
!       subsequently-created ones.
       </para>
      </listitem>
     </varlistentry>
*** a/src/bin/psql/startup.c
--- b/src/bin/psql/startup.c
***************
*** 796,801 **** verbosity_hook(const char *newval)
--- 796,803 ----
  		pset.verbosity = PQERRORS_DEFAULT;
  	else if (strcmp(newval, "terse") == 0)
  		pset.verbosity = PQERRORS_TERSE;
+ 	else if (strcmp(newval, "compact") == 0)
+ 		pset.verbosity = PQERRORS_COMPACT;
  	else if (strcmp(newval, "verbose") == 0)
  		pset.verbosity = PQERRORS_VERBOSE;
  	else
*** a/src/interfaces/libpq/fe-protocol3.c
--- b/src/interfaces/libpq/fe-protocol3.c
***************
*** 915,920 **** pqGetErrorNotice3(PGconn *conn, bool isError)
--- 915,924 ----
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("QUERY:  %s\n"), val);
  		val = PQresultErrorField(res, PG_DIAG_CONTEXT);
+ 	}
+ 	if (isError || (conn->verbosity != PQERRORS_TERSE &&
+ 					conn->verbosity != PQERRORS_COMPACT))
+ 	{
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("CONTEXT:  %s\n"), val);
  	}
*** a/src/interfaces/libpq/libpq-fe.h
--- b/src/interfaces/libpq/libpq-fe.h
***************
*** 106,111 **** typedef enum
--- 106,112 ----
  typedef enum
  {
  	PQERRORS_TERSE,				/* single-line error messages */
+ 	PQERRORS_COMPACT,			/* single-line error messages on non-error messags */
  	PQERRORS_DEFAULT,			/* recommended style */
  	PQERRORS_VERBOSE			/* all the facts, ma'am */
  } PGVerbosity;
*** a/src/pl/plpgsql/src/pl_exec.c
--- b/src/pl/plpgsql/src/pl_exec.c
***************
*** 39,46 ****
  #include "utils/typcache.h"
  
  
- static const char *const raise_skip_msg = "RAISE";
- 
  typedef struct
  {
  	int			nargs;			/* number of arguments */
--- 39,44 ----
***************
*** 867,876 **** plpgsql_exec_error_callback(void *arg)
  {
  	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) arg;
  
- 	/* if we are doing RAISE, don't report its location */
- 	if (estate->err_text == raise_skip_msg)
- 		return;
- 
  	if (estate->err_text != NULL)
  	{
  		/*
--- 865,870 ----
***************
*** 3032,3038 **** exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
  	/*
  	 * Throw the error (may or may not come back)
  	 */
- 	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
  
  	ereport(stmt->elog_level,
  			(err_code ? errcode(err_code) : 0,
--- 3026,3031 ----

*** a/doc/src/sgml/libpq.sgml
--- b/doc/src/sgml/libpq.sgml
***************
*** 5418,5423 **** int PQsetClientEncoding(PGconn *<replaceable>conn</replaceable>, const char *<re
--- 5418,5424 ----
  typedef enum
  {
      PQERRORS_TERSE,
+     PQERRORS_COMPACT,
      PQERRORS_DEFAULT,
      PQERRORS_VERBOSE
  } PGVerbosity;
***************
*** 5430,5439 **** PGVerbosity PQsetErrorVerbosity(PGconn *conn, PGVerbosity verbosity);
        returned messages include severity, primary text, and position only;
        this will normally fit on a single line.  The default mode produces
        messages that include the above plus any detail, hint, or context
!       fields (these might span multiple lines).  The <firstterm>VERBOSE</>
!       mode includes all available fields.  Changing the verbosity does not
!       affect the messages available from already-existing
!       <structname>PGresult</> objects, only subsequently-created ones.
       </para>
      </listitem>
     </varlistentry>
--- 5431,5442 ----
        returned messages include severity, primary text, and position only;
        this will normally fit on a single line.  The default mode produces
        messages that include the above plus any detail, hint, or context
!       fields (these might span multiple lines).  The COMPACT mode is otherwise
!       the same as the default, except the context field will be omitted for
!       non-error messages.  The <firstterm>VERBOSE</> mode includes all
!       available fields.  Changing the verbosity does not affect the messages
!       available from already-existing <structname>PGresult</> objects, only
!       subsequently-created ones.
       </para>
      </listitem>
     </varlistentry>
*** a/src/bin/psql/startup.c
--- b/src/bin/psql/startup.c
***************
*** 796,801 **** verbosity_hook(const char *newval)
--- 796,803 ----
  		pset.verbosity = PQERRORS_DEFAULT;
  	else if (strcmp(newval, "terse") == 0)
  		pset.verbosity = PQERRORS_TERSE;
+ 	else if (strcmp(newval, "compact") == 0)
+ 		pset.verbosity = PQERRORS_COMPACT;
  	else if (strcmp(newval, "verbose") == 0)
  		pset.verbosity = PQERRORS_VERBOSE;
  	else
*** a/src/interfaces/libpq/fe-protocol3.c
--- b/src/interfaces/libpq/fe-protocol3.c
***************
*** 915,920 **** pqGetErrorNotice3(PGconn *conn, bool isError)
--- 915,924 ----
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("QUERY:  %s\n"), val);
  		val = PQresultErrorField(res, PG_DIAG_CONTEXT);
+ 	}
+ 	if (isError || (conn->verbosity != PQERRORS_TERSE &&
+ 					conn->verbosity != PQERRORS_COMPACT))
+ 	{
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("CONTEXT:  %s\n"), val);
  	}
*** a/src/interfaces/libpq/libpq-fe.h
--- b/src/interfaces/libpq/libpq-fe.h
***************
*** 106,111 **** typedef enum
--- 106,112 ----
  typedef enum
  {
  	PQERRORS_TERSE,				/* single-line error messages */
+ 	PQERRORS_COMPACT,			/* single-line error messages on non-error messags */
  	PQERRORS_DEFAULT,			/* recommended style */
  	PQERRORS_VERBOSE			/* all the facts, ma'am */
  } PGVerbosity;
*** a/src/pl/plpgsql/src/pl_exec.c
--- b/src/pl/plpgsql/src/pl_exec.c
***************
*** 39,46 ****
  #include "utils/typcache.h"
  
  
- static const char *const raise_skip_msg = "RAISE";
- 
  typedef struct
  {
  	int			nargs;			/* number of arguments */
--- 39,44 ----
***************
*** 867,876 **** plpgsql_exec_error_callback(void *arg)
  {
  	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) arg;
  
- 	/* if we are doing RAISE, don't report its location */
- 	if (estate->err_text == raise_skip_msg)
- 		return;
- 
  	if (estate->err_text != NULL)
  	{
  		/*
--- 865,870 ----
***************
*** 3032,3038 **** exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
  	/*
  	 * Throw the error (may or may not come back)
  	 */
- 	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
  
  	ereport(stmt->elog_level,
  			(err_code ? errcode(err_code) : 0,
--- 3026,3031 ----
*** a/src/test/regress/expected/alter_table.out
--- b/src/test/regress/expected/alter_table.out
***************
*** 361,371 **** CREATE FUNCTION boo(int) RETURNS int IMMUTABLE STRICT LANGUAGE plpgsql AS $$ BEG
--- 361,374 ----
  INSERT INTO tmp7 VALUES (8, 18);
  ALTER TABLE tmp7 ADD CONSTRAINT identity CHECK (b = boo(b));
  NOTICE:  boo: 18
+ CONTEXT:  PL/pgSQL function boo(integer) line 1 at RAISE
  ALTER TABLE tmp3 ADD CONSTRAINT IDENTITY check (b = boo(b)) NOT VALID;
  NOTICE:  merging constraint "identity" with inherited definition
  ALTER TABLE tmp3 VALIDATE CONSTRAINT identity;
  NOTICE:  boo: 16
+ CONTEXT:  PL/pgSQL function boo(integer) line 1 at RAISE
  NOTICE:  boo: 20
+ CONTEXT:  PL/pgSQL function boo(integer) line 1 at RAISE
  -- Try (and fail) to create constraint from tmp5(a) to tmp4(a) - unique constraint on
  -- tmp4 is a,b
  ALTER TABLE tmp5 add constraint tmpconstr foreign key(a) references tmp4(a) match full;
*** a/src/test/regress/expected/event_trigger.out
--- b/src/test/regress/expected/event_trigger.out
***************
*** 70,79 **** alter event trigger regress_event_trigger disable;
--- 70,82 ----
  -- regress_event_trigger
  create table event_trigger_fire1 (a int);
  NOTICE:  test_event_trigger: ddl_command_start CREATE TABLE
+ CONTEXT:  PL/pgSQL function test_event_trigger() line 3 at RAISE
  NOTICE:  test_event_trigger: ddl_command_end CREATE TABLE
+ CONTEXT:  PL/pgSQL function test_event_trigger() line 3 at RAISE
  -- regress_event_trigger_end should fire here
  drop table event_trigger_fire1;
  NOTICE:  test_event_trigger: ddl_command_end DROP TABLE
+ CONTEXT:  PL/pgSQL function test_event_trigger() line 3 at RAISE
  -- alter owner to non-superuser should fail
  alter event trigger regress_event_trigger owner to regression_bob;
  ERROR:  permission denied to change owner of event trigger "regress_event_trigger"
***************
*** 194,200 **** PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
--- 197,204 ----
  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
! SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
***************
*** 224,229 **** NOTICE:  table "schema_one_table_three" does not exist, skipping
--- 228,234 ----
  CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object schema_one.table_three of type table cannot be dropped
+ CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
*** a/src/test/regress/expected/plancache.out
--- b/src/test/regress/expected/plancache.out
***************
*** 237,244 **** NOTICE:  table "temptable" does not exist, skipping
--- 237,247 ----
  CONTEXT:  SQL statement "drop table if exists temptable cascade"
  PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
   cachebug 
  ----------
   
***************
*** 249,256 **** NOTICE:  drop cascades to view vv
--- 252,262 ----
  CONTEXT:  SQL statement "drop table if exists temptable cascade"
  PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
   cachebug 
  ----------
   
*** a/src/test/regress/expected/plpgsql.out
--- b/src/test/regress/expected/plpgsql.out
***************
*** 1518,1544 **** ERROR:  duplicate key value violates unique constraint "pfield_name"
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
--- 1518,1552 ----
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 47 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 77 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_biu() line 12 at RAISE
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_bd() line 12 at RAISE
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 8 at RAISE
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 14 at RAISE
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
***************
*** 1934,1941 **** begin
--- 1942,1952 ----
  end$$ language plpgsql;
  select trap_zero_divide(50);
  NOTICE:  should see this
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
  NOTICE:  should see this only if 50 <> 0
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 8 at RAISE
  NOTICE:  should see this only if 50 fits in smallint
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 10 at RAISE
   trap_zero_divide 
  ------------------
                  2
***************
*** 1943,1949 **** NOTICE:  should see this only if 50 fits in smallint
--- 1954,1962 ----
  
  select trap_zero_divide(0);
  NOTICE:  should see this
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
  NOTICE:  caught division_by_zero
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 16 at RAISE
   trap_zero_divide 
  ------------------
                 -1
***************
*** 1951,1958 **** NOTICE:  caught division_by_zero
--- 1964,1974 ----
  
  select trap_zero_divide(100000);
  NOTICE:  should see this
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
  NOTICE:  should see this only if 100000 <> 0
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 8 at RAISE
  NOTICE:  caught numeric_value_out_of_range
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 19 at RAISE
   trap_zero_divide 
  ------------------
                 -2
***************
*** 1960,1968 **** NOTICE:  caught numeric_value_out_of_range
--- 1976,1988 ----
  
  select trap_zero_divide(-100);
  NOTICE:  should see this
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
  NOTICE:  should see this only if -100 <> 0
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 8 at RAISE
  NOTICE:  should see this only if -100 fits in smallint
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 10 at RAISE
  ERROR:  -100 is less than zero
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 12 at RAISE
  create function trap_matching_test(int) returns int as $$
  declare x int;
  	sx smallint;
***************
*** 1991,1996 **** select trap_matching_test(50);
--- 2011,2017 ----
  
  select trap_matching_test(0);
  NOTICE:  caught data_exception
+ CONTEXT:  PL/pgSQL function trap_matching_test(integer) line 13 at RAISE
   trap_matching_test 
  --------------------
                   -1
***************
*** 1998,2003 **** NOTICE:  caught data_exception
--- 2019,2025 ----
  
  select trap_matching_test(100000);
  NOTICE:  caught data_exception
+ CONTEXT:  PL/pgSQL function trap_matching_test(integer) line 13 at RAISE
   trap_matching_test 
  --------------------
                   -1
***************
*** 2005,2010 **** NOTICE:  caught data_exception
--- 2027,2033 ----
  
  select trap_matching_test(1);
  NOTICE:  caught numeric_value_out_of_range or cardinality_violation
+ CONTEXT:  PL/pgSQL function trap_matching_test(integer) line 16 at RAISE
   trap_matching_test 
  --------------------
                   -2
***************
*** 2035,2040 **** end$$ language plpgsql;
--- 2058,2064 ----
  set statement_timeout to 2000;
  select blockme();
  NOTICE:  nyeah nyeah, can't stop me
+ CONTEXT:  PL/pgSQL function blockme() line 16 at RAISE
   blockme 
  ---------
        20
***************
*** 2066,2078 **** begin
  end$$ language plpgsql;
  select test_variable_storage();
  NOTICE:  should see this
! CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 <> 0
! CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 fits in smallint
! CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
   test_variable_storage 
  -----------------------
--- 2090,2105 ----
  end$$ language plpgsql;
  select test_variable_storage();
  NOTICE:  should see this
! CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
! SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 <> 0
! CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 8 at RAISE
! SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 fits in smallint
! CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 10 at RAISE
! SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
   test_variable_storage 
  -----------------------
***************
*** 2119,2124 **** select trap_foreign_key(1);
--- 2146,2152 ----
  
  select trap_foreign_key(2);	-- detects FK violation
  NOTICE:  caught foreign_key_violation
+ CONTEXT:  PL/pgSQL function trap_foreign_key(integer) line 7 at RAISE
   trap_foreign_key 
  ------------------
                  0
***************
*** 2139,2144 **** DETAIL:  Key (f1)=(2) is not present in table "master".
--- 2167,2173 ----
    rollback to x;
    select trap_foreign_key_2();  -- detects FK violation
  NOTICE:  caught foreign_key_violation
+ CONTEXT:  PL/pgSQL function trap_foreign_key_2() line 7 at RAISE
   trap_foreign_key_2 
  --------------------
                    0
***************
*** 2481,2487 **** END;
--- 2510,2518 ----
  $$ LANGUAGE plpgsql;
  SELECT reraise_test();
  NOTICE:  exception syntax_error thrown in inner block, reraising
+ CONTEXT:  PL/pgSQL function reraise_test() line 8 at RAISE
  NOTICE:  RIGHT - exception syntax_error caught in inner block
+ CONTEXT:  PL/pgSQL function reraise_test() line 12 at RAISE
   reraise_test 
  --------------
   
***************
*** 2576,2583 **** begin
--- 2607,2617 ----
  end; $$ language plpgsql;
  select execute_into_test('eifoo');
  NOTICE:  10 1
+ CONTEXT:  PL/pgSQL function execute_into_test(character varying) line 12 at RAISE
  NOTICE:  10 15
+ CONTEXT:  PL/pgSQL function execute_into_test(character varying) line 14 at RAISE
  NOTICE:  10 15 20
+ CONTEXT:  PL/pgSQL function execute_into_test(character varying) line 16 at RAISE
   execute_into_test 
  -------------------
   (1,2)
***************
*** 2636,2644 **** begin
--- 2670,2682 ----
  end; $$ language plpgsql;
  select excpt_test3();
  NOTICE:  caught exception P0001 user exception
+ CONTEXT:  PL/pgSQL function excpt_test3() line 6 at RAISE
  NOTICE:  P0001 user exception
+ CONTEXT:  PL/pgSQL function excpt_test3() line 8 at RAISE
  NOTICE:  caught exception 22012 division by zero
+ CONTEXT:  PL/pgSQL function excpt_test3() line 15 at RAISE
  NOTICE:  P0001 user exception
+ CONTEXT:  PL/pgSQL function excpt_test3() line 17 at RAISE
   excpt_test3 
  -------------
   
***************
*** 2659,2664 **** begin
--- 2697,2703 ----
  end;$$ language plpgsql;
  select raise_exprs();
  NOTICE:  {10,20,30}; 20; xyz; xyzabc; (10,aaa,,30); <NULL>
+ CONTEXT:  PL/pgSQL function raise_exprs() line 8 at RAISE
   raise_exprs 
  -------------
   
***************
*** 2750,2807 **** begin
--- 2789,2899 ----
  end; $$ language plpgsql;
  select continue_test1();
  NOTICE:  ---1---
+ CONTEXT:  PL/pgSQL function continue_test1() line 4 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  8
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  9
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  10
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  ---2---
+ CONTEXT:  PL/pgSQL function continue_test1() line 12 at RAISE
  NOTICE:  9
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  8
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  0
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  ---3---
+ CONTEXT:  PL/pgSQL function continue_test1() line 23 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  9
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  ---4---
+ CONTEXT:  PL/pgSQL function continue_test1() line 31 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  8
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  9
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  10
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  ---5---
+ CONTEXT:  PL/pgSQL function continue_test1() line 40 at RAISE
  NOTICE:  30
+ CONTEXT:  PL/pgSQL function continue_test1() line 43 at RAISE
  NOTICE:  40
+ CONTEXT:  PL/pgSQL function continue_test1() line 43 at RAISE
  NOTICE:  ---6---
+ CONTEXT:  PL/pgSQL function continue_test1() line 46 at RAISE
  NOTICE:  30
+ CONTEXT:  PL/pgSQL function continue_test1() line 49 at RAISE
  NOTICE:  40
+ CONTEXT:  PL/pgSQL function continue_test1() line 49 at RAISE
  NOTICE:  ---7---
+ CONTEXT:  PL/pgSQL function continue_test1() line 52 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 54 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function continue_test1() line 54 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 54 at RAISE
  NOTICE:  ---8---
+ CONTEXT:  PL/pgSQL function continue_test1() line 58 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 61 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function continue_test1() line 61 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 61 at RAISE
  NOTICE:  ---9---
+ CONTEXT:  PL/pgSQL function continue_test1() line 66 at RAISE
  NOTICE:  10
+ CONTEXT:  PL/pgSQL function continue_test1() line 68 at RAISE
  NOTICE:  ---10---
+ CONTEXT:  PL/pgSQL function continue_test1() line 72 at RAISE
  NOTICE:  10
+ CONTEXT:  PL/pgSQL function continue_test1() line 74 at RAISE
   continue_test1 
  ----------------
   
***************
*** 2924,2947 **** end;
--- 3016,3058 ----
  $proc$ language plpgsql;
  select for_vect();
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function for_vect() line 6 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function for_vect() line 6 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function for_vect() line 6 at RAISE
  NOTICE:  1 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 10 at RAISE
  NOTICE:  2 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 10 at RAISE
  NOTICE:  3 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 10 at RAISE
  NOTICE:  4 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 10 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function for_vect() line 14 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function for_vect() line 14 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function for_vect() line 14 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function for_vect() line 14 at RAISE
  NOTICE:  1 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 18 at RAISE
  NOTICE:  2 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 18 at RAISE
  NOTICE:  3 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 18 at RAISE
  NOTICE:  4 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 18 at RAISE
  NOTICE:  1 bb cc
+ CONTEXT:  PL/pgSQL function for_vect() line 22 at RAISE
  NOTICE:  2 bb cc
+ CONTEXT:  PL/pgSQL function for_vect() line 22 at RAISE
  NOTICE:  3 bb cc
+ CONTEXT:  PL/pgSQL function for_vect() line 22 at RAISE
  NOTICE:  4 bb cc
+ CONTEXT:  PL/pgSQL function for_vect() line 22 at RAISE
   for_vect 
  ----------
   
***************
*** 2981,2986 **** begin
--- 3092,3098 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 5, x.f2 = 6
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3005,3010 **** begin
--- 3117,3123 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 5, x.f2 = 6
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3019,3024 **** begin
--- 3132,3138 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 7, x.f2 = 8
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3044,3049 **** begin
--- 3158,3164 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 3, x.f2 = 4
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3078,3083 **** begin
--- 3193,3199 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 3, x.f2 = 4
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3282,3290 **** end;
--- 3398,3410 ----
  $$ language plpgsql;
  select pl_qual_names(42);
  NOTICE:  param1 = 2
+ CONTEXT:  PL/pgSQL function pl_qual_names(integer) line 10 at RAISE
  NOTICE:  pl_qual_names.param1 = 42
+ CONTEXT:  PL/pgSQL function pl_qual_names(integer) line 11 at RAISE
  NOTICE:  outerblock.param1 = 1
+ CONTEXT:  PL/pgSQL function pl_qual_names(integer) line 12 at RAISE
  NOTICE:  innerblock.param1 = 2
+ CONTEXT:  PL/pgSQL function pl_qual_names(integer) line 13 at RAISE
   pl_qual_names 
  ---------------
   
***************
*** 3353,3363 **** end
--- 3473,3489 ----
  $$ language plpgsql;
  select exc_using(5, 'foobar');
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
   exc_using 
  -----------
          26
***************
*** 3381,3391 **** end;
--- 3507,3523 ----
  $$ language plpgsql;
  select exc_using(5);
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
   exc_using 
  -----------
   
***************
*** 3430,3451 **** end;
--- 3562,3600 ----
  $$ language plpgsql;
  select forc01();
  NOTICE:  5 from c
+ CONTEXT:  PL/pgSQL function forc01() line 9 at RAISE
  NOTICE:  6 from c
+ CONTEXT:  PL/pgSQL function forc01() line 9 at RAISE
  NOTICE:  7 from c
+ CONTEXT:  PL/pgSQL function forc01() line 9 at RAISE
  NOTICE:  9 from c
+ CONTEXT:  PL/pgSQL function forc01() line 13 at RAISE
  NOTICE:  10 from c
+ CONTEXT:  PL/pgSQL function forc01() line 13 at RAISE
  NOTICE:  41 from c2
+ CONTEXT:  PL/pgSQL function forc01() line 17 at RAISE
  NOTICE:  42 from c2
+ CONTEXT:  PL/pgSQL function forc01() line 17 at RAISE
  NOTICE:  43 from c2
+ CONTEXT:  PL/pgSQL function forc01() line 17 at RAISE
  NOTICE:  after loop, c2 = c2
+ CONTEXT:  PL/pgSQL function forc01() line 20 at RAISE
  NOTICE:  41 from special_name
+ CONTEXT:  PL/pgSQL function forc01() line 23 at RAISE
  NOTICE:  42 from special_name
+ CONTEXT:  PL/pgSQL function forc01() line 23 at RAISE
  NOTICE:  43 from special_name
+ CONTEXT:  PL/pgSQL function forc01() line 23 at RAISE
  NOTICE:  after loop, c2 = special_name
+ CONTEXT:  PL/pgSQL function forc01() line 25 at RAISE
  NOTICE:  41
+ CONTEXT:  PL/pgSQL function forc01() line 30 at RAISE
  NOTICE:  42
+ CONTEXT:  PL/pgSQL function forc01() line 30 at RAISE
  NOTICE:  43
+ CONTEXT:  PL/pgSQL function forc01() line 30 at RAISE
  NOTICE:  after loop, c2 = <NULL>
+ CONTEXT:  PL/pgSQL function forc01() line 32 at RAISE
   forc01 
  --------
   
***************
*** 3466,3480 **** end;
--- 3615,3639 ----
  $$ language plpgsql;
  select forc01();
  NOTICE:  1, 1
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  2, 2
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  3, 3
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  4, 4
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  5, 5
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  6, 6
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  7, 7
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  8, 8
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  9, 9
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  10, 10
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
   forc01 
  --------
   
***************
*** 3512,3526 **** end;
--- 3671,3695 ----
  $$ language plpgsql;
  select forc01();
  NOTICE:  100, 2
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  200, 4
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  300, 6
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  400, 8
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  500, 10
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  600, 12
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  700, 14
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  800, 16
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  900, 18
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  1000, 20
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
   forc01 
  --------
   
***************
*** 3769,3776 **** select raise_test();
--- 3938,3947 ----
  NOTICE:  1 2 3
  DETAIL:  some detail info
  HINT:  some hint
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  ERROR:  1 2 3
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 5 at RAISE
  -- Since we can't actually see the thrown SQLSTATE in default psql output,
  -- test it like this; this also tests re-RAISE
  create or replace function raise_test() returns void as $$
***************
*** 3785,3792 **** end;
--- 3956,3965 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  SQLSTATE: 22012 SQLERRM: check me
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise 'check me'
***************
*** 3799,3806 **** end;
--- 3972,3981 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- SQLSTATE specification in WHEN
  create or replace function raise_test() returns void as $$
  begin
***************
*** 3814,3821 **** end;
--- 3989,3998 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using detail = 'some detail info';
***************
*** 3827,3834 **** end;
--- 4004,4013 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  SQLSTATE: 22012 SQLERRM: division_by_zero
+ CONTEXT:  PL/pgSQL function raise_test() line 6 at RAISE
  ERROR:  division_by_zero
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero;
***************
*** 3836,3841 **** end;
--- 4015,4021 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  division_by_zero
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise sqlstate '1234F';
***************
*** 3843,3848 **** end;
--- 4023,4029 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  1234F
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using message = 'custom' || ' message';
***************
*** 3850,3855 **** end;
--- 4031,4037 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise using message = 'custom' || ' message', errcode = '22012';
***************
*** 3857,3862 **** end;
--- 4039,4045 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- conflict on message
  create or replace function raise_test() returns void as $$
  begin
***************
*** 3915,3920 **** end;
--- 4098,4104 ----
  $$ language plpgsql;
  select stacked_diagnostics_test();
  NOTICE:  sqlstate: 22012, message: division by zero, context: [PL/pgSQL function zero_divide() line 4 at RETURN <- SQL statement "SELECT zero_divide()" <- PL/pgSQL function stacked_diagnostics_test() line 6 at PERFORM]
+ CONTEXT:  PL/pgSQL function stacked_diagnostics_test() line 12 at RAISE
   stacked_diagnostics_test 
  --------------------------
   
***************
*** 3936,3941 **** end;
--- 4120,4126 ----
  $$ language plpgsql;
  select stacked_diagnostics_test();
  NOTICE:  message: custom exception, detail: some detail of custom exception, hint: some hint related to custom exception
+ CONTEXT:  PL/pgSQL function stacked_diagnostics_test() line 12 at RAISE
   stacked_diagnostics_test 
  --------------------------
   
***************
*** 3972,3978 **** end;
--- 4157,4165 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  22012
+ CONTEXT:  PL/pgSQL function raise_test() line 6 at RAISE
  ERROR:  substitute message
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  drop function raise_test();
  -- test passing column_name, constraint_name, datatype_name, table_name
  -- and schema_name error fields
***************
*** 4002,4007 **** end;
--- 4189,4195 ----
  $$ language plpgsql;
  select stacked_diagnostics_test();
  NOTICE:  column >>some column name<<, constraint >>some constraint name<<, type >>some datatype name<<, table >>some table name<<, schema >>some schema name<<
+ CONTEXT:  PL/pgSQL function stacked_diagnostics_test() line 21 at RAISE
   stacked_diagnostics_test 
  --------------------------
   
***************
*** 4093,4098 **** end
--- 4281,4287 ----
  $$ language plpgsql;
  select catch();
  NOTICE:  caught case_not_found 20000 case not found
+ CONTEXT:  PL/pgSQL function catch() line 6 at RAISE
   catch 
  -------
   
***************
*** 4148,4157 **** begin
--- 4337,4351 ----
  $$ language plpgsql;
  select vari(1,2,3,4,5);
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
   vari 
  ------
   
***************
*** 4159,4166 **** NOTICE:  5
--- 4353,4363 ----
  
  select vari(3,4,5);
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
   vari 
  ------
   
***************
*** 4168,4175 **** NOTICE:  5
--- 4365,4375 ----
  
  select vari(variadic array[5,6,7]);
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
   vari 
  ------
   
***************
*** 4221,4226 **** end;
--- 4421,4427 ----
  $$ language plpgsql immutable strict;
  select pleast(10);
  NOTICE:  non-variadic function called
+ CONTEXT:  PL/pgSQL function pleast(numeric) line 3 at RAISE
   pleast 
  --------
       10
***************
*** 4280,4288 **** end;
--- 4481,4493 ----
  $$ language plpgsql;
  select * from rttest();
  NOTICE:  t 2
+ CONTEXT:  PL/pgSQL function rttest() line 6 at RAISE
  NOTICE:  f 0
+ CONTEXT:  PL/pgSQL function rttest() line 9 at RAISE
  NOTICE:  t 2
+ CONTEXT:  PL/pgSQL function rttest() line 12 at RAISE
  NOTICE:  f 0
+ CONTEXT:  PL/pgSQL function rttest() line 15 at RAISE
   rttest 
  --------
       10
***************
*** 4458,4463 **** LINE 4:   return 'foo\\bar\041baz';
--- 4663,4669 ----
  HINT:  Use the escape string syntax for backslashes, e.g., E'\\'.
  select strtest();
  NOTICE:  foo\bar!baz
+ CONTEXT:  PL/pgSQL function strtest() line 3 at RAISE
  WARNING:  nonstandard use of \\ in a string literal
  LINE 1: SELECT 'foo\\bar\041baz'
                 ^
***************
*** 4477,4482 **** end
--- 4683,4689 ----
  $$ language plpgsql;
  select strtest();
  NOTICE:  foo\bar!baz
+ CONTEXT:  PL/pgSQL function strtest() line 3 at RAISE
     strtest   
  -------------
   foo\bar!baz
***************
*** 4491,4496 **** end
--- 4698,4704 ----
  $$ language plpgsql;
  select strtest();
  NOTICE:  foo\\bar\041baz\
+ CONTEXT:  PL/pgSQL function strtest() line 3 at RAISE
       strtest      
  ------------------
   foo\\bar\041baz\
***************
*** 4504,4509 **** end
--- 4712,4718 ----
  $$ language plpgsql;
  select strtest();
  NOTICE:  foo\bar!baz
+ CONTEXT:  PL/pgSQL function strtest() line 3 at RAISE
     strtest   
  -------------
   foo\bar!baz
***************
*** 4520,4534 **** BEGIN
--- 4729,4753 ----
      END LOOP;
  END$$;
  NOTICE:  001, Entrance
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  002, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  003, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  004, Technical
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  101, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  102, Conference
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  103, Restroom
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  104, Technical
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  105, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  106, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  -- these are to check syntax error reporting
  DO LANGUAGE plpgsql $$begin return 1; end$$;
  ERROR:  RETURN cannot have a parameter in function returning void
***************
*** 4656,4664 **** begin
--- 4875,4887 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[1,2,3,4]);
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4666,4674 **** NOTICE:  4
--- 4889,4901 ----
  
  select foreach_test(ARRAY[[1,2],[3,4]]);
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4703,4708 **** begin
--- 4930,4936 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[1,2,3,4]);
  NOTICE:  {1,2,3,4}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4710,4716 **** NOTICE:  {1,2,3,4}
--- 4938,4946 ----
  
  select foreach_test(ARRAY[[1,2],[3,4]]);
  NOTICE:  {1,2}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  {3,4}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4734,4739 **** CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 4 at FOREACH over array
--- 4964,4970 ----
  -- ok
  select foreach_test(ARRAY[[1,2],[3,4]]);
  NOTICE:  {{1,2},{3,4}}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4741,4747 **** NOTICE:  {{1,2},{3,4}}
--- 4972,4980 ----
  
  select foreach_test(ARRAY[[[1,2]],[[3,4]]]);
  NOTICE:  {{1,2}}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  {{3,4}}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4761,4768 **** begin
--- 4994,5004 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[(10,20),(40,69),(35,78)]::xy_tuple[]);
  NOTICE:  (10,20)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (40,69)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (35,78)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4770,4778 **** NOTICE:  (35,78)
--- 5006,5018 ----
  
  select foreach_test(ARRAY[[(10,20),(40,69)],[(35,78),(88,76)]]::xy_tuple[]);
  NOTICE:  (10,20)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (40,69)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (35,78)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (88,76)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4790,4797 **** begin
--- 5030,5040 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[(10,20),(40,69),(35,78)]::xy_tuple[]);
  NOTICE:  x = 10, y = 20
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 40, y = 69
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 35, y = 78
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4799,4807 **** NOTICE:  x = 35, y = 78
--- 5042,5054 ----
  
  select foreach_test(ARRAY[[(10,20),(40,69)],[(35,78),(88,76)]]::xy_tuple[]);
  NOTICE:  x = 10, y = 20
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 40, y = 69
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 35, y = 78
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 88, y = 76
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4820,4825 **** begin
--- 5067,5073 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[(10,20),(40,69),(35,78)]::xy_tuple[]);
  NOTICE:  {"(10,20)","(40,69)","(35,78)"}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4827,4833 **** NOTICE:  {"(10,20)","(40,69)","(35,78)"}
--- 5075,5083 ----
  
  select foreach_test(ARRAY[[(10,20),(40,69)],[(35,78),(88,76)]]::xy_tuple[]);
  NOTICE:  {"(10,20)","(40,69)"}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  {"(35,78)","(88,76)"}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4935,4958 **** end;
  $$ language plpgsql;
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
                 20
--- 5185,5215 ----
  $$ language plpgsql;
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 5 at RAISE
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_func(integer) line 5 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 5 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 8 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function inner_func(integer) line 9 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_func(integer) line 7 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 7 at RAISE
   outer_outer_func 
  ------------------
                 20
***************
*** 4961,4984 **** NOTICE:  outer_func() done
  -- repeated call should to work
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
                 40
--- 5218,5248 ----
  -- repeated call should to work
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 5 at RAISE
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_func(integer) line 5 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 5 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 8 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function inner_func(integer) line 9 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_func(integer) line 7 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 7 at RAISE
   outer_outer_func 
  ------------------
                 40
***************
*** 5033,5056 **** end;
  $$ language plpgsql;
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
                 20
--- 5297,5327 ----
  $$ language plpgsql;
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 5 at RAISE
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_func(integer) line 5 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 11 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 16 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function inner_func(integer) line 17 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_func(integer) line 7 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 7 at RAISE
   outer_outer_func 
  ------------------
                 20
***************
*** 5059,5082 **** NOTICE:  outer_func() done
  -- repeated call should to work
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
                 40
--- 5330,5360 ----
  -- repeated call should to work
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 5 at RAISE
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_func(integer) line 5 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 11 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 16 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function inner_func(integer) line 17 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_func(integer) line 7 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 7 at RAISE
   outer_outer_func 
  ------------------
                 40
*** a/src/test/regress/expected/polymorphism.out
--- b/src/test/regress/expected/polymorphism.out
***************
*** 555,564 **** select case when $1 then $2 else $3 end $$ language sql;
--- 555,569 ----
  -- if the CASE expression were not successfully inlined
  select f1, sql_if(f1 > 0, bleat(f1), bleat(f1 + 1)) from int4_tbl;
  NOTICE:  bleat 1
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
  NOTICE:  bleat 123456
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
  NOTICE:  bleat -123455
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
  NOTICE:  bleat 2147483647
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
  NOTICE:  bleat -2147483646
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
       f1      |   sql_if    
  -------------+-------------
             0 |           1
*** a/src/test/regress/expected/rangefuncs.out
--- b/src/test/regress/expected/rangefuncs.out
***************
*** 1366,1374 **** create trigger tnoticetrigger after insert on tt for each row
  execute procedure noticetrigger();
  select insert_tt2('foolme','barme') limit 1;
  NOTICE:  noticetrigger 11 foolme
! CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 12 barme
! CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           11
--- 1366,1376 ----
  execute procedure noticetrigger();
  select insert_tt2('foolme','barme') limit 1;
  NOTICE:  noticetrigger 11 foolme
! CONTEXT:  PL/pgSQL function noticetrigger() line 3 at RAISE
! SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 12 barme
! CONTEXT:  PL/pgSQL function noticetrigger() line 3 at RAISE
! SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           11
***************
*** 1397,1405 **** create rule insert_tt_rule as on insert to tt do also
    insert into tt_log values(new.*);
  select insert_tt2('foollog','barlog') limit 1;
  NOTICE:  noticetrigger 13 foollog
! CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 14 barlog
! CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           13
--- 1399,1409 ----
    insert into tt_log values(new.*);
  select insert_tt2('foollog','barlog') limit 1;
  NOTICE:  noticetrigger 13 foollog
! CONTEXT:  PL/pgSQL function noticetrigger() line 3 at RAISE
! SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 14 barlog
! CONTEXT:  PL/pgSQL function noticetrigger() line 3 at RAISE
! SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           13
*** a/src/test/regress/expected/select_views.out
--- b/src/test/regress/expected/select_views.out
***************
*** 467,472 **** SELECT name, #thepath FROM iexit ORDER BY 1, 2;
--- 467,486 ----
   I- 580                             |       21
   I- 580                             |       22
   I- 580                             |       22
+  I- 580/I-680                  Ramp |        2
+  I- 580/I-680                  Ramp |        2
+  I- 580/I-680                  Ramp |        2
+  I- 580/I-680                  Ramp |        2
+  I- 580/I-680                  Ramp |        2
+  I- 580/I-680                  Ramp |        2
+  I- 580/I-680                  Ramp |        4
+  I- 580/I-680                  Ramp |        4
+  I- 580/I-680                  Ramp |        4
+  I- 580/I-680                  Ramp |        4
+  I- 580/I-680                  Ramp |        5
+  I- 580/I-680                  Ramp |        6
+  I- 580/I-680                  Ramp |        6
+  I- 580/I-680                  Ramp |        6
   I- 580                        Ramp |        2
   I- 580                        Ramp |        2
   I- 580                        Ramp |        2
***************
*** 717,736 **** SELECT name, #thepath FROM iexit ORDER BY 1, 2;
   I- 580                        Ramp |        8
   I- 580                        Ramp |        8
   I- 580                        Ramp |        8
-  I- 580/I-680                  Ramp |        2
-  I- 580/I-680                  Ramp |        2
-  I- 580/I-680                  Ramp |        2
-  I- 580/I-680                  Ramp |        2
-  I- 580/I-680                  Ramp |        2
-  I- 580/I-680                  Ramp |        2
-  I- 580/I-680                  Ramp |        4
-  I- 580/I-680                  Ramp |        4
-  I- 580/I-680                  Ramp |        4
-  I- 580/I-680                  Ramp |        4
-  I- 580/I-680                  Ramp |        5
-  I- 580/I-680                  Ramp |        6
-  I- 580/I-680                  Ramp |        6
-  I- 580/I-680                  Ramp |        6
   I- 680                             |        2
   I- 680                             |        2
   I- 680                             |        2
--- 731,736 ----
***************
*** 1318,1325 **** SET SESSION AUTHORIZATION regress_alice;
--- 1318,1328 ----
  --
  SELECT * FROM my_property_normal WHERE f_leak(passwd);
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => beafsteak
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => hamburger
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1334,1339 **** EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal WHERE f_leak(passwd);
--- 1337,1343 ----
  
  SELECT * FROM my_property_secure WHERE f_leak(passwd);
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1355,1362 **** EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure WHERE f_leak(passwd);
--- 1359,1369 ----
  --
  SELECT * FROM my_credit_card_normal WHERE f_leak(cnum);
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => 5555-6666-7777-8888
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => 9801-2345-6789-0123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   |        cnum         | climit 
  -----+---------------+------------------+-----------+---------------------+--------
   101 | regress_alice | +81-12-3456-7890 | passwd123 | 1111-2222-3333-4444 |   4000
***************
*** 1376,1381 **** EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_normal WHERE f_leak(cnum);
--- 1383,1389 ----
  
  SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   |        cnum         | climit 
  -----+---------------+------------------+-----------+---------------------+--------
   101 | regress_alice | +81-12-3456-7890 | passwd123 | 1111-2222-3333-4444 |   4000
***************
*** 1402,1407 **** EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
--- 1410,1416 ----
  SELECT * FROM my_credit_card_usage_normal
         WHERE f_leak(cnum) AND ymd >= '2011-10-01' AND ymd < '2011-11-01';
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   |        cnum         | climit |    ymd     | usage 
  -----+---------------+------------------+-----------+---------------------+--------+------------+-------
   101 | regress_alice | +81-12-3456-7890 | passwd123 | 1111-2222-3333-4444 |   4000 | 10-05-2011 |    90
***************
*** 1431,1438 **** EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_usage_normal
--- 1440,1450 ----
  SELECT * FROM my_credit_card_usage_secure
         WHERE f_leak(cnum) AND ymd >= '2011-10-01' AND ymd < '2011-11-01';
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   |        cnum         | climit |    ymd     | usage 
  -----+---------------+------------------+-----------+---------------------+--------+------------+-------
   101 | regress_alice | +81-12-3456-7890 | passwd123 | 1111-2222-3333-4444 |   4000 | 10-05-2011 |    90
***************
*** 1467,1474 **** PREPARE p1 AS SELECT * FROM my_property_normal WHERE f_leak(passwd);
--- 1479,1489 ----
  PREPARE p2 AS SELECT * FROM my_property_secure WHERE f_leak(passwd);
  EXECUTE p1;
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => beafsteak
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => hamburger
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1476,1481 **** NOTICE:  f_leak => hamburger
--- 1491,1497 ----
  
  EXECUTE p2;
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1487,1492 **** ALTER VIEW my_property_secure SET (security_barrier=false);
--- 1503,1509 ----
  SET SESSION AUTHORIZATION regress_alice;
  EXECUTE p1;		-- To be perform as a view with security-barrier
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1494,1501 **** NOTICE:  f_leak => passwd123
--- 1511,1521 ----
  
  EXECUTE p2;		-- To be perform as a view without security-barrier
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => beafsteak
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => hamburger
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
*** a/src/test/regress/expected/triggers.out
--- b/src/test/regress/expected/triggers.out
***************
*** 295,314 **** CREATE TRIGGER after_upd_row_trig AFTER UPDATE ON main_table
--- 295,324 ----
  FOR EACH ROW EXECUTE PROCEDURE trigger_func('after_upd_row');
  INSERT INTO main_table DEFAULT VALUES;
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  UPDATE main_table SET a = a + 1 WHERE b < 30;
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  -- UPDATE that effects zero rows should still call per-statement trigger
  UPDATE main_table SET a = a + 2 WHERE b > 100;
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  -- COPY should fire per-row and per-statement INSERT triggers
  COPY main_table (a, b) FROM stdin;
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  SELECT * FROM main_table ORDER BY a, b;
   a  | b  
  ----+----
***************
*** 339,366 **** CREATE TRIGGER delete_when AFTER DELETE ON main_table
--- 349,396 ----
  FOR EACH STATEMENT WHEN (true) EXECUTE PROCEDURE trigger_func('delete_when');
  INSERT INTO main_table (a) VALUES (123), (456);
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(insert_when) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(insert_a) called: action = INSERT, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  COPY main_table FROM stdin;
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(insert_when) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(insert_a) called: action = INSERT, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  DELETE FROM main_table WHERE a IN (123, 456);
  NOTICE:  trigger_func(delete_a) called: action = DELETE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(delete_a) called: action = DELETE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(delete_when) called: action = DELETE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  UPDATE main_table SET a = 50, b = 60;
  NOTICE:  trigger_func(modified_any) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_any) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  SELECT * FROM main_table ORDER BY a, b;
   a  | b  
  ----+----
***************
*** 418,451 **** SELECT pg_get_triggerdef(oid) FROM pg_trigger WHERE tgrelid = 'main_table'::regc
--- 448,509 ----
  
  UPDATE main_table SET a = 50;
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  UPDATE main_table SET b = 10;
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  --
  -- Test case for bug with BEFORE trigger followed by AFTER trigger with WHEN
  --
***************
*** 468,479 **** CREATE TRIGGER some_trig_afterb AFTER UPDATE ON some_t FOR EACH ROW
--- 526,542 ----
  INSERT INTO some_t VALUES (TRUE);
  UPDATE some_t SET some_col = TRUE;
  NOTICE:  dummy_update_func(before) called: action = UPDATE, old = (t), new = (t)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  UPDATE some_t SET some_col = FALSE;
  NOTICE:  dummy_update_func(before) called: action = UPDATE, old = (t), new = (f)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  NOTICE:  dummy_update_func(afterb) called: action = UPDATE, old = (t), new = (f)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  UPDATE some_t SET some_col = TRUE;
  NOTICE:  dummy_update_func(before) called: action = UPDATE, old = (f), new = (t)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  NOTICE:  dummy_update_func(aftera) called: action = UPDATE, old = (f), new = (t)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  DROP TABLE some_t;
  -- bogus cases
  CREATE TRIGGER error_upd_and_col BEFORE UPDATE OR UPDATE OF a ON main_table
***************
*** 546,568 **** create trigger trigtest_a_stmt_tg after insert or update or delete on trigtest
--- 609,640 ----
  for each statement execute procedure trigtest();
  insert into trigtest default values;
  NOTICE:  trigtest INSERT BEFORE STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT BEFORE ROW
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT AFTER ROW
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT AFTER STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  alter table trigtest disable trigger trigtest_b_row_tg;
  insert into trigtest default values;
  NOTICE:  trigtest INSERT BEFORE STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT AFTER ROW
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT AFTER STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  alter table trigtest disable trigger user;
  insert into trigtest default values;
  alter table trigtest enable trigger trigtest_a_stmt_tg;
  insert into trigtest default values;
  NOTICE:  trigtest INSERT AFTER STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  insert into trigtest2 values(1);
  insert into trigtest2 values(2);
  delete from trigtest where i=2;
  NOTICE:  trigtest DELETE AFTER STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  select * from trigtest2;
   i 
  ---
***************
*** 650,690 **** BEFORE INSERT OR UPDATE OR DELETE ON trigger_test
--- 722,796 ----
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
  insert into trigger_test values(1,'insert');
  NOTICE:  TG_NAME: show_trigger_data_trig
+ CONTEXT:  PL/pgSQL function trigger_data() line 15 at RAISE
  NOTICE:  TG_WHEN: BEFORE
+ CONTEXT:  PL/pgSQL function trigger_data() line 16 at RAISE
  NOTICE:  TG_LEVEL: ROW
+ CONTEXT:  PL/pgSQL function trigger_data() line 17 at RAISE
  NOTICE:  TG_OP: INSERT
+ CONTEXT:  PL/pgSQL function trigger_data() line 18 at RAISE
  NOTICE:  TG_RELID::regclass: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 19 at RAISE
  NOTICE:  TG_RELNAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 20 at RAISE
  NOTICE:  TG_TABLE_NAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 21 at RAISE
  NOTICE:  TG_TABLE_SCHEMA: public
+ CONTEXT:  PL/pgSQL function trigger_data() line 22 at RAISE
  NOTICE:  TG_NARGS: 2
+ CONTEXT:  PL/pgSQL function trigger_data() line 23 at RAISE
  NOTICE:  TG_ARGV: [23, skidoo]
+ CONTEXT:  PL/pgSQL function trigger_data() line 33 at RAISE
  NOTICE:  NEW: (1,insert)
+ CONTEXT:  PL/pgSQL function trigger_data() line 40 at RAISE
  update trigger_test set v = 'update' where i = 1;
  NOTICE:  TG_NAME: show_trigger_data_trig
+ CONTEXT:  PL/pgSQL function trigger_data() line 15 at RAISE
  NOTICE:  TG_WHEN: BEFORE
+ CONTEXT:  PL/pgSQL function trigger_data() line 16 at RAISE
  NOTICE:  TG_LEVEL: ROW
+ CONTEXT:  PL/pgSQL function trigger_data() line 17 at RAISE
  NOTICE:  TG_OP: UPDATE
+ CONTEXT:  PL/pgSQL function trigger_data() line 18 at RAISE
  NOTICE:  TG_RELID::regclass: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 19 at RAISE
  NOTICE:  TG_RELNAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 20 at RAISE
  NOTICE:  TG_TABLE_NAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 21 at RAISE
  NOTICE:  TG_TABLE_SCHEMA: public
+ CONTEXT:  PL/pgSQL function trigger_data() line 22 at RAISE
  NOTICE:  TG_NARGS: 2
+ CONTEXT:  PL/pgSQL function trigger_data() line 23 at RAISE
  NOTICE:  TG_ARGV: [23, skidoo]
+ CONTEXT:  PL/pgSQL function trigger_data() line 33 at RAISE
  NOTICE:  OLD: (1,insert)
+ CONTEXT:  PL/pgSQL function trigger_data() line 36 at RAISE
  NOTICE:  NEW: (1,update)
+ CONTEXT:  PL/pgSQL function trigger_data() line 40 at RAISE
  delete from trigger_test;
  NOTICE:  TG_NAME: show_trigger_data_trig
+ CONTEXT:  PL/pgSQL function trigger_data() line 15 at RAISE
  NOTICE:  TG_WHEN: BEFORE
+ CONTEXT:  PL/pgSQL function trigger_data() line 16 at RAISE
  NOTICE:  TG_LEVEL: ROW
+ CONTEXT:  PL/pgSQL function trigger_data() line 17 at RAISE
  NOTICE:  TG_OP: DELETE
+ CONTEXT:  PL/pgSQL function trigger_data() line 18 at RAISE
  NOTICE:  TG_RELID::regclass: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 19 at RAISE
  NOTICE:  TG_RELNAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 20 at RAISE
  NOTICE:  TG_TABLE_NAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 21 at RAISE
  NOTICE:  TG_TABLE_SCHEMA: public
+ CONTEXT:  PL/pgSQL function trigger_data() line 22 at RAISE
  NOTICE:  TG_NARGS: 2
+ CONTEXT:  PL/pgSQL function trigger_data() line 23 at RAISE
  NOTICE:  TG_ARGV: [23, skidoo]
+ CONTEXT:  PL/pgSQL function trigger_data() line 33 at RAISE
  NOTICE:  OLD: (1,update)
+ CONTEXT:  PL/pgSQL function trigger_data() line 36 at RAISE
  DROP TRIGGER show_trigger_data_trig on trigger_test;
  DROP FUNCTION trigger_data();
  DROP TABLE trigger_test;
***************
*** 709,722 **** INSERT INTO trigger_test VALUES(1, 'foo', 'bar');
--- 815,834 ----
  INSERT INTO trigger_test VALUES(2, 'baz', 'quux');
  UPDATE trigger_test SET f3 = 'bar';
  NOTICE:  row 1 not changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  UPDATE trigger_test SET f3 = NULL;
  NOTICE:  row 1 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  -- this demonstrates that the above isn't really working as desired:
  UPDATE trigger_test SET f3 = NULL;
  NOTICE:  row 1 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  -- the right way when considering nulls is
  CREATE OR REPLACE FUNCTION mytrigger() RETURNS trigger LANGUAGE plpgsql as $$
  begin
***************
*** 729,741 **** begin
--- 841,859 ----
  end$$;
  UPDATE trigger_test SET f3 = 'bar';
  NOTICE:  row 1 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  UPDATE trigger_test SET f3 = NULL;
  NOTICE:  row 1 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  UPDATE trigger_test SET f3 = NULL;
  NOTICE:  row 1 not changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  NOTICE:  row 2 not changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  DROP TABLE trigger_test;
  DROP FUNCTION mytrigger();
  -- Test snapshot management in serializable transactions involving triggers
***************
*** 945,971 **** FOR EACH STATEMENT EXECUTE PROCEDURE view_trigger('after_view_del_stmt');
  -- Insert into view using trigger
  INSERT INTO main_view VALUES (20, 30);
  NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (20,30)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
  INSERT 0 1
  INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
  NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (21,31)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
   a  | b  
  ----+----
   21 | 31
--- 1063,1101 ----
  -- Insert into view using trigger
  INSERT INTO main_view VALUES (20, 30);
  NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  NEW: (20,30)
+ CONTEXT:  PL/pgSQL function view_trigger() line 16 at RAISE
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  INSERT 0 1
  INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
  NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  NEW: (21,31)
+ CONTEXT:  PL/pgSQL function view_trigger() line 16 at RAISE
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
   a  | b  
  ----+----
   21 | 31
***************
*** 975,1013 **** INSERT 0 1
  -- Table trigger will prevent updates
  UPDATE main_view SET b = 31 WHERE a = 20;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 0
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a | b 
  ---+---
  (0 rows)
--- 1105,1159 ----
  -- Table trigger will prevent updates
  UPDATE main_view SET b = 31 WHERE a = 20;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (20,30), NEW: (20,31)
+ CONTEXT:  PL/pgSQL function view_trigger() line 22 at RAISE
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  UPDATE 0
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (21,31), NEW: (21,32)
+ CONTEXT:  PL/pgSQL function view_trigger() line 22 at RAISE
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
   a | b 
  ---+---
  (0 rows)
***************
*** 1018,1062 **** DROP TRIGGER before_upd_a_row_trig ON main_table;
  DROP TRIGGER
  UPDATE main_view SET b = 31 WHERE a = 20;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 1
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a  | b  
  ----+----
   21 | 32
--- 1164,1226 ----
  DROP TRIGGER
  UPDATE main_view SET b = 31 WHERE a = 20;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (20,30), NEW: (20,31)
+ CONTEXT:  PL/pgSQL function view_trigger() line 22 at RAISE
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  UPDATE 1
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (21,31), NEW: (21,32)
+ CONTEXT:  PL/pgSQL function view_trigger() line 22 at RAISE
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
   a  | b  
  ----+----
   21 | 32
***************
*** 1066,1089 **** UPDATE 1
--- 1230,1267 ----
  -- Before and after stmt triggers should fire even when no rows are affected
  UPDATE main_view SET b = 0 WHERE false;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  UPDATE 0
  -- Delete from view using trigger
  DELETE FROM main_view WHERE a IN (20,21);
  NOTICE:  main_view BEFORE DELETE STATEMENT (before_view_del_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF DELETE ROW (instead_of_del)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (21,10)
+ CONTEXT:  PL/pgSQL function view_trigger() line 29 at RAISE
  NOTICE:  main_view INSTEAD OF DELETE ROW (instead_of_del)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (20,31)
+ CONTEXT:  PL/pgSQL function view_trigger() line 29 at RAISE
  NOTICE:  main_view INSTEAD OF DELETE ROW (instead_of_del)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (21,32)
+ CONTEXT:  PL/pgSQL function view_trigger() line 29 at RAISE
  NOTICE:  main_view AFTER DELETE STATEMENT (after_view_del_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  DELETE 3
  DELETE FROM main_view WHERE a = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE DELETE STATEMENT (before_view_del_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF DELETE ROW (instead_of_del)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (31,10)
+ CONTEXT:  PL/pgSQL function view_trigger() line 29 at RAISE
  NOTICE:  main_view AFTER DELETE STATEMENT (after_view_del_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
   a  | b  
  ----+----
   31 | 10
***************
*** 1267,1272 **** INSERT 0 1
--- 1445,1451 ----
  -- UPDATE .. RETURNING
  UPDATE city_view SET country_name = 'Japon' WHERE city_name = 'Tokyo'; -- error
  ERROR:  No such country: "Japon"
+ CONTEXT:  PL/pgSQL function city_update() line 9 at RAISE
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Takyo'; -- no match
  UPDATE 0
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Tokyo' RETURNING *; -- OK
***************
*** 1478,1504 **** select pg_trigger_depth();
  
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  SQLSTATE = U9999: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  ERROR:  U9999
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
--- 1657,1690 ----
  
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
+ CONTEXT:  PL/pgSQL function depth_a_tf() line 3 at RAISE
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 3 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  PL/pgSQL function depth_c_tf() line 3 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  SQLSTATE = U9999: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 8 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 10 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  PL/pgSQL function depth_c_tf() line 3 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  ERROR:  U9999
! CONTEXT:  PL/pgSQL function depth_c_tf() line 5 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
***************
*** 1510,1532 **** select pg_trigger_depth();
  
  insert into depth_a values (2);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  SQL statement "insert into depth_c values (2)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  SQL statement "insert into depth_c values (2)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_a_tr: depth = 1
  select pg_trigger_depth();
   pg_trigger_depth 
  ------------------
--- 1696,1724 ----
  
  insert into depth_a values (2);
  NOTICE:  depth_a_tr: depth = 1
+ CONTEXT:  PL/pgSQL function depth_a_tf() line 3 at RAISE
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 3 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  PL/pgSQL function depth_c_tf() line 3 at RAISE
! SQL statement "insert into depth_c values (2)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  PL/pgSQL function depth_c_tf() line 7 at RAISE
! SQL statement "insert into depth_c values (2)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 10 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_a_tr: depth = 1
+ CONTEXT:  PL/pgSQL function depth_a_tf() line 5 at RAISE
  select pg_trigger_depth();
   pg_trigger_depth 
  ------------------
*** a/src/test/regress/expected/with.out
--- b/src/test/regress/expected/with.out
***************
*** 1903,1910 **** WITH t AS (
--- 1903,1913 ----
  )
  SELECT * FROM t;
  NOTICE:  y_trigger: a = 21
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
  NOTICE:  y_trigger: a = 22
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
  NOTICE:  y_trigger: a = 23
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
   a  
  ----
   21
***************
*** 1943,1950 **** WITH t AS (
--- 1946,1956 ----
  )
  SELECT * FROM t LIMIT 1;
  NOTICE:  y_trigger: a = 31
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
  NOTICE:  y_trigger: a = 32
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
  NOTICE:  y_trigger: a = 33
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
   a  
  ----
   31
***************
*** 1990,1995 **** WITH t AS (
--- 1996,2002 ----
  )
  SELECT * FROM t;
  NOTICE:  y_trigger
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
   a  
  ----
   41
*** a/src/test/regress/expected/xml_1.out
--- b/src/test/regress/expected/xml_1.out
***************
*** 773,778 **** HINT:  You need to rebuild PostgreSQL using --with-libxml.
--- 773,779 ----
  \set VERBOSITY terse
  SELECT xpath('/*', '<invalidns xmlns=''&lt;''/>');
  ERROR:  unsupported XML feature at character 20
+ CONTEXT:  20
  \set VERBOSITY default
  -- Again, the XML isn't well-formed for namespace purposes
  SELECT xpath('/*', '<nosuchprefix:tag/>');

*** a/doc/src/sgml/libpq.sgml
--- b/doc/src/sgml/libpq.sgml
***************
*** 5418,5423 **** int PQsetClientEncoding(PGconn *<replaceable>conn</replaceable>, const char *<re
--- 5418,5424 ----
  typedef enum
  {
      PQERRORS_TERSE,
+     PQERRORS_COMPACT,
      PQERRORS_DEFAULT,
      PQERRORS_VERBOSE
  } PGVerbosity;
***************
*** 5430,5439 **** PGVerbosity PQsetErrorVerbosity(PGconn *conn, PGVerbosity verbosity);
        returned messages include severity, primary text, and position only;
        this will normally fit on a single line.  The default mode produces
        messages that include the above plus any detail, hint, or context
!       fields (these might span multiple lines).  The <firstterm>VERBOSE</>
!       mode includes all available fields.  Changing the verbosity does not
!       affect the messages available from already-existing
!       <structname>PGresult</> objects, only subsequently-created ones.
       </para>
      </listitem>
     </varlistentry>
--- 5431,5442 ----
        returned messages include severity, primary text, and position only;
        this will normally fit on a single line.  The default mode produces
        messages that include the above plus any detail, hint, or context
!       fields (these might span multiple lines).  The COMPACT mode is otherwise
!       the same as the default, except the context field will be omitted for
!       non-error messages.  The <firstterm>VERBOSE</> mode includes all
!       available fields.  Changing the verbosity does not affect the messages
!       available from already-existing <structname>PGresult</> objects, only
!       subsequently-created ones.
       </para>
      </listitem>
     </varlistentry>
*** a/src/bin/psql/startup.c
--- b/src/bin/psql/startup.c
***************
*** 796,801 **** verbosity_hook(const char *newval)
--- 796,803 ----
  		pset.verbosity = PQERRORS_DEFAULT;
  	else if (strcmp(newval, "terse") == 0)
  		pset.verbosity = PQERRORS_TERSE;
+ 	else if (strcmp(newval, "compact") == 0)
+ 		pset.verbosity = PQERRORS_COMPACT;
  	else if (strcmp(newval, "verbose") == 0)
  		pset.verbosity = PQERRORS_VERBOSE;
  	else
*** a/src/interfaces/libpq/fe-protocol3.c
--- b/src/interfaces/libpq/fe-protocol3.c
***************
*** 915,920 **** pqGetErrorNotice3(PGconn *conn, bool isError)
--- 915,924 ----
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("QUERY:  %s\n"), val);
  		val = PQresultErrorField(res, PG_DIAG_CONTEXT);
+ 	}
+ 	if (isError || (conn->verbosity != PQERRORS_TERSE &&
+ 					conn->verbosity != PQERRORS_COMPACT))
+ 	{
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("CONTEXT:  %s\n"), val);
  	}
*** a/src/interfaces/libpq/libpq-fe.h
--- b/src/interfaces/libpq/libpq-fe.h
***************
*** 106,111 **** typedef enum
--- 106,112 ----
  typedef enum
  {
  	PQERRORS_TERSE,				/* single-line error messages */
+ 	PQERRORS_COMPACT,			/* single-line error messages on non-error messags */
  	PQERRORS_DEFAULT,			/* recommended style */
  	PQERRORS_VERBOSE			/* all the facts, ma'am */
  } PGVerbosity;
*** a/src/pl/plpgsql/src/pl_exec.c
--- b/src/pl/plpgsql/src/pl_exec.c
***************
*** 39,46 ****
  #include "utils/typcache.h"
  
  
- static const char *const raise_skip_msg = "RAISE";
- 
  typedef struct
  {
  	int			nargs;			/* number of arguments */
--- 39,44 ----
***************
*** 867,876 **** plpgsql_exec_error_callback(void *arg)
  {
  	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) arg;
  
- 	/* if we are doing RAISE, don't report its location */
- 	if (estate->err_text == raise_skip_msg)
- 		return;
- 
  	if (estate->err_text != NULL)
  	{
  		/*
--- 865,870 ----
***************
*** 3032,3038 **** exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
  	/*
  	 * Throw the error (may or may not come back)
  	 */
- 	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
  
  	ereport(stmt->elog_level,
  			(err_code ? errcode(err_code) : 0,
--- 3026,3031 ----
*** a/src/test/regress/expected/alter_table.out
--- b/src/test/regress/expected/alter_table.out
***************
*** 361,371 **** CREATE FUNCTION boo(int) RETURNS int IMMUTABLE STRICT LANGUAGE plpgsql AS $$ BEG
--- 361,374 ----
  INSERT INTO tmp7 VALUES (8, 18);
  ALTER TABLE tmp7 ADD CONSTRAINT identity CHECK (b = boo(b));
  NOTICE:  boo: 18
+ CONTEXT:  PL/pgSQL function boo(integer) line 1 at RAISE
  ALTER TABLE tmp3 ADD CONSTRAINT IDENTITY check (b = boo(b)) NOT VALID;
  NOTICE:  merging constraint "identity" with inherited definition
  ALTER TABLE tmp3 VALIDATE CONSTRAINT identity;
  NOTICE:  boo: 16
+ CONTEXT:  PL/pgSQL function boo(integer) line 1 at RAISE
  NOTICE:  boo: 20
+ CONTEXT:  PL/pgSQL function boo(integer) line 1 at RAISE
  -- Try (and fail) to create constraint from tmp5(a) to tmp4(a) - unique constraint on
  -- tmp4 is a,b
  ALTER TABLE tmp5 add constraint tmpconstr foreign key(a) references tmp4(a) match full;
*** a/src/test/regress/expected/event_trigger.out
--- b/src/test/regress/expected/event_trigger.out
***************
*** 70,79 **** alter event trigger regress_event_trigger disable;
--- 70,82 ----
  -- regress_event_trigger
  create table event_trigger_fire1 (a int);
  NOTICE:  test_event_trigger: ddl_command_start CREATE TABLE
+ CONTEXT:  PL/pgSQL function test_event_trigger() line 3 at RAISE
  NOTICE:  test_event_trigger: ddl_command_end CREATE TABLE
+ CONTEXT:  PL/pgSQL function test_event_trigger() line 3 at RAISE
  -- regress_event_trigger_end should fire here
  drop table event_trigger_fire1;
  NOTICE:  test_event_trigger: ddl_command_end DROP TABLE
+ CONTEXT:  PL/pgSQL function test_event_trigger() line 3 at RAISE
  -- alter owner to non-superuser should fail
  alter event trigger regress_event_trigger owner to regression_bob;
  ERROR:  permission denied to change owner of event trigger "regress_event_trigger"
***************
*** 194,200 **** PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
--- 197,204 ----
  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
! SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
***************
*** 224,229 **** NOTICE:  table "schema_one_table_three" does not exist, skipping
--- 228,234 ----
  CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object schema_one.table_three of type table cannot be dropped
+ CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
*** a/src/test/regress/expected/plancache.out
--- b/src/test/regress/expected/plancache.out
***************
*** 237,244 **** NOTICE:  table "temptable" does not exist, skipping
--- 237,247 ----
  CONTEXT:  SQL statement "drop table if exists temptable cascade"
  PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
   cachebug 
  ----------
   
***************
*** 249,256 **** NOTICE:  drop cascades to view vv
--- 252,262 ----
  CONTEXT:  SQL statement "drop table if exists temptable cascade"
  PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function cachebug() line 8 at RAISE
   cachebug 
  ----------
   
*** a/src/test/regress/expected/plpgsql.out
--- b/src/test/regress/expected/plpgsql.out
***************
*** 1518,1544 **** ERROR:  duplicate key value violates unique constraint "pfield_name"
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
--- 1518,1552 ----
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 47 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 77 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_biu() line 12 at RAISE
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_bd() line 12 at RAISE
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 8 at RAISE
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 14 at RAISE
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
***************
*** 1934,1941 **** begin
--- 1942,1952 ----
  end$$ language plpgsql;
  select trap_zero_divide(50);
  NOTICE:  should see this
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
  NOTICE:  should see this only if 50 <> 0
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 8 at RAISE
  NOTICE:  should see this only if 50 fits in smallint
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 10 at RAISE
   trap_zero_divide 
  ------------------
                  2
***************
*** 1943,1949 **** NOTICE:  should see this only if 50 fits in smallint
--- 1954,1962 ----
  
  select trap_zero_divide(0);
  NOTICE:  should see this
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
  NOTICE:  caught division_by_zero
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 16 at RAISE
   trap_zero_divide 
  ------------------
                 -1
***************
*** 1951,1958 **** NOTICE:  caught division_by_zero
--- 1964,1974 ----
  
  select trap_zero_divide(100000);
  NOTICE:  should see this
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
  NOTICE:  should see this only if 100000 <> 0
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 8 at RAISE
  NOTICE:  caught numeric_value_out_of_range
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 19 at RAISE
   trap_zero_divide 
  ------------------
                 -2
***************
*** 1960,1968 **** NOTICE:  caught numeric_value_out_of_range
--- 1976,1988 ----
  
  select trap_zero_divide(-100);
  NOTICE:  should see this
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
  NOTICE:  should see this only if -100 <> 0
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 8 at RAISE
  NOTICE:  should see this only if -100 fits in smallint
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 10 at RAISE
  ERROR:  -100 is less than zero
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 12 at RAISE
  create function trap_matching_test(int) returns int as $$
  declare x int;
  	sx smallint;
***************
*** 1991,1996 **** select trap_matching_test(50);
--- 2011,2017 ----
  
  select trap_matching_test(0);
  NOTICE:  caught data_exception
+ CONTEXT:  PL/pgSQL function trap_matching_test(integer) line 13 at RAISE
   trap_matching_test 
  --------------------
                   -1
***************
*** 1998,2003 **** NOTICE:  caught data_exception
--- 2019,2025 ----
  
  select trap_matching_test(100000);
  NOTICE:  caught data_exception
+ CONTEXT:  PL/pgSQL function trap_matching_test(integer) line 13 at RAISE
   trap_matching_test 
  --------------------
                   -1
***************
*** 2005,2010 **** NOTICE:  caught data_exception
--- 2027,2033 ----
  
  select trap_matching_test(1);
  NOTICE:  caught numeric_value_out_of_range or cardinality_violation
+ CONTEXT:  PL/pgSQL function trap_matching_test(integer) line 16 at RAISE
   trap_matching_test 
  --------------------
                   -2
***************
*** 2035,2040 **** end$$ language plpgsql;
--- 2058,2064 ----
  set statement_timeout to 2000;
  select blockme();
  NOTICE:  nyeah nyeah, can't stop me
+ CONTEXT:  PL/pgSQL function blockme() line 16 at RAISE
   blockme 
  ---------
        20
***************
*** 2066,2078 **** begin
  end$$ language plpgsql;
  select test_variable_storage();
  NOTICE:  should see this
! CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 <> 0
! CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 fits in smallint
! CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
   test_variable_storage 
  -----------------------
--- 2090,2105 ----
  end$$ language plpgsql;
  select test_variable_storage();
  NOTICE:  should see this
! CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 6 at RAISE
! SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 <> 0
! CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 8 at RAISE
! SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 fits in smallint
! CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 10 at RAISE
! SQL statement "SELECT trap_zero_divide(-100)"
  PL/pgSQL function test_variable_storage() line 8 at PERFORM
   test_variable_storage 
  -----------------------
***************
*** 2119,2124 **** select trap_foreign_key(1);
--- 2146,2152 ----
  
  select trap_foreign_key(2);	-- detects FK violation
  NOTICE:  caught foreign_key_violation
+ CONTEXT:  PL/pgSQL function trap_foreign_key(integer) line 7 at RAISE
   trap_foreign_key 
  ------------------
                  0
***************
*** 2139,2144 **** DETAIL:  Key (f1)=(2) is not present in table "master".
--- 2167,2173 ----
    rollback to x;
    select trap_foreign_key_2();  -- detects FK violation
  NOTICE:  caught foreign_key_violation
+ CONTEXT:  PL/pgSQL function trap_foreign_key_2() line 7 at RAISE
   trap_foreign_key_2 
  --------------------
                    0
***************
*** 2481,2487 **** END;
--- 2510,2518 ----
  $$ LANGUAGE plpgsql;
  SELECT reraise_test();
  NOTICE:  exception syntax_error thrown in inner block, reraising
+ CONTEXT:  PL/pgSQL function reraise_test() line 8 at RAISE
  NOTICE:  RIGHT - exception syntax_error caught in inner block
+ CONTEXT:  PL/pgSQL function reraise_test() line 12 at RAISE
   reraise_test 
  --------------
   
***************
*** 2576,2583 **** begin
--- 2607,2617 ----
  end; $$ language plpgsql;
  select execute_into_test('eifoo');
  NOTICE:  10 1
+ CONTEXT:  PL/pgSQL function execute_into_test(character varying) line 12 at RAISE
  NOTICE:  10 15
+ CONTEXT:  PL/pgSQL function execute_into_test(character varying) line 14 at RAISE
  NOTICE:  10 15 20
+ CONTEXT:  PL/pgSQL function execute_into_test(character varying) line 16 at RAISE
   execute_into_test 
  -------------------
   (1,2)
***************
*** 2636,2644 **** begin
--- 2670,2682 ----
  end; $$ language plpgsql;
  select excpt_test3();
  NOTICE:  caught exception P0001 user exception
+ CONTEXT:  PL/pgSQL function excpt_test3() line 6 at RAISE
  NOTICE:  P0001 user exception
+ CONTEXT:  PL/pgSQL function excpt_test3() line 8 at RAISE
  NOTICE:  caught exception 22012 division by zero
+ CONTEXT:  PL/pgSQL function excpt_test3() line 15 at RAISE
  NOTICE:  P0001 user exception
+ CONTEXT:  PL/pgSQL function excpt_test3() line 17 at RAISE
   excpt_test3 
  -------------
   
***************
*** 2659,2664 **** begin
--- 2697,2703 ----
  end;$$ language plpgsql;
  select raise_exprs();
  NOTICE:  {10,20,30}; 20; xyz; xyzabc; (10,aaa,,30); <NULL>
+ CONTEXT:  PL/pgSQL function raise_exprs() line 8 at RAISE
   raise_exprs 
  -------------
   
***************
*** 2750,2807 **** begin
--- 2789,2899 ----
  end; $$ language plpgsql;
  select continue_test1();
  NOTICE:  ---1---
+ CONTEXT:  PL/pgSQL function continue_test1() line 4 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  8
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  9
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  10
+ CONTEXT:  PL/pgSQL function continue_test1() line 7 at RAISE
  NOTICE:  ---2---
+ CONTEXT:  PL/pgSQL function continue_test1() line 12 at RAISE
  NOTICE:  9
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  8
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  0
+ CONTEXT:  PL/pgSQL function continue_test1() line 17 at RAISE
  NOTICE:  ---3---
+ CONTEXT:  PL/pgSQL function continue_test1() line 23 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  9
+ CONTEXT:  PL/pgSQL function continue_test1() line 28 at RAISE
  NOTICE:  ---4---
+ CONTEXT:  PL/pgSQL function continue_test1() line 31 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  8
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  9
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  10
+ CONTEXT:  PL/pgSQL function continue_test1() line 36 at RAISE
  NOTICE:  ---5---
+ CONTEXT:  PL/pgSQL function continue_test1() line 40 at RAISE
  NOTICE:  30
+ CONTEXT:  PL/pgSQL function continue_test1() line 43 at RAISE
  NOTICE:  40
+ CONTEXT:  PL/pgSQL function continue_test1() line 43 at RAISE
  NOTICE:  ---6---
+ CONTEXT:  PL/pgSQL function continue_test1() line 46 at RAISE
  NOTICE:  30
+ CONTEXT:  PL/pgSQL function continue_test1() line 49 at RAISE
  NOTICE:  40
+ CONTEXT:  PL/pgSQL function continue_test1() line 49 at RAISE
  NOTICE:  ---7---
+ CONTEXT:  PL/pgSQL function continue_test1() line 52 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 54 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function continue_test1() line 54 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 54 at RAISE
  NOTICE:  ---8---
+ CONTEXT:  PL/pgSQL function continue_test1() line 58 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function continue_test1() line 61 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function continue_test1() line 61 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function continue_test1() line 61 at RAISE
  NOTICE:  ---9---
+ CONTEXT:  PL/pgSQL function continue_test1() line 66 at RAISE
  NOTICE:  10
+ CONTEXT:  PL/pgSQL function continue_test1() line 68 at RAISE
  NOTICE:  ---10---
+ CONTEXT:  PL/pgSQL function continue_test1() line 72 at RAISE
  NOTICE:  10
+ CONTEXT:  PL/pgSQL function continue_test1() line 74 at RAISE
   continue_test1 
  ----------------
   
***************
*** 2924,2947 **** end;
--- 3016,3058 ----
  $proc$ language plpgsql;
  select for_vect();
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function for_vect() line 6 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function for_vect() line 6 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function for_vect() line 6 at RAISE
  NOTICE:  1 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 10 at RAISE
  NOTICE:  2 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 10 at RAISE
  NOTICE:  3 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 10 at RAISE
  NOTICE:  4 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 10 at RAISE
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function for_vect() line 14 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function for_vect() line 14 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function for_vect() line 14 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function for_vect() line 14 at RAISE
  NOTICE:  1 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 18 at RAISE
  NOTICE:  2 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 18 at RAISE
  NOTICE:  3 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 18 at RAISE
  NOTICE:  4 BB CC
+ CONTEXT:  PL/pgSQL function for_vect() line 18 at RAISE
  NOTICE:  1 bb cc
+ CONTEXT:  PL/pgSQL function for_vect() line 22 at RAISE
  NOTICE:  2 bb cc
+ CONTEXT:  PL/pgSQL function for_vect() line 22 at RAISE
  NOTICE:  3 bb cc
+ CONTEXT:  PL/pgSQL function for_vect() line 22 at RAISE
  NOTICE:  4 bb cc
+ CONTEXT:  PL/pgSQL function for_vect() line 22 at RAISE
   for_vect 
  ----------
   
***************
*** 2981,2986 **** begin
--- 3092,3098 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 5, x.f2 = 6
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3005,3010 **** begin
--- 3117,3123 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 5, x.f2 = 6
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3019,3024 **** begin
--- 3132,3138 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 7, x.f2 = 8
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3044,3049 **** begin
--- 3158,3164 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 3, x.f2 = 4
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3078,3083 **** begin
--- 3193,3199 ----
  end$$ language plpgsql;
  select footest();
  NOTICE:  x.f1 = 3, x.f2 = 4
+ CONTEXT:  PL/pgSQL function footest() line 6 at RAISE
   footest 
  ---------
   
***************
*** 3282,3290 **** end;
--- 3398,3410 ----
  $$ language plpgsql;
  select pl_qual_names(42);
  NOTICE:  param1 = 2
+ CONTEXT:  PL/pgSQL function pl_qual_names(integer) line 10 at RAISE
  NOTICE:  pl_qual_names.param1 = 42
+ CONTEXT:  PL/pgSQL function pl_qual_names(integer) line 11 at RAISE
  NOTICE:  outerblock.param1 = 1
+ CONTEXT:  PL/pgSQL function pl_qual_names(integer) line 12 at RAISE
  NOTICE:  innerblock.param1 = 2
+ CONTEXT:  PL/pgSQL function pl_qual_names(integer) line 13 at RAISE
   pl_qual_names 
  ---------------
   
***************
*** 3353,3363 **** end
--- 3473,3489 ----
  $$ language plpgsql;
  select exc_using(5, 'foobar');
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function exc_using(integer,text) line 5 at RAISE
   exc_using 
  -----------
          26
***************
*** 3381,3391 **** end;
--- 3507,3523 ----
  $$ language plpgsql;
  select exc_using(5);
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function exc_using(integer) line 10 at RAISE
   exc_using 
  -----------
   
***************
*** 3430,3451 **** end;
--- 3562,3600 ----
  $$ language plpgsql;
  select forc01();
  NOTICE:  5 from c
+ CONTEXT:  PL/pgSQL function forc01() line 9 at RAISE
  NOTICE:  6 from c
+ CONTEXT:  PL/pgSQL function forc01() line 9 at RAISE
  NOTICE:  7 from c
+ CONTEXT:  PL/pgSQL function forc01() line 9 at RAISE
  NOTICE:  9 from c
+ CONTEXT:  PL/pgSQL function forc01() line 13 at RAISE
  NOTICE:  10 from c
+ CONTEXT:  PL/pgSQL function forc01() line 13 at RAISE
  NOTICE:  41 from c2
+ CONTEXT:  PL/pgSQL function forc01() line 17 at RAISE
  NOTICE:  42 from c2
+ CONTEXT:  PL/pgSQL function forc01() line 17 at RAISE
  NOTICE:  43 from c2
+ CONTEXT:  PL/pgSQL function forc01() line 17 at RAISE
  NOTICE:  after loop, c2 = c2
+ CONTEXT:  PL/pgSQL function forc01() line 20 at RAISE
  NOTICE:  41 from special_name
+ CONTEXT:  PL/pgSQL function forc01() line 23 at RAISE
  NOTICE:  42 from special_name
+ CONTEXT:  PL/pgSQL function forc01() line 23 at RAISE
  NOTICE:  43 from special_name
+ CONTEXT:  PL/pgSQL function forc01() line 23 at RAISE
  NOTICE:  after loop, c2 = special_name
+ CONTEXT:  PL/pgSQL function forc01() line 25 at RAISE
  NOTICE:  41
+ CONTEXT:  PL/pgSQL function forc01() line 30 at RAISE
  NOTICE:  42
+ CONTEXT:  PL/pgSQL function forc01() line 30 at RAISE
  NOTICE:  43
+ CONTEXT:  PL/pgSQL function forc01() line 30 at RAISE
  NOTICE:  after loop, c2 = <NULL>
+ CONTEXT:  PL/pgSQL function forc01() line 32 at RAISE
   forc01 
  --------
   
***************
*** 3466,3480 **** end;
--- 3615,3639 ----
  $$ language plpgsql;
  select forc01();
  NOTICE:  1, 1
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  2, 2
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  3, 3
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  4, 4
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  5, 5
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  6, 6
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  7, 7
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  8, 8
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  9, 9
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
  NOTICE:  10, 10
+ CONTEXT:  PL/pgSQL function forc01() line 6 at RAISE
   forc01 
  --------
   
***************
*** 3512,3526 **** end;
--- 3671,3695 ----
  $$ language plpgsql;
  select forc01();
  NOTICE:  100, 2
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  200, 4
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  300, 6
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  400, 8
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  500, 10
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  600, 12
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  700, 14
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  800, 16
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  900, 18
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
  NOTICE:  1000, 20
+ CONTEXT:  PL/pgSQL function forc01() line 10 at RAISE
   forc01 
  --------
   
***************
*** 3769,3776 **** select raise_test();
--- 3938,3947 ----
  NOTICE:  1 2 3
  DETAIL:  some detail info
  HINT:  some hint
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  ERROR:  1 2 3
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 5 at RAISE
  -- Since we can't actually see the thrown SQLSTATE in default psql output,
  -- test it like this; this also tests re-RAISE
  create or replace function raise_test() returns void as $$
***************
*** 3785,3792 **** end;
--- 3956,3965 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  SQLSTATE: 22012 SQLERRM: check me
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise 'check me'
***************
*** 3799,3806 **** end;
--- 3972,3981 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- SQLSTATE specification in WHEN
  create or replace function raise_test() returns void as $$
  begin
***************
*** 3814,3821 **** end;
--- 3989,3998 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using detail = 'some detail info';
***************
*** 3827,3834 **** end;
--- 4004,4013 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  SQLSTATE: 22012 SQLERRM: division_by_zero
+ CONTEXT:  PL/pgSQL function raise_test() line 6 at RAISE
  ERROR:  division_by_zero
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero;
***************
*** 3836,3841 **** end;
--- 4015,4021 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  division_by_zero
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise sqlstate '1234F';
***************
*** 3843,3848 **** end;
--- 4023,4029 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  1234F
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using message = 'custom' || ' message';
***************
*** 3850,3855 **** end;
--- 4031,4037 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise using message = 'custom' || ' message', errcode = '22012';
***************
*** 3857,3862 **** end;
--- 4039,4045 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- conflict on message
  create or replace function raise_test() returns void as $$
  begin
***************
*** 3915,3920 **** end;
--- 4098,4104 ----
  $$ language plpgsql;
  select stacked_diagnostics_test();
  NOTICE:  sqlstate: 22012, message: division by zero, context: [PL/pgSQL function zero_divide() line 4 at RETURN <- SQL statement "SELECT zero_divide()" <- PL/pgSQL function stacked_diagnostics_test() line 6 at PERFORM]
+ CONTEXT:  PL/pgSQL function stacked_diagnostics_test() line 12 at RAISE
   stacked_diagnostics_test 
  --------------------------
   
***************
*** 3936,3941 **** end;
--- 4120,4126 ----
  $$ language plpgsql;
  select stacked_diagnostics_test();
  NOTICE:  message: custom exception, detail: some detail of custom exception, hint: some hint related to custom exception
+ CONTEXT:  PL/pgSQL function stacked_diagnostics_test() line 12 at RAISE
   stacked_diagnostics_test 
  --------------------------
   
***************
*** 3972,3978 **** end;
--- 4157,4165 ----
  $$ language plpgsql;
  select raise_test();
  NOTICE:  22012
+ CONTEXT:  PL/pgSQL function raise_test() line 6 at RAISE
  ERROR:  substitute message
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  drop function raise_test();
  -- test passing column_name, constraint_name, datatype_name, table_name
  -- and schema_name error fields
***************
*** 4002,4007 **** end;
--- 4189,4195 ----
  $$ language plpgsql;
  select stacked_diagnostics_test();
  NOTICE:  column >>some column name<<, constraint >>some constraint name<<, type >>some datatype name<<, table >>some table name<<, schema >>some schema name<<
+ CONTEXT:  PL/pgSQL function stacked_diagnostics_test() line 21 at RAISE
   stacked_diagnostics_test 
  --------------------------
   
***************
*** 4093,4098 **** end
--- 4281,4287 ----
  $$ language plpgsql;
  select catch();
  NOTICE:  caught case_not_found 20000 case not found
+ CONTEXT:  PL/pgSQL function catch() line 6 at RAISE
   catch 
  -------
   
***************
*** 4148,4157 **** begin
--- 4337,4351 ----
  $$ language plpgsql;
  select vari(1,2,3,4,5);
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
   vari 
  ------
   
***************
*** 4159,4166 **** NOTICE:  5
--- 4353,4363 ----
  
  select vari(3,4,5);
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
   vari 
  ------
   
***************
*** 4168,4175 **** NOTICE:  5
--- 4365,4375 ----
  
  select vari(variadic array[5,6,7]);
  NOTICE:  5
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  6
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
  NOTICE:  7
+ CONTEXT:  PL/pgSQL function vari(integer[]) line 4 at RAISE
   vari 
  ------
   
***************
*** 4221,4226 **** end;
--- 4421,4427 ----
  $$ language plpgsql immutable strict;
  select pleast(10);
  NOTICE:  non-variadic function called
+ CONTEXT:  PL/pgSQL function pleast(numeric) line 3 at RAISE
   pleast 
  --------
       10
***************
*** 4280,4288 **** end;
--- 4481,4493 ----
  $$ language plpgsql;
  select * from rttest();
  NOTICE:  t 2
+ CONTEXT:  PL/pgSQL function rttest() line 6 at RAISE
  NOTICE:  f 0
+ CONTEXT:  PL/pgSQL function rttest() line 9 at RAISE
  NOTICE:  t 2
+ CONTEXT:  PL/pgSQL function rttest() line 12 at RAISE
  NOTICE:  f 0
+ CONTEXT:  PL/pgSQL function rttest() line 15 at RAISE
   rttest 
  --------
       10
***************
*** 4458,4463 **** LINE 4:   return 'foo\\bar\041baz';
--- 4663,4669 ----
  HINT:  Use the escape string syntax for backslashes, e.g., E'\\'.
  select strtest();
  NOTICE:  foo\bar!baz
+ CONTEXT:  PL/pgSQL function strtest() line 3 at RAISE
  WARNING:  nonstandard use of \\ in a string literal
  LINE 1: SELECT 'foo\\bar\041baz'
                 ^
***************
*** 4477,4482 **** end
--- 4683,4689 ----
  $$ language plpgsql;
  select strtest();
  NOTICE:  foo\bar!baz
+ CONTEXT:  PL/pgSQL function strtest() line 3 at RAISE
     strtest   
  -------------
   foo\bar!baz
***************
*** 4491,4496 **** end
--- 4698,4704 ----
  $$ language plpgsql;
  select strtest();
  NOTICE:  foo\\bar\041baz\
+ CONTEXT:  PL/pgSQL function strtest() line 3 at RAISE
       strtest      
  ------------------
   foo\\bar\041baz\
***************
*** 4504,4509 **** end
--- 4712,4718 ----
  $$ language plpgsql;
  select strtest();
  NOTICE:  foo\bar!baz
+ CONTEXT:  PL/pgSQL function strtest() line 3 at RAISE
     strtest   
  -------------
   foo\bar!baz
***************
*** 4520,4534 **** BEGIN
--- 4729,4753 ----
      END LOOP;
  END$$;
  NOTICE:  001, Entrance
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  002, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  003, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  004, Technical
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  101, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  102, Conference
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  103, Restroom
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  104, Technical
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  105, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  NOTICE:  106, Office
+ CONTEXT:  PL/pgSQL function inline_code_block line 6 at RAISE
  -- these are to check syntax error reporting
  DO LANGUAGE plpgsql $$begin return 1; end$$;
  ERROR:  RETURN cannot have a parameter in function returning void
***************
*** 4656,4664 **** begin
--- 4875,4887 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[1,2,3,4]);
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4666,4674 **** NOTICE:  4
--- 4889,4901 ----
  
  select foreach_test(ARRAY[[1,2],[3,4]]);
  NOTICE:  1
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  2
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  3
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  4
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4703,4708 **** begin
--- 4930,4936 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[1,2,3,4]);
  NOTICE:  {1,2,3,4}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4710,4716 **** NOTICE:  {1,2,3,4}
--- 4938,4946 ----
  
  select foreach_test(ARRAY[[1,2],[3,4]]);
  NOTICE:  {1,2}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  {3,4}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4734,4739 **** CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 4 at FOREACH over array
--- 4964,4970 ----
  -- ok
  select foreach_test(ARRAY[[1,2],[3,4]]);
  NOTICE:  {{1,2},{3,4}}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4741,4747 **** NOTICE:  {{1,2},{3,4}}
--- 4972,4980 ----
  
  select foreach_test(ARRAY[[[1,2]],[[3,4]]]);
  NOTICE:  {{1,2}}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  {{3,4}}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4761,4768 **** begin
--- 4994,5004 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[(10,20),(40,69),(35,78)]::xy_tuple[]);
  NOTICE:  (10,20)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (40,69)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (35,78)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4770,4778 **** NOTICE:  (35,78)
--- 5006,5018 ----
  
  select foreach_test(ARRAY[[(10,20),(40,69)],[(35,78),(88,76)]]::xy_tuple[]);
  NOTICE:  (10,20)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (40,69)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (35,78)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  (88,76)
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4790,4797 **** begin
--- 5030,5040 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[(10,20),(40,69),(35,78)]::xy_tuple[]);
  NOTICE:  x = 10, y = 20
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 40, y = 69
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 35, y = 78
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4799,4807 **** NOTICE:  x = 35, y = 78
--- 5042,5054 ----
  
  select foreach_test(ARRAY[[(10,20),(40,69)],[(35,78),(88,76)]]::xy_tuple[]);
  NOTICE:  x = 10, y = 20
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 40, y = 69
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 35, y = 78
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  x = 88, y = 76
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4820,4825 **** begin
--- 5067,5073 ----
  $$ language plpgsql;
  select foreach_test(ARRAY[(10,20),(40,69),(35,78)]::xy_tuple[]);
  NOTICE:  {"(10,20)","(40,69)","(35,78)"}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4827,4833 **** NOTICE:  {"(10,20)","(40,69)","(35,78)"}
--- 5075,5083 ----
  
  select foreach_test(ARRAY[[(10,20),(40,69)],[(35,78),(88,76)]]::xy_tuple[]);
  NOTICE:  {"(10,20)","(40,69)"}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
  NOTICE:  {"(35,78)","(88,76)"}
+ CONTEXT:  PL/pgSQL function foreach_test(anyarray) line 6 at RAISE
   foreach_test 
  --------------
   
***************
*** 4935,4958 **** end;
  $$ language plpgsql;
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
                 20
--- 5185,5215 ----
  $$ language plpgsql;
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 5 at RAISE
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_func(integer) line 5 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 5 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 8 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function inner_func(integer) line 9 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_func(integer) line 7 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 7 at RAISE
   outer_outer_func 
  ------------------
                 20
***************
*** 4961,4984 **** NOTICE:  outer_func() done
  -- repeated call should to work
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
                 40
--- 5218,5248 ----
  -- repeated call should to work
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 5 at RAISE
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_func(integer) line 5 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 5 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 8 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function inner_func(integer) line 9 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_func(integer) line 7 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 7 at RAISE
   outer_outer_func 
  ------------------
                 40
***************
*** 5033,5056 **** end;
  $$ language plpgsql;
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
                 20
--- 5297,5327 ----
  $$ language plpgsql;
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 5 at RAISE
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_func(integer) line 5 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 11 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 16 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function inner_func(integer) line 17 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_func(integer) line 7 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 7 at RAISE
   outer_outer_func 
  ------------------
                 20
***************
*** 5059,5082 **** NOTICE:  outer_func() done
  -- repeated call should to work
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
                 40
--- 5330,5360 ----
  -- repeated call should to work
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 5 at RAISE
  NOTICE:  calling down into inner_func()
! CONTEXT:  PL/pgSQL function outer_func(integer) line 5 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 11 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
! CONTEXT:  PL/pgSQL function inner_func(integer) line 16 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
! CONTEXT:  PL/pgSQL function inner_func(integer) line 17 at RAISE
! PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
! CONTEXT:  PL/pgSQL function outer_func(integer) line 7 at RAISE
! PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
+ CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 7 at RAISE
   outer_outer_func 
  ------------------
                 40
*** a/src/test/regress/expected/polymorphism.out
--- b/src/test/regress/expected/polymorphism.out
***************
*** 555,564 **** select case when $1 then $2 else $3 end $$ language sql;
--- 555,569 ----
  -- if the CASE expression were not successfully inlined
  select f1, sql_if(f1 > 0, bleat(f1), bleat(f1 + 1)) from int4_tbl;
  NOTICE:  bleat 1
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
  NOTICE:  bleat 123456
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
  NOTICE:  bleat -123455
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
  NOTICE:  bleat 2147483647
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
  NOTICE:  bleat -2147483646
+ CONTEXT:  PL/pgSQL function bleat(integer) line 3 at RAISE
       f1      |   sql_if    
  -------------+-------------
             0 |           1
*** a/src/test/regress/expected/rangefuncs.out
--- b/src/test/regress/expected/rangefuncs.out
***************
*** 1366,1374 **** create trigger tnoticetrigger after insert on tt for each row
  execute procedure noticetrigger();
  select insert_tt2('foolme','barme') limit 1;
  NOTICE:  noticetrigger 11 foolme
! CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 12 barme
! CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           11
--- 1366,1376 ----
  execute procedure noticetrigger();
  select insert_tt2('foolme','barme') limit 1;
  NOTICE:  noticetrigger 11 foolme
! CONTEXT:  PL/pgSQL function noticetrigger() line 3 at RAISE
! SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 12 barme
! CONTEXT:  PL/pgSQL function noticetrigger() line 3 at RAISE
! SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           11
***************
*** 1397,1405 **** create rule insert_tt_rule as on insert to tt do also
    insert into tt_log values(new.*);
  select insert_tt2('foollog','barlog') limit 1;
  NOTICE:  noticetrigger 13 foollog
! CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 14 barlog
! CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           13
--- 1399,1409 ----
    insert into tt_log values(new.*);
  select insert_tt2('foollog','barlog') limit 1;
  NOTICE:  noticetrigger 13 foollog
! CONTEXT:  PL/pgSQL function noticetrigger() line 3 at RAISE
! SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 14 barlog
! CONTEXT:  PL/pgSQL function noticetrigger() line 3 at RAISE
! SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           13
*** a/src/test/regress/expected/select_views_1.out
--- b/src/test/regress/expected/select_views_1.out
***************
*** 1318,1325 **** SET SESSION AUTHORIZATION regress_alice;
--- 1318,1328 ----
  --
  SELECT * FROM my_property_normal WHERE f_leak(passwd);
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => beafsteak
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => hamburger
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1334,1339 **** EXPLAIN (COSTS OFF) SELECT * FROM my_property_normal WHERE f_leak(passwd);
--- 1337,1343 ----
  
  SELECT * FROM my_property_secure WHERE f_leak(passwd);
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1355,1362 **** EXPLAIN (COSTS OFF) SELECT * FROM my_property_secure WHERE f_leak(passwd);
--- 1359,1369 ----
  --
  SELECT * FROM my_credit_card_normal WHERE f_leak(cnum);
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => 5555-6666-7777-8888
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => 9801-2345-6789-0123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   |        cnum         | climit 
  -----+---------------+------------------+-----------+---------------------+--------
   101 | regress_alice | +81-12-3456-7890 | passwd123 | 1111-2222-3333-4444 |   4000
***************
*** 1376,1381 **** EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_normal WHERE f_leak(cnum);
--- 1383,1389 ----
  
  SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   |        cnum         | climit 
  -----+---------------+------------------+-----------+---------------------+--------
   101 | regress_alice | +81-12-3456-7890 | passwd123 | 1111-2222-3333-4444 |   4000
***************
*** 1402,1407 **** EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_secure WHERE f_leak(cnum);
--- 1410,1416 ----
  SELECT * FROM my_credit_card_usage_normal
         WHERE f_leak(cnum) AND ymd >= '2011-10-01' AND ymd < '2011-11-01';
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   |        cnum         | climit |    ymd     | usage 
  -----+---------------+------------------+-----------+---------------------+--------+------------+-------
   101 | regress_alice | +81-12-3456-7890 | passwd123 | 1111-2222-3333-4444 |   4000 | 10-05-2011 |    90
***************
*** 1431,1438 **** EXPLAIN (COSTS OFF) SELECT * FROM my_credit_card_usage_normal
--- 1440,1450 ----
  SELECT * FROM my_credit_card_usage_secure
         WHERE f_leak(cnum) AND ymd >= '2011-10-01' AND ymd < '2011-11-01';
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => 1111-2222-3333-4444
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   |        cnum         | climit |    ymd     | usage 
  -----+---------------+------------------+-----------+---------------------+--------+------------+-------
   101 | regress_alice | +81-12-3456-7890 | passwd123 | 1111-2222-3333-4444 |   4000 | 10-05-2011 |    90
***************
*** 1467,1474 **** PREPARE p1 AS SELECT * FROM my_property_normal WHERE f_leak(passwd);
--- 1479,1489 ----
  PREPARE p2 AS SELECT * FROM my_property_secure WHERE f_leak(passwd);
  EXECUTE p1;
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => beafsteak
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => hamburger
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1476,1481 **** NOTICE:  f_leak => hamburger
--- 1491,1497 ----
  
  EXECUTE p2;
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1487,1492 **** ALTER VIEW my_property_secure SET (security_barrier=false);
--- 1503,1509 ----
  SET SESSION AUTHORIZATION regress_alice;
  EXECUTE p1;		-- To be perform as a view with security-barrier
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
***************
*** 1494,1501 **** NOTICE:  f_leak => passwd123
--- 1511,1521 ----
  
  EXECUTE p2;		-- To be perform as a view without security-barrier
  NOTICE:  f_leak => passwd123
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => beafsteak
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
  NOTICE:  f_leak => hamburger
+ CONTEXT:  PL/pgSQL function f_leak(text) line 1 at RAISE
   cid |     name      |       tel        |  passwd   
  -----+---------------+------------------+-----------
   101 | regress_alice | +81-12-3456-7890 | passwd123
*** a/src/test/regress/expected/triggers.out
--- b/src/test/regress/expected/triggers.out
***************
*** 295,314 **** CREATE TRIGGER after_upd_row_trig AFTER UPDATE ON main_table
--- 295,324 ----
  FOR EACH ROW EXECUTE PROCEDURE trigger_func('after_upd_row');
  INSERT INTO main_table DEFAULT VALUES;
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  UPDATE main_table SET a = a + 1 WHERE b < 30;
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  -- UPDATE that effects zero rows should still call per-statement trigger
  UPDATE main_table SET a = a + 2 WHERE b > 100;
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  -- COPY should fire per-row and per-statement INSERT triggers
  COPY main_table (a, b) FROM stdin;
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  SELECT * FROM main_table ORDER BY a, b;
   a  | b  
  ----+----
***************
*** 339,366 **** CREATE TRIGGER delete_when AFTER DELETE ON main_table
--- 349,396 ----
  FOR EACH STATEMENT WHEN (true) EXECUTE PROCEDURE trigger_func('delete_when');
  INSERT INTO main_table (a) VALUES (123), (456);
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(insert_when) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(insert_a) called: action = INSERT, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  COPY main_table FROM stdin;
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(insert_when) called: action = INSERT, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(insert_a) called: action = INSERT, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  DELETE FROM main_table WHERE a IN (123, 456);
  NOTICE:  trigger_func(delete_a) called: action = DELETE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(delete_a) called: action = DELETE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(delete_when) called: action = DELETE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  UPDATE main_table SET a = 50, b = 60;
  NOTICE:  trigger_func(modified_any) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_any) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(modified_a) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  SELECT * FROM main_table ORDER BY a, b;
   a  | b  
  ----+----
***************
*** 418,451 **** SELECT pg_get_triggerdef(oid) FROM pg_trigger WHERE tgrelid = 'main_table'::regc
--- 448,509 ----
  
  UPDATE main_table SET a = 50;
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  UPDATE main_table SET b = 10;
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
+ CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
  --
  -- Test case for bug with BEFORE trigger followed by AFTER trigger with WHEN
  --
***************
*** 468,479 **** CREATE TRIGGER some_trig_afterb AFTER UPDATE ON some_t FOR EACH ROW
--- 526,542 ----
  INSERT INTO some_t VALUES (TRUE);
  UPDATE some_t SET some_col = TRUE;
  NOTICE:  dummy_update_func(before) called: action = UPDATE, old = (t), new = (t)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  UPDATE some_t SET some_col = FALSE;
  NOTICE:  dummy_update_func(before) called: action = UPDATE, old = (t), new = (f)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  NOTICE:  dummy_update_func(afterb) called: action = UPDATE, old = (t), new = (f)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  UPDATE some_t SET some_col = TRUE;
  NOTICE:  dummy_update_func(before) called: action = UPDATE, old = (f), new = (t)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  NOTICE:  dummy_update_func(aftera) called: action = UPDATE, old = (f), new = (t)
+ CONTEXT:  PL/pgSQL function dummy_update_func() line 3 at RAISE
  DROP TABLE some_t;
  -- bogus cases
  CREATE TRIGGER error_upd_and_col BEFORE UPDATE OR UPDATE OF a ON main_table
***************
*** 546,568 **** create trigger trigtest_a_stmt_tg after insert or update or delete on trigtest
--- 609,640 ----
  for each statement execute procedure trigtest();
  insert into trigtest default values;
  NOTICE:  trigtest INSERT BEFORE STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT BEFORE ROW
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT AFTER ROW
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT AFTER STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  alter table trigtest disable trigger trigtest_b_row_tg;
  insert into trigtest default values;
  NOTICE:  trigtest INSERT BEFORE STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT AFTER ROW
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  NOTICE:  trigtest INSERT AFTER STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  alter table trigtest disable trigger user;
  insert into trigtest default values;
  alter table trigtest enable trigger trigtest_a_stmt_tg;
  insert into trigtest default values;
  NOTICE:  trigtest INSERT AFTER STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  insert into trigtest2 values(1);
  insert into trigtest2 values(2);
  delete from trigtest where i=2;
  NOTICE:  trigtest DELETE AFTER STATEMENT
+ CONTEXT:  PL/pgSQL function trigtest() line 3 at RAISE
  select * from trigtest2;
   i 
  ---
***************
*** 650,690 **** BEFORE INSERT OR UPDATE OR DELETE ON trigger_test
--- 722,796 ----
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
  insert into trigger_test values(1,'insert');
  NOTICE:  TG_NAME: show_trigger_data_trig
+ CONTEXT:  PL/pgSQL function trigger_data() line 15 at RAISE
  NOTICE:  TG_WHEN: BEFORE
+ CONTEXT:  PL/pgSQL function trigger_data() line 16 at RAISE
  NOTICE:  TG_LEVEL: ROW
+ CONTEXT:  PL/pgSQL function trigger_data() line 17 at RAISE
  NOTICE:  TG_OP: INSERT
+ CONTEXT:  PL/pgSQL function trigger_data() line 18 at RAISE
  NOTICE:  TG_RELID::regclass: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 19 at RAISE
  NOTICE:  TG_RELNAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 20 at RAISE
  NOTICE:  TG_TABLE_NAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 21 at RAISE
  NOTICE:  TG_TABLE_SCHEMA: public
+ CONTEXT:  PL/pgSQL function trigger_data() line 22 at RAISE
  NOTICE:  TG_NARGS: 2
+ CONTEXT:  PL/pgSQL function trigger_data() line 23 at RAISE
  NOTICE:  TG_ARGV: [23, skidoo]
+ CONTEXT:  PL/pgSQL function trigger_data() line 33 at RAISE
  NOTICE:  NEW: (1,insert)
+ CONTEXT:  PL/pgSQL function trigger_data() line 40 at RAISE
  update trigger_test set v = 'update' where i = 1;
  NOTICE:  TG_NAME: show_trigger_data_trig
+ CONTEXT:  PL/pgSQL function trigger_data() line 15 at RAISE
  NOTICE:  TG_WHEN: BEFORE
+ CONTEXT:  PL/pgSQL function trigger_data() line 16 at RAISE
  NOTICE:  TG_LEVEL: ROW
+ CONTEXT:  PL/pgSQL function trigger_data() line 17 at RAISE
  NOTICE:  TG_OP: UPDATE
+ CONTEXT:  PL/pgSQL function trigger_data() line 18 at RAISE
  NOTICE:  TG_RELID::regclass: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 19 at RAISE
  NOTICE:  TG_RELNAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 20 at RAISE
  NOTICE:  TG_TABLE_NAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 21 at RAISE
  NOTICE:  TG_TABLE_SCHEMA: public
+ CONTEXT:  PL/pgSQL function trigger_data() line 22 at RAISE
  NOTICE:  TG_NARGS: 2
+ CONTEXT:  PL/pgSQL function trigger_data() line 23 at RAISE
  NOTICE:  TG_ARGV: [23, skidoo]
+ CONTEXT:  PL/pgSQL function trigger_data() line 33 at RAISE
  NOTICE:  OLD: (1,insert)
+ CONTEXT:  PL/pgSQL function trigger_data() line 36 at RAISE
  NOTICE:  NEW: (1,update)
+ CONTEXT:  PL/pgSQL function trigger_data() line 40 at RAISE
  delete from trigger_test;
  NOTICE:  TG_NAME: show_trigger_data_trig
+ CONTEXT:  PL/pgSQL function trigger_data() line 15 at RAISE
  NOTICE:  TG_WHEN: BEFORE
+ CONTEXT:  PL/pgSQL function trigger_data() line 16 at RAISE
  NOTICE:  TG_LEVEL: ROW
+ CONTEXT:  PL/pgSQL function trigger_data() line 17 at RAISE
  NOTICE:  TG_OP: DELETE
+ CONTEXT:  PL/pgSQL function trigger_data() line 18 at RAISE
  NOTICE:  TG_RELID::regclass: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 19 at RAISE
  NOTICE:  TG_RELNAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 20 at RAISE
  NOTICE:  TG_TABLE_NAME: trigger_test
+ CONTEXT:  PL/pgSQL function trigger_data() line 21 at RAISE
  NOTICE:  TG_TABLE_SCHEMA: public
+ CONTEXT:  PL/pgSQL function trigger_data() line 22 at RAISE
  NOTICE:  TG_NARGS: 2
+ CONTEXT:  PL/pgSQL function trigger_data() line 23 at RAISE
  NOTICE:  TG_ARGV: [23, skidoo]
+ CONTEXT:  PL/pgSQL function trigger_data() line 33 at RAISE
  NOTICE:  OLD: (1,update)
+ CONTEXT:  PL/pgSQL function trigger_data() line 36 at RAISE
  DROP TRIGGER show_trigger_data_trig on trigger_test;
  DROP FUNCTION trigger_data();
  DROP TABLE trigger_test;
***************
*** 709,722 **** INSERT INTO trigger_test VALUES(1, 'foo', 'bar');
--- 815,834 ----
  INSERT INTO trigger_test VALUES(2, 'baz', 'quux');
  UPDATE trigger_test SET f3 = 'bar';
  NOTICE:  row 1 not changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  UPDATE trigger_test SET f3 = NULL;
  NOTICE:  row 1 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  -- this demonstrates that the above isn't really working as desired:
  UPDATE trigger_test SET f3 = NULL;
  NOTICE:  row 1 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  -- the right way when considering nulls is
  CREATE OR REPLACE FUNCTION mytrigger() RETURNS trigger LANGUAGE plpgsql as $$
  begin
***************
*** 729,741 **** begin
--- 841,859 ----
  end$$;
  UPDATE trigger_test SET f3 = 'bar';
  NOTICE:  row 1 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  UPDATE trigger_test SET f3 = NULL;
  NOTICE:  row 1 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  NOTICE:  row 2 changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 4 at RAISE
  UPDATE trigger_test SET f3 = NULL;
  NOTICE:  row 1 not changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  NOTICE:  row 2 not changed
+ CONTEXT:  PL/pgSQL function mytrigger() line 6 at RAISE
  DROP TABLE trigger_test;
  DROP FUNCTION mytrigger();
  -- Test snapshot management in serializable transactions involving triggers
***************
*** 945,971 **** FOR EACH STATEMENT EXECUTE PROCEDURE view_trigger('after_view_del_stmt');
  -- Insert into view using trigger
  INSERT INTO main_view VALUES (20, 30);
  NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (20,30)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
  INSERT 0 1
  INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
  NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (21,31)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
   a  | b  
  ----+----
   21 | 31
--- 1063,1101 ----
  -- Insert into view using trigger
  INSERT INTO main_view VALUES (20, 30);
  NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  NEW: (20,30)
+ CONTEXT:  PL/pgSQL function view_trigger() line 16 at RAISE
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  INSERT 0 1
  INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
  NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  NEW: (21,31)
+ CONTEXT:  PL/pgSQL function view_trigger() line 16 at RAISE
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
  PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
   a  | b  
  ----+----
   21 | 31
***************
*** 975,1013 **** INSERT 0 1
  -- Table trigger will prevent updates
  UPDATE main_view SET b = 31 WHERE a = 20;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 0
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a | b 
  ---+---
  (0 rows)
--- 1105,1159 ----
  -- Table trigger will prevent updates
  UPDATE main_view SET b = 31 WHERE a = 20;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (20,30), NEW: (20,31)
+ CONTEXT:  PL/pgSQL function view_trigger() line 22 at RAISE
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  UPDATE 0
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (21,31), NEW: (21,32)
+ CONTEXT:  PL/pgSQL function view_trigger() line 22 at RAISE
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
   a | b 
  ---+---
  (0 rows)
***************
*** 1018,1062 **** DROP TRIGGER before_upd_a_row_trig ON main_table;
  DROP TRIGGER
  UPDATE main_view SET b = 31 WHERE a = 20;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 1
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a  | b  
  ----+----
   21 | 32
--- 1164,1226 ----
  DROP TRIGGER
  UPDATE main_view SET b = 31 WHERE a = 20;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (20,30), NEW: (20,31)
+ CONTEXT:  PL/pgSQL function view_trigger() line 22 at RAISE
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  UPDATE 1
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (21,31), NEW: (21,32)
+ CONTEXT:  PL/pgSQL function view_trigger() line 22 at RAISE
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
! CONTEXT:  PL/pgSQL function trigger_func() line 3 at RAISE
! SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
  PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
   a  | b  
  ----+----
   21 | 32
***************
*** 1066,1089 **** UPDATE 1
--- 1230,1267 ----
  -- Before and after stmt triggers should fire even when no rows are affected
  UPDATE main_view SET b = 0 WHERE false;
  NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  UPDATE 0
  -- Delete from view using trigger
  DELETE FROM main_view WHERE a IN (20,21);
  NOTICE:  main_view BEFORE DELETE STATEMENT (before_view_del_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF DELETE ROW (instead_of_del)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (21,10)
+ CONTEXT:  PL/pgSQL function view_trigger() line 29 at RAISE
  NOTICE:  main_view INSTEAD OF DELETE ROW (instead_of_del)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (20,31)
+ CONTEXT:  PL/pgSQL function view_trigger() line 29 at RAISE
  NOTICE:  main_view INSTEAD OF DELETE ROW (instead_of_del)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (21,32)
+ CONTEXT:  PL/pgSQL function view_trigger() line 29 at RAISE
  NOTICE:  main_view AFTER DELETE STATEMENT (after_view_del_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  DELETE 3
  DELETE FROM main_view WHERE a = 31 RETURNING a, b;
  NOTICE:  main_view BEFORE DELETE STATEMENT (before_view_del_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  main_view INSTEAD OF DELETE ROW (instead_of_del)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
  NOTICE:  OLD: (31,10)
+ CONTEXT:  PL/pgSQL function view_trigger() line 29 at RAISE
  NOTICE:  main_view AFTER DELETE STATEMENT (after_view_del_stmt)
+ CONTEXT:  PL/pgSQL function view_trigger() line 12 at RAISE
   a  | b  
  ----+----
   31 | 10
***************
*** 1267,1272 **** INSERT 0 1
--- 1445,1451 ----
  -- UPDATE .. RETURNING
  UPDATE city_view SET country_name = 'Japon' WHERE city_name = 'Tokyo'; -- error
  ERROR:  No such country: "Japon"
+ CONTEXT:  PL/pgSQL function city_update() line 9 at RAISE
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Takyo'; -- no match
  UPDATE 0
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Tokyo' RETURNING *; -- OK
***************
*** 1478,1504 **** select pg_trigger_depth();
  
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  SQLSTATE = U9999: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  ERROR:  U9999
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
--- 1657,1690 ----
  
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
+ CONTEXT:  PL/pgSQL function depth_a_tf() line 3 at RAISE
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 3 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  PL/pgSQL function depth_c_tf() line 3 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  SQLSTATE = U9999: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 8 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 10 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  PL/pgSQL function depth_c_tf() line 3 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  ERROR:  U9999
! CONTEXT:  PL/pgSQL function depth_c_tf() line 5 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
***************
*** 1510,1532 **** select pg_trigger_depth();
  
  insert into depth_a values (2);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  SQL statement "insert into depth_c values (2)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  SQL statement "insert into depth_c values (2)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_a_tr: depth = 1
  select pg_trigger_depth();
   pg_trigger_depth 
  ------------------
--- 1696,1724 ----
  
  insert into depth_a values (2);
  NOTICE:  depth_a_tr: depth = 1
+ CONTEXT:  PL/pgSQL function depth_a_tf() line 3 at RAISE
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 3 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  PL/pgSQL function depth_c_tf() line 3 at RAISE
! SQL statement "insert into depth_c values (2)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
! CONTEXT:  PL/pgSQL function depth_c_tf() line 7 at RAISE
! SQL statement "insert into depth_c values (2)"
  PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
! CONTEXT:  PL/pgSQL function depth_b_tf() line 10 at RAISE
! SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_a_tr: depth = 1
+ CONTEXT:  PL/pgSQL function depth_a_tf() line 5 at RAISE
  select pg_trigger_depth();
   pg_trigger_depth 
  ------------------
*** a/src/test/regress/expected/with.out
--- b/src/test/regress/expected/with.out
***************
*** 1903,1910 **** WITH t AS (
--- 1903,1913 ----
  )
  SELECT * FROM t;
  NOTICE:  y_trigger: a = 21
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
  NOTICE:  y_trigger: a = 22
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
  NOTICE:  y_trigger: a = 23
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
   a  
  ----
   21
***************
*** 1943,1950 **** WITH t AS (
--- 1946,1956 ----
  )
  SELECT * FROM t LIMIT 1;
  NOTICE:  y_trigger: a = 31
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
  NOTICE:  y_trigger: a = 32
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
  NOTICE:  y_trigger: a = 33
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
   a  
  ----
   31
***************
*** 1990,1995 **** WITH t AS (
--- 1996,2002 ----
  )
  SELECT * FROM t;
  NOTICE:  y_trigger
+ CONTEXT:  PL/pgSQL function y_trigger() line 3 at RAISE
   a  
  ----
   41
*** a/src/test/regress/expected/xml_1.out
--- b/src/test/regress/expected/xml_1.out
***************
*** 773,778 **** HINT:  You need to rebuild PostgreSQL using --with-libxml.
--- 773,779 ----
  \set VERBOSITY terse
  SELECT xpath('/*', '<invalidns xmlns=''&lt;''/>');
  ERROR:  unsupported XML feature at character 20
+ CONTEXT:  20
  \set VERBOSITY default
  -- Again, the XML isn't well-formed for namespace purposes
  SELECT xpath('/*', '<nosuchprefix:tag/>');

commit cf9e23a29162ac55fcab1ac4d9e7a24492de0736
Author: Pavel Stehule <pavel.stehule@gooddata.com>
Date:   Sat Apr 25 22:09:28 2015 +0200

    initial implementation of (WITH|WITHOUT) CONTEXT clause to plpgsql RAISE statement.
    
    initial implementation of plpgsql GUC plpgsql.display_context_messages

diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index deefb1f..ea0dac5 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -2921,6 +2921,7 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 	char	   *err_table = NULL;
 	char	   *err_schema = NULL;
 	ListCell   *lc;
+	bool			hide_ctx;
 
 	/* RAISE with no parameters: re-throw current exception */
 	if (stmt->condname == NULL && stmt->message == NULL &&
@@ -3080,10 +3081,42 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			err_message = pstrdup(unpack_sql_state(err_code));
 	}
 
-	/*
-	 * Throw the error (may or may not come back)
-	 */
-	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
+	if (stmt->context_info == PLPGSQL_CONTEXT_DISPLAY)
+		hide_ctx = false;
+	else if (stmt->context_info == PLPGSQL_CONTEXT_SUPPRESS)
+	{
+		hide_ctx = true;
+	}
+	else
+	{
+		/* we display a messages via plpgsql_display_context_messages */
+		switch (stmt->elog_level)
+		{
+			case ERROR:
+				hide_ctx = !(plpgsql_display_context_messages & PLPGSQL_DISPLAY_CONTEXT_ERROR);
+				break;
+			case WARNING:
+				hide_ctx = !(plpgsql_display_context_messages & PLPGSQL_DISPLAY_CONTEXT_WARNING);
+				break;
+			case NOTICE:
+				hide_ctx = !(plpgsql_display_context_messages & PLPGSQL_DISPLAY_CONTEXT_NOTICE);
+				break;
+			case INFO:
+				hide_ctx = !(plpgsql_display_context_messages & PLPGSQL_DISPLAY_CONTEXT_INFO);
+				break;
+			case LOG:
+				hide_ctx = !(plpgsql_display_context_messages & PLPGSQL_DISPLAY_CONTEXT_LOG);
+				break;
+			case DEBUG1:
+				hide_ctx = !(plpgsql_display_context_messages & PLPGSQL_DISPLAY_CONTEXT_DEBUG);
+				break;
+			default:
+				elog(ERROR, "unexpected RAISE statement level");
+		}
+	}
+
+	if (hide_ctx)
+		estate->err_text = raise_skip_msg;
 
 	ereport(stmt->elog_level,
 			(err_code ? errcode(err_code) : 0,
@@ -3099,7 +3132,8 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			 (err_table != NULL) ?
 			 err_generic_string(PG_DIAG_TABLE_NAME, err_table) : 0,
 			 (err_schema != NULL) ?
-			 err_generic_string(PG_DIAG_SCHEMA_NAME, err_schema) : 0));
+			 err_generic_string(PG_DIAG_SCHEMA_NAME, err_schema) : 0,
+			 errhidecontext(hide_ctx)));
 
 	estate->err_text = NULL;	/* un-suppress... */
 
diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index 4026e41..48914a7 100644
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -259,6 +259,7 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_CONSTANT
 %token <keyword>	K_CONSTRAINT
 %token <keyword>	K_CONSTRAINT_NAME
+%token <keyword>	K_CONTEXT
 %token <keyword>	K_CONTINUE
 %token <keyword>	K_CURRENT
 %token <keyword>	K_CURSOR
@@ -341,6 +342,8 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_WARNING
 %token <keyword>	K_WHEN
 %token <keyword>	K_WHILE
+%token <keyword>	K_WITH
+%token <keyword>	K_WITHOUT
 
 %%
 
@@ -1716,6 +1719,7 @@ stmt_raise		: K_RAISE
 						new->cmd_type	= PLPGSQL_STMT_RAISE;
 						new->lineno		= plpgsql_location_to_lineno(@1);
 						new->elog_level = ERROR;	/* default */
+						new->context_info = PLPGSQL_CONTEXT_DEFAULT;
 						new->condname	= NULL;
 						new->message	= NULL;
 						new->params		= NIL;
@@ -1773,6 +1777,21 @@ stmt_raise		: K_RAISE
 							if (tok == 0)
 								yyerror("unexpected end of function definition");
 
+							/* Optional choose about including context */
+							if (tok == K_WITH || tok == K_WITHOUT)
+							{
+								if (tok == K_WITH)
+									new->context_info = PLPGSQL_CONTEXT_DISPLAY;
+								else
+									new->context_info = PLPGSQL_CONTEXT_SUPPRESS;
+							
+								/* keyword CONTEXT is required */
+								if (yylex() != K_CONTEXT)
+									yyerror("expected CONTEXT");
+
+								tok = yylex();
+							}
+
 							/*
 							 * Next we can have a condition name, or
 							 * equivalently SQLSTATE 'xxxxx', or a string
@@ -2350,6 +2369,7 @@ unreserved_keyword	:
 				| K_CONSTANT
 				| K_CONSTRAINT
 				| K_CONSTRAINT_NAME
+				| K_CONTEXT
 				| K_CONTINUE
 				| K_CURRENT
 				| K_CURSOR
@@ -2412,6 +2432,8 @@ unreserved_keyword	:
 				| K_USE_VARIABLE
 				| K_VARIABLE_CONFLICT
 				| K_WARNING
+				| K_WITH
+				| K_WITHOUT
 				;
 
 %%
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index 266c314..c47365b 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -30,6 +30,9 @@ static bool plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSo
 static void plpgsql_extra_warnings_assign_hook(const char *newvalue, void *extra);
 static void plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra);
 
+static bool plpgsql_display_context_messages_check_hook(char **newvalue, void **extra, GucSource source);
+static void plpgsql_display_context_messages_assign_hook(const char *newvalue, void *extra);
+
 PG_MODULE_MAGIC;
 
 /* Custom GUC variable */
@@ -51,9 +54,12 @@ char	   *plpgsql_extra_errors_string = NULL;
 int			plpgsql_extra_warnings;
 int			plpgsql_extra_errors;
 
+char	   *plpgsql_display_context_messages_string = NULL;
+
 /* Hook for plugins */
 PLpgSQL_plugin **plugin_ptr = NULL;
 
+int	plpgsql_display_context_messages;
 
 static bool
 plpgsql_extra_checks_check_hook(char **newvalue, void **extra, GucSource source)
@@ -128,6 +134,87 @@ plpgsql_extra_errors_assign_hook(const char *newvalue, void *extra)
 	plpgsql_extra_errors = *((int *) extra);
 }
 
+static bool 
+plpgsql_display_context_messages_check_hook(char **newvalue, void **extra, GucSource source)
+{
+	int		display_context_messages = 0;
+	char	   *rawstring;
+	List	   *elemlist;
+	ListCell   *l;
+	int		*myextra;
+
+	if (pg_strcasecmp(*newvalue, "all") == 0)
+	{
+		display_context_messages = PLPGSQL_DISPLAY_CONTEXT_ALL;
+	}
+	else if (pg_strcasecmp(*newvalue, "none") == 0)
+	{
+		display_context_messages = PLPGSQL_DISPLAY_CONTEXT_NONE;
+	}
+	else
+	{
+		/* Need a modifiable copy of string */
+		rawstring = pstrdup(*newvalue);
+
+		/* Parse string into list of identifiers */
+		if (!SplitIdentifierString(rawstring, ',', &elemlist))
+		{
+			/* syntax error in list */
+			GUC_check_errdetail("List syntax is invalid.");
+			pfree(rawstring);
+			list_free(elemlist);
+			return false;
+		}
+
+		foreach(l, elemlist)
+		{
+			char	   *tok = (char *) lfirst(l);
+
+			if (pg_strcasecmp(tok, "exception") == 0)
+				display_context_messages |= PLPGSQL_DISPLAY_CONTEXT_ERROR;
+			else if (pg_strcasecmp(tok, "warning") == 0)
+				display_context_messages |= PLPGSQL_DISPLAY_CONTEXT_WARNING;
+			else if (pg_strcasecmp(tok, "notice") == 0)
+				display_context_messages |= PLPGSQL_DISPLAY_CONTEXT_NOTICE;
+			else if (pg_strcasecmp(tok, "info") == 0)
+				display_context_messages |= PLPGSQL_DISPLAY_CONTEXT_INFO;
+			else if (pg_strcasecmp(tok, "log") == 0)
+				display_context_messages |= PLPGSQL_DISPLAY_CONTEXT_LOG;
+			else if (pg_strcasecmp(tok, "debug") == 0)
+				display_context_messages |= PLPGSQL_DISPLAY_CONTEXT_DEBUG;
+			else if (pg_strcasecmp(tok, "all") == 0 || pg_strcasecmp(tok, "none") == 0)
+			{
+				GUC_check_errdetail("Key word \"%s\" cannot be combined with other key words.", tok);
+				pfree(rawstring);
+				list_free(elemlist);
+				return false;
+			}
+			else
+			{
+				GUC_check_errdetail("Unrecognized key word: \"%s\".", tok);
+				pfree(rawstring);
+				list_free(elemlist);
+				return false;
+			}
+		}
+
+		pfree(rawstring);
+		list_free(elemlist);
+	}
+
+	myextra = (int *) malloc(sizeof(int));
+	*myextra = display_context_messages;
+	*extra = (void *) myextra;
+
+	return true;
+
+}
+
+static void plpgsql_display_context_messages_assign_hook(const char *newvalue, void *extra)
+{
+	plpgsql_display_context_messages = *((int *) extra);
+}
+
 
 /*
  * _PG_init()			- library load-time initialization
@@ -190,6 +277,16 @@ _PG_init(void)
 							   plpgsql_extra_errors_assign_hook,
 							   NULL);
 
+	DefineCustomStringVariable("plpgsql.display_context_messages",
+							   gettext_noop(""),
+							   NULL,
+							   &plpgsql_display_context_messages_string,
+							   "none",
+							   PGC_USERSET, GUC_LIST_INPUT,
+							   plpgsql_display_context_messages_check_hook,
+							   plpgsql_display_context_messages_assign_hook,
+							   NULL);
+
 	EmitWarningsOnPlaceholders("plpgsql");
 
 	plpgsql_HashTableInit();
diff --git a/src/pl/plpgsql/src/pl_scanner.c b/src/pl/plpgsql/src/pl_scanner.c
index 683fdab..973cab8 100644
--- a/src/pl/plpgsql/src/pl_scanner.c
+++ b/src/pl/plpgsql/src/pl_scanner.c
@@ -107,6 +107,7 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("constant", K_CONSTANT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint", K_CONSTRAINT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint_name", K_CONSTRAINT_NAME, UNRESERVED_KEYWORD)
+	PG_KEYWORD("context", K_CONTEXT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("continue", K_CONTINUE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("current", K_CURRENT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("cursor", K_CURSOR, UNRESERVED_KEYWORD)
@@ -170,6 +171,8 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("use_variable", K_USE_VARIABLE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("variable_conflict", K_VARIABLE_CONFLICT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("warning", K_WARNING, UNRESERVED_KEYWORD)
+	PG_KEYWORD("with", K_WITH, UNRESERVED_KEYWORD)
+	PG_KEYWORD("without", K_WITHOUT, UNRESERVED_KEYWORD)
 };
 
 static const int num_unreserved_keywords = lengthof(unreserved_keywords);
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index bec773a..cac3833 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -168,6 +168,18 @@ typedef enum
 } PLpgSQL_resolve_option;
 
 
+/* --------
+ * Manipulation with context of exception
+ * --------
+ */
+enum
+{
+	PLPGSQL_CONTEXT_DISPLAY,
+	PLPGSQL_CONTEXT_SUPPRESS,
+	PLPGSQL_CONTEXT_DEFAULT
+};
+
+
 /**********************************************************************
  * Node and structure definitions
  **********************************************************************/
@@ -619,6 +631,7 @@ typedef struct
 	int			cmd_type;
 	int			lineno;
 	int			elog_level;
+	int			context_info;
 	char	   *condname;		/* condition name, SQLSTATE, or NULL */
 	char	   *message;		/* old-style message format literal, or NULL */
 	List	   *params;			/* list of expressions for old-style message */
@@ -922,6 +935,18 @@ extern MemoryContext compile_tmp_cxt;
 
 extern PLpgSQL_plugin **plugin_ptr;
 
+/* display context messages */
+#define PLPGSQL_DISPLAY_CONTEXT_NONE		0
+#define PLPGSQL_DISPLAY_CONTEXT_ALL		((int) ~0)
+#define PLPGSQL_DISPLAY_CONTEXT_ERROR		2
+#define PLPGSQL_DISPLAY_CONTEXT_WARNING		4
+#define PLPGSQL_DISPLAY_CONTEXT_NOTICE		8
+#define PLPGSQL_DISPLAY_CONTEXT_INFO		16
+#define PLPGSQL_DISPLAY_CONTEXT_LOG		32
+#define PLPGSQL_DISPLAY_CONTEXT_DEBUG		64
+
+extern int plpgsql_display_context_messages;
+
 /**********************************************************************
  * Function declarations
  **********************************************************************/
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 78e5a85..6e75185 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -5426,3 +5426,38 @@ end;
 $$;
 ERROR:  unhandled assertion
 CONTEXT:  PL/pgSQL function inline_code_block line 3 at ASSERT
+--possibility to enforce context message displaying
+do $$
+begin
+  raise notice with context 'hello';
+end;
+$$;
+NOTICE:  hello
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+do $$
+begin
+  raise exception with context 'hello';
+end;
+$$;
+ERROR:  hello
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+set plpgsql.display_context_messages = 'notice, exception';
+do $$
+begin
+  raise notice 'some notice';
+  raise exception 'some exception';
+end;
+$$;
+NOTICE:  some notice
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+ERROR:  some exception
+CONTEXT:  PL/pgSQL function inline_code_block line 4 at RAISE
+-- possibility to suppress default
+do $$
+begin
+  raise notice without context 'some notice';
+  raise exception without context 'some exception';
+end;
+$$;
+NOTICE:  some notice
+ERROR:  some exception
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index e19e415..927da16 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -4265,3 +4265,35 @@ exception when others then
   null; -- do nothing
 end;
 $$;
+
+
+--possibility to enforce context message displaying
+do $$
+begin
+  raise notice with context 'hello';
+end;
+$$;
+
+do $$
+begin
+  raise exception with context 'hello';
+end;
+$$;
+
+set plpgsql.display_context_messages = 'notice, exception';
+do $$
+begin
+  raise notice 'some notice';
+  raise exception 'some exception';
+end;
+$$;
+
+-- possibility to suppress default
+do $$
+begin
+  raise notice without context 'some notice';
+  raise exception without context 'some exception';
+end;
+$$;
+
+

commit 33951bc23365029ee94af5ec43e90893dcd737a8
Author: Pavel Stehule <pavel.stehule@gooddata.com>
Date:   Sat Apr 25 22:09:28 2015 +0200

    initial implementation of (WITH|WITHOUT) CONTEXT clause to plpgsql RAISE statement.
    
    initial implementation of plpgsql GUC plpgsql.display_context_messages

diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index d36acf6..8aebb87 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -3406,10 +3406,10 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
     raise errors.
 
 <synopsis>
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ... </optional></optional> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <replaceable class="parameter">condition_name</> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> SQLSTATE '<replaceable class="parameter">sqlstate</>' <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ... </optional></optional> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> <replaceable class="parameter">condition_name</> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> SQLSTATE '<replaceable class="parameter">sqlstate</>' <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional>;
 RAISE ;
 </synopsis>
 
@@ -3431,6 +3431,18 @@ RAISE ;
    </para>
 
    <para>
+    The options <literal>WITH CONTEXT</literal> or <literal>WITHOUT CONTEXT</literal>
+    can enforce or suppress context information related to error or notice. This possibility
+    can be forced by settings of configuration parameter <literal>plpgsql.display_context_min_messages</>.
+    This allows same values like <replaceable class="parameter">level</replaceable> option plus
+    value <literal>none</literal> that is a default. When it is changed, then all errors and notices
+    with higher than specified severity are raised with context info.
+<programlisting>
+RAISE NOTICE WITH CONTEXT 'This message will have a context';
+</programlisting>
+   </para>
+
+   <para>
     After <replaceable class="parameter">level</replaceable> if any,
     you can write a <replaceable class="parameter">format</replaceable>
     (which must be a simple string literal, not an expression).  The
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index deefb1f..6d1e791 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -2921,6 +2921,7 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 	char	   *err_table = NULL;
 	char	   *err_schema = NULL;
 	ListCell   *lc;
+	bool			hide_ctx = true;		/* suppress context by default */
 
 	/* RAISE with no parameters: re-throw current exception */
 	if (stmt->condname == NULL && stmt->message == NULL &&
@@ -3080,10 +3081,16 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			err_message = pstrdup(unpack_sql_state(err_code));
 	}
 
-	/*
-	 * Throw the error (may or may not come back)
-	 */
-	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
+	if (stmt->context_info == PLPGSQL_CONTEXT_DISPLAY)
+		hide_ctx = false;
+	else if (stmt->context_info == PLPGSQL_CONTEXT_DEFAULT)
+	{
+		if (plpgsql_display_context_min_messages != PLPGSQL_DISPLAY_CONTEXT_SUPPRESS)
+			hide_ctx = stmt->elog_level < plpgsql_display_context_min_messages;
+	}
+
+	if (hide_ctx)
+		estate->err_text = raise_skip_msg;
 
 	ereport(stmt->elog_level,
 			(err_code ? errcode(err_code) : 0,
@@ -3099,7 +3106,8 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			 (err_table != NULL) ?
 			 err_generic_string(PG_DIAG_TABLE_NAME, err_table) : 0,
 			 (err_schema != NULL) ?
-			 err_generic_string(PG_DIAG_SCHEMA_NAME, err_schema) : 0));
+			 err_generic_string(PG_DIAG_SCHEMA_NAME, err_schema) : 0,
+			 errhidecontext(hide_ctx)));
 
 	estate->err_text = NULL;	/* un-suppress... */
 
diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index 4026e41..48914a7 100644
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -259,6 +259,7 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_CONSTANT
 %token <keyword>	K_CONSTRAINT
 %token <keyword>	K_CONSTRAINT_NAME
+%token <keyword>	K_CONTEXT
 %token <keyword>	K_CONTINUE
 %token <keyword>	K_CURRENT
 %token <keyword>	K_CURSOR
@@ -341,6 +342,8 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_WARNING
 %token <keyword>	K_WHEN
 %token <keyword>	K_WHILE
+%token <keyword>	K_WITH
+%token <keyword>	K_WITHOUT
 
 %%
 
@@ -1716,6 +1719,7 @@ stmt_raise		: K_RAISE
 						new->cmd_type	= PLPGSQL_STMT_RAISE;
 						new->lineno		= plpgsql_location_to_lineno(@1);
 						new->elog_level = ERROR;	/* default */
+						new->context_info = PLPGSQL_CONTEXT_DEFAULT;
 						new->condname	= NULL;
 						new->message	= NULL;
 						new->params		= NIL;
@@ -1773,6 +1777,21 @@ stmt_raise		: K_RAISE
 							if (tok == 0)
 								yyerror("unexpected end of function definition");
 
+							/* Optional choose about including context */
+							if (tok == K_WITH || tok == K_WITHOUT)
+							{
+								if (tok == K_WITH)
+									new->context_info = PLPGSQL_CONTEXT_DISPLAY;
+								else
+									new->context_info = PLPGSQL_CONTEXT_SUPPRESS;
+							
+								/* keyword CONTEXT is required */
+								if (yylex() != K_CONTEXT)
+									yyerror("expected CONTEXT");
+
+								tok = yylex();
+							}
+
 							/*
 							 * Next we can have a condition name, or
 							 * equivalently SQLSTATE 'xxxxx', or a string
@@ -2350,6 +2369,7 @@ unreserved_keyword	:
 				| K_CONSTANT
 				| K_CONSTRAINT
 				| K_CONSTRAINT_NAME
+				| K_CONTEXT
 				| K_CONTINUE
 				| K_CURRENT
 				| K_CURSOR
@@ -2412,6 +2432,8 @@ unreserved_keyword	:
 				| K_USE_VARIABLE
 				| K_VARIABLE_CONFLICT
 				| K_WARNING
+				| K_WITH
+				| K_WITHOUT
 				;
 
 %%
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index 266c314..e9f9029 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -40,6 +40,17 @@ static const struct config_enum_entry variable_conflict_options[] = {
 	{NULL, 0, false}
 };
 
+static const struct config_enum_entry display_context_min_messages_options[] = {
+	{"none", PLPGSQL_DISPLAY_CONTEXT_SUPPRESS},
+	{"exception", ERROR},
+	{"warning", WARNING},
+	{"notice", NOTICE},
+	{"info", INFO},
+	{"log", LOG},
+	{"debug", DEBUG1},
+	{NULL, 0, false}
+};
+
 int			plpgsql_variable_conflict = PLPGSQL_RESOLVE_ERROR;
 
 bool		plpgsql_print_strict_params = false;
@@ -51,6 +62,8 @@ char	   *plpgsql_extra_errors_string = NULL;
 int			plpgsql_extra_warnings;
 int			plpgsql_extra_errors;
 
+int			plpgsql_display_context_min_messages = PLPGSQL_DISPLAY_CONTEXT_SUPPRESS;
+
 /* Hook for plugins */
 PLpgSQL_plugin **plugin_ptr = NULL;
 
@@ -154,6 +167,15 @@ _PG_init(void)
 							 PGC_SUSET, 0,
 							 NULL, NULL, NULL);
 
+	DefineCustomEnumVariable("plpgsql.display_context_min_messages",
+							 gettext_noop("Sets minimal level of messages with context information."),
+							 NULL,
+							 &plpgsql_display_context_min_messages,
+							 PLPGSQL_DISPLAY_CONTEXT_SUPPRESS,
+							 display_context_min_messages_options,
+							 PGC_SUSET, 0,
+							 NULL, NULL, NULL);
+
 	DefineCustomBoolVariable("plpgsql.print_strict_params",
 							 gettext_noop("Print information about parameters in the DETAIL part of the error messages generated on INTO ... STRICT failures."),
 							 NULL,
diff --git a/src/pl/plpgsql/src/pl_scanner.c b/src/pl/plpgsql/src/pl_scanner.c
index 683fdab..973cab8 100644
--- a/src/pl/plpgsql/src/pl_scanner.c
+++ b/src/pl/plpgsql/src/pl_scanner.c
@@ -107,6 +107,7 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("constant", K_CONSTANT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint", K_CONSTRAINT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint_name", K_CONSTRAINT_NAME, UNRESERVED_KEYWORD)
+	PG_KEYWORD("context", K_CONTEXT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("continue", K_CONTINUE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("current", K_CURRENT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("cursor", K_CURSOR, UNRESERVED_KEYWORD)
@@ -170,6 +171,8 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("use_variable", K_USE_VARIABLE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("variable_conflict", K_VARIABLE_CONFLICT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("warning", K_WARNING, UNRESERVED_KEYWORD)
+	PG_KEYWORD("with", K_WITH, UNRESERVED_KEYWORD)
+	PG_KEYWORD("without", K_WITHOUT, UNRESERVED_KEYWORD)
 };
 
 static const int num_unreserved_keywords = lengthof(unreserved_keywords);
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index bec773a..73d3238 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -168,6 +168,18 @@ typedef enum
 } PLpgSQL_resolve_option;
 
 
+/* --------
+ * Manipulation with context of exception
+ * --------
+ */
+enum
+{
+	PLPGSQL_CONTEXT_DISPLAY,
+	PLPGSQL_CONTEXT_SUPPRESS,
+	PLPGSQL_CONTEXT_DEFAULT
+};
+
+
 /**********************************************************************
  * Node and structure definitions
  **********************************************************************/
@@ -619,6 +631,7 @@ typedef struct
 	int			cmd_type;
 	int			lineno;
 	int			elog_level;
+	int			context_info;
 	char	   *condname;		/* condition name, SQLSTATE, or NULL */
 	char	   *message;		/* old-style message format literal, or NULL */
 	List	   *params;			/* list of expressions for old-style message */
@@ -922,6 +935,10 @@ extern MemoryContext compile_tmp_cxt;
 
 extern PLpgSQL_plugin **plugin_ptr;
 
+#define PLPGSQL_DISPLAY_CONTEXT_SUPPRESS		0
+
+extern int plpgsql_display_context_min_messages;
+
 /**********************************************************************
  * Function declarations
  **********************************************************************/
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 78e5a85..4726df8 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -5426,3 +5426,38 @@ end;
 $$;
 ERROR:  unhandled assertion
 CONTEXT:  PL/pgSQL function inline_code_block line 3 at ASSERT
+--possibility to enforce context message displaying
+do $$
+begin
+  raise notice with context 'hello';
+end;
+$$;
+NOTICE:  hello
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+do $$
+begin
+  raise exception with context 'hello';
+end;
+$$;
+ERROR:  hello
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+set plpgsql.display_context_min_messages = 'notice';
+do $$
+begin
+  raise notice 'some notice';
+  raise exception 'some exception';
+end;
+$$;
+NOTICE:  some notice
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+ERROR:  some exception
+CONTEXT:  PL/pgSQL function inline_code_block line 4 at RAISE
+-- possibility to suppress default
+do $$
+begin
+  raise notice without context 'some notice';
+  raise exception without context 'some exception';
+end;
+$$;
+NOTICE:  some notice
+ERROR:  some exception
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index e19e415..fdb8e49 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -4265,3 +4265,35 @@ exception when others then
   null; -- do nothing
 end;
 $$;
+
+
+--possibility to enforce context message displaying
+do $$
+begin
+  raise notice with context 'hello';
+end;
+$$;
+
+do $$
+begin
+  raise exception with context 'hello';
+end;
+$$;
+
+set plpgsql.display_context_min_messages = 'notice';
+do $$
+begin
+  raise notice 'some notice';
+  raise exception 'some exception';
+end;
+$$;
+
+-- possibility to suppress default
+do $$
+begin
+  raise notice without context 'some notice';
+  raise exception without context 'some exception';
+end;
+$$;
+
+

commit d60c21fb798cf25609dc37a4bda3ec7822f790e1
Author: Pavel Stehule <pavel.stehule@gooddata.com>
Date:   Sat Apr 25 22:09:28 2015 +0200

    initial implementation of (WITH|WITHOUT) CONTEXT clause to plpgsql RAISE statement.
    
    initial implementation of plpgsql GUC plpgsql.display_context_messages

diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index d36acf6..8aebb87 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -3406,10 +3406,10 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
     raise errors.
 
 <synopsis>
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ... </optional></optional> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <replaceable class="parameter">condition_name</> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> SQLSTATE '<replaceable class="parameter">sqlstate</>' <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ... </optional></optional> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> <replaceable class="parameter">condition_name</> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> SQLSTATE '<replaceable class="parameter">sqlstate</>' <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional>;
 RAISE ;
 </synopsis>
 
@@ -3431,6 +3431,18 @@ RAISE ;
    </para>
 
    <para>
+    The options <literal>WITH CONTEXT</literal> or <literal>WITHOUT CONTEXT</literal>
+    can enforce or suppress context information related to error or notice. This possibility
+    can be forced by settings of configuration parameter <literal>plpgsql.display_context_min_messages</>.
+    This allows same values like <replaceable class="parameter">level</replaceable> option plus
+    value <literal>none</literal> that is a default. When it is changed, then all errors and notices
+    with higher than specified severity are raised with context info.
+<programlisting>
+RAISE NOTICE WITH CONTEXT 'This message will have a context';
+</programlisting>
+   </para>
+
+   <para>
     After <replaceable class="parameter">level</replaceable> if any,
     you can write a <replaceable class="parameter">format</replaceable>
     (which must be a simple string literal, not an expression).  The
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index deefb1f..6d1e791 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -2921,6 +2921,7 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 	char	   *err_table = NULL;
 	char	   *err_schema = NULL;
 	ListCell   *lc;
+	bool			hide_ctx = true;		/* suppress context by default */
 
 	/* RAISE with no parameters: re-throw current exception */
 	if (stmt->condname == NULL && stmt->message == NULL &&
@@ -3080,10 +3081,16 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			err_message = pstrdup(unpack_sql_state(err_code));
 	}
 
-	/*
-	 * Throw the error (may or may not come back)
-	 */
-	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
+	if (stmt->context_info == PLPGSQL_CONTEXT_DISPLAY)
+		hide_ctx = false;
+	else if (stmt->context_info == PLPGSQL_CONTEXT_DEFAULT)
+	{
+		if (plpgsql_display_context_min_messages != PLPGSQL_DISPLAY_CONTEXT_SUPPRESS)
+			hide_ctx = stmt->elog_level < plpgsql_display_context_min_messages;
+	}
+
+	if (hide_ctx)
+		estate->err_text = raise_skip_msg;
 
 	ereport(stmt->elog_level,
 			(err_code ? errcode(err_code) : 0,
@@ -3099,7 +3106,8 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			 (err_table != NULL) ?
 			 err_generic_string(PG_DIAG_TABLE_NAME, err_table) : 0,
 			 (err_schema != NULL) ?
-			 err_generic_string(PG_DIAG_SCHEMA_NAME, err_schema) : 0));
+			 err_generic_string(PG_DIAG_SCHEMA_NAME, err_schema) : 0,
+			 errhidecontext(hide_ctx)));
 
 	estate->err_text = NULL;	/* un-suppress... */
 
diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index 4026e41..48914a7 100644
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -259,6 +259,7 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_CONSTANT
 %token <keyword>	K_CONSTRAINT
 %token <keyword>	K_CONSTRAINT_NAME
+%token <keyword>	K_CONTEXT
 %token <keyword>	K_CONTINUE
 %token <keyword>	K_CURRENT
 %token <keyword>	K_CURSOR
@@ -341,6 +342,8 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_WARNING
 %token <keyword>	K_WHEN
 %token <keyword>	K_WHILE
+%token <keyword>	K_WITH
+%token <keyword>	K_WITHOUT
 
 %%
 
@@ -1716,6 +1719,7 @@ stmt_raise		: K_RAISE
 						new->cmd_type	= PLPGSQL_STMT_RAISE;
 						new->lineno		= plpgsql_location_to_lineno(@1);
 						new->elog_level = ERROR;	/* default */
+						new->context_info = PLPGSQL_CONTEXT_DEFAULT;
 						new->condname	= NULL;
 						new->message	= NULL;
 						new->params		= NIL;
@@ -1773,6 +1777,21 @@ stmt_raise		: K_RAISE
 							if (tok == 0)
 								yyerror("unexpected end of function definition");
 
+							/* Optional choose about including context */
+							if (tok == K_WITH || tok == K_WITHOUT)
+							{
+								if (tok == K_WITH)
+									new->context_info = PLPGSQL_CONTEXT_DISPLAY;
+								else
+									new->context_info = PLPGSQL_CONTEXT_SUPPRESS;
+							
+								/* keyword CONTEXT is required */
+								if (yylex() != K_CONTEXT)
+									yyerror("expected CONTEXT");
+
+								tok = yylex();
+							}
+
 							/*
 							 * Next we can have a condition name, or
 							 * equivalently SQLSTATE 'xxxxx', or a string
@@ -2350,6 +2369,7 @@ unreserved_keyword	:
 				| K_CONSTANT
 				| K_CONSTRAINT
 				| K_CONSTRAINT_NAME
+				| K_CONTEXT
 				| K_CONTINUE
 				| K_CURRENT
 				| K_CURSOR
@@ -2412,6 +2432,8 @@ unreserved_keyword	:
 				| K_USE_VARIABLE
 				| K_VARIABLE_CONFLICT
 				| K_WARNING
+				| K_WITH
+				| K_WITHOUT
 				;
 
 %%
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index 266c314..e9f9029 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -40,6 +40,17 @@ static const struct config_enum_entry variable_conflict_options[] = {
 	{NULL, 0, false}
 };
 
+static const struct config_enum_entry display_context_min_messages_options[] = {
+	{"none", PLPGSQL_DISPLAY_CONTEXT_SUPPRESS},
+	{"exception", ERROR},
+	{"warning", WARNING},
+	{"notice", NOTICE},
+	{"info", INFO},
+	{"log", LOG},
+	{"debug", DEBUG1},
+	{NULL, 0, false}
+};
+
 int			plpgsql_variable_conflict = PLPGSQL_RESOLVE_ERROR;
 
 bool		plpgsql_print_strict_params = false;
@@ -51,6 +62,8 @@ char	   *plpgsql_extra_errors_string = NULL;
 int			plpgsql_extra_warnings;
 int			plpgsql_extra_errors;
 
+int			plpgsql_display_context_min_messages = PLPGSQL_DISPLAY_CONTEXT_SUPPRESS;
+
 /* Hook for plugins */
 PLpgSQL_plugin **plugin_ptr = NULL;
 
@@ -154,6 +167,15 @@ _PG_init(void)
 							 PGC_SUSET, 0,
 							 NULL, NULL, NULL);
 
+	DefineCustomEnumVariable("plpgsql.display_context_min_messages",
+							 gettext_noop("Sets minimal level of messages with context information."),
+							 NULL,
+							 &plpgsql_display_context_min_messages,
+							 PLPGSQL_DISPLAY_CONTEXT_SUPPRESS,
+							 display_context_min_messages_options,
+							 PGC_SUSET, 0,
+							 NULL, NULL, NULL);
+
 	DefineCustomBoolVariable("plpgsql.print_strict_params",
 							 gettext_noop("Print information about parameters in the DETAIL part of the error messages generated on INTO ... STRICT failures."),
 							 NULL,
diff --git a/src/pl/plpgsql/src/pl_scanner.c b/src/pl/plpgsql/src/pl_scanner.c
index 683fdab..973cab8 100644
--- a/src/pl/plpgsql/src/pl_scanner.c
+++ b/src/pl/plpgsql/src/pl_scanner.c
@@ -107,6 +107,7 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("constant", K_CONSTANT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint", K_CONSTRAINT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint_name", K_CONSTRAINT_NAME, UNRESERVED_KEYWORD)
+	PG_KEYWORD("context", K_CONTEXT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("continue", K_CONTINUE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("current", K_CURRENT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("cursor", K_CURSOR, UNRESERVED_KEYWORD)
@@ -170,6 +171,8 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("use_variable", K_USE_VARIABLE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("variable_conflict", K_VARIABLE_CONFLICT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("warning", K_WARNING, UNRESERVED_KEYWORD)
+	PG_KEYWORD("with", K_WITH, UNRESERVED_KEYWORD)
+	PG_KEYWORD("without", K_WITHOUT, UNRESERVED_KEYWORD)
 };
 
 static const int num_unreserved_keywords = lengthof(unreserved_keywords);
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index bec773a..73d3238 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -168,6 +168,18 @@ typedef enum
 } PLpgSQL_resolve_option;
 
 
+/* --------
+ * Manipulation with context of exception
+ * --------
+ */
+enum
+{
+	PLPGSQL_CONTEXT_DISPLAY,
+	PLPGSQL_CONTEXT_SUPPRESS,
+	PLPGSQL_CONTEXT_DEFAULT
+};
+
+
 /**********************************************************************
  * Node and structure definitions
  **********************************************************************/
@@ -619,6 +631,7 @@ typedef struct
 	int			cmd_type;
 	int			lineno;
 	int			elog_level;
+	int			context_info;
 	char	   *condname;		/* condition name, SQLSTATE, or NULL */
 	char	   *message;		/* old-style message format literal, or NULL */
 	List	   *params;			/* list of expressions for old-style message */
@@ -922,6 +935,10 @@ extern MemoryContext compile_tmp_cxt;
 
 extern PLpgSQL_plugin **plugin_ptr;
 
+#define PLPGSQL_DISPLAY_CONTEXT_SUPPRESS		0
+
+extern int plpgsql_display_context_min_messages;
+
 /**********************************************************************
  * Function declarations
  **********************************************************************/
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 78e5a85..b8dd2b1 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -5426,3 +5426,51 @@ end;
 $$;
 ERROR:  unhandled assertion
 CONTEXT:  PL/pgSQL function inline_code_block line 3 at ASSERT
+-- context is not displayed by default
+do $$
+begin
+  raise notice 'hello';
+end;
+$$;
+NOTICE:  hello
+do $$
+begin
+  raise exception 'hello';
+end;
+$$;
+ERROR:  hello
+--possibility to enforce context message displaying
+do $$
+begin
+  raise notice with context 'hello';
+end;
+$$;
+NOTICE:  hello
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+do $$
+begin
+  raise exception with context 'hello';
+end;
+$$;
+ERROR:  hello
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+set plpgsql.display_context_min_messages = 'notice';
+do $$
+begin
+  raise notice 'some notice';
+  raise exception 'some exception';
+end;
+$$;
+NOTICE:  some notice
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+ERROR:  some exception
+CONTEXT:  PL/pgSQL function inline_code_block line 4 at RAISE
+-- possibility to suppress default
+do $$
+begin
+  raise notice without context 'some notice';
+  raise exception without context 'some exception';
+end;
+$$;
+NOTICE:  some notice
+ERROR:  some exception
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index e19e415..725ce58 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -4265,3 +4265,47 @@ exception when others then
   null; -- do nothing
 end;
 $$;
+
+-- context is not displayed by default
+do $$
+begin
+  raise notice 'hello';
+end;
+$$;
+
+do $$
+begin
+  raise exception 'hello';
+end;
+$$;
+
+--possibility to enforce context message displaying
+do $$
+begin
+  raise notice with context 'hello';
+end;
+$$;
+
+do $$
+begin
+  raise exception with context 'hello';
+end;
+$$;
+
+set plpgsql.display_context_min_messages = 'notice';
+do $$
+begin
+  raise notice 'some notice';
+  raise exception 'some exception';
+end;
+$$;
+
+-- possibility to suppress default
+do $$
+begin
+  raise notice without context 'some notice';
+  raise exception without context 'some exception';
+end;
+$$;
+
+

commit c2f49938f636864234d03994d2f64f8095392d11
Author: Pavel Stehule <pavel.stehule@gooddata.com>
Date:   Sat Apr 25 22:09:28 2015 +0200

    initial implementation of (WITH|WITHOUT) CONTEXT clause to plpgsql RAISE statement.
    
    initial implementation of plpgsql GUC plpgsql.min_context

diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index d36acf6..ffc3eb8 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -3406,10 +3406,10 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
     raise errors.
 
 <synopsis>
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ... </optional></optional> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <replaceable class="parameter">condition_name</> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> SQLSTATE '<replaceable class="parameter">sqlstate</>' <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ... </optional></optional> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> <replaceable class="parameter">condition_name</> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> SQLSTATE '<replaceable class="parameter">sqlstate</>' <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <optional> ( WITH | WITHOUT ) CONTEXT </optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional>;
 RAISE ;
 </synopsis>
 
@@ -3431,6 +3431,18 @@ RAISE ;
    </para>
 
    <para>
+    The options <literal>WITH CONTEXT</literal> or <literal>WITHOUT CONTEXT</literal>
+    can enforce or suppress context information related to error or notice. This possibility
+    can be forced by settings of configuration parameter <literal>plpgsql.min_context</>.
+    This allows same values like <replaceable class="parameter">level</replaceable> option plus
+    value <literal>none</literal> that is a default. When it is changed, then all errors and notices
+    with higher than specified severity are raised with context info.
+<programlisting>
+RAISE NOTICE WITH CONTEXT 'This message will have a context';
+</programlisting>
+   </para>
+
+   <para>
     After <replaceable class="parameter">level</replaceable> if any,
     you can write a <replaceable class="parameter">format</replaceable>
     (which must be a simple string literal, not an expression).  The
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index deefb1f..eaee5a7 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -2921,6 +2921,7 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 	char	   *err_table = NULL;
 	char	   *err_schema = NULL;
 	ListCell   *lc;
+	bool			hide_ctx = true;		/* suppress context by default */
 
 	/* RAISE with no parameters: re-throw current exception */
 	if (stmt->condname == NULL && stmt->message == NULL &&
@@ -3080,10 +3081,16 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			err_message = pstrdup(unpack_sql_state(err_code));
 	}
 
-	/*
-	 * Throw the error (may or may not come back)
-	 */
-	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
+	if (stmt->context_info == PLPGSQL_CONTEXT_DISPLAY)
+		hide_ctx = false;
+	else if (stmt->context_info == PLPGSQL_CONTEXT_DEFAULT)
+	{
+		if (plpgsql_min_context != PLPGSQL_MIN_CONTEXT_SUPPRESS)
+			hide_ctx = stmt->elog_level < plpgsql_min_context;
+	}
+
+	if (hide_ctx)
+		estate->err_text = raise_skip_msg;
 
 	ereport(stmt->elog_level,
 			(err_code ? errcode(err_code) : 0,
@@ -3099,7 +3106,8 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 			 (err_table != NULL) ?
 			 err_generic_string(PG_DIAG_TABLE_NAME, err_table) : 0,
 			 (err_schema != NULL) ?
-			 err_generic_string(PG_DIAG_SCHEMA_NAME, err_schema) : 0));
+			 err_generic_string(PG_DIAG_SCHEMA_NAME, err_schema) : 0,
+			 errhidecontext(hide_ctx)));
 
 	estate->err_text = NULL;	/* un-suppress... */
 
diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index 4026e41..48914a7 100644
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -259,6 +259,7 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_CONSTANT
 %token <keyword>	K_CONSTRAINT
 %token <keyword>	K_CONSTRAINT_NAME
+%token <keyword>	K_CONTEXT
 %token <keyword>	K_CONTINUE
 %token <keyword>	K_CURRENT
 %token <keyword>	K_CURSOR
@@ -341,6 +342,8 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_WARNING
 %token <keyword>	K_WHEN
 %token <keyword>	K_WHILE
+%token <keyword>	K_WITH
+%token <keyword>	K_WITHOUT
 
 %%
 
@@ -1716,6 +1719,7 @@ stmt_raise		: K_RAISE
 						new->cmd_type	= PLPGSQL_STMT_RAISE;
 						new->lineno		= plpgsql_location_to_lineno(@1);
 						new->elog_level = ERROR;	/* default */
+						new->context_info = PLPGSQL_CONTEXT_DEFAULT;
 						new->condname	= NULL;
 						new->message	= NULL;
 						new->params		= NIL;
@@ -1773,6 +1777,21 @@ stmt_raise		: K_RAISE
 							if (tok == 0)
 								yyerror("unexpected end of function definition");
 
+							/* Optional choose about including context */
+							if (tok == K_WITH || tok == K_WITHOUT)
+							{
+								if (tok == K_WITH)
+									new->context_info = PLPGSQL_CONTEXT_DISPLAY;
+								else
+									new->context_info = PLPGSQL_CONTEXT_SUPPRESS;
+							
+								/* keyword CONTEXT is required */
+								if (yylex() != K_CONTEXT)
+									yyerror("expected CONTEXT");
+
+								tok = yylex();
+							}
+
 							/*
 							 * Next we can have a condition name, or
 							 * equivalently SQLSTATE 'xxxxx', or a string
@@ -2350,6 +2369,7 @@ unreserved_keyword	:
 				| K_CONSTANT
 				| K_CONSTRAINT
 				| K_CONSTRAINT_NAME
+				| K_CONTEXT
 				| K_CONTINUE
 				| K_CURRENT
 				| K_CURSOR
@@ -2412,6 +2432,8 @@ unreserved_keyword	:
 				| K_USE_VARIABLE
 				| K_VARIABLE_CONFLICT
 				| K_WARNING
+				| K_WITH
+				| K_WITHOUT
 				;
 
 %%
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index 266c314..2d05cf6 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -40,6 +40,17 @@ static const struct config_enum_entry variable_conflict_options[] = {
 	{NULL, 0, false}
 };
 
+static const struct config_enum_entry min_context_options[] = {
+	{"none", PLPGSQL_MIN_CONTEXT_SUPPRESS},
+	{"exception", ERROR},
+	{"warning", WARNING},
+	{"notice", NOTICE},
+	{"info", INFO},
+	{"log", LOG},
+	{"debug", DEBUG1},
+	{NULL, 0, false}
+};
+
 int			plpgsql_variable_conflict = PLPGSQL_RESOLVE_ERROR;
 
 bool		plpgsql_print_strict_params = false;
@@ -51,6 +62,8 @@ char	   *plpgsql_extra_errors_string = NULL;
 int			plpgsql_extra_warnings;
 int			plpgsql_extra_errors;
 
+int			plpgsql_min_context = PLPGSQL_MIN_CONTEXT_SUPPRESS;
+
 /* Hook for plugins */
 PLpgSQL_plugin **plugin_ptr = NULL;
 
@@ -154,6 +167,15 @@ _PG_init(void)
 							 PGC_SUSET, 0,
 							 NULL, NULL, NULL);
 
+	DefineCustomEnumVariable("plpgsql.min_context",
+							 gettext_noop("Sets minimal level of messages with context information."),
+							 NULL,
+							 &plpgsql_min_context,
+							 PLPGSQL_MIN_CONTEXT_SUPPRESS,
+							 min_context_options,
+							 PGC_SUSET, 0,
+							 NULL, NULL, NULL);
+
 	DefineCustomBoolVariable("plpgsql.print_strict_params",
 							 gettext_noop("Print information about parameters in the DETAIL part of the error messages generated on INTO ... STRICT failures."),
 							 NULL,
diff --git a/src/pl/plpgsql/src/pl_scanner.c b/src/pl/plpgsql/src/pl_scanner.c
index 683fdab..973cab8 100644
--- a/src/pl/plpgsql/src/pl_scanner.c
+++ b/src/pl/plpgsql/src/pl_scanner.c
@@ -107,6 +107,7 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("constant", K_CONSTANT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint", K_CONSTRAINT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint_name", K_CONSTRAINT_NAME, UNRESERVED_KEYWORD)
+	PG_KEYWORD("context", K_CONTEXT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("continue", K_CONTINUE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("current", K_CURRENT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("cursor", K_CURSOR, UNRESERVED_KEYWORD)
@@ -170,6 +171,8 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("use_variable", K_USE_VARIABLE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("variable_conflict", K_VARIABLE_CONFLICT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("warning", K_WARNING, UNRESERVED_KEYWORD)
+	PG_KEYWORD("with", K_WITH, UNRESERVED_KEYWORD)
+	PG_KEYWORD("without", K_WITHOUT, UNRESERVED_KEYWORD)
 };
 
 static const int num_unreserved_keywords = lengthof(unreserved_keywords);
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index bec773a..269fec3 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -168,6 +168,18 @@ typedef enum
 } PLpgSQL_resolve_option;
 
 
+/* --------
+ * Manipulation with context of exception
+ * --------
+ */
+enum
+{
+	PLPGSQL_CONTEXT_DISPLAY,
+	PLPGSQL_CONTEXT_SUPPRESS,
+	PLPGSQL_CONTEXT_DEFAULT
+};
+
+
 /**********************************************************************
  * Node and structure definitions
  **********************************************************************/
@@ -619,6 +631,7 @@ typedef struct
 	int			cmd_type;
 	int			lineno;
 	int			elog_level;
+	int			context_info;
 	char	   *condname;		/* condition name, SQLSTATE, or NULL */
 	char	   *message;		/* old-style message format literal, or NULL */
 	List	   *params;			/* list of expressions for old-style message */
@@ -922,6 +935,10 @@ extern MemoryContext compile_tmp_cxt;
 
 extern PLpgSQL_plugin **plugin_ptr;
 
+#define PLPGSQL_MIN_CONTEXT_SUPPRESS		0
+
+extern int plpgsql_min_context;
+
 /**********************************************************************
  * Function declarations
  **********************************************************************/
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 78e5a85..4f74f9f 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -5426,3 +5426,51 @@ end;
 $$;
 ERROR:  unhandled assertion
 CONTEXT:  PL/pgSQL function inline_code_block line 3 at ASSERT
+-- context is not displayed by default
+do $$
+begin
+  raise notice 'hello';
+end;
+$$;
+NOTICE:  hello
+do $$
+begin
+  raise exception 'hello';
+end;
+$$;
+ERROR:  hello
+--possibility to enforce context message displaying
+do $$
+begin
+  raise notice with context 'hello';
+end;
+$$;
+NOTICE:  hello
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+do $$
+begin
+  raise exception with context 'hello';
+end;
+$$;
+ERROR:  hello
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+set plpgsql.min_context = 'notice';
+do $$
+begin
+  raise notice 'some notice';
+  raise exception 'some exception';
+end;
+$$;
+NOTICE:  some notice
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+ERROR:  some exception
+CONTEXT:  PL/pgSQL function inline_code_block line 4 at RAISE
+-- possibility to suppress default
+do $$
+begin
+  raise notice without context 'some notice';
+  raise exception without context 'some exception';
+end;
+$$;
+NOTICE:  some notice
+ERROR:  some exception
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index e19e415..e23a74a 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -4265,3 +4265,47 @@ exception when others then
   null; -- do nothing
 end;
 $$;
+
+-- context is not displayed by default
+do $$
+begin
+  raise notice 'hello';
+end;
+$$;
+
+do $$
+begin
+  raise exception 'hello';
+end;
+$$;
+
+--possibility to enforce context message displaying
+do $$
+begin
+  raise notice with context 'hello';
+end;
+$$;
+
+do $$
+begin
+  raise exception with context 'hello';
+end;
+$$;
+
+set plpgsql.min_context = 'notice';
+do $$
+begin
+  raise notice 'some notice';
+  raise exception 'some exception';
+end;
+$$;
+
+-- possibility to suppress default
+do $$
+begin
+  raise notice without context 'some notice';
+  raise exception without context 'some exception';
+end;
+$$;
+
+

*** /home/heikki/git-sandbox-pgsql/master/src/test/regress/expected/triggers.out	2015-07-07 15:40:38.697861317 +0300
--- /home/heikki/git-sandbox-pgsql/master/src/test/regress/results/triggers.out	2015-07-07 15:50:34.885805473 +0300
***************
*** 958,968 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (20,30)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
  INSERT 0 1
  INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
--- 958,964 ----
***************
*** 970,980 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (21,31)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
   a  | b  
  ----+----
--- 966,972 ----
***************
*** 988,1004 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 0
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 980,988 ----
***************
*** 1006,1022 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a | b 
  ---+---
--- 990,998 ----
***************
*** 1031,1050 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 1
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 1007,1016 ----
***************
*** 1052,1071 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a  | b  
  ----+----
--- 1018,1027 ----
***************
*** 1277,1282 ****
--- 1233,1239 ----
  -- UPDATE .. RETURNING
  UPDATE city_view SET country_name = 'Japon' WHERE city_name = 'Tokyo'; -- error
  ERROR:  No such country: "Japon"
+ CONTEXT:  PL/pgSQL function city_update() line 9 at RAISE
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Takyo'; -- no match
  UPDATE 0
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Tokyo' RETURNING *; -- OK
***************
*** 1489,1514 ****
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  SQLSTATE = U9999: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  ERROR:  U9999
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
--- 1446,1458 ----
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  NOTICE:  SQLSTATE = U9999: depth = 2
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  ERROR:  U9999
! CONTEXT:  PL/pgSQL function depth_c_tf() line 5 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
***************
*** 1521,1541 ****
  insert into depth_a values (2);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_a_tr: depth = 1
  select pg_trigger_depth();
   pg_trigger_depth 
--- 1465,1473 ----

======================================================================

*** /home/heikki/git-sandbox-pgsql/master/src/test/regress/expected/privileges.out	2015-07-07 15:40:38.689861374 +0300
--- /home/heikki/git-sandbox-pgsql/master/src/test/regress/results/privileges.out	2015-07-07 15:50:39.833771884 +0300
***************
*** 1023,1029 ****
  ERROR:  must have admin option on role "regressgroup2"
  SELECT dogrant_ok();			-- ok: SECURITY DEFINER conveys ADMIN
  NOTICE:  role "regressuser5" is already a member of role "regressgroup2"
- CONTEXT:  SQL function "dogrant_ok" statement 1
   dogrant_ok 
  ------------
   
--- 1023,1028 ----

======================================================================

*** /home/heikki/git-sandbox-pgsql/master/src/test/regress/expected/plancache.out	2015-07-07 15:40:38.689861374 +0300
--- /home/heikki/git-sandbox-pgsql/master/src/test/regress/results/plancache.out	2015-07-07 15:50:42.433754234 +0300
***************
*** 234,241 ****
  end$$ language plpgsql;
  select cachebug();
  NOTICE:  table "temptable" does not exist, skipping
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 234,239 ----
***************
*** 246,253 ****
  
  select cachebug();
  NOTICE:  drop cascades to view vv
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 244,249 ----

======================================================================

*** /home/heikki/git-sandbox-pgsql/master/src/test/regress/expected/plpgsql.out	2015-07-07 15:40:38.689861374 +0300
--- /home/heikki/git-sandbox-pgsql/master/src/test/regress/results/plpgsql.out	2015-07-07 15:50:45.549733081 +0300
***************
*** 1518,1544 ****
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
--- 1518,1552 ----
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 47 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 77 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_biu() line 12 at RAISE
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_bd() line 12 at RAISE
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 8 at RAISE
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 14 at RAISE
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
***************
*** 1963,1968 ****
--- 1971,1977 ----
  NOTICE:  should see this only if -100 <> 0
  NOTICE:  should see this only if -100 fits in smallint
  ERROR:  -100 is less than zero
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 12 at RAISE
  create function trap_matching_test(int) returns int as $$
  declare x int;
  	sx smallint;
***************
*** 2066,2079 ****
  end$$ language plpgsql;
  select test_variable_storage();
  NOTICE:  should see this
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 <> 0
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 fits in smallint
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
   test_variable_storage 
  -----------------------
   123456789012
--- 2075,2082 ----
***************
*** 4052,4057 ****
--- 4055,4061 ----
  HINT:  some hint
  ERROR:  1 2 3
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 5 at RAISE
  -- Since we can't actually see the thrown SQLSTATE in default psql output,
  -- test it like this; this also tests re-RAISE
  create or replace function raise_test() returns void as $$
***************
*** 4068,4073 ****
--- 4072,4078 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise 'check me'
***************
*** 4082,4087 ****
--- 4087,4093 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- SQLSTATE specification in WHEN
  create or replace function raise_test() returns void as $$
  begin
***************
*** 4097,4102 ****
--- 4103,4109 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using detail = 'some detail info';
***************
*** 4110,4115 ****
--- 4117,4123 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: division_by_zero
  ERROR:  division_by_zero
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero;
***************
*** 4117,4122 ****
--- 4125,4131 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  division_by_zero
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise sqlstate '1234F';
***************
*** 4124,4129 ****
--- 4133,4139 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  1234F
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using message = 'custom' || ' message';
***************
*** 4131,4136 ****
--- 4141,4147 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise using message = 'custom' || ' message', errcode = '22012';
***************
*** 4138,4143 ****
--- 4149,4155 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- conflict on message
  create or replace function raise_test() returns void as $$
  begin
***************
*** 4254,4259 ****
--- 4266,4272 ----
  select raise_test();
  NOTICE:  22012
  ERROR:  substitute message
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  drop function raise_test();
  -- test passing column_name, constraint_name, datatype_name, table_name
  -- and schema_name error fields
***************
*** 4744,4750 ****
                 ^
  HINT:  Use the escape string syntax for backslashes, e.g., E'\\'.
  QUERY:  SELECT 'foo\\bar\041baz'
- CONTEXT:  PL/pgSQL function strtest() line 4 at RETURN
     strtest   
  -------------
   foo\bar!baz
--- 4757,4762 ----
***************
*** 5260,5281 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5272,5285 ----
***************
*** 5286,5307 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5290,5303 ----
***************
*** 5358,5379 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5354,5367 ----
***************
*** 5384,5405 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5372,5385 ----

======================================================================

*** /home/heikki/git-sandbox-pgsql/master/src/test/regress/expected/copy2.out	2015-07-07 15:40:38.677861460 +0300
--- /home/heikki/git-sandbox-pgsql/master/src/test/regress/results/copy2.out	2015-07-07 15:50:42.577753257 +0300
***************
*** 447,458 ****
  
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":1}
- CONTEXT:  COPY check_con_tbl, line 1: "1"
  NOTICE:  input = {"f1":null}
- CONTEXT:  COPY check_con_tbl, line 2: "\N"
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":0}
- CONTEXT:  COPY check_con_tbl, line 1: "0"
  ERROR:  new row for relation "check_con_tbl" violates check constraint "check_con_tbl_check"
  DETAIL:  Failing row contains (0).
  CONTEXT:  COPY check_con_tbl, line 1: "0"
--- 447,455 ----

======================================================================

*** /home/heikki/git-sandbox-pgsql/master/src/test/regress/expected/rangefuncs.out	2015-07-07 15:40:38.689861374 +0300
--- /home/heikki/git-sandbox-pgsql/master/src/test/regress/results/rangefuncs.out	2015-07-07 15:50:42.745752116 +0300
***************
*** 1704,1712 ****
  execute procedure noticetrigger();
  select insert_tt2('foolme','barme') limit 1;
  NOTICE:  noticetrigger 11 foolme
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 12 barme
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           11
--- 1704,1710 ----
***************
*** 1735,1743 ****
    insert into tt_log values(new.*);
  select insert_tt2('foollog','barlog') limit 1;
  NOTICE:  noticetrigger 13 foollog
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 14 barlog
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           13
--- 1733,1739 ----

======================================================================

*** /home/heikki/git-sandbox-pgsql/master/src/test/regress/expected/xml.out	2015-07-07 15:40:38.697861317 +0300
--- /home/heikki/git-sandbox-pgsql/master/src/test/regress/results/xml.out	2015-07-07 15:50:42.425754288 +0300
***************
*** 934,940 ****
  WARNING:  line 1: xmlns: URI relative is not absolute
  <relativens xmlns='relative'/>
                              ^
- CONTEXT:  SQL function "xpath" statement 1
                  xpath                 
  --------------------------------------
   {"<relativens xmlns=\"relative\"/>"}
--- 934,939 ----

======================================================================

*** /home/heikki/git-sandbox-pgsql/master/src/test/regress/expected/event_trigger.out	2015-07-07 15:40:38.681861432 +0300
--- /home/heikki/git-sandbox-pgsql/master/src/test/regress/results/event_trigger.out	2015-07-07 15:50:45.665732294 +0300
***************
*** 234,248 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
--- 234,243 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
! SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
***************
*** 255,277 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object schema_one.table_three of type table cannot be dropped
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
--- 250,261 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  NOTICE:  table "schema_one_table_one" does not exist, skipping
  NOTICE:  table "schema_one_table two" does not exist, skipping
  NOTICE:  table "schema_one_table_three" does not exist, skipping
  ERROR:  object schema_one.table_three of type table cannot be dropped
+ CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
***************
*** 283,304 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
       type     |   schema   |               object                
  --------------+------------+-------------------------------------
--- 267,276 ----
***************
*** 329,336 ****
  
  DROP OWNED BY regression_bob;
  NOTICE:  schema "audit_tbls" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_one_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE type = 'schema';
    type  | schema |   object   
  --------+--------+------------
--- 301,306 ----
***************
*** 402,409 ****
--- 372,381 ----
       select x * 1.001 from generate_series(1, 500) as t(x);
  alter table rewriteme alter column foo type numeric;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  alter table rewriteme add column baz int default 0;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  -- test with more than one reason to rewrite a single table
  CREATE OR REPLACE FUNCTION test_evtrig_no_rewrite() RETURNS event_trigger
  LANGUAGE plpgsql AS $$

======================================================================

commit e3053e47ab7a9735aeda24995501c7b74042e7c6
Author: Pavel Stehule <pavel.stehule@gooddata.com>
Date:   Wed Jul 8 22:12:30 2015 +0200

    initial

diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 088c714..9445230 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2730,7 +2730,7 @@ write_csvlog(ErrorData *edata)
 	appendStringInfoChar(&buf, ',');
 
 	/* errcontext */
-	if (!edata->hide_ctx)
+	if (!edata->hide_ctx && edata->elevel >= log_min_context)
 		appendCSVLiteral(&buf, edata->context);
 	appendStringInfoChar(&buf, ',');
 
@@ -2863,7 +2863,7 @@ send_message_to_server_log(ErrorData *edata)
 			append_with_tabs(&buf, edata->internalquery);
 			appendStringInfoChar(&buf, '\n');
 		}
-		if (edata->context && !edata->hide_ctx)
+		if (edata->context && !edata->hide_ctx && edata->elevel >= log_min_context)
 		{
 			log_line_prefix(&buf, edata);
 			appendStringInfoString(&buf, _("CONTEXT:  "));
@@ -3137,7 +3137,7 @@ send_message_to_frontend(ErrorData *edata)
 			err_sendstring(&msgbuf, edata->hint);
 		}
 
-		if (edata->context)
+		if (edata->context && edata->elevel >= client_min_context)
 		{
 			pq_sendbyte(&msgbuf, PG_DIAG_CONTEXT);
 			err_sendstring(&msgbuf, edata->context);
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 595a609..ca63bf5 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -430,6 +430,8 @@ bool		Password_encryption = true;
 int			log_min_error_statement = ERROR;
 int			log_min_messages = WARNING;
 int			client_min_messages = NOTICE;
+int			log_min_context = ERROR;
+int			client_min_context = ERROR;
 int			log_min_duration_statement = -1;
 int			log_temp_files = -1;
 int			trace_recovery_messages = LOG;
@@ -3426,6 +3428,17 @@ static struct config_enum ConfigureNamesEnum[] =
 	},
 
 	{
+		{"client_min_context", PGC_USERSET, LOGGING_WHEN,
+			gettext_noop("Sets the message levels when the context is send to the client."),
+			gettext_noop("Each level includes all the levels that follow it. The later"
+						 " the level, the less content are sent.")
+		},
+		&client_min_context,
+		ERROR, client_message_level_options,
+		NULL, NULL, NULL
+	},
+
+	{
 		{"client_min_messages", PGC_USERSET, LOGGING_WHEN,
 			gettext_noop("Sets the message levels that are sent to the client."),
 			gettext_noop("Each level includes all the levels that follow it. The later"
@@ -3479,6 +3492,17 @@ static struct config_enum ConfigureNamesEnum[] =
 	},
 
 	{
+		{"log_min_context", PGC_SUSET, LOGGING_WHEN,
+			gettext_noop("Sets the message levels that has context logged."),
+			gettext_noop("Each level includes all the levels that follow it. The later"
+						 " the level, the less content are sent.")
+		},
+		&log_min_context,
+		WARNING, server_message_level_options,
+		NULL, NULL, NULL
+	},
+
+	{
 		{"log_min_messages", PGC_SUSET, LOGGING_WHEN,
 			gettext_noop("Sets the message levels that are logged."),
 			gettext_noop("Each level includes all the levels that follow it. The later"
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 06dfc06..8695e8b 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -360,6 +360,31 @@
 
 # - When to Log -
 
+#client_min_context = error		# values in order of decreasing detail:
+					#   debug5
+					#   debug4
+					#   debug3
+					#   debug2
+					#   debug1
+					#   log
+					#   notice
+					#   warning
+					#   error
+
+#log_min_context = warning		# values in order of decreasing detail:
+					#   debug5
+					#   debug4
+					#   debug3
+					#   debug2
+					#   debug1
+					#   info
+					#   notice
+					#   warning
+					#   error
+					#   log
+					#   fatal
+					#   panic
+
 #client_min_messages = notice		# values in order of decreasing detail:
 					#   debug5
 					#   debug4
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index dc167f9..f03a5e1 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -246,6 +246,8 @@ extern PGDLLIMPORT bool check_function_bodies;
 extern bool default_with_oids;
 extern bool SQL_inheritance;
 
+extern int	log_min_context;
+extern int	client_min_context;
 extern int	log_min_error_statement;
 extern int	log_min_messages;
 extern int	client_min_messages;
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 7d4001c..e1a6b7d 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -42,8 +42,6 @@
 #include "utils/typcache.h"
 
 
-static const char *const raise_skip_msg = "RAISE";
-
 typedef struct
 {
 	int			nargs;			/* number of arguments */
@@ -939,10 +937,6 @@ plpgsql_exec_error_callback(void *arg)
 {
 	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) arg;
 
-	/* if we are doing RAISE, don't report its location */
-	if (estate->err_text == raise_skip_msg)
-		return;
-
 	if (estate->err_text != NULL)
 	{
 		/*
@@ -3158,8 +3152,6 @@ exec_stmt_raise(PLpgSQL_execstate *estate, PLpgSQL_stmt_raise *stmt)
 	/*
 	 * Throw the error (may or may not come back)
 	 */
-	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
-
 	ereport(stmt->elog_level,
 			(err_code ? errcode(err_code) : 0,
 			 errmsg_internal("%s", err_message),
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
index 5e31737..72ada21 100644
--- a/src/test/regress/expected/copy2.out
+++ b/src/test/regress/expected/copy2.out
@@ -447,12 +447,9 @@ Check constraints:
 
 copy check_con_tbl from stdin;
 NOTICE:  input = {"f1":1}
-CONTEXT:  COPY check_con_tbl, line 1: "1"
 NOTICE:  input = {"f1":null}
-CONTEXT:  COPY check_con_tbl, line 2: "\N"
 copy check_con_tbl from stdin;
 NOTICE:  input = {"f1":0}
-CONTEXT:  COPY check_con_tbl, line 1: "0"
 ERROR:  new row for relation "check_con_tbl" violates check constraint "check_con_tbl_check"
 DETAIL:  Failing row contains (0).
 CONTEXT:  COPY check_con_tbl, line 1: "0"
diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
index e70c315..05ac0ad 100644
--- a/src/test/regress/expected/event_trigger.out
+++ b/src/test/regress/expected/event_trigger.out
@@ -234,15 +234,10 @@ drop cascades to table schema_one.table_one
 drop cascades to table schema_one."table two"
 drop cascades to table schema_one.table_three
 NOTICE:  table "schema_two_table_two" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
-SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
+CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
+SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
 PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
 DROP SCHEMA schema_one, schema_two CASCADE;
@@ -255,23 +250,12 @@ drop cascades to table schema_one.table_one
 drop cascades to table schema_one."table two"
 drop cascades to table schema_one.table_three
 NOTICE:  table "schema_two_table_two" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
-SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 NOTICE:  table "schema_one_table_one" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 NOTICE:  table "schema_one_table two" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 NOTICE:  table "schema_one_table_three" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 ERROR:  object schema_one.table_three of type table cannot be dropped
+CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
 DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
 DROP SCHEMA schema_one, schema_two CASCADE;
 NOTICE:  drop cascades to 7 other objects
@@ -283,22 +267,10 @@ drop cascades to table schema_one.table_one
 drop cascades to table schema_one."table two"
 drop cascades to table schema_one.table_three
 NOTICE:  table "schema_two_table_two" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
-SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 NOTICE:  table "schema_one_table_one" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 NOTICE:  table "schema_one_table two" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 NOTICE:  table "schema_one_table_three" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
      type     |   schema   |               object                
 --------------+------------+-------------------------------------
@@ -329,8 +301,6 @@ SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
 
 DROP OWNED BY regression_bob;
 NOTICE:  schema "audit_tbls" does not exist, skipping
-CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_one_table_two"
-PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
 SELECT * FROM dropped_objects WHERE type = 'schema';
   type  | schema |   object   
 --------+--------+------------
@@ -402,8 +372,10 @@ insert into rewriteme
      select x * 1.001 from generate_series(1, 500) as t(x);
 alter table rewriteme alter column foo type numeric;
 ERROR:  I'm sorry Sir, No Rewrite Allowed.
+CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
 alter table rewriteme add column baz int default 0;
 ERROR:  I'm sorry Sir, No Rewrite Allowed.
+CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
 -- test with more than one reason to rewrite a single table
 CREATE OR REPLACE FUNCTION test_evtrig_no_rewrite() RETURNS event_trigger
 LANGUAGE plpgsql AS $$
diff --git a/src/test/regress/expected/plancache.out b/src/test/regress/expected/plancache.out
index 864f70f..3f3db33 100644
--- a/src/test/regress/expected/plancache.out
+++ b/src/test/regress/expected/plancache.out
@@ -234,8 +234,6 @@ begin
 end$$ language plpgsql;
 select cachebug();
 NOTICE:  table "temptable" does not exist, skipping
-CONTEXT:  SQL statement "drop table if exists temptable cascade"
-PL/pgSQL function cachebug() line 4 at SQL statement
 NOTICE:  1
 NOTICE:  2
 NOTICE:  3
@@ -246,8 +244,6 @@ NOTICE:  3
 
 select cachebug();
 NOTICE:  drop cascades to view vv
-CONTEXT:  SQL statement "drop table if exists temptable cascade"
-PL/pgSQL function cachebug() line 4 at SQL statement
 NOTICE:  1
 NOTICE:  2
 NOTICE:  3
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 7ce5415..a19424d 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -1518,27 +1518,35 @@ ERROR:  duplicate key value violates unique constraint "pfield_name"
 DETAIL:  Key (name)=(PF1_1) already exists.
 update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
 ERROR:  WS.not.there         does not exist
-CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
+CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 30 at RAISE
+PL/pgSQL function tg_backlink_a() line 17 at assignment
 update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
 ERROR:  illegal backlink beginning with XX
-CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
+CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 47 at RAISE
+PL/pgSQL function tg_backlink_a() line 17 at assignment
 update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
 ERROR:  PS.not.there         does not exist
-CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
+CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 30 at RAISE
+PL/pgSQL function tg_slotlink_a() line 17 at assignment
 update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
 ERROR:  illegal slotlink beginning with XX
-CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
+CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 77 at RAISE
+PL/pgSQL function tg_slotlink_a() line 17 at assignment
 insert into HSlot values ('HS', 'base.hub1', 1, '');
 ERROR:  duplicate key value violates unique constraint "hslot_name"
 DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
 insert into HSlot values ('HS', 'base.hub1', 20, '');
 ERROR:  no manual manipulation of HSlot
+CONTEXT:  PL/pgSQL function tg_hslot_biu() line 12 at RAISE
 delete from HSlot;
 ERROR:  no manual manipulation of HSlot
+CONTEXT:  PL/pgSQL function tg_hslot_bd() line 12 at RAISE
 insert into IFace values ('IF', 'notthere', 'eth0', '');
 ERROR:  system "notthere" does not exist
+CONTEXT:  PL/pgSQL function tg_iface_biu() line 8 at RAISE
 insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
 ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
+CONTEXT:  PL/pgSQL function tg_iface_biu() line 14 at RAISE
 --
 -- The following tests are unrelated to the scenario outlined above;
 -- they merely exercise specific parts of PL/pgSQL
@@ -1963,6 +1971,7 @@ NOTICE:  should see this
 NOTICE:  should see this only if -100 <> 0
 NOTICE:  should see this only if -100 fits in smallint
 ERROR:  -100 is less than zero
+CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 12 at RAISE
 create function trap_matching_test(int) returns int as $$
 declare x int;
 	sx smallint;
@@ -2066,14 +2075,8 @@ begin
 end$$ language plpgsql;
 select test_variable_storage();
 NOTICE:  should see this
-CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
-PL/pgSQL function test_variable_storage() line 8 at PERFORM
 NOTICE:  should see this only if -100 <> 0
-CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
-PL/pgSQL function test_variable_storage() line 8 at PERFORM
 NOTICE:  should see this only if -100 fits in smallint
-CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
-PL/pgSQL function test_variable_storage() line 8 at PERFORM
  test_variable_storage 
 -----------------------
  123456789012
@@ -4052,6 +4055,7 @@ DETAIL:  some detail info
 HINT:  some hint
 ERROR:  1 2 3
 DETAIL:  some detail info
+CONTEXT:  PL/pgSQL function raise_test() line 5 at RAISE
 -- Since we can't actually see the thrown SQLSTATE in default psql output,
 -- test it like this; this also tests re-RAISE
 create or replace function raise_test() returns void as $$
@@ -4068,6 +4072,7 @@ select raise_test();
 NOTICE:  SQLSTATE: 22012 SQLERRM: check me
 ERROR:  check me
 DETAIL:  some detail info
+CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
 create or replace function raise_test() returns void as $$
 begin
   raise 'check me'
@@ -4082,6 +4087,7 @@ select raise_test();
 NOTICE:  SQLSTATE: 1234F SQLERRM: check me
 ERROR:  check me
 DETAIL:  some detail info
+CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
 -- SQLSTATE specification in WHEN
 create or replace function raise_test() returns void as $$
 begin
@@ -4097,6 +4103,7 @@ select raise_test();
 NOTICE:  SQLSTATE: 1234F SQLERRM: check me
 ERROR:  check me
 DETAIL:  some detail info
+CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
 create or replace function raise_test() returns void as $$
 begin
   raise division_by_zero using detail = 'some detail info';
@@ -4110,6 +4117,7 @@ select raise_test();
 NOTICE:  SQLSTATE: 22012 SQLERRM: division_by_zero
 ERROR:  division_by_zero
 DETAIL:  some detail info
+CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
 create or replace function raise_test() returns void as $$
 begin
   raise division_by_zero;
@@ -4117,6 +4125,7 @@ end;
 $$ language plpgsql;
 select raise_test();
 ERROR:  division_by_zero
+CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
 create or replace function raise_test() returns void as $$
 begin
   raise sqlstate '1234F';
@@ -4124,6 +4133,7 @@ end;
 $$ language plpgsql;
 select raise_test();
 ERROR:  1234F
+CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
 create or replace function raise_test() returns void as $$
 begin
   raise division_by_zero using message = 'custom' || ' message';
@@ -4131,6 +4141,7 @@ end;
 $$ language plpgsql;
 select raise_test();
 ERROR:  custom message
+CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
 create or replace function raise_test() returns void as $$
 begin
   raise using message = 'custom' || ' message', errcode = '22012';
@@ -4138,6 +4149,7 @@ end;
 $$ language plpgsql;
 select raise_test();
 ERROR:  custom message
+CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
 -- conflict on message
 create or replace function raise_test() returns void as $$
 begin
@@ -4254,6 +4266,7 @@ $$ language plpgsql;
 select raise_test();
 NOTICE:  22012
 ERROR:  substitute message
+CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
 drop function raise_test();
 -- test passing column_name, constraint_name, datatype_name, table_name
 -- and schema_name error fields
@@ -4744,7 +4757,6 @@ LINE 1: SELECT 'foo\\bar\041baz'
                ^
 HINT:  Use the escape string syntax for backslashes, e.g., E'\\'.
 QUERY:  SELECT 'foo\\bar\041baz'
-CONTEXT:  PL/pgSQL function strtest() line 4 at RETURN
    strtest   
 -------------
  foo\bar!baz
@@ -5260,22 +5272,14 @@ $$ language plpgsql;
 select outer_outer_func(10);
 NOTICE:  calling down into outer_func()
 NOTICE:  calling down into inner_func()
-CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
 PL/pgSQL function outer_func(integer) line 6 at assignment
 PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
 PL/pgSQL function outer_func(integer) line 6 at assignment
 PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  lets make sure we didnt break anything
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  inner_func() done
-CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  outer_func() done
  outer_outer_func 
 ------------------
@@ -5286,22 +5290,14 @@ NOTICE:  outer_func() done
 select outer_outer_func(20);
 NOTICE:  calling down into outer_func()
 NOTICE:  calling down into inner_func()
-CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
 PL/pgSQL function outer_func(integer) line 6 at assignment
 PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
 PL/pgSQL function outer_func(integer) line 6 at assignment
 PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  lets make sure we didnt break anything
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  inner_func() done
-CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  outer_func() done
  outer_outer_func 
 ------------------
@@ -5358,22 +5354,14 @@ $$ language plpgsql;
 select outer_outer_func(10);
 NOTICE:  calling down into outer_func()
 NOTICE:  calling down into inner_func()
-CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
 PL/pgSQL function outer_func(integer) line 6 at assignment
 PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
 PL/pgSQL function outer_func(integer) line 6 at assignment
 PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  lets make sure we didnt break anything
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  inner_func() done
-CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  outer_func() done
  outer_outer_func 
 ------------------
@@ -5384,22 +5372,14 @@ NOTICE:  outer_func() done
 select outer_outer_func(20);
 NOTICE:  calling down into outer_func()
 NOTICE:  calling down into inner_func()
-CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
 PL/pgSQL function outer_func(integer) line 6 at assignment
 PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
 PL/pgSQL function outer_func(integer) line 6 at assignment
 PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  lets make sure we didnt break anything
-CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
-PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  inner_func() done
-CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
 NOTICE:  outer_func() done
  outer_outer_func 
 ------------------
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index c0cd9fa..88bdc2c 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -1023,7 +1023,6 @@ GRANT regressgroup2 TO regressuser5; -- fails: no ADMIN OPTION
 ERROR:  must have admin option on role "regressgroup2"
 SELECT dogrant_ok();			-- ok: SECURITY DEFINER conveys ADMIN
 NOTICE:  role "regressuser5" is already a member of role "regressgroup2"
-CONTEXT:  SQL function "dogrant_ok" statement 1
  dogrant_ok 
 ------------
  
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
index 6dabe50..00ef421 100644
--- a/src/test/regress/expected/rangefuncs.out
+++ b/src/test/regress/expected/rangefuncs.out
@@ -1704,9 +1704,7 @@ create trigger tnoticetrigger after insert on tt for each row
 execute procedure noticetrigger();
 select insert_tt2('foolme','barme') limit 1;
 NOTICE:  noticetrigger 11 foolme
-CONTEXT:  SQL function "insert_tt2" statement 1
 NOTICE:  noticetrigger 12 barme
-CONTEXT:  SQL function "insert_tt2" statement 1
  insert_tt2 
 ------------
          11
@@ -1735,9 +1733,7 @@ create rule insert_tt_rule as on insert to tt do also
   insert into tt_log values(new.*);
 select insert_tt2('foollog','barlog') limit 1;
 NOTICE:  noticetrigger 13 foollog
-CONTEXT:  SQL function "insert_tt2" statement 1
 NOTICE:  noticetrigger 14 barlog
-CONTEXT:  SQL function "insert_tt2" statement 1
  insert_tt2 
 ------------
          13
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index 3b32e8f..cd43e46 100644
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -958,11 +958,7 @@ NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
 NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
 NOTICE:  NEW: (20,30)
 NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
-CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
-PL/pgSQL function view_trigger() line 17 at SQL statement
 NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
-PL/pgSQL function view_trigger() line 17 at SQL statement
 NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
 INSERT 0 1
 INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
@@ -970,11 +966,7 @@ NOTICE:  main_view BEFORE INSERT STATEMENT (before_view_ins_stmt)
 NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
 NOTICE:  NEW: (21,31)
 NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
-CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
-PL/pgSQL function view_trigger() line 17 at SQL statement
 NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
-PL/pgSQL function view_trigger() line 17 at SQL statement
 NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
  a  | b  
 ----+----
@@ -988,17 +980,9 @@ NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
 NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
 NOTICE:  OLD: (20,30), NEW: (20,31)
 NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
 UPDATE 0
 UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
@@ -1006,17 +990,9 @@ NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
 NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
 NOTICE:  OLD: (21,31), NEW: (21,32)
 NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  a | b 
 ---+---
@@ -1031,20 +1007,10 @@ NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
 NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
 NOTICE:  OLD: (20,30), NEW: (20,31)
 NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
 UPDATE 1
 UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
@@ -1052,20 +1018,10 @@ NOTICE:  main_view BEFORE UPDATE STATEMENT (before_view_upd_stmt)
 NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
 NOTICE:  OLD: (21,31), NEW: (21,32)
 NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
-CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
-PL/pgSQL function view_trigger() line 23 at SQL statement
 NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  a  | b  
 ----+----
@@ -1277,6 +1233,7 @@ INSERT 0 1
 -- UPDATE .. RETURNING
 UPDATE city_view SET country_name = 'Japon' WHERE city_name = 'Tokyo'; -- error
 ERROR:  No such country: "Japon"
+CONTEXT:  PL/pgSQL function city_update() line 9 at RAISE
 UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Takyo'; -- no match
 UPDATE 0
 UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Tokyo' RETURNING *; -- OK
@@ -1489,26 +1446,13 @@ select pg_trigger_depth();
 insert into depth_a values (1);
 NOTICE:  depth_a_tr: depth = 1
 NOTICE:  depth_b_tr: depth = 2
-CONTEXT:  SQL statement "insert into depth_b values (new.id)"
-PL/pgSQL function depth_a_tf() line 4 at SQL statement
 NOTICE:  depth_c_tr: depth = 3
-CONTEXT:  SQL statement "insert into depth_c values (1)"
-PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
-SQL statement "insert into depth_b values (new.id)"
-PL/pgSQL function depth_a_tf() line 4 at SQL statement
 NOTICE:  SQLSTATE = U9999: depth = 2
-CONTEXT:  SQL statement "insert into depth_b values (new.id)"
-PL/pgSQL function depth_a_tf() line 4 at SQL statement
 NOTICE:  depth_b_tr: depth = 2
-CONTEXT:  SQL statement "insert into depth_b values (new.id)"
-PL/pgSQL function depth_a_tf() line 4 at SQL statement
 NOTICE:  depth_c_tr: depth = 3
-CONTEXT:  SQL statement "insert into depth_c values (1)"
-PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
-SQL statement "insert into depth_b values (new.id)"
-PL/pgSQL function depth_a_tf() line 4 at SQL statement
 ERROR:  U9999
-CONTEXT:  SQL statement "insert into depth_c values (1)"
+CONTEXT:  PL/pgSQL function depth_c_tf() line 5 at RAISE
+SQL statement "insert into depth_c values (1)"
 PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
 SQL statement "insert into depth_b values (new.id)"
 PL/pgSQL function depth_a_tf() line 4 at SQL statement
@@ -1521,21 +1465,9 @@ select pg_trigger_depth();
 insert into depth_a values (2);
 NOTICE:  depth_a_tr: depth = 1
 NOTICE:  depth_b_tr: depth = 2
-CONTEXT:  SQL statement "insert into depth_b values (new.id)"
-PL/pgSQL function depth_a_tf() line 4 at SQL statement
 NOTICE:  depth_c_tr: depth = 3
-CONTEXT:  SQL statement "insert into depth_c values (2)"
-PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
-SQL statement "insert into depth_b values (new.id)"
-PL/pgSQL function depth_a_tf() line 4 at SQL statement
 NOTICE:  depth_c_tr: depth = 3
-CONTEXT:  SQL statement "insert into depth_c values (2)"
-PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
-SQL statement "insert into depth_b values (new.id)"
-PL/pgSQL function depth_a_tf() line 4 at SQL statement
 NOTICE:  depth_b_tr: depth = 2
-CONTEXT:  SQL statement "insert into depth_b values (new.id)"
-PL/pgSQL function depth_a_tf() line 4 at SQL statement
 NOTICE:  depth_a_tr: depth = 1
 select pg_trigger_depth();
  pg_trigger_depth 
diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
index 9b2d264..5691e47 100644
--- a/src/test/regress/expected/xml.out
+++ b/src/test/regress/expected/xml.out
@@ -934,7 +934,6 @@ SELECT xpath('/*', '<relativens xmlns=''relative''/>');
 WARNING:  line 1: xmlns: URI relative is not absolute
 <relativens xmlns='relative'/>
                             ^
-CONTEXT:  SQL function "xpath" statement 1
                 xpath                 
 --------------------------------------
  {"<relativens xmlns=\"relative\"/>"}

diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
new file mode 100644
index a49b562..a268fc7
*** a/contrib/dblink/expected/dblink.out
--- b/contrib/dblink/expected/dblink.out
***************
*** 1,3 ****
--- 1,4 ----
+ set client_min_context TO notice;
  CREATE EXTENSION dblink;
  CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2));
  INSERT INTO foo VALUES (0,'a','{"a0","b0","c0"}');
diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql
new file mode 100644
index ea78cc2..cf7e57e
*** a/contrib/dblink/sql/dblink.sql
--- b/contrib/dblink/sql/dblink.sql
***************
*** 1,3 ****
--- 1,5 ----
+ set client_min_context TO notice;
+ 
  CREATE EXTENSION dblink;
  
  CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2));
diff --git a/contrib/hstore_plperl/expected/hstore_plperlu.out b/contrib/hstore_plperl/expected/hstore_plperlu.out
new file mode 100644
index 8c689ad..c97fd3f
*** a/contrib/hstore_plperl/expected/hstore_plperlu.out
--- b/contrib/hstore_plperl/expected/hstore_plperlu.out
*************** INFO:  $VAR1 = {
*** 29,35 ****
            'cc' => undef
          };
  
- CONTEXT:  PL/Perl function "test1"
   test1 
  -------
       2
--- 29,34 ----
*************** $$;
*** 46,52 ****
  SELECT test1none('aa=>bb, cc=>NULL'::hstore);
  INFO:  $VAR1 = '"aa"=>"bb", "cc"=>NULL';
  
- CONTEXT:  PL/Perl function "test1none"
   test1none 
  -----------
           0
--- 45,50 ----
*************** INFO:  $VAR1 = {
*** 67,73 ****
            'cc' => undef
          };
  
- CONTEXT:  PL/Perl function "test1list"
   test1list 
  -----------
           2
--- 65,70 ----
*************** $VAR2 = {
*** 92,98 ****
            'dd' => 'ee'
          };
  
- CONTEXT:  PL/Perl function "test1arr"
   test1arr 
  ----------
          2
--- 89,94 ----
*************** INFO:  $VAR1 = {
*** 120,129 ****
            'cc' => undef
          };
  
- CONTEXT:  PL/Perl function "test3"
  INFO:  $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
  
- CONTEXT:  PL/Perl function "test3"
   test3 
  -------
   
--- 116,123 ----
*************** INFO:  $VAR1 = {
*** 161,167 ****
                 }
          };
  
- CONTEXT:  PL/Perl function "test4"
  SELECT * FROM test1;
   a |                b                
  ---+---------------------------------
--- 155,160 ----
diff --git a/contrib/hstore_plpython/expected/hstore_plpython.out b/contrib/hstore_plpython/expected/hstore_plpython.out
new file mode 100644
index b7a6a92..23091d3
*** a/contrib/hstore_plpython/expected/hstore_plpython.out
--- b/contrib/hstore_plpython/expected/hstore_plpython.out
*************** return len(val)
*** 13,19 ****
  $$;
  SELECT test1('aa=>bb, cc=>NULL'::hstore);
  INFO:  [('aa', 'bb'), ('cc', None)]
- CONTEXT:  PL/Python function "test1"
   test1 
  -------
       2
--- 13,18 ----
*************** return len(val)
*** 32,38 ****
  $$;
  SELECT test1n('aa=>bb, cc=>NULL'::hstore);
  INFO:  [('aa', 'bb'), ('cc', None)]
- CONTEXT:  PL/Python function "test1n"
   test1n 
  --------
        2
--- 31,36 ----
diff --git a/contrib/ltree_plpython/expected/ltree_plpython.out b/contrib/ltree_plpython/expected/ltree_plpython.out
new file mode 100644
index 934529e..c6e8a7c
*** a/contrib/ltree_plpython/expected/ltree_plpython.out
--- b/contrib/ltree_plpython/expected/ltree_plpython.out
*************** return len(val)
*** 9,15 ****
  $$;
  SELECT test1('aa.bb.cc'::ltree);
  INFO:  ['aa', 'bb', 'cc']
- CONTEXT:  PL/Python function "test1"
   test1 
  -------
       3
--- 9,14 ----
*************** return len(val)
*** 24,30 ****
  $$;
  SELECT test1n('aa.bb.cc'::ltree);
  INFO:  ['aa', 'bb', 'cc']
- CONTEXT:  PL/Python function "test1n"
   test1n 
  --------
        3
--- 23,28 ----
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
new file mode 100644
index 088c714..9445230
*** a/src/backend/utils/error/elog.c
--- b/src/backend/utils/error/elog.c
*************** write_csvlog(ErrorData *edata)
*** 2730,2736 ****
  	appendStringInfoChar(&buf, ',');
  
  	/* errcontext */
! 	if (!edata->hide_ctx)
  		appendCSVLiteral(&buf, edata->context);
  	appendStringInfoChar(&buf, ',');
  
--- 2730,2736 ----
  	appendStringInfoChar(&buf, ',');
  
  	/* errcontext */
! 	if (!edata->hide_ctx && edata->elevel >= log_min_context)
  		appendCSVLiteral(&buf, edata->context);
  	appendStringInfoChar(&buf, ',');
  
*************** send_message_to_server_log(ErrorData *ed
*** 2863,2869 ****
  			append_with_tabs(&buf, edata->internalquery);
  			appendStringInfoChar(&buf, '\n');
  		}
! 		if (edata->context && !edata->hide_ctx)
  		{
  			log_line_prefix(&buf, edata);
  			appendStringInfoString(&buf, _("CONTEXT:  "));
--- 2863,2869 ----
  			append_with_tabs(&buf, edata->internalquery);
  			appendStringInfoChar(&buf, '\n');
  		}
! 		if (edata->context && !edata->hide_ctx && edata->elevel >= log_min_context)
  		{
  			log_line_prefix(&buf, edata);
  			appendStringInfoString(&buf, _("CONTEXT:  "));
*************** send_message_to_frontend(ErrorData *edat
*** 3137,3143 ****
  			err_sendstring(&msgbuf, edata->hint);
  		}
  
! 		if (edata->context)
  		{
  			pq_sendbyte(&msgbuf, PG_DIAG_CONTEXT);
  			err_sendstring(&msgbuf, edata->context);
--- 3137,3143 ----
  			err_sendstring(&msgbuf, edata->hint);
  		}
  
! 		if (edata->context && edata->elevel >= client_min_context)
  		{
  			pq_sendbyte(&msgbuf, PG_DIAG_CONTEXT);
  			err_sendstring(&msgbuf, edata->context);
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
new file mode 100644
index 595a609..e2fae21
*** a/src/backend/utils/misc/guc.c
--- b/src/backend/utils/misc/guc.c
*************** bool		Password_encryption = true;
*** 430,435 ****
--- 430,437 ----
  int			log_min_error_statement = ERROR;
  int			log_min_messages = WARNING;
  int			client_min_messages = NOTICE;
+ int			log_min_context = WARNING;
+ int			client_min_context = ERROR;
  int			log_min_duration_statement = -1;
  int			log_temp_files = -1;
  int			trace_recovery_messages = LOG;
*************** static struct config_enum ConfigureNames
*** 3426,3431 ****
--- 3428,3444 ----
  	},
  
  	{
+ 		{"client_min_context", PGC_USERSET, LOGGING_WHEN,
+ 			gettext_noop("Sets the message levels when the context is send to the client."),
+ 			gettext_noop("Each level includes all the levels that follow it. The later"
+ 						 " the level, the less content are sent.")
+ 		},
+ 		&client_min_context,
+ 		ERROR, client_message_level_options,
+ 		NULL, NULL, NULL
+ 	},
+ 
+ 	{
  		{"client_min_messages", PGC_USERSET, LOGGING_WHEN,
  			gettext_noop("Sets the message levels that are sent to the client."),
  			gettext_noop("Each level includes all the levels that follow it. The later"
*************** static struct config_enum ConfigureNames
*** 3478,3483 ****
--- 3491,3507 ----
  		NULL, NULL, NULL
  	},
  
+ 	{
+ 		{"log_min_context", PGC_SUSET, LOGGING_WHEN,
+ 			gettext_noop("Sets the message levels that has context logged."),
+ 			gettext_noop("Each level includes all the levels that follow it. The later"
+ 						 " the level, the less content are sent.")
+ 		},
+ 		&log_min_context,
+ 		WARNING, server_message_level_options,
+ 		NULL, NULL, NULL
+ 	},
+ 
  	{
  		{"log_min_messages", PGC_SUSET, LOGGING_WHEN,
  			gettext_noop("Sets the message levels that are logged."),
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
new file mode 100644
index 06dfc06..8695e8b
*** a/src/backend/utils/misc/postgresql.conf.sample
--- b/src/backend/utils/misc/postgresql.conf.sample
***************
*** 360,365 ****
--- 360,390 ----
  
  # - When to Log -
  
+ #client_min_context = error		# values in order of decreasing detail:
+ 					#   debug5
+ 					#   debug4
+ 					#   debug3
+ 					#   debug2
+ 					#   debug1
+ 					#   log
+ 					#   notice
+ 					#   warning
+ 					#   error
+ 
+ #log_min_context = warning		# values in order of decreasing detail:
+ 					#   debug5
+ 					#   debug4
+ 					#   debug3
+ 					#   debug2
+ 					#   debug1
+ 					#   info
+ 					#   notice
+ 					#   warning
+ 					#   error
+ 					#   log
+ 					#   fatal
+ 					#   panic
+ 
  #client_min_messages = notice		# values in order of decreasing detail:
  					#   debug5
  					#   debug4
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
new file mode 100644
index dc167f9..f03a5e1
*** a/src/include/utils/guc.h
--- b/src/include/utils/guc.h
*************** extern PGDLLIMPORT bool check_function_b
*** 246,251 ****
--- 246,253 ----
  extern bool default_with_oids;
  extern bool SQL_inheritance;
  
+ extern int	log_min_context;
+ extern int	client_min_context;
  extern int	log_min_error_statement;
  extern int	log_min_messages;
  extern int	client_min_messages;
diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out
new file mode 100644
index d23a302..14df5f4
*** a/src/pl/plperl/expected/plperl.out
--- b/src/pl/plperl/expected/plperl.out
*************** DO $$
*** 614,620 ****
    elog(NOTICE, $a);
  $$ LANGUAGE plperl;
  NOTICE:  This is a test
- CONTEXT:  PL/Perl anonymous code block
  -- check that restricted operations are rejected in a plperl DO block
  DO $$ system("/nonesuch"); $$ LANGUAGE plperl;
  ERROR:  'system' trapped by operation mask at line 1.
--- 614,619 ----
*************** CONTEXT:  PL/Perl anonymous code block
*** 628,634 ****
  -- check that eval is allowed and eval'd restricted ops are caught
  DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
  WARNING:  Caught: 'chdir' trapped by operation mask at line 1.
- CONTEXT:  PL/Perl anonymous code block
  -- check that compiling do (dofile opcode) is allowed
  -- but that executing it for a file not already loaded (via require) dies
  DO $$ warn do "/dev/null"; $$ LANGUAGE plperl;
--- 627,632 ----
diff --git a/src/pl/plperl/expected/plperl_elog.out b/src/pl/plperl/expected/plperl_elog.out
new file mode 100644
index c447fa2..3f9449a
*** a/src/pl/plperl/expected/plperl_elog.out
--- b/src/pl/plperl/expected/plperl_elog.out
*************** create or replace function perl_elog(tex
*** 7,13 ****
  $$;
  select perl_elog('explicit elog');
  NOTICE:  explicit elog
- CONTEXT:  PL/Perl function "perl_elog"
   perl_elog 
  -----------
   
--- 7,12 ----
*************** create or replace function perl_warn(tex
*** 21,27 ****
  $$;
  select perl_warn('implicit elog via warn');
  WARNING:  implicit elog via warn at line 4.
- CONTEXT:  PL/Perl function "perl_warn"
   perl_warn 
  -----------
   
--- 20,25 ----
*************** select uses_global();
*** 61,67 ****
  -- make sure we don't choke on readonly values
  do language plperl $$ elog(NOTICE, ${^TAINT}); $$;
  NOTICE:  0
- CONTEXT:  PL/Perl anonymous code block
  -- test recovery after "die"
  create or replace function just_die() returns void language plperl AS $$
  die "just die";
--- 59,64 ----
*************** return $a + $b;
*** 94,104 ****
  $$;
  select indirect_die_caller();
  NOTICE:  caught die
- CONTEXT:  SQL statement "SELECT die_caller() AS fx"
- PL/Perl function "indirect_die_caller"
  NOTICE:  caught die
- CONTEXT:  SQL statement "SELECT die_caller() AS fx"
- PL/Perl function "indirect_die_caller"
   indirect_die_caller 
  ---------------------
                     2
--- 91,97 ----
diff --git a/src/pl/plperl/expected/plperl_trigger.out b/src/pl/plperl/expected/plperl_trigger.out
new file mode 100644
index 36ecb92..5e3860e
*** a/src/pl/plperl/expected/plperl_trigger.out
--- b/src/pl/plperl/expected/plperl_trigger.out
*************** BEFORE INSERT OR UPDATE OR DELETE ON tri
*** 62,136 ****
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
  insert into trigger_test values(1,'insert', '("(1)")');
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['23', 'skidoo']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'INSERT'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'BEFORE'
- CONTEXT:  PL/Perl function "trigger_data"
  update trigger_test set v = 'update' where i = 1;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['23', 'skidoo']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'UPDATE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'update'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'BEFORE'
- CONTEXT:  PL/Perl function "trigger_data"
  delete from trigger_test;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['23', 'skidoo']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'DELETE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'update'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'BEFORE'
- CONTEXT:  PL/Perl function "trigger_data"
  DROP TRIGGER show_trigger_data_trig on trigger_test;
  insert into trigger_test values(1,'insert', '("(1)")');
  CREATE VIEW trigger_test_view AS SELECT * FROM trigger_test;
--- 62,102 ----
*************** INSTEAD OF INSERT OR UPDATE OR DELETE ON
*** 139,213 ****
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(24,'skidoo view');
  insert into trigger_test_view values(2,'insert', '("(2)")');
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['24', 'skidoo view']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'INSERT'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '2'}}, 'i' => '2', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'INSTEAD OF'
- CONTEXT:  PL/Perl function "trigger_data"
  update trigger_test_view set v = 'update', foo = '("(3)")' where i = 1;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['24', 'skidoo view']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'UPDATE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '3'}}, 'i' => '1', 'v' => 'update'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'INSTEAD OF'
- CONTEXT:  PL/Perl function "trigger_data"
  delete from trigger_test_view;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['24', 'skidoo view']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'DELETE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'INSTEAD OF'
- CONTEXT:  PL/Perl function "trigger_data"
  DROP VIEW trigger_test_view;
  delete from trigger_test;
  DROP FUNCTION trigger_data();
--- 105,145 ----
*************** create event trigger perl_b_snitch on dd
*** 319,346 ****
     execute procedure perlsnitch();
  create or replace function foobar() returns int language sql as $$select 1;$$;
  NOTICE:  perlsnitch: ddl_command_start CREATE FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end CREATE FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  alter function foobar() cost 77;
  NOTICE:  perlsnitch: ddl_command_start ALTER FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end ALTER FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  drop function foobar();
  NOTICE:  perlsnitch: ddl_command_start DROP FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end DROP FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  create table foo();
  NOTICE:  perlsnitch: ddl_command_start CREATE TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end CREATE TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  drop table foo;
  NOTICE:  perlsnitch: ddl_command_start DROP TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end DROP TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  drop event trigger perl_a_snitch;
  drop event trigger perl_b_snitch;
--- 251,268 ----
diff --git a/src/pl/plperl/expected/plperlu.out b/src/pl/plperl/expected/plperlu.out
new file mode 100644
index 3daf4ce..a3edb38
*** a/src/pl/plperl/expected/plperlu.out
--- b/src/pl/plperl/expected/plperlu.out
*************** LOAD 'plperl';
*** 6,12 ****
  SET plperl.on_plperlu_init = '$_SHARED{init} = 42';
  DO $$ warn $_SHARED{init} $$ language plperlu;
  WARNING:  42 at line 1.
- CONTEXT:  PL/Perl anonymous code block
  --
  -- Test compilation of unicode regex - regardless of locale.
  -- This code fails in plain plperl in a non-UTF8 database.
--- 6,11 ----
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
new file mode 100644
index 7d4001c..e1a6b7d
*** a/src/pl/plpgsql/src/pl_exec.c
--- b/src/pl/plpgsql/src/pl_exec.c
***************
*** 42,49 ****
  #include "utils/typcache.h"
  
  
- static const char *const raise_skip_msg = "RAISE";
- 
  typedef struct
  {
  	int			nargs;			/* number of arguments */
--- 42,47 ----
*************** plpgsql_exec_error_callback(void *arg)
*** 939,948 ****
  {
  	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) arg;
  
- 	/* if we are doing RAISE, don't report its location */
- 	if (estate->err_text == raise_skip_msg)
- 		return;
- 
  	if (estate->err_text != NULL)
  	{
  		/*
--- 937,942 ----
*************** exec_stmt_raise(PLpgSQL_execstate *estat
*** 3158,3165 ****
  	/*
  	 * Throw the error (may or may not come back)
  	 */
- 	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
- 
  	ereport(stmt->elog_level,
  			(err_code ? errcode(err_code) : 0,
  			 errmsg_internal("%s", err_message),
--- 3152,3157 ----
diff --git a/src/pl/plpython/expected/plpython_do.out b/src/pl/plpython/expected/plpython_do.out
new file mode 100644
index 0977812..e300530
*** a/src/pl/plpython/expected/plpython_do.out
--- b/src/pl/plpython/expected/plpython_do.out
***************
*** 1,9 ****
  DO $$ plpy.notice("This is plpythonu.") $$ LANGUAGE plpythonu;
  NOTICE:  This is plpythonu.
- CONTEXT:  PL/Python anonymous code block
  DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;
  NOTICE:  This is plpython2u.
- CONTEXT:  PL/Python anonymous code block
  DO $$ raise Exception("error test") $$ LANGUAGE plpythonu;
  ERROR:  Exception: error test
  CONTEXT:  Traceback (most recent call last):
--- 1,7 ----
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index be2ec97..1f52af7
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** return None
*** 108,114 ****
  	LANGUAGE plpythonu;
  SELECT invalid_type_caught('rick');
  NOTICE:  type "test" does not exist
- CONTEXT:  PL/Python function "invalid_type_caught"
   invalid_type_caught 
  ---------------------
   
--- 108,113 ----
*************** return "you''ve been warned"
*** 232,238 ****
  	LANGUAGE plpythonu;
  SELECT nested_warning();
  WARNING:  boom
- CONTEXT:  PL/Python function "nested_warning"
     nested_warning   
  --------------------
   you've been warned
--- 231,236 ----
*************** SELECT specific_exception(2);
*** 336,342 ****
  
  SELECT specific_exception(NULL);
  NOTICE:  Violated the NOT NULL constraint, sqlstate 23502
- CONTEXT:  PL/Python function "specific_exception"
   specific_exception 
  --------------------
   
--- 334,339 ----
*************** CONTEXT:  PL/Python function "specific_e
*** 344,350 ****
  
  SELECT specific_exception(2);
  NOTICE:  Violated the UNIQUE constraint, sqlstate 23505
- CONTEXT:  PL/Python function "specific_exception"
   specific_exception 
  --------------------
   
--- 341,346 ----
diff --git a/src/pl/plpython/expected/plpython_spi.out b/src/pl/plpython/expected/plpython_spi.out
new file mode 100644
index e2861df..e715ee5
*** a/src/pl/plpython/expected/plpython_spi.out
--- b/src/pl/plpython/expected/plpython_spi.out
*************** else:
*** 130,142 ****
  $$ LANGUAGE plpythonu;
  SELECT result_metadata_test($$SELECT 1 AS foo, '11'::text AS bar UNION SELECT 2, '22'$$);
  INFO:  True
- CONTEXT:  PL/Python function "result_metadata_test"
  INFO:  ['foo', 'bar']
- CONTEXT:  PL/Python function "result_metadata_test"
  INFO:  [23, 25]
- CONTEXT:  PL/Python function "result_metadata_test"
  INFO:  [-1, -1]
- CONTEXT:  PL/Python function "result_metadata_test"
   result_metadata_test 
  ----------------------
                      2
--- 130,138 ----
*************** CONTEXT:  PL/Python function "result_met
*** 144,150 ****
  
  SELECT result_metadata_test($$CREATE TEMPORARY TABLE foo1 (a int, b text)$$);
  INFO:  True
- CONTEXT:  PL/Python function "result_metadata_test"
  ERROR:  plpy.Error: command did not produce a result set
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "result_metadata_test", line 6, in <module>
--- 140,145 ----
*************** else:
*** 234,248 ****
  $$ LANGUAGE plpythonu;
  SELECT result_subscript_test();
  INFO:  2
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  4
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  [2, 3]
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  [1, 3]
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  [10, 100, 3, 1000]
- CONTEXT:  PL/Python function "result_subscript_test"
   result_subscript_test 
  -----------------------
   
--- 229,238 ----
*************** plpy.info(result[:])
*** 257,263 ****
  $$ LANGUAGE plpythonu;
  SELECT result_empty_test();
  INFO:  []
- CONTEXT:  PL/Python function "result_empty_test"
   result_empty_test 
  -------------------
   
--- 247,252 ----
diff --git a/src/pl/plpython/expected/plpython_subtransaction.out b/src/pl/plpython/expected/plpython_subtransaction.out
new file mode 100644
index ced4682..635bac6
*** a/src/pl/plpython/expected/plpython_subtransaction.out
--- b/src/pl/plpython/expected/plpython_subtransaction.out
*************** SELECT * FROM subtransaction_tbl;
*** 154,160 ****
  TRUNCATE subtransaction_tbl;
  SELECT subtransaction_nested_test('t');
  NOTICE:  Swallowed SyntaxError('syntax error at or near "error"',)
- CONTEXT:  PL/Python function "subtransaction_nested_test"
   subtransaction_nested_test 
  ----------------------------
   ok
--- 154,159 ----
*************** return "ok"
*** 180,188 ****
  $$ LANGUAGE plpythonu;
  SELECT subtransaction_deeply_nested_test();
  NOTICE:  Swallowed SyntaxError('syntax error at or near "error"',)
- CONTEXT:  PL/Python function "subtransaction_nested_test"
- SQL statement "SELECT subtransaction_nested_test('t')"
- PL/Python function "subtransaction_nested_test"
   subtransaction_deeply_nested_test 
  -----------------------------------
   ok
--- 179,184 ----
*************** CONTEXT:  Traceback (most recent call la
*** 251,257 ****
  PL/Python function "subtransaction_exit_without_enter"
  SELECT subtransaction_enter_without_exit();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_without_exit"
   subtransaction_enter_without_exit 
  -----------------------------------
   
--- 247,252 ----
*************** CONTEXT:  PL/Python function "subtransac
*** 259,265 ****
  
  SELECT subtransaction_exit_twice();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_exit_twice"
  ERROR:  ValueError: this subtransaction has not been entered
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "subtransaction_exit_twice", line 3, in <module>
--- 254,259 ----
*************** CONTEXT:  Traceback (most recent call la
*** 267,275 ****
  PL/Python function "subtransaction_exit_twice"
  SELECT subtransaction_enter_twice();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_twice"
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_twice"
   subtransaction_enter_twice 
  ----------------------------
   
--- 261,267 ----
*************** CONTEXT:  Traceback (most recent call la
*** 283,289 ****
  PL/Python function "subtransaction_exit_same_subtransaction_twice"
  SELECT subtransaction_enter_same_subtransaction_twice();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_same_subtransaction_twice"
  ERROR:  ValueError: this subtransaction has already been entered
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "subtransaction_enter_same_subtransaction_twice", line 4, in <module>
--- 275,280 ----
*************** except plpy.SPIError:
*** 329,337 ****
  $$ LANGUAGE plpythonu;
  SELECT subtransaction_mix_explicit_and_implicit();
  WARNING:  Caught a SPI error from an explicit subtransaction
- CONTEXT:  PL/Python function "subtransaction_mix_explicit_and_implicit"
  WARNING:  Caught a SPI error
- CONTEXT:  PL/Python function "subtransaction_mix_explicit_and_implicit"
   subtransaction_mix_explicit_and_implicit 
  ------------------------------------------
   
--- 320,326 ----
*************** with plpy.subtransaction():
*** 370,376 ****
  $$ LANGUAGE plpythonu;
  SELECT try_catch_inside_subtransaction();
  NOTICE:  caught
- CONTEXT:  PL/Python function "try_catch_inside_subtransaction"
   try_catch_inside_subtransaction 
  ---------------------------------
   
--- 359,364 ----
*************** with plpy.subtransaction():
*** 395,401 ****
  $$ LANGUAGE plpythonu;
  SELECT pk_violation_inside_subtransaction();
  NOTICE:  caught
- CONTEXT:  PL/Python function "pk_violation_inside_subtransaction"
   pk_violation_inside_subtransaction 
  ------------------------------------
   
--- 383,388 ----
diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
new file mode 100644
index a884fc0..7b76faf
*** a/src/pl/plpython/expected/plpython_test.out
--- b/src/pl/plpython/expected/plpython_test.out
*************** plpy.error('error')
*** 62,78 ****
  $$ LANGUAGE plpythonu;
  SELECT elog_test();
  INFO:  info
- CONTEXT:  PL/Python function "elog_test"
  INFO:  37
- CONTEXT:  PL/Python function "elog_test"
  INFO:  ()
- CONTEXT:  PL/Python function "elog_test"
  INFO:  ('info', 37, [1, 2, 3])
- CONTEXT:  PL/Python function "elog_test"
  NOTICE:  notice
- CONTEXT:  PL/Python function "elog_test"
  WARNING:  warning
- CONTEXT:  PL/Python function "elog_test"
  ERROR:  plpy.Error: error
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "elog_test", line 10, in <module>
--- 62,72 ----
diff --git a/src/pl/plpython/expected/plpython_trigger.out b/src/pl/plpython/expected/plpython_trigger.out
new file mode 100644
index 80e478b..4148963
*** a/src/pl/plpython/expected/plpython_trigger.out
--- b/src/pl/plpython/expected/plpython_trigger.out
*************** BEFORE INSERT OR UPDATE OR DELETE OR TRU
*** 98,305 ****
  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_data(23,'skidoo');
  insert into trigger_test values(1,'insert');
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_before
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_after
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => AFTER
- CONTEXT:  PL/Python function "trigger_data"
  update trigger_test set v = 'update' where i = 1;
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_before
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_after
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => AFTER
- CONTEXT:  PL/Python function "trigger_data"
  delete from trigger_test;
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_before
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_after
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => AFTER
- CONTEXT:  PL/Python function "trigger_data"
  truncate table trigger_test;
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => TRUNCATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  DROP TRIGGER show_trigger_data_trig_stmt on trigger_test;
  DROP TRIGGER show_trigger_data_trig_before on trigger_test;
  DROP TRIGGER show_trigger_data_trig_after on trigger_test;
--- 98,205 ----
*************** INSTEAD OF INSERT OR UPDATE OR DELETE ON
*** 310,376 ****
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(24,'skidoo view');
  insert into trigger_test_view values(2,'insert');
  NOTICE:  TD[args] => ['24', 'skidoo view']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 2, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test_view
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => INSTEAD OF
- CONTEXT:  PL/Python function "trigger_data"
  update trigger_test_view set v = 'update' where i = 1;
  NOTICE:  TD[args] => ['24', 'skidoo view']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test_view
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => INSTEAD OF
- CONTEXT:  PL/Python function "trigger_data"
  delete from trigger_test_view;
  NOTICE:  TD[args] => ['24', 'skidoo view']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test_view
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => INSTEAD OF
- CONTEXT:  PL/Python function "trigger_data"
  DROP FUNCTION trigger_data() CASCADE;
  NOTICE:  drop cascades to trigger show_trigger_data_trig on view trigger_test_view
  DROP VIEW trigger_test_view;
--- 210,246 ----
*************** BEFORE DELETE ON trigger_test
*** 402,408 ****
  FOR EACH ROW EXECUTE PROCEDURE stupid2();
  DELETE FROM trigger_test WHERE i = 0;
  WARNING:  PL/Python trigger function returned "MODIFY" in a DELETE trigger -- ignored
- CONTEXT:  PL/Python function "stupid2"
  DROP TRIGGER stupid_trigger2 ON trigger_test;
  INSERT INTO trigger_test VALUES (0, 'zero');
  -- returning unrecognized string from trigger function
--- 272,277 ----
diff --git a/src/pl/plpython/expected/plpython_types.out b/src/pl/plpython/expected/plpython_types.out
new file mode 100644
index 17057a5..f0b6abd
*** a/src/pl/plpython/expected/plpython_types.out
--- b/src/pl/plpython/expected/plpython_types.out
*************** return x
*** 10,16 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool(true);
  INFO:  (True, <type 'bool'>)
- CONTEXT:  PL/Python function "test_type_conversion_bool"
   test_type_conversion_bool 
  ---------------------------
   t
--- 10,15 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 18,24 ****
  
  SELECT * FROM test_type_conversion_bool(false);
  INFO:  (False, <type 'bool'>)
- CONTEXT:  PL/Python function "test_type_conversion_bool"
   test_type_conversion_bool 
  ---------------------------
   f
--- 17,22 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 26,32 ****
  
  SELECT * FROM test_type_conversion_bool(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_bool"
   test_type_conversion_bool 
  ---------------------------
   
--- 24,29 ----
*************** return ret
*** 54,60 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool_other(0);
  INFO:  (0, False)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   f
--- 51,56 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 62,68 ****
  
  SELECT * FROM test_type_conversion_bool_other(1);
  INFO:  (5, True)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   t
--- 58,63 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 70,76 ****
  
  SELECT * FROM test_type_conversion_bool_other(2);
  INFO:  ('', False)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   f
--- 65,70 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 78,84 ****
  
  SELECT * FROM test_type_conversion_bool_other(3);
  INFO:  ('fa', True)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   t
--- 72,77 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 86,92 ****
  
  SELECT * FROM test_type_conversion_bool_other(4);
  INFO:  ([], False)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   f
--- 79,84 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 94,100 ****
  
  SELECT * FROM test_type_conversion_bool_other(5);
  INFO:  ([0], True)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   t
--- 86,91 ----
*************** return x
*** 106,112 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_char('a');
  INFO:  ('a', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_char"
   test_type_conversion_char 
  ---------------------------
   a
--- 97,102 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 114,120 ****
  
  SELECT * FROM test_type_conversion_char(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_char"
   test_type_conversion_char 
  ---------------------------
   
--- 104,109 ----
*************** return x
*** 126,132 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int2(100::int2);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int2"
   test_type_conversion_int2 
  ---------------------------
                         100
--- 115,120 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 134,140 ****
  
  SELECT * FROM test_type_conversion_int2(-100::int2);
  INFO:  (-100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int2"
   test_type_conversion_int2 
  ---------------------------
                        -100
--- 122,127 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 142,148 ****
  
  SELECT * FROM test_type_conversion_int2(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_int2"
   test_type_conversion_int2 
  ---------------------------
                            
--- 129,134 ----
*************** return x
*** 154,160 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int4(100);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int4"
   test_type_conversion_int4 
  ---------------------------
                         100
--- 140,145 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 162,168 ****
  
  SELECT * FROM test_type_conversion_int4(-100);
  INFO:  (-100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int4"
   test_type_conversion_int4 
  ---------------------------
                        -100
--- 147,152 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 170,176 ****
  
  SELECT * FROM test_type_conversion_int4(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_int4"
   test_type_conversion_int4 
  ---------------------------
                            
--- 154,159 ----
*************** return x
*** 182,188 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int8(100);
  INFO:  (100L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                         100
--- 165,170 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 190,196 ****
  
  SELECT * FROM test_type_conversion_int8(-100);
  INFO:  (-100L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                        -100
--- 172,177 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 198,204 ****
  
  SELECT * FROM test_type_conversion_int8(5000000000);
  INFO:  (5000000000L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                  5000000000
--- 179,184 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 206,212 ****
  
  SELECT * FROM test_type_conversion_int8(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                            
--- 186,191 ----
*************** return x
*** 220,226 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_numeric(100);
  INFO:  ('100', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                            100
--- 199,204 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 228,234 ****
  
  SELECT * FROM test_type_conversion_numeric(-100);
  INFO:  ('-100', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                           -100
--- 206,211 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 236,242 ****
  
  SELECT * FROM test_type_conversion_numeric(100.0);
  INFO:  ('100.0', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                          100.0
--- 213,218 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 244,250 ****
  
  SELECT * FROM test_type_conversion_numeric(100.00);
  INFO:  ('100.00', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                         100.00
--- 220,225 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 252,258 ****
  
  SELECT * FROM test_type_conversion_numeric(5000000000.5);
  INFO:  ('5000000000.5', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                   5000000000.5
--- 227,232 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 260,266 ****
  
  SELECT * FROM test_type_conversion_numeric(1234567890.0987654321);
  INFO:  ('1234567890.0987654321', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
          1234567890.0987654321
--- 234,239 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 268,274 ****
  
  SELECT * FROM test_type_conversion_numeric(-1234567890.0987654321);
  INFO:  ('-1234567890.0987654321', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
         -1234567890.0987654321
--- 241,246 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 276,282 ****
  
  SELECT * FROM test_type_conversion_numeric(null);
  INFO:  ('None', 'NoneType')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                               
--- 248,253 ----
*************** return x
*** 288,294 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float4(100);
  INFO:  (100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                           100
--- 259,264 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 296,302 ****
  
  SELECT * FROM test_type_conversion_float4(-100);
  INFO:  (-100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                          -100
--- 266,271 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 304,310 ****
  
  SELECT * FROM test_type_conversion_float4(5000.5);
  INFO:  (5000.5, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                        5000.5
--- 273,278 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 312,318 ****
  
  SELECT * FROM test_type_conversion_float4(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                              
--- 280,285 ----
*************** return x
*** 324,330 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float8(100);
  INFO:  (100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                           100
--- 291,296 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 332,338 ****
  
  SELECT * FROM test_type_conversion_float8(-100);
  INFO:  (-100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                          -100
--- 298,303 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 340,346 ****
  
  SELECT * FROM test_type_conversion_float8(5000000000.5);
  INFO:  (5000000000.5, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                  5000000000.5
--- 305,310 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 348,354 ****
  
  SELECT * FROM test_type_conversion_float8(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                              
--- 312,317 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 356,362 ****
  
  SELECT * FROM test_type_conversion_float8(100100100.654321);
  INFO:  (100100100.654321, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
              100100100.654321
--- 319,324 ----
*************** return x
*** 368,374 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_oid(100);
  INFO:  (100L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_oid"
   test_type_conversion_oid 
  --------------------------
                        100
--- 330,335 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 376,382 ****
  
  SELECT * FROM test_type_conversion_oid(2147483649);
  INFO:  (2147483649L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_oid"
   test_type_conversion_oid 
  --------------------------
                 2147483649
--- 337,342 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 384,390 ****
  
  SELECT * FROM test_type_conversion_oid(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_oid"
   test_type_conversion_oid 
  --------------------------
                           
--- 344,349 ----
*************** return x
*** 396,402 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_text('hello world');
  INFO:  ('hello world', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_text"
   test_type_conversion_text 
  ---------------------------
   hello world
--- 355,360 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 404,410 ****
  
  SELECT * FROM test_type_conversion_text(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_text"
   test_type_conversion_text 
  ---------------------------
   
--- 362,367 ----
*************** return x
*** 416,422 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea('hello world');
  INFO:  ('hello world', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea"
   test_type_conversion_bytea 
  ----------------------------
   \x68656c6c6f20776f726c64
--- 373,378 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 424,430 ****
  
  SELECT * FROM test_type_conversion_bytea(E'null\\000byte');
  INFO:  ('null\x00byte', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea"
   test_type_conversion_bytea 
  ----------------------------
   \x6e756c6c0062797465
--- 380,385 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 432,438 ****
  
  SELECT * FROM test_type_conversion_bytea(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea"
   test_type_conversion_bytea 
  ----------------------------
   
--- 387,392 ----
*************** return y
*** 481,487 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_uint2(100::uint2, 50);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_uint2"
   test_type_conversion_uint2 
  ----------------------------
                           50
--- 435,440 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 489,501 ****
  
  SELECT * FROM test_type_conversion_uint2(100::uint2, -50);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_uint2"
  ERROR:  value for domain uint2 violates check constraint "uint2_check"
  CONTEXT:  while creating return value
  PL/Python function "test_type_conversion_uint2"
  SELECT * FROM test_type_conversion_uint2(null, 1);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_uint2"
   test_type_conversion_uint2 
  ----------------------------
                            1
--- 442,452 ----
*************** return y
*** 524,530 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea10('hello wold', 'hello wold');
  INFO:  ('hello wold', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea10"
   test_type_conversion_bytea10 
  ------------------------------
   \x68656c6c6f20776f6c64
--- 475,480 ----
*************** SELECT * FROM test_type_conversion_bytea
*** 534,540 ****
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  SELECT * FROM test_type_conversion_bytea10('hello word', 'hello world');
  INFO:  ('hello word', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea10"
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  CONTEXT:  while creating return value
  PL/Python function "test_type_conversion_bytea10"
--- 484,489 ----
*************** SELECT * FROM test_type_conversion_bytea
*** 542,548 ****
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  SELECT * FROM test_type_conversion_bytea10('hello word', null);
  INFO:  ('hello word', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea10"
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  CONTEXT:  while creating return value
  PL/Python function "test_type_conversion_bytea10"
--- 491,496 ----
*************** return x
*** 555,561 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0, 100]);
  INFO:  ([0, 100], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {0,100}
--- 503,508 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 563,569 ****
  
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0,-100,55]);
  INFO:  ([0, -100, 55], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {0,-100,55}
--- 510,515 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 571,577 ****
  
  SELECT * FROM test_type_conversion_array_int4(ARRAY[NULL,1]);
  INFO:  ([None, 1], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {NULL,1}
--- 517,522 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 579,585 ****
  
  SELECT * FROM test_type_conversion_array_int4(ARRAY[]::integer[]);
  INFO:  ([], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {}
--- 524,529 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 587,593 ****
  
  SELECT * FROM test_type_conversion_array_int4(NULL);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   
--- 531,536 ----
*************** return x
*** 603,609 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_text(ARRAY['foo', 'bar']);
  INFO:  (['foo', 'bar'], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_text"
   test_type_conversion_array_text 
  ---------------------------------
   {foo,bar}
--- 546,551 ----
*************** return x
*** 615,621 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_bytea(ARRAY[E'\\xdeadbeef'::bytea, NULL]);
  INFO:  (['\xde\xad\xbe\xef', None], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_bytea"
   test_type_conversion_array_bytea 
  ----------------------------------
   {"\\xdeadbeef",NULL}
--- 557,562 ----
*************** return x
*** 681,687 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_domain(ARRAY[0, 100]::ordered_pair_domain);
  INFO:  ([0, 100], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_domain"
   test_type_conversion_array_domain 
  -----------------------------------
   {0,100}
--- 622,627 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 689,695 ****
  
  SELECT * FROM test_type_conversion_array_domain(NULL::ordered_pair_domain);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_domain"
   test_type_conversion_array_domain 
  -----------------------------------
   
--- 629,634 ----
*************** return rv[0]['val']
*** 783,789 ****
  $$;
  SELECT test_prep_bool_output(); -- false
  INFO:  {'val': False}
- CONTEXT:  PL/Python function "test_prep_bool_output"
   test_prep_bool_output 
  -----------------------
   f
--- 722,727 ----
*************** return rv[0]['val']
*** 812,818 ****
  $$;
  SELECT test_prep_bytea_output();
  INFO:  {'val': '\xaa\x00\xbb'}
- CONTEXT:  PL/Python function "test_prep_bytea_output"
   test_prep_bytea_output 
  ------------------------
   \xaa00bb
--- 750,755 ----
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
new file mode 100644
index 5e31737..72ada21
*** a/src/test/regress/expected/copy2.out
--- b/src/test/regress/expected/copy2.out
*************** Check constraints:
*** 447,458 ****
  
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":1}
- CONTEXT:  COPY check_con_tbl, line 1: "1"
  NOTICE:  input = {"f1":null}
- CONTEXT:  COPY check_con_tbl, line 2: "\N"
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":0}
- CONTEXT:  COPY check_con_tbl, line 1: "0"
  ERROR:  new row for relation "check_con_tbl" violates check constraint "check_con_tbl_check"
  DETAIL:  Failing row contains (0).
  CONTEXT:  COPY check_con_tbl, line 1: "0"
--- 447,455 ----
diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
new file mode 100644
index e70c315..05ac0ad
*** a/src/test/regress/expected/event_trigger.out
--- b/src/test/regress/expected/event_trigger.out
*************** drop cascades to table schema_one.table_
*** 234,248 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
--- 234,243 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
! SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
*************** drop cascades to table schema_one.table_
*** 255,277 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object schema_one.table_three of type table cannot be dropped
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
--- 250,261 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  NOTICE:  table "schema_one_table_one" does not exist, skipping
  NOTICE:  table "schema_one_table two" does not exist, skipping
  NOTICE:  table "schema_one_table_three" does not exist, skipping
  ERROR:  object schema_one.table_three of type table cannot be dropped
+ CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
*************** drop cascades to table schema_one.table_
*** 283,304 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
       type     |   schema   |               object                
  --------------+------------+-------------------------------------
--- 267,276 ----
*************** SELECT * FROM dropped_objects WHERE sche
*** 329,336 ****
  
  DROP OWNED BY regression_bob;
  NOTICE:  schema "audit_tbls" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_one_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE type = 'schema';
    type  | schema |   object   
  --------+--------+------------
--- 301,306 ----
*************** insert into rewriteme
*** 402,409 ****
--- 372,381 ----
       select x * 1.001 from generate_series(1, 500) as t(x);
  alter table rewriteme alter column foo type numeric;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  alter table rewriteme add column baz int default 0;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  -- test with more than one reason to rewrite a single table
  CREATE OR REPLACE FUNCTION test_evtrig_no_rewrite() RETURNS event_trigger
  LANGUAGE plpgsql AS $$
diff --git a/src/test/regress/expected/plancache.out b/src/test/regress/expected/plancache.out
new file mode 100644
index 864f70f..3f3db33
*** a/src/test/regress/expected/plancache.out
--- b/src/test/regress/expected/plancache.out
*************** begin
*** 234,241 ****
  end$$ language plpgsql;
  select cachebug();
  NOTICE:  table "temptable" does not exist, skipping
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 234,239 ----
*************** NOTICE:  3
*** 246,253 ****
  
  select cachebug();
  NOTICE:  drop cascades to view vv
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 244,249 ----
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
new file mode 100644
index 7ce5415..a19424d
*** a/src/test/regress/expected/plpgsql.out
--- b/src/test/regress/expected/plpgsql.out
*************** ERROR:  duplicate key value violates uni
*** 1518,1544 ****
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
--- 1518,1552 ----
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 47 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 77 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_biu() line 12 at RAISE
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_bd() line 12 at RAISE
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 8 at RAISE
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 14 at RAISE
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
*************** NOTICE:  should see this
*** 1963,1968 ****
--- 1971,1977 ----
  NOTICE:  should see this only if -100 <> 0
  NOTICE:  should see this only if -100 fits in smallint
  ERROR:  -100 is less than zero
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 12 at RAISE
  create function trap_matching_test(int) returns int as $$
  declare x int;
  	sx smallint;
*************** begin
*** 2066,2079 ****
  end$$ language plpgsql;
  select test_variable_storage();
  NOTICE:  should see this
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 <> 0
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 fits in smallint
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
   test_variable_storage 
  -----------------------
   123456789012
--- 2075,2082 ----
*************** DETAIL:  some detail info
*** 4052,4057 ****
--- 4055,4061 ----
  HINT:  some hint
  ERROR:  1 2 3
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 5 at RAISE
  -- Since we can't actually see the thrown SQLSTATE in default psql output,
  -- test it like this; this also tests re-RAISE
  create or replace function raise_test() returns void as $$
*************** select raise_test();
*** 4068,4073 ****
--- 4072,4078 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise 'check me'
*************** select raise_test();
*** 4082,4087 ****
--- 4087,4093 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- SQLSTATE specification in WHEN
  create or replace function raise_test() returns void as $$
  begin
*************** select raise_test();
*** 4097,4102 ****
--- 4103,4109 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using detail = 'some detail info';
*************** select raise_test();
*** 4110,4115 ****
--- 4117,4123 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: division_by_zero
  ERROR:  division_by_zero
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero;
*************** end;
*** 4117,4122 ****
--- 4125,4131 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  division_by_zero
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise sqlstate '1234F';
*************** end;
*** 4124,4129 ****
--- 4133,4139 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  1234F
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using message = 'custom' || ' message';
*************** end;
*** 4131,4136 ****
--- 4141,4147 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise using message = 'custom' || ' message', errcode = '22012';
*************** end;
*** 4138,4143 ****
--- 4149,4155 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- conflict on message
  create or replace function raise_test() returns void as $$
  begin
*************** $$ language plpgsql;
*** 4254,4259 ****
--- 4266,4272 ----
  select raise_test();
  NOTICE:  22012
  ERROR:  substitute message
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  drop function raise_test();
  -- test passing column_name, constraint_name, datatype_name, table_name
  -- and schema_name error fields
*************** LINE 1: SELECT 'foo\\bar\041baz'
*** 4744,4750 ****
                 ^
  HINT:  Use the escape string syntax for backslashes, e.g., E'\\'.
  QUERY:  SELECT 'foo\\bar\041baz'
- CONTEXT:  PL/pgSQL function strtest() line 4 at RETURN
     strtest   
  -------------
   foo\bar!baz
--- 4757,4762 ----
*************** $$ language plpgsql;
*** 5260,5281 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5272,5285 ----
*************** NOTICE:  outer_func() done
*** 5286,5307 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5290,5303 ----
*************** $$ language plpgsql;
*** 5358,5379 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5354,5367 ----
*************** NOTICE:  outer_func() done
*** 5384,5405 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5372,5385 ----
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
new file mode 100644
index c0cd9fa..88bdc2c
*** a/src/test/regress/expected/privileges.out
--- b/src/test/regress/expected/privileges.out
*************** GRANT regressgroup2 TO regressuser5; --
*** 1023,1029 ****
  ERROR:  must have admin option on role "regressgroup2"
  SELECT dogrant_ok();			-- ok: SECURITY DEFINER conveys ADMIN
  NOTICE:  role "regressuser5" is already a member of role "regressgroup2"
- CONTEXT:  SQL function "dogrant_ok" statement 1
   dogrant_ok 
  ------------
   
--- 1023,1028 ----
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
new file mode 100644
index 6dabe50..00ef421
*** a/src/test/regress/expected/rangefuncs.out
--- b/src/test/regress/expected/rangefuncs.out
*************** create trigger tnoticetrigger after inse
*** 1704,1712 ****
  execute procedure noticetrigger();
  select insert_tt2('foolme','barme') limit 1;
  NOTICE:  noticetrigger 11 foolme
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 12 barme
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           11
--- 1704,1710 ----
*************** create rule insert_tt_rule as on insert
*** 1735,1743 ****
    insert into tt_log values(new.*);
  select insert_tt2('foollog','barlog') limit 1;
  NOTICE:  noticetrigger 13 foollog
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 14 barlog
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           13
--- 1733,1739 ----
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
new file mode 100644
index 3b32e8f..cd43e46
*** a/src/test/regress/expected/triggers.out
--- b/src/test/regress/expected/triggers.out
*************** NOTICE:  main_view BEFORE INSERT STATEME
*** 958,968 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (20,30)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
  INSERT 0 1
  INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
--- 958,964 ----
*************** NOTICE:  main_view BEFORE INSERT STATEME
*** 970,980 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (21,31)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
   a  | b  
  ----+----
--- 966,972 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 988,1004 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 0
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 980,988 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1006,1022 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a | b 
  ---+---
--- 990,998 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1031,1050 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 1
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 1007,1016 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1052,1071 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a  | b  
  ----+----
--- 1018,1027 ----
*************** INSERT 0 1
*** 1277,1282 ****
--- 1233,1239 ----
  -- UPDATE .. RETURNING
  UPDATE city_view SET country_name = 'Japon' WHERE city_name = 'Tokyo'; -- error
  ERROR:  No such country: "Japon"
+ CONTEXT:  PL/pgSQL function city_update() line 9 at RAISE
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Takyo'; -- no match
  UPDATE 0
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Tokyo' RETURNING *; -- OK
*************** select pg_trigger_depth();
*** 1489,1514 ****
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  SQLSTATE = U9999: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  ERROR:  U9999
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
--- 1446,1458 ----
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  NOTICE:  SQLSTATE = U9999: depth = 2
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  ERROR:  U9999
! CONTEXT:  PL/pgSQL function depth_c_tf() line 5 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
*************** select pg_trigger_depth();
*** 1521,1541 ****
  insert into depth_a values (2);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_a_tr: depth = 1
  select pg_trigger_depth();
   pg_trigger_depth 
--- 1465,1473 ----
diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
new file mode 100644
index 9b2d264..5691e47
*** a/src/test/regress/expected/xml.out
--- b/src/test/regress/expected/xml.out
*************** SELECT xpath('/*', '<relativens xmlns=''
*** 934,940 ****
  WARNING:  line 1: xmlns: URI relative is not absolute
  <relativens xmlns='relative'/>
                              ^
- CONTEXT:  SQL function "xpath" statement 1
                  xpath                 
  --------------------------------------
   {"<relativens xmlns=\"relative\"/>"}
--- 934,939 ----

diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
new file mode 100644
index a49b562..a268fc7
*** a/contrib/dblink/expected/dblink.out
--- b/contrib/dblink/expected/dblink.out
***************
*** 1,3 ****
--- 1,4 ----
+ set client_min_context TO notice;
  CREATE EXTENSION dblink;
  CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2));
  INSERT INTO foo VALUES (0,'a','{"a0","b0","c0"}');
diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql
new file mode 100644
index ea78cc2..cf7e57e
*** a/contrib/dblink/sql/dblink.sql
--- b/contrib/dblink/sql/dblink.sql
***************
*** 1,3 ****
--- 1,5 ----
+ set client_min_context TO notice;
+ 
  CREATE EXTENSION dblink;
  
  CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2));
diff --git a/contrib/hstore_plperl/expected/hstore_plperlu.out b/contrib/hstore_plperl/expected/hstore_plperlu.out
new file mode 100644
index 8c689ad..c97fd3f
*** a/contrib/hstore_plperl/expected/hstore_plperlu.out
--- b/contrib/hstore_plperl/expected/hstore_plperlu.out
*************** INFO:  $VAR1 = {
*** 29,35 ****
            'cc' => undef
          };
  
- CONTEXT:  PL/Perl function "test1"
   test1 
  -------
       2
--- 29,34 ----
*************** $$;
*** 46,52 ****
  SELECT test1none('aa=>bb, cc=>NULL'::hstore);
  INFO:  $VAR1 = '"aa"=>"bb", "cc"=>NULL';
  
- CONTEXT:  PL/Perl function "test1none"
   test1none 
  -----------
           0
--- 45,50 ----
*************** INFO:  $VAR1 = {
*** 67,73 ****
            'cc' => undef
          };
  
- CONTEXT:  PL/Perl function "test1list"
   test1list 
  -----------
           2
--- 65,70 ----
*************** $VAR2 = {
*** 92,98 ****
            'dd' => 'ee'
          };
  
- CONTEXT:  PL/Perl function "test1arr"
   test1arr 
  ----------
          2
--- 89,94 ----
*************** INFO:  $VAR1 = {
*** 120,129 ****
            'cc' => undef
          };
  
- CONTEXT:  PL/Perl function "test3"
  INFO:  $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
  
- CONTEXT:  PL/Perl function "test3"
   test3 
  -------
   
--- 116,123 ----
*************** INFO:  $VAR1 = {
*** 161,167 ****
                 }
          };
  
- CONTEXT:  PL/Perl function "test4"
  SELECT * FROM test1;
   a |                b                
  ---+---------------------------------
--- 155,160 ----
diff --git a/contrib/hstore_plpython/expected/hstore_plpython.out b/contrib/hstore_plpython/expected/hstore_plpython.out
new file mode 100644
index b7a6a92..23091d3
*** a/contrib/hstore_plpython/expected/hstore_plpython.out
--- b/contrib/hstore_plpython/expected/hstore_plpython.out
*************** return len(val)
*** 13,19 ****
  $$;
  SELECT test1('aa=>bb, cc=>NULL'::hstore);
  INFO:  [('aa', 'bb'), ('cc', None)]
- CONTEXT:  PL/Python function "test1"
   test1 
  -------
       2
--- 13,18 ----
*************** return len(val)
*** 32,38 ****
  $$;
  SELECT test1n('aa=>bb, cc=>NULL'::hstore);
  INFO:  [('aa', 'bb'), ('cc', None)]
- CONTEXT:  PL/Python function "test1n"
   test1n 
  --------
        2
--- 31,36 ----
diff --git a/contrib/ltree_plpython/expected/ltree_plpython.out b/contrib/ltree_plpython/expected/ltree_plpython.out
new file mode 100644
index 934529e..c6e8a7c
*** a/contrib/ltree_plpython/expected/ltree_plpython.out
--- b/contrib/ltree_plpython/expected/ltree_plpython.out
*************** return len(val)
*** 9,15 ****
  $$;
  SELECT test1('aa.bb.cc'::ltree);
  INFO:  ['aa', 'bb', 'cc']
- CONTEXT:  PL/Python function "test1"
   test1 
  -------
       3
--- 9,14 ----
*************** return len(val)
*** 24,30 ****
  $$;
  SELECT test1n('aa.bb.cc'::ltree);
  INFO:  ['aa', 'bb', 'cc']
- CONTEXT:  PL/Python function "test1n"
   test1n 
  --------
        3
--- 23,28 ----
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
new file mode 100644
index b91d6c7..38ae0ad
*** a/doc/src/sgml/config.sgml
--- b/doc/src/sgml/config.sgml
*************** local0.*    /var/log/postgresql
*** 4144,4149 ****
--- 4144,4171 ----
  
       <variablelist>
  
+      <varlistentry id="guc-client-min-context" xreflabel="client_min_context">
+       <term><varname>client_min_context</varname> (<type>enum</type>)
+       <indexterm>
+        <primary><varname>client_min_context</> configuration parameter</primary>
+       </indexterm>
+       </term>
+       <listitem>
+        <para>
+         Controls which message levels include context when sent to the client.
+         Valid values are <literal>DEBUG5</>,
+         <literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
+         <literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
+         <literal>WARNING</>, <literal>ERROR</>, <literal>FATAL</>,
+         and <literal>PANIC</>.  Each level
+         includes all the levels that follow it.  The later the level,
+         the fewer messages are sent.  The default is
+         <literal>NOTICE</>.  Note that <literal>LOG</> has a different
+         rank here than in <varname>log_min_messages</>.
+        </para>
+       </listitem>
+      </varlistentry>
+ 
       <varlistentry id="guc-client-min-messages" xreflabel="client_min_messages">
        <term><varname>client_min_messages</varname> (<type>enum</type>)
        <indexterm>
*************** local0.*    /var/log/postgresql
*** 4165,4170 ****
--- 4187,4216 ----
         </para>
        </listitem>
       </varlistentry>
+ 
+      <varlistentry id="guc-log-min-context" xreflabel="log_min_context">
+       <term><varname>log_min_context</varname> (<type>enum</type>)
+       <indexterm>
+        <primary><varname>log_min_context</> configuration parameter</primary>
+       </indexterm>
+       </term>
+       <listitem>
+        <para>
+         Controls which message levels include context when written to 
+         the server log.
+         Valid values are <literal>DEBUG5</>, <literal>DEBUG4</>,
+         <literal>DEBUG3</>, <literal>DEBUG2</>, <literal>DEBUG1</>,
+         <literal>INFO</>, <literal>NOTICE</>, <literal>WARNING</>,
+         <literal>ERROR</>, <literal>LOG</>, <literal>FATAL</>, and
+         <literal>PANIC</>.  Each level includes all the levels that
+         follow it.  The later the level, the fewer messages are sent
+         to the log.  The default is <literal>WARNING</>.  Note that
+         <literal>LOG</> has a different rank here than in
+         <varname>client_min_messages</>.
+         Only superusers can change this setting.
+        </para>
+       </listitem>
+      </varlistentry>
  
       <varlistentry id="guc-log-min-messages" xreflabel="log_min_messages">
        <term><varname>log_min_messages</varname> (<type>enum</type>)
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
new file mode 100644
index 088c714..9445230
*** a/src/backend/utils/error/elog.c
--- b/src/backend/utils/error/elog.c
*************** write_csvlog(ErrorData *edata)
*** 2730,2736 ****
  	appendStringInfoChar(&buf, ',');
  
  	/* errcontext */
! 	if (!edata->hide_ctx)
  		appendCSVLiteral(&buf, edata->context);
  	appendStringInfoChar(&buf, ',');
  
--- 2730,2736 ----
  	appendStringInfoChar(&buf, ',');
  
  	/* errcontext */
! 	if (!edata->hide_ctx && edata->elevel >= log_min_context)
  		appendCSVLiteral(&buf, edata->context);
  	appendStringInfoChar(&buf, ',');
  
*************** send_message_to_server_log(ErrorData *ed
*** 2863,2869 ****
  			append_with_tabs(&buf, edata->internalquery);
  			appendStringInfoChar(&buf, '\n');
  		}
! 		if (edata->context && !edata->hide_ctx)
  		{
  			log_line_prefix(&buf, edata);
  			appendStringInfoString(&buf, _("CONTEXT:  "));
--- 2863,2869 ----
  			append_with_tabs(&buf, edata->internalquery);
  			appendStringInfoChar(&buf, '\n');
  		}
! 		if (edata->context && !edata->hide_ctx && edata->elevel >= log_min_context)
  		{
  			log_line_prefix(&buf, edata);
  			appendStringInfoString(&buf, _("CONTEXT:  "));
*************** send_message_to_frontend(ErrorData *edat
*** 3137,3143 ****
  			err_sendstring(&msgbuf, edata->hint);
  		}
  
! 		if (edata->context)
  		{
  			pq_sendbyte(&msgbuf, PG_DIAG_CONTEXT);
  			err_sendstring(&msgbuf, edata->context);
--- 3137,3143 ----
  			err_sendstring(&msgbuf, edata->hint);
  		}
  
! 		if (edata->context && edata->elevel >= client_min_context)
  		{
  			pq_sendbyte(&msgbuf, PG_DIAG_CONTEXT);
  			err_sendstring(&msgbuf, edata->context);
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
new file mode 100644
index 1bed525..cae8094
*** a/src/backend/utils/misc/guc.c
--- b/src/backend/utils/misc/guc.c
*************** bool		Password_encryption = true;
*** 430,435 ****
--- 430,437 ----
  int			log_min_error_statement = ERROR;
  int			log_min_messages = WARNING;
  int			client_min_messages = NOTICE;
+ int			log_min_context = WARNING;
+ int			client_min_context = ERROR;
  int			log_min_duration_statement = -1;
  int			log_temp_files = -1;
  int			trace_recovery_messages = LOG;
*************** static struct config_enum ConfigureNames
*** 3426,3431 ****
--- 3428,3444 ----
  	},
  
  	{
+ 		{"client_min_context", PGC_USERSET, LOGGING_WHEN,
+ 			gettext_noop("Sets the message levels for which context is sent to the client."),
+ 			gettext_noop("Each level includes all the levels that follow it. The later"
+ 						 " the level, the less context is sent.")
+ 		},
+ 		&client_min_context,
+ 		ERROR, client_message_level_options,
+ 		NULL, NULL, NULL
+ 	},
+ 
+ 	{
  		{"client_min_messages", PGC_USERSET, LOGGING_WHEN,
  			gettext_noop("Sets the message levels that are sent to the client."),
  			gettext_noop("Each level includes all the levels that follow it. The later"
*************** static struct config_enum ConfigureNames
*** 3478,3483 ****
--- 3491,3507 ----
  		NULL, NULL, NULL
  	},
  
+ 	{
+ 		{"log_min_context", PGC_SUSET, LOGGING_WHEN,
+ 			gettext_noop("Sets the message levels for which context is logged."),
+ 			gettext_noop("Each level includes all the levels that follow it. The later"
+ 						 " the level, the less context is sent.")
+ 		},
+ 		&log_min_context,
+ 		WARNING, server_message_level_options,
+ 		NULL, NULL, NULL
+ 	},
+ 
  	{
  		{"log_min_messages", PGC_SUSET, LOGGING_WHEN,
  			gettext_noop("Sets the message levels that are logged."),
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
new file mode 100644
index 06dfc06..8695e8b
*** a/src/backend/utils/misc/postgresql.conf.sample
--- b/src/backend/utils/misc/postgresql.conf.sample
***************
*** 360,365 ****
--- 360,390 ----
  
  # - When to Log -
  
+ #client_min_context = error		# values in order of decreasing detail:
+ 					#   debug5
+ 					#   debug4
+ 					#   debug3
+ 					#   debug2
+ 					#   debug1
+ 					#   log
+ 					#   notice
+ 					#   warning
+ 					#   error
+ 
+ #log_min_context = warning		# values in order of decreasing detail:
+ 					#   debug5
+ 					#   debug4
+ 					#   debug3
+ 					#   debug2
+ 					#   debug1
+ 					#   info
+ 					#   notice
+ 					#   warning
+ 					#   error
+ 					#   log
+ 					#   fatal
+ 					#   panic
+ 
  #client_min_messages = notice		# values in order of decreasing detail:
  					#   debug5
  					#   debug4
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
new file mode 100644
index dc167f9..f03a5e1
*** a/src/include/utils/guc.h
--- b/src/include/utils/guc.h
*************** extern PGDLLIMPORT bool check_function_b
*** 246,251 ****
--- 246,253 ----
  extern bool default_with_oids;
  extern bool SQL_inheritance;
  
+ extern int	log_min_context;
+ extern int	client_min_context;
  extern int	log_min_error_statement;
  extern int	log_min_messages;
  extern int	client_min_messages;
diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out
new file mode 100644
index d23a302..14df5f4
*** a/src/pl/plperl/expected/plperl.out
--- b/src/pl/plperl/expected/plperl.out
*************** DO $$
*** 614,620 ****
    elog(NOTICE, $a);
  $$ LANGUAGE plperl;
  NOTICE:  This is a test
- CONTEXT:  PL/Perl anonymous code block
  -- check that restricted operations are rejected in a plperl DO block
  DO $$ system("/nonesuch"); $$ LANGUAGE plperl;
  ERROR:  'system' trapped by operation mask at line 1.
--- 614,619 ----
*************** CONTEXT:  PL/Perl anonymous code block
*** 628,634 ****
  -- check that eval is allowed and eval'd restricted ops are caught
  DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
  WARNING:  Caught: 'chdir' trapped by operation mask at line 1.
- CONTEXT:  PL/Perl anonymous code block
  -- check that compiling do (dofile opcode) is allowed
  -- but that executing it for a file not already loaded (via require) dies
  DO $$ warn do "/dev/null"; $$ LANGUAGE plperl;
--- 627,632 ----
diff --git a/src/pl/plperl/expected/plperl_elog.out b/src/pl/plperl/expected/plperl_elog.out
new file mode 100644
index c447fa2..3f9449a
*** a/src/pl/plperl/expected/plperl_elog.out
--- b/src/pl/plperl/expected/plperl_elog.out
*************** create or replace function perl_elog(tex
*** 7,13 ****
  $$;
  select perl_elog('explicit elog');
  NOTICE:  explicit elog
- CONTEXT:  PL/Perl function "perl_elog"
   perl_elog 
  -----------
   
--- 7,12 ----
*************** create or replace function perl_warn(tex
*** 21,27 ****
  $$;
  select perl_warn('implicit elog via warn');
  WARNING:  implicit elog via warn at line 4.
- CONTEXT:  PL/Perl function "perl_warn"
   perl_warn 
  -----------
   
--- 20,25 ----
*************** select uses_global();
*** 61,67 ****
  -- make sure we don't choke on readonly values
  do language plperl $$ elog(NOTICE, ${^TAINT}); $$;
  NOTICE:  0
- CONTEXT:  PL/Perl anonymous code block
  -- test recovery after "die"
  create or replace function just_die() returns void language plperl AS $$
  die "just die";
--- 59,64 ----
*************** return $a + $b;
*** 94,104 ****
  $$;
  select indirect_die_caller();
  NOTICE:  caught die
- CONTEXT:  SQL statement "SELECT die_caller() AS fx"
- PL/Perl function "indirect_die_caller"
  NOTICE:  caught die
- CONTEXT:  SQL statement "SELECT die_caller() AS fx"
- PL/Perl function "indirect_die_caller"
   indirect_die_caller 
  ---------------------
                     2
--- 91,97 ----
diff --git a/src/pl/plperl/expected/plperl_trigger.out b/src/pl/plperl/expected/plperl_trigger.out
new file mode 100644
index 36ecb92..5e3860e
*** a/src/pl/plperl/expected/plperl_trigger.out
--- b/src/pl/plperl/expected/plperl_trigger.out
*************** BEFORE INSERT OR UPDATE OR DELETE ON tri
*** 62,136 ****
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
  insert into trigger_test values(1,'insert', '("(1)")');
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['23', 'skidoo']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'INSERT'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'BEFORE'
- CONTEXT:  PL/Perl function "trigger_data"
  update trigger_test set v = 'update' where i = 1;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['23', 'skidoo']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'UPDATE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'update'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'BEFORE'
- CONTEXT:  PL/Perl function "trigger_data"
  delete from trigger_test;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['23', 'skidoo']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'DELETE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'update'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'BEFORE'
- CONTEXT:  PL/Perl function "trigger_data"
  DROP TRIGGER show_trigger_data_trig on trigger_test;
  insert into trigger_test values(1,'insert', '("(1)")');
  CREATE VIEW trigger_test_view AS SELECT * FROM trigger_test;
--- 62,102 ----
*************** INSTEAD OF INSERT OR UPDATE OR DELETE ON
*** 139,213 ****
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(24,'skidoo view');
  insert into trigger_test_view values(2,'insert', '("(2)")');
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['24', 'skidoo view']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'INSERT'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '2'}}, 'i' => '2', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'INSTEAD OF'
- CONTEXT:  PL/Perl function "trigger_data"
  update trigger_test_view set v = 'update', foo = '("(3)")' where i = 1;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['24', 'skidoo view']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'UPDATE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '3'}}, 'i' => '1', 'v' => 'update'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'INSTEAD OF'
- CONTEXT:  PL/Perl function "trigger_data"
  delete from trigger_test_view;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['24', 'skidoo view']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'DELETE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'INSTEAD OF'
- CONTEXT:  PL/Perl function "trigger_data"
  DROP VIEW trigger_test_view;
  delete from trigger_test;
  DROP FUNCTION trigger_data();
--- 105,145 ----
*************** create event trigger perl_b_snitch on dd
*** 319,346 ****
     execute procedure perlsnitch();
  create or replace function foobar() returns int language sql as $$select 1;$$;
  NOTICE:  perlsnitch: ddl_command_start CREATE FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end CREATE FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  alter function foobar() cost 77;
  NOTICE:  perlsnitch: ddl_command_start ALTER FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end ALTER FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  drop function foobar();
  NOTICE:  perlsnitch: ddl_command_start DROP FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end DROP FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  create table foo();
  NOTICE:  perlsnitch: ddl_command_start CREATE TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end CREATE TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  drop table foo;
  NOTICE:  perlsnitch: ddl_command_start DROP TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end DROP TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  drop event trigger perl_a_snitch;
  drop event trigger perl_b_snitch;
--- 251,268 ----
diff --git a/src/pl/plperl/expected/plperlu.out b/src/pl/plperl/expected/plperlu.out
new file mode 100644
index 3daf4ce..a3edb38
*** a/src/pl/plperl/expected/plperlu.out
--- b/src/pl/plperl/expected/plperlu.out
*************** LOAD 'plperl';
*** 6,12 ****
  SET plperl.on_plperlu_init = '$_SHARED{init} = 42';
  DO $$ warn $_SHARED{init} $$ language plperlu;
  WARNING:  42 at line 1.
- CONTEXT:  PL/Perl anonymous code block
  --
  -- Test compilation of unicode regex - regardless of locale.
  -- This code fails in plain plperl in a non-UTF8 database.
--- 6,11 ----
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
new file mode 100644
index 7d4001c..e1a6b7d
*** a/src/pl/plpgsql/src/pl_exec.c
--- b/src/pl/plpgsql/src/pl_exec.c
***************
*** 42,49 ****
  #include "utils/typcache.h"
  
  
- static const char *const raise_skip_msg = "RAISE";
- 
  typedef struct
  {
  	int			nargs;			/* number of arguments */
--- 42,47 ----
*************** plpgsql_exec_error_callback(void *arg)
*** 939,948 ****
  {
  	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) arg;
  
- 	/* if we are doing RAISE, don't report its location */
- 	if (estate->err_text == raise_skip_msg)
- 		return;
- 
  	if (estate->err_text != NULL)
  	{
  		/*
--- 937,942 ----
*************** exec_stmt_raise(PLpgSQL_execstate *estat
*** 3158,3165 ****
  	/*
  	 * Throw the error (may or may not come back)
  	 */
- 	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
- 
  	ereport(stmt->elog_level,
  			(err_code ? errcode(err_code) : 0,
  			 errmsg_internal("%s", err_message),
--- 3152,3157 ----
diff --git a/src/pl/plpython/expected/plpython_do.out b/src/pl/plpython/expected/plpython_do.out
new file mode 100644
index 0977812..e300530
*** a/src/pl/plpython/expected/plpython_do.out
--- b/src/pl/plpython/expected/plpython_do.out
***************
*** 1,9 ****
  DO $$ plpy.notice("This is plpythonu.") $$ LANGUAGE plpythonu;
  NOTICE:  This is plpythonu.
- CONTEXT:  PL/Python anonymous code block
  DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;
  NOTICE:  This is plpython2u.
- CONTEXT:  PL/Python anonymous code block
  DO $$ raise Exception("error test") $$ LANGUAGE plpythonu;
  ERROR:  Exception: error test
  CONTEXT:  Traceback (most recent call last):
--- 1,7 ----
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index be2ec97..1f52af7
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** return None
*** 108,114 ****
  	LANGUAGE plpythonu;
  SELECT invalid_type_caught('rick');
  NOTICE:  type "test" does not exist
- CONTEXT:  PL/Python function "invalid_type_caught"
   invalid_type_caught 
  ---------------------
   
--- 108,113 ----
*************** return "you''ve been warned"
*** 232,238 ****
  	LANGUAGE plpythonu;
  SELECT nested_warning();
  WARNING:  boom
- CONTEXT:  PL/Python function "nested_warning"
     nested_warning   
  --------------------
   you've been warned
--- 231,236 ----
*************** SELECT specific_exception(2);
*** 336,342 ****
  
  SELECT specific_exception(NULL);
  NOTICE:  Violated the NOT NULL constraint, sqlstate 23502
- CONTEXT:  PL/Python function "specific_exception"
   specific_exception 
  --------------------
   
--- 334,339 ----
*************** CONTEXT:  PL/Python function "specific_e
*** 344,350 ****
  
  SELECT specific_exception(2);
  NOTICE:  Violated the UNIQUE constraint, sqlstate 23505
- CONTEXT:  PL/Python function "specific_exception"
   specific_exception 
  --------------------
   
--- 341,346 ----
diff --git a/src/pl/plpython/expected/plpython_spi.out b/src/pl/plpython/expected/plpython_spi.out
new file mode 100644
index e2861df..e715ee5
*** a/src/pl/plpython/expected/plpython_spi.out
--- b/src/pl/plpython/expected/plpython_spi.out
*************** else:
*** 130,142 ****
  $$ LANGUAGE plpythonu;
  SELECT result_metadata_test($$SELECT 1 AS foo, '11'::text AS bar UNION SELECT 2, '22'$$);
  INFO:  True
- CONTEXT:  PL/Python function "result_metadata_test"
  INFO:  ['foo', 'bar']
- CONTEXT:  PL/Python function "result_metadata_test"
  INFO:  [23, 25]
- CONTEXT:  PL/Python function "result_metadata_test"
  INFO:  [-1, -1]
- CONTEXT:  PL/Python function "result_metadata_test"
   result_metadata_test 
  ----------------------
                      2
--- 130,138 ----
*************** CONTEXT:  PL/Python function "result_met
*** 144,150 ****
  
  SELECT result_metadata_test($$CREATE TEMPORARY TABLE foo1 (a int, b text)$$);
  INFO:  True
- CONTEXT:  PL/Python function "result_metadata_test"
  ERROR:  plpy.Error: command did not produce a result set
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "result_metadata_test", line 6, in <module>
--- 140,145 ----
*************** else:
*** 234,248 ****
  $$ LANGUAGE plpythonu;
  SELECT result_subscript_test();
  INFO:  2
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  4
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  [2, 3]
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  [1, 3]
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  [10, 100, 3, 1000]
- CONTEXT:  PL/Python function "result_subscript_test"
   result_subscript_test 
  -----------------------
   
--- 229,238 ----
*************** plpy.info(result[:])
*** 257,263 ****
  $$ LANGUAGE plpythonu;
  SELECT result_empty_test();
  INFO:  []
- CONTEXT:  PL/Python function "result_empty_test"
   result_empty_test 
  -------------------
   
--- 247,252 ----
diff --git a/src/pl/plpython/expected/plpython_subtransaction.out b/src/pl/plpython/expected/plpython_subtransaction.out
new file mode 100644
index ced4682..635bac6
*** a/src/pl/plpython/expected/plpython_subtransaction.out
--- b/src/pl/plpython/expected/plpython_subtransaction.out
*************** SELECT * FROM subtransaction_tbl;
*** 154,160 ****
  TRUNCATE subtransaction_tbl;
  SELECT subtransaction_nested_test('t');
  NOTICE:  Swallowed SyntaxError('syntax error at or near "error"',)
- CONTEXT:  PL/Python function "subtransaction_nested_test"
   subtransaction_nested_test 
  ----------------------------
   ok
--- 154,159 ----
*************** return "ok"
*** 180,188 ****
  $$ LANGUAGE plpythonu;
  SELECT subtransaction_deeply_nested_test();
  NOTICE:  Swallowed SyntaxError('syntax error at or near "error"',)
- CONTEXT:  PL/Python function "subtransaction_nested_test"
- SQL statement "SELECT subtransaction_nested_test('t')"
- PL/Python function "subtransaction_nested_test"
   subtransaction_deeply_nested_test 
  -----------------------------------
   ok
--- 179,184 ----
*************** CONTEXT:  Traceback (most recent call la
*** 251,257 ****
  PL/Python function "subtransaction_exit_without_enter"
  SELECT subtransaction_enter_without_exit();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_without_exit"
   subtransaction_enter_without_exit 
  -----------------------------------
   
--- 247,252 ----
*************** CONTEXT:  PL/Python function "subtransac
*** 259,265 ****
  
  SELECT subtransaction_exit_twice();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_exit_twice"
  ERROR:  ValueError: this subtransaction has not been entered
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "subtransaction_exit_twice", line 3, in <module>
--- 254,259 ----
*************** CONTEXT:  Traceback (most recent call la
*** 267,275 ****
  PL/Python function "subtransaction_exit_twice"
  SELECT subtransaction_enter_twice();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_twice"
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_twice"
   subtransaction_enter_twice 
  ----------------------------
   
--- 261,267 ----
*************** CONTEXT:  Traceback (most recent call la
*** 283,289 ****
  PL/Python function "subtransaction_exit_same_subtransaction_twice"
  SELECT subtransaction_enter_same_subtransaction_twice();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_same_subtransaction_twice"
  ERROR:  ValueError: this subtransaction has already been entered
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "subtransaction_enter_same_subtransaction_twice", line 4, in <module>
--- 275,280 ----
*************** except plpy.SPIError:
*** 329,337 ****
  $$ LANGUAGE plpythonu;
  SELECT subtransaction_mix_explicit_and_implicit();
  WARNING:  Caught a SPI error from an explicit subtransaction
- CONTEXT:  PL/Python function "subtransaction_mix_explicit_and_implicit"
  WARNING:  Caught a SPI error
- CONTEXT:  PL/Python function "subtransaction_mix_explicit_and_implicit"
   subtransaction_mix_explicit_and_implicit 
  ------------------------------------------
   
--- 320,326 ----
*************** with plpy.subtransaction():
*** 370,376 ****
  $$ LANGUAGE plpythonu;
  SELECT try_catch_inside_subtransaction();
  NOTICE:  caught
- CONTEXT:  PL/Python function "try_catch_inside_subtransaction"
   try_catch_inside_subtransaction 
  ---------------------------------
   
--- 359,364 ----
*************** with plpy.subtransaction():
*** 395,401 ****
  $$ LANGUAGE plpythonu;
  SELECT pk_violation_inside_subtransaction();
  NOTICE:  caught
- CONTEXT:  PL/Python function "pk_violation_inside_subtransaction"
   pk_violation_inside_subtransaction 
  ------------------------------------
   
--- 383,388 ----
diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
new file mode 100644
index a884fc0..7b76faf
*** a/src/pl/plpython/expected/plpython_test.out
--- b/src/pl/plpython/expected/plpython_test.out
*************** plpy.error('error')
*** 62,78 ****
  $$ LANGUAGE plpythonu;
  SELECT elog_test();
  INFO:  info
- CONTEXT:  PL/Python function "elog_test"
  INFO:  37
- CONTEXT:  PL/Python function "elog_test"
  INFO:  ()
- CONTEXT:  PL/Python function "elog_test"
  INFO:  ('info', 37, [1, 2, 3])
- CONTEXT:  PL/Python function "elog_test"
  NOTICE:  notice
- CONTEXT:  PL/Python function "elog_test"
  WARNING:  warning
- CONTEXT:  PL/Python function "elog_test"
  ERROR:  plpy.Error: error
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "elog_test", line 10, in <module>
--- 62,72 ----
diff --git a/src/pl/plpython/expected/plpython_trigger.out b/src/pl/plpython/expected/plpython_trigger.out
new file mode 100644
index 80e478b..4148963
*** a/src/pl/plpython/expected/plpython_trigger.out
--- b/src/pl/plpython/expected/plpython_trigger.out
*************** BEFORE INSERT OR UPDATE OR DELETE OR TRU
*** 98,305 ****
  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_data(23,'skidoo');
  insert into trigger_test values(1,'insert');
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_before
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_after
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => AFTER
- CONTEXT:  PL/Python function "trigger_data"
  update trigger_test set v = 'update' where i = 1;
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_before
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_after
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => AFTER
- CONTEXT:  PL/Python function "trigger_data"
  delete from trigger_test;
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_before
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_after
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => AFTER
- CONTEXT:  PL/Python function "trigger_data"
  truncate table trigger_test;
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => TRUNCATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  DROP TRIGGER show_trigger_data_trig_stmt on trigger_test;
  DROP TRIGGER show_trigger_data_trig_before on trigger_test;
  DROP TRIGGER show_trigger_data_trig_after on trigger_test;
--- 98,205 ----
*************** INSTEAD OF INSERT OR UPDATE OR DELETE ON
*** 310,376 ****
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(24,'skidoo view');
  insert into trigger_test_view values(2,'insert');
  NOTICE:  TD[args] => ['24', 'skidoo view']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 2, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test_view
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => INSTEAD OF
- CONTEXT:  PL/Python function "trigger_data"
  update trigger_test_view set v = 'update' where i = 1;
  NOTICE:  TD[args] => ['24', 'skidoo view']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test_view
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => INSTEAD OF
- CONTEXT:  PL/Python function "trigger_data"
  delete from trigger_test_view;
  NOTICE:  TD[args] => ['24', 'skidoo view']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test_view
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => INSTEAD OF
- CONTEXT:  PL/Python function "trigger_data"
  DROP FUNCTION trigger_data() CASCADE;
  NOTICE:  drop cascades to trigger show_trigger_data_trig on view trigger_test_view
  DROP VIEW trigger_test_view;
--- 210,246 ----
*************** BEFORE DELETE ON trigger_test
*** 402,408 ****
  FOR EACH ROW EXECUTE PROCEDURE stupid2();
  DELETE FROM trigger_test WHERE i = 0;
  WARNING:  PL/Python trigger function returned "MODIFY" in a DELETE trigger -- ignored
- CONTEXT:  PL/Python function "stupid2"
  DROP TRIGGER stupid_trigger2 ON trigger_test;
  INSERT INTO trigger_test VALUES (0, 'zero');
  -- returning unrecognized string from trigger function
--- 272,277 ----
diff --git a/src/pl/plpython/expected/plpython_types.out b/src/pl/plpython/expected/plpython_types.out
new file mode 100644
index 17057a5..f0b6abd
*** a/src/pl/plpython/expected/plpython_types.out
--- b/src/pl/plpython/expected/plpython_types.out
*************** return x
*** 10,16 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool(true);
  INFO:  (True, <type 'bool'>)
- CONTEXT:  PL/Python function "test_type_conversion_bool"
   test_type_conversion_bool 
  ---------------------------
   t
--- 10,15 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 18,24 ****
  
  SELECT * FROM test_type_conversion_bool(false);
  INFO:  (False, <type 'bool'>)
- CONTEXT:  PL/Python function "test_type_conversion_bool"
   test_type_conversion_bool 
  ---------------------------
   f
--- 17,22 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 26,32 ****
  
  SELECT * FROM test_type_conversion_bool(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_bool"
   test_type_conversion_bool 
  ---------------------------
   
--- 24,29 ----
*************** return ret
*** 54,60 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool_other(0);
  INFO:  (0, False)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   f
--- 51,56 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 62,68 ****
  
  SELECT * FROM test_type_conversion_bool_other(1);
  INFO:  (5, True)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   t
--- 58,63 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 70,76 ****
  
  SELECT * FROM test_type_conversion_bool_other(2);
  INFO:  ('', False)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   f
--- 65,70 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 78,84 ****
  
  SELECT * FROM test_type_conversion_bool_other(3);
  INFO:  ('fa', True)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   t
--- 72,77 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 86,92 ****
  
  SELECT * FROM test_type_conversion_bool_other(4);
  INFO:  ([], False)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   f
--- 79,84 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 94,100 ****
  
  SELECT * FROM test_type_conversion_bool_other(5);
  INFO:  ([0], True)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   t
--- 86,91 ----
*************** return x
*** 106,112 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_char('a');
  INFO:  ('a', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_char"
   test_type_conversion_char 
  ---------------------------
   a
--- 97,102 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 114,120 ****
  
  SELECT * FROM test_type_conversion_char(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_char"
   test_type_conversion_char 
  ---------------------------
   
--- 104,109 ----
*************** return x
*** 126,132 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int2(100::int2);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int2"
   test_type_conversion_int2 
  ---------------------------
                         100
--- 115,120 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 134,140 ****
  
  SELECT * FROM test_type_conversion_int2(-100::int2);
  INFO:  (-100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int2"
   test_type_conversion_int2 
  ---------------------------
                        -100
--- 122,127 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 142,148 ****
  
  SELECT * FROM test_type_conversion_int2(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_int2"
   test_type_conversion_int2 
  ---------------------------
                            
--- 129,134 ----
*************** return x
*** 154,160 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int4(100);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int4"
   test_type_conversion_int4 
  ---------------------------
                         100
--- 140,145 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 162,168 ****
  
  SELECT * FROM test_type_conversion_int4(-100);
  INFO:  (-100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int4"
   test_type_conversion_int4 
  ---------------------------
                        -100
--- 147,152 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 170,176 ****
  
  SELECT * FROM test_type_conversion_int4(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_int4"
   test_type_conversion_int4 
  ---------------------------
                            
--- 154,159 ----
*************** return x
*** 182,188 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int8(100);
  INFO:  (100L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                         100
--- 165,170 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 190,196 ****
  
  SELECT * FROM test_type_conversion_int8(-100);
  INFO:  (-100L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                        -100
--- 172,177 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 198,204 ****
  
  SELECT * FROM test_type_conversion_int8(5000000000);
  INFO:  (5000000000L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                  5000000000
--- 179,184 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 206,212 ****
  
  SELECT * FROM test_type_conversion_int8(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                            
--- 186,191 ----
*************** return x
*** 220,226 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_numeric(100);
  INFO:  ('100', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                            100
--- 199,204 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 228,234 ****
  
  SELECT * FROM test_type_conversion_numeric(-100);
  INFO:  ('-100', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                           -100
--- 206,211 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 236,242 ****
  
  SELECT * FROM test_type_conversion_numeric(100.0);
  INFO:  ('100.0', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                          100.0
--- 213,218 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 244,250 ****
  
  SELECT * FROM test_type_conversion_numeric(100.00);
  INFO:  ('100.00', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                         100.00
--- 220,225 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 252,258 ****
  
  SELECT * FROM test_type_conversion_numeric(5000000000.5);
  INFO:  ('5000000000.5', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                   5000000000.5
--- 227,232 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 260,266 ****
  
  SELECT * FROM test_type_conversion_numeric(1234567890.0987654321);
  INFO:  ('1234567890.0987654321', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
          1234567890.0987654321
--- 234,239 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 268,274 ****
  
  SELECT * FROM test_type_conversion_numeric(-1234567890.0987654321);
  INFO:  ('-1234567890.0987654321', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
         -1234567890.0987654321
--- 241,246 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 276,282 ****
  
  SELECT * FROM test_type_conversion_numeric(null);
  INFO:  ('None', 'NoneType')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                               
--- 248,253 ----
*************** return x
*** 288,294 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float4(100);
  INFO:  (100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                           100
--- 259,264 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 296,302 ****
  
  SELECT * FROM test_type_conversion_float4(-100);
  INFO:  (-100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                          -100
--- 266,271 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 304,310 ****
  
  SELECT * FROM test_type_conversion_float4(5000.5);
  INFO:  (5000.5, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                        5000.5
--- 273,278 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 312,318 ****
  
  SELECT * FROM test_type_conversion_float4(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                              
--- 280,285 ----
*************** return x
*** 324,330 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float8(100);
  INFO:  (100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                           100
--- 291,296 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 332,338 ****
  
  SELECT * FROM test_type_conversion_float8(-100);
  INFO:  (-100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                          -100
--- 298,303 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 340,346 ****
  
  SELECT * FROM test_type_conversion_float8(5000000000.5);
  INFO:  (5000000000.5, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                  5000000000.5
--- 305,310 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 348,354 ****
  
  SELECT * FROM test_type_conversion_float8(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                              
--- 312,317 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 356,362 ****
  
  SELECT * FROM test_type_conversion_float8(100100100.654321);
  INFO:  (100100100.654321, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
              100100100.654321
--- 319,324 ----
*************** return x
*** 368,374 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_oid(100);
  INFO:  (100L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_oid"
   test_type_conversion_oid 
  --------------------------
                        100
--- 330,335 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 376,382 ****
  
  SELECT * FROM test_type_conversion_oid(2147483649);
  INFO:  (2147483649L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_oid"
   test_type_conversion_oid 
  --------------------------
                 2147483649
--- 337,342 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 384,390 ****
  
  SELECT * FROM test_type_conversion_oid(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_oid"
   test_type_conversion_oid 
  --------------------------
                           
--- 344,349 ----
*************** return x
*** 396,402 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_text('hello world');
  INFO:  ('hello world', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_text"
   test_type_conversion_text 
  ---------------------------
   hello world
--- 355,360 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 404,410 ****
  
  SELECT * FROM test_type_conversion_text(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_text"
   test_type_conversion_text 
  ---------------------------
   
--- 362,367 ----
*************** return x
*** 416,422 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea('hello world');
  INFO:  ('hello world', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea"
   test_type_conversion_bytea 
  ----------------------------
   \x68656c6c6f20776f726c64
--- 373,378 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 424,430 ****
  
  SELECT * FROM test_type_conversion_bytea(E'null\\000byte');
  INFO:  ('null\x00byte', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea"
   test_type_conversion_bytea 
  ----------------------------
   \x6e756c6c0062797465
--- 380,385 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 432,438 ****
  
  SELECT * FROM test_type_conversion_bytea(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea"
   test_type_conversion_bytea 
  ----------------------------
   
--- 387,392 ----
*************** return y
*** 481,487 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_uint2(100::uint2, 50);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_uint2"
   test_type_conversion_uint2 
  ----------------------------
                           50
--- 435,440 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 489,501 ****
  
  SELECT * FROM test_type_conversion_uint2(100::uint2, -50);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_uint2"
  ERROR:  value for domain uint2 violates check constraint "uint2_check"
  CONTEXT:  while creating return value
  PL/Python function "test_type_conversion_uint2"
  SELECT * FROM test_type_conversion_uint2(null, 1);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_uint2"
   test_type_conversion_uint2 
  ----------------------------
                            1
--- 442,452 ----
*************** return y
*** 524,530 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea10('hello wold', 'hello wold');
  INFO:  ('hello wold', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea10"
   test_type_conversion_bytea10 
  ------------------------------
   \x68656c6c6f20776f6c64
--- 475,480 ----
*************** SELECT * FROM test_type_conversion_bytea
*** 534,540 ****
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  SELECT * FROM test_type_conversion_bytea10('hello word', 'hello world');
  INFO:  ('hello word', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea10"
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  CONTEXT:  while creating return value
  PL/Python function "test_type_conversion_bytea10"
--- 484,489 ----
*************** SELECT * FROM test_type_conversion_bytea
*** 542,548 ****
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  SELECT * FROM test_type_conversion_bytea10('hello word', null);
  INFO:  ('hello word', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea10"
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  CONTEXT:  while creating return value
  PL/Python function "test_type_conversion_bytea10"
--- 491,496 ----
*************** return x
*** 555,561 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0, 100]);
  INFO:  ([0, 100], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {0,100}
--- 503,508 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 563,569 ****
  
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0,-100,55]);
  INFO:  ([0, -100, 55], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {0,-100,55}
--- 510,515 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 571,577 ****
  
  SELECT * FROM test_type_conversion_array_int4(ARRAY[NULL,1]);
  INFO:  ([None, 1], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {NULL,1}
--- 517,522 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 579,585 ****
  
  SELECT * FROM test_type_conversion_array_int4(ARRAY[]::integer[]);
  INFO:  ([], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {}
--- 524,529 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 587,593 ****
  
  SELECT * FROM test_type_conversion_array_int4(NULL);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   
--- 531,536 ----
*************** return x
*** 603,609 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_text(ARRAY['foo', 'bar']);
  INFO:  (['foo', 'bar'], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_text"
   test_type_conversion_array_text 
  ---------------------------------
   {foo,bar}
--- 546,551 ----
*************** return x
*** 615,621 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_bytea(ARRAY[E'\\xdeadbeef'::bytea, NULL]);
  INFO:  (['\xde\xad\xbe\xef', None], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_bytea"
   test_type_conversion_array_bytea 
  ----------------------------------
   {"\\xdeadbeef",NULL}
--- 557,562 ----
*************** return x
*** 681,687 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_domain(ARRAY[0, 100]::ordered_pair_domain);
  INFO:  ([0, 100], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_domain"
   test_type_conversion_array_domain 
  -----------------------------------
   {0,100}
--- 622,627 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 689,695 ****
  
  SELECT * FROM test_type_conversion_array_domain(NULL::ordered_pair_domain);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_domain"
   test_type_conversion_array_domain 
  -----------------------------------
   
--- 629,634 ----
*************** return rv[0]['val']
*** 783,789 ****
  $$;
  SELECT test_prep_bool_output(); -- false
  INFO:  {'val': False}
- CONTEXT:  PL/Python function "test_prep_bool_output"
   test_prep_bool_output 
  -----------------------
   f
--- 722,727 ----
*************** return rv[0]['val']
*** 812,818 ****
  $$;
  SELECT test_prep_bytea_output();
  INFO:  {'val': '\xaa\x00\xbb'}
- CONTEXT:  PL/Python function "test_prep_bytea_output"
   test_prep_bytea_output 
  ------------------------
   \xaa00bb
--- 750,755 ----
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
new file mode 100644
index 5e31737..72ada21
*** a/src/test/regress/expected/copy2.out
--- b/src/test/regress/expected/copy2.out
*************** Check constraints:
*** 447,458 ****
  
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":1}
- CONTEXT:  COPY check_con_tbl, line 1: "1"
  NOTICE:  input = {"f1":null}
- CONTEXT:  COPY check_con_tbl, line 2: "\N"
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":0}
- CONTEXT:  COPY check_con_tbl, line 1: "0"
  ERROR:  new row for relation "check_con_tbl" violates check constraint "check_con_tbl_check"
  DETAIL:  Failing row contains (0).
  CONTEXT:  COPY check_con_tbl, line 1: "0"
--- 447,455 ----
diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
new file mode 100644
index e70c315..05ac0ad
*** a/src/test/regress/expected/event_trigger.out
--- b/src/test/regress/expected/event_trigger.out
*************** drop cascades to table schema_one.table_
*** 234,248 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
--- 234,243 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
! SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
*************** drop cascades to table schema_one.table_
*** 255,277 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object schema_one.table_three of type table cannot be dropped
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
--- 250,261 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  NOTICE:  table "schema_one_table_one" does not exist, skipping
  NOTICE:  table "schema_one_table two" does not exist, skipping
  NOTICE:  table "schema_one_table_three" does not exist, skipping
  ERROR:  object schema_one.table_three of type table cannot be dropped
+ CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
*************** drop cascades to table schema_one.table_
*** 283,304 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
       type     |   schema   |               object                
  --------------+------------+-------------------------------------
--- 267,276 ----
*************** SELECT * FROM dropped_objects WHERE sche
*** 329,336 ****
  
  DROP OWNED BY regression_bob;
  NOTICE:  schema "audit_tbls" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_one_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE type = 'schema';
    type  | schema |   object   
  --------+--------+------------
--- 301,306 ----
*************** insert into rewriteme
*** 402,409 ****
--- 372,381 ----
       select x * 1.001 from generate_series(1, 500) as t(x);
  alter table rewriteme alter column foo type numeric;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  alter table rewriteme add column baz int default 0;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  -- test with more than one reason to rewrite a single table
  CREATE OR REPLACE FUNCTION test_evtrig_no_rewrite() RETURNS event_trigger
  LANGUAGE plpgsql AS $$
diff --git a/src/test/regress/expected/plancache.out b/src/test/regress/expected/plancache.out
new file mode 100644
index 864f70f..3f3db33
*** a/src/test/regress/expected/plancache.out
--- b/src/test/regress/expected/plancache.out
*************** begin
*** 234,241 ****
  end$$ language plpgsql;
  select cachebug();
  NOTICE:  table "temptable" does not exist, skipping
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 234,239 ----
*************** NOTICE:  3
*** 246,253 ****
  
  select cachebug();
  NOTICE:  drop cascades to view vv
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 244,249 ----
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
new file mode 100644
index 7ce5415..a19424d
*** a/src/test/regress/expected/plpgsql.out
--- b/src/test/regress/expected/plpgsql.out
*************** ERROR:  duplicate key value violates uni
*** 1518,1544 ****
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
--- 1518,1552 ----
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 47 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 77 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_biu() line 12 at RAISE
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_bd() line 12 at RAISE
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 8 at RAISE
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 14 at RAISE
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
*************** NOTICE:  should see this
*** 1963,1968 ****
--- 1971,1977 ----
  NOTICE:  should see this only if -100 <> 0
  NOTICE:  should see this only if -100 fits in smallint
  ERROR:  -100 is less than zero
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 12 at RAISE
  create function trap_matching_test(int) returns int as $$
  declare x int;
  	sx smallint;
*************** begin
*** 2066,2079 ****
  end$$ language plpgsql;
  select test_variable_storage();
  NOTICE:  should see this
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 <> 0
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 fits in smallint
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
   test_variable_storage 
  -----------------------
   123456789012
--- 2075,2082 ----
*************** DETAIL:  some detail info
*** 4052,4057 ****
--- 4055,4061 ----
  HINT:  some hint
  ERROR:  1 2 3
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 5 at RAISE
  -- Since we can't actually see the thrown SQLSTATE in default psql output,
  -- test it like this; this also tests re-RAISE
  create or replace function raise_test() returns void as $$
*************** select raise_test();
*** 4068,4073 ****
--- 4072,4078 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise 'check me'
*************** select raise_test();
*** 4082,4087 ****
--- 4087,4093 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- SQLSTATE specification in WHEN
  create or replace function raise_test() returns void as $$
  begin
*************** select raise_test();
*** 4097,4102 ****
--- 4103,4109 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using detail = 'some detail info';
*************** select raise_test();
*** 4110,4115 ****
--- 4117,4123 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: division_by_zero
  ERROR:  division_by_zero
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero;
*************** end;
*** 4117,4122 ****
--- 4125,4131 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  division_by_zero
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise sqlstate '1234F';
*************** end;
*** 4124,4129 ****
--- 4133,4139 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  1234F
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using message = 'custom' || ' message';
*************** end;
*** 4131,4136 ****
--- 4141,4147 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise using message = 'custom' || ' message', errcode = '22012';
*************** end;
*** 4138,4143 ****
--- 4149,4155 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- conflict on message
  create or replace function raise_test() returns void as $$
  begin
*************** $$ language plpgsql;
*** 4254,4259 ****
--- 4266,4272 ----
  select raise_test();
  NOTICE:  22012
  ERROR:  substitute message
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  drop function raise_test();
  -- test passing column_name, constraint_name, datatype_name, table_name
  -- and schema_name error fields
*************** LINE 1: SELECT 'foo\\bar\041baz'
*** 4744,4750 ****
                 ^
  HINT:  Use the escape string syntax for backslashes, e.g., E'\\'.
  QUERY:  SELECT 'foo\\bar\041baz'
- CONTEXT:  PL/pgSQL function strtest() line 4 at RETURN
     strtest   
  -------------
   foo\bar!baz
--- 4757,4762 ----
*************** $$ language plpgsql;
*** 5260,5281 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5272,5285 ----
*************** NOTICE:  outer_func() done
*** 5286,5307 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5290,5303 ----
*************** $$ language plpgsql;
*** 5358,5379 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5354,5367 ----
*************** NOTICE:  outer_func() done
*** 5384,5405 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5372,5385 ----
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
new file mode 100644
index c0cd9fa..88bdc2c
*** a/src/test/regress/expected/privileges.out
--- b/src/test/regress/expected/privileges.out
*************** GRANT regressgroup2 TO regressuser5; --
*** 1023,1029 ****
  ERROR:  must have admin option on role "regressgroup2"
  SELECT dogrant_ok();			-- ok: SECURITY DEFINER conveys ADMIN
  NOTICE:  role "regressuser5" is already a member of role "regressgroup2"
- CONTEXT:  SQL function "dogrant_ok" statement 1
   dogrant_ok 
  ------------
   
--- 1023,1028 ----
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
new file mode 100644
index 6dabe50..00ef421
*** a/src/test/regress/expected/rangefuncs.out
--- b/src/test/regress/expected/rangefuncs.out
*************** create trigger tnoticetrigger after inse
*** 1704,1712 ****
  execute procedure noticetrigger();
  select insert_tt2('foolme','barme') limit 1;
  NOTICE:  noticetrigger 11 foolme
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 12 barme
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           11
--- 1704,1710 ----
*************** create rule insert_tt_rule as on insert
*** 1735,1743 ****
    insert into tt_log values(new.*);
  select insert_tt2('foollog','barlog') limit 1;
  NOTICE:  noticetrigger 13 foollog
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 14 barlog
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           13
--- 1733,1739 ----
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
new file mode 100644
index 3b32e8f..cd43e46
*** a/src/test/regress/expected/triggers.out
--- b/src/test/regress/expected/triggers.out
*************** NOTICE:  main_view BEFORE INSERT STATEME
*** 958,968 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (20,30)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
  INSERT 0 1
  INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
--- 958,964 ----
*************** NOTICE:  main_view BEFORE INSERT STATEME
*** 970,980 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (21,31)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
   a  | b  
  ----+----
--- 966,972 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 988,1004 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 0
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 980,988 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1006,1022 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a | b 
  ---+---
--- 990,998 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1031,1050 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 1
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 1007,1016 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1052,1071 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a  | b  
  ----+----
--- 1018,1027 ----
*************** INSERT 0 1
*** 1277,1282 ****
--- 1233,1239 ----
  -- UPDATE .. RETURNING
  UPDATE city_view SET country_name = 'Japon' WHERE city_name = 'Tokyo'; -- error
  ERROR:  No such country: "Japon"
+ CONTEXT:  PL/pgSQL function city_update() line 9 at RAISE
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Takyo'; -- no match
  UPDATE 0
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Tokyo' RETURNING *; -- OK
*************** select pg_trigger_depth();
*** 1489,1514 ****
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  SQLSTATE = U9999: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  ERROR:  U9999
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
--- 1446,1458 ----
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  NOTICE:  SQLSTATE = U9999: depth = 2
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  ERROR:  U9999
! CONTEXT:  PL/pgSQL function depth_c_tf() line 5 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
*************** select pg_trigger_depth();
*** 1521,1541 ****
  insert into depth_a values (2);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_a_tr: depth = 1
  select pg_trigger_depth();
   pg_trigger_depth 
--- 1465,1473 ----
diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
new file mode 100644
index 9b2d264..5691e47
*** a/src/test/regress/expected/xml.out
--- b/src/test/regress/expected/xml.out
*************** SELECT xpath('/*', '<relativens xmlns=''
*** 934,940 ****
  WARNING:  line 1: xmlns: URI relative is not absolute
  <relativens xmlns='relative'/>
                              ^
- CONTEXT:  SQL function "xpath" statement 1
                  xpath                 
  --------------------------------------
   {"<relativens xmlns=\"relative\"/>"}
--- 934,939 ----

diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
new file mode 100644
index a49b562..a268fc7
*** a/contrib/dblink/expected/dblink.out
--- b/contrib/dblink/expected/dblink.out
***************
*** 1,3 ****
--- 1,4 ----
+ set client_min_context TO notice;
  CREATE EXTENSION dblink;
  CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2));
  INSERT INTO foo VALUES (0,'a','{"a0","b0","c0"}');
diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql
new file mode 100644
index ea78cc2..cf7e57e
*** a/contrib/dblink/sql/dblink.sql
--- b/contrib/dblink/sql/dblink.sql
***************
*** 1,3 ****
--- 1,5 ----
+ set client_min_context TO notice;
+ 
  CREATE EXTENSION dblink;
  
  CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2));
diff --git a/contrib/hstore_plperl/expected/hstore_plperlu.out b/contrib/hstore_plperl/expected/hstore_plperlu.out
new file mode 100644
index 8c689ad..c97fd3f
*** a/contrib/hstore_plperl/expected/hstore_plperlu.out
--- b/contrib/hstore_plperl/expected/hstore_plperlu.out
*************** INFO:  $VAR1 = {
*** 29,35 ****
            'cc' => undef
          };
  
- CONTEXT:  PL/Perl function "test1"
   test1 
  -------
       2
--- 29,34 ----
*************** $$;
*** 46,52 ****
  SELECT test1none('aa=>bb, cc=>NULL'::hstore);
  INFO:  $VAR1 = '"aa"=>"bb", "cc"=>NULL';
  
- CONTEXT:  PL/Perl function "test1none"
   test1none 
  -----------
           0
--- 45,50 ----
*************** INFO:  $VAR1 = {
*** 67,73 ****
            'cc' => undef
          };
  
- CONTEXT:  PL/Perl function "test1list"
   test1list 
  -----------
           2
--- 65,70 ----
*************** $VAR2 = {
*** 92,98 ****
            'dd' => 'ee'
          };
  
- CONTEXT:  PL/Perl function "test1arr"
   test1arr 
  ----------
          2
--- 89,94 ----
*************** INFO:  $VAR1 = {
*** 120,129 ****
            'cc' => undef
          };
  
- CONTEXT:  PL/Perl function "test3"
  INFO:  $VAR1 = '"a"=>"1", "b"=>"boo", "c"=>NULL';
  
- CONTEXT:  PL/Perl function "test3"
   test3 
  -------
   
--- 116,123 ----
*************** INFO:  $VAR1 = {
*** 161,167 ****
                 }
          };
  
- CONTEXT:  PL/Perl function "test4"
  SELECT * FROM test1;
   a |                b                
  ---+---------------------------------
--- 155,160 ----
diff --git a/contrib/hstore_plpython/expected/hstore_plpython.out b/contrib/hstore_plpython/expected/hstore_plpython.out
new file mode 100644
index b7a6a92..23091d3
*** a/contrib/hstore_plpython/expected/hstore_plpython.out
--- b/contrib/hstore_plpython/expected/hstore_plpython.out
*************** return len(val)
*** 13,19 ****
  $$;
  SELECT test1('aa=>bb, cc=>NULL'::hstore);
  INFO:  [('aa', 'bb'), ('cc', None)]
- CONTEXT:  PL/Python function "test1"
   test1 
  -------
       2
--- 13,18 ----
*************** return len(val)
*** 32,38 ****
  $$;
  SELECT test1n('aa=>bb, cc=>NULL'::hstore);
  INFO:  [('aa', 'bb'), ('cc', None)]
- CONTEXT:  PL/Python function "test1n"
   test1n 
  --------
        2
--- 31,36 ----
diff --git a/contrib/ltree_plpython/expected/ltree_plpython.out b/contrib/ltree_plpython/expected/ltree_plpython.out
new file mode 100644
index 934529e..c6e8a7c
*** a/contrib/ltree_plpython/expected/ltree_plpython.out
--- b/contrib/ltree_plpython/expected/ltree_plpython.out
*************** return len(val)
*** 9,15 ****
  $$;
  SELECT test1('aa.bb.cc'::ltree);
  INFO:  ['aa', 'bb', 'cc']
- CONTEXT:  PL/Python function "test1"
   test1 
  -------
       3
--- 9,14 ----
*************** return len(val)
*** 24,30 ****
  $$;
  SELECT test1n('aa.bb.cc'::ltree);
  INFO:  ['aa', 'bb', 'cc']
- CONTEXT:  PL/Python function "test1n"
   test1n 
  --------
        3
--- 23,28 ----
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
new file mode 100644
index b91d6c7..6365d4a
*** a/doc/src/sgml/config.sgml
--- b/doc/src/sgml/config.sgml
*************** local0.*    /var/log/postgresql
*** 4144,4149 ****
--- 4144,4171 ----
  
       <variablelist>
  
+      <varlistentry id="guc-client-min-context" xreflabel="client_min_context">
+       <term><varname>client_min_context</varname> (<type>enum</type>)
+       <indexterm>
+        <primary><varname>client_min_context</> configuration parameter</primary>
+       </indexterm>
+       </term>
+       <listitem>
+        <para>
+         Controls which message levels include context when sent to the client.
+         Valid values are <literal>DEBUG5</>,
+         <literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
+         <literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
+         <literal>WARNING</>, <literal>ERROR</>, <literal>FATAL</>,
+         and <literal>PANIC</>.  Each level
+         includes all the levels that follow it.  The later the level,
+         the fewer messages are sent.  The default is
+         <literal>ERROR</>.  Note that <literal>LOG</> has a different
+         rank here than in <varname>log_min_messages</>.
+        </para>
+       </listitem>
+      </varlistentry>
+ 
       <varlistentry id="guc-client-min-messages" xreflabel="client_min_messages">
        <term><varname>client_min_messages</varname> (<type>enum</type>)
        <indexterm>
*************** local0.*    /var/log/postgresql
*** 4165,4170 ****
--- 4187,4216 ----
         </para>
        </listitem>
       </varlistentry>
+ 
+      <varlistentry id="guc-log-min-context" xreflabel="log_min_context">
+       <term><varname>log_min_context</varname> (<type>enum</type>)
+       <indexterm>
+        <primary><varname>log_min_context</> configuration parameter</primary>
+       </indexterm>
+       </term>
+       <listitem>
+        <para>
+         Controls which message levels include context when written to 
+         the server log.
+         Valid values are <literal>DEBUG5</>, <literal>DEBUG4</>,
+         <literal>DEBUG3</>, <literal>DEBUG2</>, <literal>DEBUG1</>,
+         <literal>INFO</>, <literal>NOTICE</>, <literal>WARNING</>,
+         <literal>ERROR</>, <literal>LOG</>, <literal>FATAL</>, and
+         <literal>PANIC</>.  Each level includes all the levels that
+         follow it.  The later the level, the fewer messages are sent
+         to the log.  The default is <literal>WARNING</>.  Note that
+         <literal>LOG</> has a different rank here than in
+         <varname>client_min_messages</>.
+         Only superusers can change this setting.
+        </para>
+       </listitem>
+      </varlistentry>
  
       <varlistentry id="guc-log-min-messages" xreflabel="log_min_messages">
        <term><varname>log_min_messages</varname> (<type>enum</type>)
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
new file mode 100644
index 088c714..9445230
*** a/src/backend/utils/error/elog.c
--- b/src/backend/utils/error/elog.c
*************** write_csvlog(ErrorData *edata)
*** 2730,2736 ****
  	appendStringInfoChar(&buf, ',');
  
  	/* errcontext */
! 	if (!edata->hide_ctx)
  		appendCSVLiteral(&buf, edata->context);
  	appendStringInfoChar(&buf, ',');
  
--- 2730,2736 ----
  	appendStringInfoChar(&buf, ',');
  
  	/* errcontext */
! 	if (!edata->hide_ctx && edata->elevel >= log_min_context)
  		appendCSVLiteral(&buf, edata->context);
  	appendStringInfoChar(&buf, ',');
  
*************** send_message_to_server_log(ErrorData *ed
*** 2863,2869 ****
  			append_with_tabs(&buf, edata->internalquery);
  			appendStringInfoChar(&buf, '\n');
  		}
! 		if (edata->context && !edata->hide_ctx)
  		{
  			log_line_prefix(&buf, edata);
  			appendStringInfoString(&buf, _("CONTEXT:  "));
--- 2863,2869 ----
  			append_with_tabs(&buf, edata->internalquery);
  			appendStringInfoChar(&buf, '\n');
  		}
! 		if (edata->context && !edata->hide_ctx && edata->elevel >= log_min_context)
  		{
  			log_line_prefix(&buf, edata);
  			appendStringInfoString(&buf, _("CONTEXT:  "));
*************** send_message_to_frontend(ErrorData *edat
*** 3137,3143 ****
  			err_sendstring(&msgbuf, edata->hint);
  		}
  
! 		if (edata->context)
  		{
  			pq_sendbyte(&msgbuf, PG_DIAG_CONTEXT);
  			err_sendstring(&msgbuf, edata->context);
--- 3137,3143 ----
  			err_sendstring(&msgbuf, edata->hint);
  		}
  
! 		if (edata->context && edata->elevel >= client_min_context)
  		{
  			pq_sendbyte(&msgbuf, PG_DIAG_CONTEXT);
  			err_sendstring(&msgbuf, edata->context);
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
new file mode 100644
index 1bed525..cae8094
*** a/src/backend/utils/misc/guc.c
--- b/src/backend/utils/misc/guc.c
*************** bool		Password_encryption = true;
*** 430,435 ****
--- 430,437 ----
  int			log_min_error_statement = ERROR;
  int			log_min_messages = WARNING;
  int			client_min_messages = NOTICE;
+ int			log_min_context = WARNING;
+ int			client_min_context = ERROR;
  int			log_min_duration_statement = -1;
  int			log_temp_files = -1;
  int			trace_recovery_messages = LOG;
*************** static struct config_enum ConfigureNames
*** 3426,3431 ****
--- 3428,3444 ----
  	},
  
  	{
+ 		{"client_min_context", PGC_USERSET, LOGGING_WHEN,
+ 			gettext_noop("Sets the message levels for which context is sent to the client."),
+ 			gettext_noop("Each level includes all the levels that follow it. The later"
+ 						 " the level, the less context is sent.")
+ 		},
+ 		&client_min_context,
+ 		ERROR, client_message_level_options,
+ 		NULL, NULL, NULL
+ 	},
+ 
+ 	{
  		{"client_min_messages", PGC_USERSET, LOGGING_WHEN,
  			gettext_noop("Sets the message levels that are sent to the client."),
  			gettext_noop("Each level includes all the levels that follow it. The later"
*************** static struct config_enum ConfigureNames
*** 3478,3483 ****
--- 3491,3507 ----
  		NULL, NULL, NULL
  	},
  
+ 	{
+ 		{"log_min_context", PGC_SUSET, LOGGING_WHEN,
+ 			gettext_noop("Sets the message levels for which context is logged."),
+ 			gettext_noop("Each level includes all the levels that follow it. The later"
+ 						 " the level, the less context is sent.")
+ 		},
+ 		&log_min_context,
+ 		WARNING, server_message_level_options,
+ 		NULL, NULL, NULL
+ 	},
+ 
  	{
  		{"log_min_messages", PGC_SUSET, LOGGING_WHEN,
  			gettext_noop("Sets the message levels that are logged."),
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
new file mode 100644
index 06dfc06..8695e8b
*** a/src/backend/utils/misc/postgresql.conf.sample
--- b/src/backend/utils/misc/postgresql.conf.sample
***************
*** 360,365 ****
--- 360,390 ----
  
  # - When to Log -
  
+ #client_min_context = error		# values in order of decreasing detail:
+ 					#   debug5
+ 					#   debug4
+ 					#   debug3
+ 					#   debug2
+ 					#   debug1
+ 					#   log
+ 					#   notice
+ 					#   warning
+ 					#   error
+ 
+ #log_min_context = warning		# values in order of decreasing detail:
+ 					#   debug5
+ 					#   debug4
+ 					#   debug3
+ 					#   debug2
+ 					#   debug1
+ 					#   info
+ 					#   notice
+ 					#   warning
+ 					#   error
+ 					#   log
+ 					#   fatal
+ 					#   panic
+ 
  #client_min_messages = notice		# values in order of decreasing detail:
  					#   debug5
  					#   debug4
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
new file mode 100644
index dc167f9..f03a5e1
*** a/src/include/utils/guc.h
--- b/src/include/utils/guc.h
*************** extern PGDLLIMPORT bool check_function_b
*** 246,251 ****
--- 246,253 ----
  extern bool default_with_oids;
  extern bool SQL_inheritance;
  
+ extern int	log_min_context;
+ extern int	client_min_context;
  extern int	log_min_error_statement;
  extern int	log_min_messages;
  extern int	client_min_messages;
diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out
new file mode 100644
index d23a302..14df5f4
*** a/src/pl/plperl/expected/plperl.out
--- b/src/pl/plperl/expected/plperl.out
*************** DO $$
*** 614,620 ****
    elog(NOTICE, $a);
  $$ LANGUAGE plperl;
  NOTICE:  This is a test
- CONTEXT:  PL/Perl anonymous code block
  -- check that restricted operations are rejected in a plperl DO block
  DO $$ system("/nonesuch"); $$ LANGUAGE plperl;
  ERROR:  'system' trapped by operation mask at line 1.
--- 614,619 ----
*************** CONTEXT:  PL/Perl anonymous code block
*** 628,634 ****
  -- check that eval is allowed and eval'd restricted ops are caught
  DO $$ eval q{chdir '.';}; warn "Caught: $@"; $$ LANGUAGE plperl;
  WARNING:  Caught: 'chdir' trapped by operation mask at line 1.
- CONTEXT:  PL/Perl anonymous code block
  -- check that compiling do (dofile opcode) is allowed
  -- but that executing it for a file not already loaded (via require) dies
  DO $$ warn do "/dev/null"; $$ LANGUAGE plperl;
--- 627,632 ----
diff --git a/src/pl/plperl/expected/plperl_elog.out b/src/pl/plperl/expected/plperl_elog.out
new file mode 100644
index c447fa2..3f9449a
*** a/src/pl/plperl/expected/plperl_elog.out
--- b/src/pl/plperl/expected/plperl_elog.out
*************** create or replace function perl_elog(tex
*** 7,13 ****
  $$;
  select perl_elog('explicit elog');
  NOTICE:  explicit elog
- CONTEXT:  PL/Perl function "perl_elog"
   perl_elog 
  -----------
   
--- 7,12 ----
*************** create or replace function perl_warn(tex
*** 21,27 ****
  $$;
  select perl_warn('implicit elog via warn');
  WARNING:  implicit elog via warn at line 4.
- CONTEXT:  PL/Perl function "perl_warn"
   perl_warn 
  -----------
   
--- 20,25 ----
*************** select uses_global();
*** 61,67 ****
  -- make sure we don't choke on readonly values
  do language plperl $$ elog(NOTICE, ${^TAINT}); $$;
  NOTICE:  0
- CONTEXT:  PL/Perl anonymous code block
  -- test recovery after "die"
  create or replace function just_die() returns void language plperl AS $$
  die "just die";
--- 59,64 ----
*************** return $a + $b;
*** 94,104 ****
  $$;
  select indirect_die_caller();
  NOTICE:  caught die
- CONTEXT:  SQL statement "SELECT die_caller() AS fx"
- PL/Perl function "indirect_die_caller"
  NOTICE:  caught die
- CONTEXT:  SQL statement "SELECT die_caller() AS fx"
- PL/Perl function "indirect_die_caller"
   indirect_die_caller 
  ---------------------
                     2
--- 91,97 ----
diff --git a/src/pl/plperl/expected/plperl_trigger.out b/src/pl/plperl/expected/plperl_trigger.out
new file mode 100644
index 36ecb92..5e3860e
*** a/src/pl/plperl/expected/plperl_trigger.out
--- b/src/pl/plperl/expected/plperl_trigger.out
*************** BEFORE INSERT OR UPDATE OR DELETE ON tri
*** 62,136 ****
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
  insert into trigger_test values(1,'insert', '("(1)")');
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['23', 'skidoo']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'INSERT'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'BEFORE'
- CONTEXT:  PL/Perl function "trigger_data"
  update trigger_test set v = 'update' where i = 1;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['23', 'skidoo']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'UPDATE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'update'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'BEFORE'
- CONTEXT:  PL/Perl function "trigger_data"
  delete from trigger_test;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['23', 'skidoo']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'DELETE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'update'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'BEFORE'
- CONTEXT:  PL/Perl function "trigger_data"
  DROP TRIGGER show_trigger_data_trig on trigger_test;
  insert into trigger_test values(1,'insert', '("(1)")');
  CREATE VIEW trigger_test_view AS SELECT * FROM trigger_test;
--- 62,102 ----
*************** INSTEAD OF INSERT OR UPDATE OR DELETE ON
*** 139,213 ****
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(24,'skidoo view');
  insert into trigger_test_view values(2,'insert', '("(2)")');
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['24', 'skidoo view']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'INSERT'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '2'}}, 'i' => '2', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'INSTEAD OF'
- CONTEXT:  PL/Perl function "trigger_data"
  update trigger_test_view set v = 'update', foo = '("(3)")' where i = 1;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['24', 'skidoo view']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'UPDATE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{new} = {'foo' => {'rfoo' => {'i' => '3'}}, 'i' => '1', 'v' => 'update'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'INSTEAD OF'
- CONTEXT:  PL/Perl function "trigger_data"
  delete from trigger_test_view;
  NOTICE:  $_TD->{argc} = '2'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{args} = ['24', 'skidoo view']
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{event} = 'DELETE'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{level} = 'ROW'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{name} = 'show_trigger_data_trig'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{old} = {'foo' => {'rfoo' => {'i' => '1'}}, 'i' => '1', 'v' => 'insert'}
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relid} = 'bogus:12345'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{relname} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_name} = 'trigger_test_view'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{table_schema} = 'public'
- CONTEXT:  PL/Perl function "trigger_data"
  NOTICE:  $_TD->{when} = 'INSTEAD OF'
- CONTEXT:  PL/Perl function "trigger_data"
  DROP VIEW trigger_test_view;
  delete from trigger_test;
  DROP FUNCTION trigger_data();
--- 105,145 ----
*************** create event trigger perl_b_snitch on dd
*** 319,346 ****
     execute procedure perlsnitch();
  create or replace function foobar() returns int language sql as $$select 1;$$;
  NOTICE:  perlsnitch: ddl_command_start CREATE FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end CREATE FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  alter function foobar() cost 77;
  NOTICE:  perlsnitch: ddl_command_start ALTER FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end ALTER FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  drop function foobar();
  NOTICE:  perlsnitch: ddl_command_start DROP FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end DROP FUNCTION 
- CONTEXT:  PL/Perl function "perlsnitch"
  create table foo();
  NOTICE:  perlsnitch: ddl_command_start CREATE TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end CREATE TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  drop table foo;
  NOTICE:  perlsnitch: ddl_command_start DROP TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  NOTICE:  perlsnitch: ddl_command_end DROP TABLE 
- CONTEXT:  PL/Perl function "perlsnitch"
  drop event trigger perl_a_snitch;
  drop event trigger perl_b_snitch;
--- 251,268 ----
diff --git a/src/pl/plperl/expected/plperlu.out b/src/pl/plperl/expected/plperlu.out
new file mode 100644
index 3daf4ce..a3edb38
*** a/src/pl/plperl/expected/plperlu.out
--- b/src/pl/plperl/expected/plperlu.out
*************** LOAD 'plperl';
*** 6,12 ****
  SET plperl.on_plperlu_init = '$_SHARED{init} = 42';
  DO $$ warn $_SHARED{init} $$ language plperlu;
  WARNING:  42 at line 1.
- CONTEXT:  PL/Perl anonymous code block
  --
  -- Test compilation of unicode regex - regardless of locale.
  -- This code fails in plain plperl in a non-UTF8 database.
--- 6,11 ----
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
new file mode 100644
index 7d4001c..e1a6b7d
*** a/src/pl/plpgsql/src/pl_exec.c
--- b/src/pl/plpgsql/src/pl_exec.c
***************
*** 42,49 ****
  #include "utils/typcache.h"
  
  
- static const char *const raise_skip_msg = "RAISE";
- 
  typedef struct
  {
  	int			nargs;			/* number of arguments */
--- 42,47 ----
*************** plpgsql_exec_error_callback(void *arg)
*** 939,948 ****
  {
  	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) arg;
  
- 	/* if we are doing RAISE, don't report its location */
- 	if (estate->err_text == raise_skip_msg)
- 		return;
- 
  	if (estate->err_text != NULL)
  	{
  		/*
--- 937,942 ----
*************** exec_stmt_raise(PLpgSQL_execstate *estat
*** 3158,3165 ****
  	/*
  	 * Throw the error (may or may not come back)
  	 */
- 	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
- 
  	ereport(stmt->elog_level,
  			(err_code ? errcode(err_code) : 0,
  			 errmsg_internal("%s", err_message),
--- 3152,3157 ----
diff --git a/src/pl/plpython/expected/plpython_do.out b/src/pl/plpython/expected/plpython_do.out
new file mode 100644
index 0977812..e300530
*** a/src/pl/plpython/expected/plpython_do.out
--- b/src/pl/plpython/expected/plpython_do.out
***************
*** 1,9 ****
  DO $$ plpy.notice("This is plpythonu.") $$ LANGUAGE plpythonu;
  NOTICE:  This is plpythonu.
- CONTEXT:  PL/Python anonymous code block
  DO $$ plpy.notice("This is plpython2u.") $$ LANGUAGE plpython2u;
  NOTICE:  This is plpython2u.
- CONTEXT:  PL/Python anonymous code block
  DO $$ raise Exception("error test") $$ LANGUAGE plpythonu;
  ERROR:  Exception: error test
  CONTEXT:  Traceback (most recent call last):
--- 1,7 ----
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
new file mode 100644
index be2ec97..1f52af7
*** a/src/pl/plpython/expected/plpython_error.out
--- b/src/pl/plpython/expected/plpython_error.out
*************** return None
*** 108,114 ****
  	LANGUAGE plpythonu;
  SELECT invalid_type_caught('rick');
  NOTICE:  type "test" does not exist
- CONTEXT:  PL/Python function "invalid_type_caught"
   invalid_type_caught 
  ---------------------
   
--- 108,113 ----
*************** return "you''ve been warned"
*** 232,238 ****
  	LANGUAGE plpythonu;
  SELECT nested_warning();
  WARNING:  boom
- CONTEXT:  PL/Python function "nested_warning"
     nested_warning   
  --------------------
   you've been warned
--- 231,236 ----
*************** SELECT specific_exception(2);
*** 336,342 ****
  
  SELECT specific_exception(NULL);
  NOTICE:  Violated the NOT NULL constraint, sqlstate 23502
- CONTEXT:  PL/Python function "specific_exception"
   specific_exception 
  --------------------
   
--- 334,339 ----
*************** CONTEXT:  PL/Python function "specific_e
*** 344,350 ****
  
  SELECT specific_exception(2);
  NOTICE:  Violated the UNIQUE constraint, sqlstate 23505
- CONTEXT:  PL/Python function "specific_exception"
   specific_exception 
  --------------------
   
--- 341,346 ----
diff --git a/src/pl/plpython/expected/plpython_spi.out b/src/pl/plpython/expected/plpython_spi.out
new file mode 100644
index e2861df..e715ee5
*** a/src/pl/plpython/expected/plpython_spi.out
--- b/src/pl/plpython/expected/plpython_spi.out
*************** else:
*** 130,142 ****
  $$ LANGUAGE plpythonu;
  SELECT result_metadata_test($$SELECT 1 AS foo, '11'::text AS bar UNION SELECT 2, '22'$$);
  INFO:  True
- CONTEXT:  PL/Python function "result_metadata_test"
  INFO:  ['foo', 'bar']
- CONTEXT:  PL/Python function "result_metadata_test"
  INFO:  [23, 25]
- CONTEXT:  PL/Python function "result_metadata_test"
  INFO:  [-1, -1]
- CONTEXT:  PL/Python function "result_metadata_test"
   result_metadata_test 
  ----------------------
                      2
--- 130,138 ----
*************** CONTEXT:  PL/Python function "result_met
*** 144,150 ****
  
  SELECT result_metadata_test($$CREATE TEMPORARY TABLE foo1 (a int, b text)$$);
  INFO:  True
- CONTEXT:  PL/Python function "result_metadata_test"
  ERROR:  plpy.Error: command did not produce a result set
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "result_metadata_test", line 6, in <module>
--- 140,145 ----
*************** else:
*** 234,248 ****
  $$ LANGUAGE plpythonu;
  SELECT result_subscript_test();
  INFO:  2
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  4
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  [2, 3]
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  [1, 3]
- CONTEXT:  PL/Python function "result_subscript_test"
  INFO:  [10, 100, 3, 1000]
- CONTEXT:  PL/Python function "result_subscript_test"
   result_subscript_test 
  -----------------------
   
--- 229,238 ----
*************** plpy.info(result[:])
*** 257,263 ****
  $$ LANGUAGE plpythonu;
  SELECT result_empty_test();
  INFO:  []
- CONTEXT:  PL/Python function "result_empty_test"
   result_empty_test 
  -------------------
   
--- 247,252 ----
diff --git a/src/pl/plpython/expected/plpython_subtransaction.out b/src/pl/plpython/expected/plpython_subtransaction.out
new file mode 100644
index ced4682..635bac6
*** a/src/pl/plpython/expected/plpython_subtransaction.out
--- b/src/pl/plpython/expected/plpython_subtransaction.out
*************** SELECT * FROM subtransaction_tbl;
*** 154,160 ****
  TRUNCATE subtransaction_tbl;
  SELECT subtransaction_nested_test('t');
  NOTICE:  Swallowed SyntaxError('syntax error at or near "error"',)
- CONTEXT:  PL/Python function "subtransaction_nested_test"
   subtransaction_nested_test 
  ----------------------------
   ok
--- 154,159 ----
*************** return "ok"
*** 180,188 ****
  $$ LANGUAGE plpythonu;
  SELECT subtransaction_deeply_nested_test();
  NOTICE:  Swallowed SyntaxError('syntax error at or near "error"',)
- CONTEXT:  PL/Python function "subtransaction_nested_test"
- SQL statement "SELECT subtransaction_nested_test('t')"
- PL/Python function "subtransaction_nested_test"
   subtransaction_deeply_nested_test 
  -----------------------------------
   ok
--- 179,184 ----
*************** CONTEXT:  Traceback (most recent call la
*** 251,257 ****
  PL/Python function "subtransaction_exit_without_enter"
  SELECT subtransaction_enter_without_exit();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_without_exit"
   subtransaction_enter_without_exit 
  -----------------------------------
   
--- 247,252 ----
*************** CONTEXT:  PL/Python function "subtransac
*** 259,265 ****
  
  SELECT subtransaction_exit_twice();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_exit_twice"
  ERROR:  ValueError: this subtransaction has not been entered
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "subtransaction_exit_twice", line 3, in <module>
--- 254,259 ----
*************** CONTEXT:  Traceback (most recent call la
*** 267,275 ****
  PL/Python function "subtransaction_exit_twice"
  SELECT subtransaction_enter_twice();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_twice"
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_twice"
   subtransaction_enter_twice 
  ----------------------------
   
--- 261,267 ----
*************** CONTEXT:  Traceback (most recent call la
*** 283,289 ****
  PL/Python function "subtransaction_exit_same_subtransaction_twice"
  SELECT subtransaction_enter_same_subtransaction_twice();
  WARNING:  forcibly aborting a subtransaction that has not been exited
- CONTEXT:  PL/Python function "subtransaction_enter_same_subtransaction_twice"
  ERROR:  ValueError: this subtransaction has already been entered
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "subtransaction_enter_same_subtransaction_twice", line 4, in <module>
--- 275,280 ----
*************** except plpy.SPIError:
*** 329,337 ****
  $$ LANGUAGE plpythonu;
  SELECT subtransaction_mix_explicit_and_implicit();
  WARNING:  Caught a SPI error from an explicit subtransaction
- CONTEXT:  PL/Python function "subtransaction_mix_explicit_and_implicit"
  WARNING:  Caught a SPI error
- CONTEXT:  PL/Python function "subtransaction_mix_explicit_and_implicit"
   subtransaction_mix_explicit_and_implicit 
  ------------------------------------------
   
--- 320,326 ----
*************** with plpy.subtransaction():
*** 370,376 ****
  $$ LANGUAGE plpythonu;
  SELECT try_catch_inside_subtransaction();
  NOTICE:  caught
- CONTEXT:  PL/Python function "try_catch_inside_subtransaction"
   try_catch_inside_subtransaction 
  ---------------------------------
   
--- 359,364 ----
*************** with plpy.subtransaction():
*** 395,401 ****
  $$ LANGUAGE plpythonu;
  SELECT pk_violation_inside_subtransaction();
  NOTICE:  caught
- CONTEXT:  PL/Python function "pk_violation_inside_subtransaction"
   pk_violation_inside_subtransaction 
  ------------------------------------
   
--- 383,388 ----
diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
new file mode 100644
index a884fc0..7b76faf
*** a/src/pl/plpython/expected/plpython_test.out
--- b/src/pl/plpython/expected/plpython_test.out
*************** plpy.error('error')
*** 62,78 ****
  $$ LANGUAGE plpythonu;
  SELECT elog_test();
  INFO:  info
- CONTEXT:  PL/Python function "elog_test"
  INFO:  37
- CONTEXT:  PL/Python function "elog_test"
  INFO:  ()
- CONTEXT:  PL/Python function "elog_test"
  INFO:  ('info', 37, [1, 2, 3])
- CONTEXT:  PL/Python function "elog_test"
  NOTICE:  notice
- CONTEXT:  PL/Python function "elog_test"
  WARNING:  warning
- CONTEXT:  PL/Python function "elog_test"
  ERROR:  plpy.Error: error
  CONTEXT:  Traceback (most recent call last):
    PL/Python function "elog_test", line 10, in <module>
--- 62,72 ----
diff --git a/src/pl/plpython/expected/plpython_trigger.out b/src/pl/plpython/expected/plpython_trigger.out
new file mode 100644
index 80e478b..4148963
*** a/src/pl/plpython/expected/plpython_trigger.out
--- b/src/pl/plpython/expected/plpython_trigger.out
*************** BEFORE INSERT OR UPDATE OR DELETE OR TRU
*** 98,305 ****
  FOR EACH STATEMENT EXECUTE PROCEDURE trigger_data(23,'skidoo');
  insert into trigger_test values(1,'insert');
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_before
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_after
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => AFTER
- CONTEXT:  PL/Python function "trigger_data"
  update trigger_test set v = 'update' where i = 1;
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_before
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_after
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => AFTER
- CONTEXT:  PL/Python function "trigger_data"
  delete from trigger_test;
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_before
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_after
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => AFTER
- CONTEXT:  PL/Python function "trigger_data"
  truncate table trigger_test;
  NOTICE:  TD[args] => ['23', 'skidoo']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => TRUNCATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => STATEMENT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig_stmt
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => BEFORE
- CONTEXT:  PL/Python function "trigger_data"
  DROP TRIGGER show_trigger_data_trig_stmt on trigger_test;
  DROP TRIGGER show_trigger_data_trig_before on trigger_test;
  DROP TRIGGER show_trigger_data_trig_after on trigger_test;
--- 98,205 ----
*************** INSTEAD OF INSERT OR UPDATE OR DELETE ON
*** 310,376 ****
  FOR EACH ROW EXECUTE PROCEDURE trigger_data(24,'skidoo view');
  insert into trigger_test_view values(2,'insert');
  NOTICE:  TD[args] => ['24', 'skidoo view']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => INSERT
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 2, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test_view
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => INSTEAD OF
- CONTEXT:  PL/Python function "trigger_data"
  update trigger_test_view set v = 'update' where i = 1;
  NOTICE:  TD[args] => ['24', 'skidoo view']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => UPDATE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => {'i': 1, 'v': 'update'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test_view
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => INSTEAD OF
- CONTEXT:  PL/Python function "trigger_data"
  delete from trigger_test_view;
  NOTICE:  TD[args] => ['24', 'skidoo view']
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[event] => DELETE
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[level] => ROW
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[name] => show_trigger_data_trig
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[new] => None
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[old] => {'i': 1, 'v': 'insert'}
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[relid] => bogus:12345
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_name] => trigger_test_view
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[table_schema] => public
- CONTEXT:  PL/Python function "trigger_data"
  NOTICE:  TD[when] => INSTEAD OF
- CONTEXT:  PL/Python function "trigger_data"
  DROP FUNCTION trigger_data() CASCADE;
  NOTICE:  drop cascades to trigger show_trigger_data_trig on view trigger_test_view
  DROP VIEW trigger_test_view;
--- 210,246 ----
*************** BEFORE DELETE ON trigger_test
*** 402,408 ****
  FOR EACH ROW EXECUTE PROCEDURE stupid2();
  DELETE FROM trigger_test WHERE i = 0;
  WARNING:  PL/Python trigger function returned "MODIFY" in a DELETE trigger -- ignored
- CONTEXT:  PL/Python function "stupid2"
  DROP TRIGGER stupid_trigger2 ON trigger_test;
  INSERT INTO trigger_test VALUES (0, 'zero');
  -- returning unrecognized string from trigger function
--- 272,277 ----
diff --git a/src/pl/plpython/expected/plpython_types.out b/src/pl/plpython/expected/plpython_types.out
new file mode 100644
index 17057a5..f0b6abd
*** a/src/pl/plpython/expected/plpython_types.out
--- b/src/pl/plpython/expected/plpython_types.out
*************** return x
*** 10,16 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool(true);
  INFO:  (True, <type 'bool'>)
- CONTEXT:  PL/Python function "test_type_conversion_bool"
   test_type_conversion_bool 
  ---------------------------
   t
--- 10,15 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 18,24 ****
  
  SELECT * FROM test_type_conversion_bool(false);
  INFO:  (False, <type 'bool'>)
- CONTEXT:  PL/Python function "test_type_conversion_bool"
   test_type_conversion_bool 
  ---------------------------
   f
--- 17,22 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 26,32 ****
  
  SELECT * FROM test_type_conversion_bool(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_bool"
   test_type_conversion_bool 
  ---------------------------
   
--- 24,29 ----
*************** return ret
*** 54,60 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bool_other(0);
  INFO:  (0, False)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   f
--- 51,56 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 62,68 ****
  
  SELECT * FROM test_type_conversion_bool_other(1);
  INFO:  (5, True)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   t
--- 58,63 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 70,76 ****
  
  SELECT * FROM test_type_conversion_bool_other(2);
  INFO:  ('', False)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   f
--- 65,70 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 78,84 ****
  
  SELECT * FROM test_type_conversion_bool_other(3);
  INFO:  ('fa', True)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   t
--- 72,77 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 86,92 ****
  
  SELECT * FROM test_type_conversion_bool_other(4);
  INFO:  ([], False)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   f
--- 79,84 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 94,100 ****
  
  SELECT * FROM test_type_conversion_bool_other(5);
  INFO:  ([0], True)
- CONTEXT:  PL/Python function "test_type_conversion_bool_other"
   test_type_conversion_bool_other 
  ---------------------------------
   t
--- 86,91 ----
*************** return x
*** 106,112 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_char('a');
  INFO:  ('a', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_char"
   test_type_conversion_char 
  ---------------------------
   a
--- 97,102 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 114,120 ****
  
  SELECT * FROM test_type_conversion_char(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_char"
   test_type_conversion_char 
  ---------------------------
   
--- 104,109 ----
*************** return x
*** 126,132 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int2(100::int2);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int2"
   test_type_conversion_int2 
  ---------------------------
                         100
--- 115,120 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 134,140 ****
  
  SELECT * FROM test_type_conversion_int2(-100::int2);
  INFO:  (-100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int2"
   test_type_conversion_int2 
  ---------------------------
                        -100
--- 122,127 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 142,148 ****
  
  SELECT * FROM test_type_conversion_int2(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_int2"
   test_type_conversion_int2 
  ---------------------------
                            
--- 129,134 ----
*************** return x
*** 154,160 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int4(100);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int4"
   test_type_conversion_int4 
  ---------------------------
                         100
--- 140,145 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 162,168 ****
  
  SELECT * FROM test_type_conversion_int4(-100);
  INFO:  (-100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_int4"
   test_type_conversion_int4 
  ---------------------------
                        -100
--- 147,152 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 170,176 ****
  
  SELECT * FROM test_type_conversion_int4(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_int4"
   test_type_conversion_int4 
  ---------------------------
                            
--- 154,159 ----
*************** return x
*** 182,188 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_int8(100);
  INFO:  (100L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                         100
--- 165,170 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 190,196 ****
  
  SELECT * FROM test_type_conversion_int8(-100);
  INFO:  (-100L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                        -100
--- 172,177 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 198,204 ****
  
  SELECT * FROM test_type_conversion_int8(5000000000);
  INFO:  (5000000000L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                  5000000000
--- 179,184 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 206,212 ****
  
  SELECT * FROM test_type_conversion_int8(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_int8"
   test_type_conversion_int8 
  ---------------------------
                            
--- 186,191 ----
*************** return x
*** 220,226 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_numeric(100);
  INFO:  ('100', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                            100
--- 199,204 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 228,234 ****
  
  SELECT * FROM test_type_conversion_numeric(-100);
  INFO:  ('-100', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                           -100
--- 206,211 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 236,242 ****
  
  SELECT * FROM test_type_conversion_numeric(100.0);
  INFO:  ('100.0', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                          100.0
--- 213,218 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 244,250 ****
  
  SELECT * FROM test_type_conversion_numeric(100.00);
  INFO:  ('100.00', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                         100.00
--- 220,225 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 252,258 ****
  
  SELECT * FROM test_type_conversion_numeric(5000000000.5);
  INFO:  ('5000000000.5', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                   5000000000.5
--- 227,232 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 260,266 ****
  
  SELECT * FROM test_type_conversion_numeric(1234567890.0987654321);
  INFO:  ('1234567890.0987654321', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
          1234567890.0987654321
--- 234,239 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 268,274 ****
  
  SELECT * FROM test_type_conversion_numeric(-1234567890.0987654321);
  INFO:  ('-1234567890.0987654321', 'Decimal')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
         -1234567890.0987654321
--- 241,246 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 276,282 ****
  
  SELECT * FROM test_type_conversion_numeric(null);
  INFO:  ('None', 'NoneType')
- CONTEXT:  PL/Python function "test_type_conversion_numeric"
   test_type_conversion_numeric 
  ------------------------------
                               
--- 248,253 ----
*************** return x
*** 288,294 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float4(100);
  INFO:  (100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                           100
--- 259,264 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 296,302 ****
  
  SELECT * FROM test_type_conversion_float4(-100);
  INFO:  (-100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                          -100
--- 266,271 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 304,310 ****
  
  SELECT * FROM test_type_conversion_float4(5000.5);
  INFO:  (5000.5, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                        5000.5
--- 273,278 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 312,318 ****
  
  SELECT * FROM test_type_conversion_float4(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_float4"
   test_type_conversion_float4 
  -----------------------------
                              
--- 280,285 ----
*************** return x
*** 324,330 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_float8(100);
  INFO:  (100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                           100
--- 291,296 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 332,338 ****
  
  SELECT * FROM test_type_conversion_float8(-100);
  INFO:  (-100.0, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                          -100
--- 298,303 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 340,346 ****
  
  SELECT * FROM test_type_conversion_float8(5000000000.5);
  INFO:  (5000000000.5, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                  5000000000.5
--- 305,310 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 348,354 ****
  
  SELECT * FROM test_type_conversion_float8(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
                              
--- 312,317 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 356,362 ****
  
  SELECT * FROM test_type_conversion_float8(100100100.654321);
  INFO:  (100100100.654321, <type 'float'>)
- CONTEXT:  PL/Python function "test_type_conversion_float8"
   test_type_conversion_float8 
  -----------------------------
              100100100.654321
--- 319,324 ----
*************** return x
*** 368,374 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_oid(100);
  INFO:  (100L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_oid"
   test_type_conversion_oid 
  --------------------------
                        100
--- 330,335 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 376,382 ****
  
  SELECT * FROM test_type_conversion_oid(2147483649);
  INFO:  (2147483649L, <type 'long'>)
- CONTEXT:  PL/Python function "test_type_conversion_oid"
   test_type_conversion_oid 
  --------------------------
                 2147483649
--- 337,342 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 384,390 ****
  
  SELECT * FROM test_type_conversion_oid(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_oid"
   test_type_conversion_oid 
  --------------------------
                           
--- 344,349 ----
*************** return x
*** 396,402 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_text('hello world');
  INFO:  ('hello world', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_text"
   test_type_conversion_text 
  ---------------------------
   hello world
--- 355,360 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 404,410 ****
  
  SELECT * FROM test_type_conversion_text(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_text"
   test_type_conversion_text 
  ---------------------------
   
--- 362,367 ----
*************** return x
*** 416,422 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea('hello world');
  INFO:  ('hello world', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea"
   test_type_conversion_bytea 
  ----------------------------
   \x68656c6c6f20776f726c64
--- 373,378 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 424,430 ****
  
  SELECT * FROM test_type_conversion_bytea(E'null\\000byte');
  INFO:  ('null\x00byte', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea"
   test_type_conversion_bytea 
  ----------------------------
   \x6e756c6c0062797465
--- 380,385 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 432,438 ****
  
  SELECT * FROM test_type_conversion_bytea(null);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea"
   test_type_conversion_bytea 
  ----------------------------
   
--- 387,392 ----
*************** return y
*** 481,487 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_uint2(100::uint2, 50);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_uint2"
   test_type_conversion_uint2 
  ----------------------------
                           50
--- 435,440 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 489,501 ****
  
  SELECT * FROM test_type_conversion_uint2(100::uint2, -50);
  INFO:  (100, <type 'int'>)
- CONTEXT:  PL/Python function "test_type_conversion_uint2"
  ERROR:  value for domain uint2 violates check constraint "uint2_check"
  CONTEXT:  while creating return value
  PL/Python function "test_type_conversion_uint2"
  SELECT * FROM test_type_conversion_uint2(null, 1);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_uint2"
   test_type_conversion_uint2 
  ----------------------------
                            1
--- 442,452 ----
*************** return y
*** 524,530 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_bytea10('hello wold', 'hello wold');
  INFO:  ('hello wold', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea10"
   test_type_conversion_bytea10 
  ------------------------------
   \x68656c6c6f20776f6c64
--- 475,480 ----
*************** SELECT * FROM test_type_conversion_bytea
*** 534,540 ****
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  SELECT * FROM test_type_conversion_bytea10('hello word', 'hello world');
  INFO:  ('hello word', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea10"
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  CONTEXT:  while creating return value
  PL/Python function "test_type_conversion_bytea10"
--- 484,489 ----
*************** SELECT * FROM test_type_conversion_bytea
*** 542,548 ****
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  SELECT * FROM test_type_conversion_bytea10('hello word', null);
  INFO:  ('hello word', <type 'str'>)
- CONTEXT:  PL/Python function "test_type_conversion_bytea10"
  ERROR:  value for domain bytea10 violates check constraint "bytea10_check"
  CONTEXT:  while creating return value
  PL/Python function "test_type_conversion_bytea10"
--- 491,496 ----
*************** return x
*** 555,561 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0, 100]);
  INFO:  ([0, 100], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {0,100}
--- 503,508 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 563,569 ****
  
  SELECT * FROM test_type_conversion_array_int4(ARRAY[0,-100,55]);
  INFO:  ([0, -100, 55], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {0,-100,55}
--- 510,515 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 571,577 ****
  
  SELECT * FROM test_type_conversion_array_int4(ARRAY[NULL,1]);
  INFO:  ([None, 1], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {NULL,1}
--- 517,522 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 579,585 ****
  
  SELECT * FROM test_type_conversion_array_int4(ARRAY[]::integer[]);
  INFO:  ([], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   {}
--- 524,529 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 587,593 ****
  
  SELECT * FROM test_type_conversion_array_int4(NULL);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_int4"
   test_type_conversion_array_int4 
  ---------------------------------
   
--- 531,536 ----
*************** return x
*** 603,609 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_text(ARRAY['foo', 'bar']);
  INFO:  (['foo', 'bar'], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_text"
   test_type_conversion_array_text 
  ---------------------------------
   {foo,bar}
--- 546,551 ----
*************** return x
*** 615,621 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_bytea(ARRAY[E'\\xdeadbeef'::bytea, NULL]);
  INFO:  (['\xde\xad\xbe\xef', None], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_bytea"
   test_type_conversion_array_bytea 
  ----------------------------------
   {"\\xdeadbeef",NULL}
--- 557,562 ----
*************** return x
*** 681,687 ****
  $$ LANGUAGE plpythonu;
  SELECT * FROM test_type_conversion_array_domain(ARRAY[0, 100]::ordered_pair_domain);
  INFO:  ([0, 100], <type 'list'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_domain"
   test_type_conversion_array_domain 
  -----------------------------------
   {0,100}
--- 622,627 ----
*************** CONTEXT:  PL/Python function "test_type_
*** 689,695 ****
  
  SELECT * FROM test_type_conversion_array_domain(NULL::ordered_pair_domain);
  INFO:  (None, <type 'NoneType'>)
- CONTEXT:  PL/Python function "test_type_conversion_array_domain"
   test_type_conversion_array_domain 
  -----------------------------------
   
--- 629,634 ----
*************** return rv[0]['val']
*** 783,789 ****
  $$;
  SELECT test_prep_bool_output(); -- false
  INFO:  {'val': False}
- CONTEXT:  PL/Python function "test_prep_bool_output"
   test_prep_bool_output 
  -----------------------
   f
--- 722,727 ----
*************** return rv[0]['val']
*** 812,818 ****
  $$;
  SELECT test_prep_bytea_output();
  INFO:  {'val': '\xaa\x00\xbb'}
- CONTEXT:  PL/Python function "test_prep_bytea_output"
   test_prep_bytea_output 
  ------------------------
   \xaa00bb
--- 750,755 ----
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
new file mode 100644
index 5e31737..72ada21
*** a/src/test/regress/expected/copy2.out
--- b/src/test/regress/expected/copy2.out
*************** Check constraints:
*** 447,458 ****
  
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":1}
- CONTEXT:  COPY check_con_tbl, line 1: "1"
  NOTICE:  input = {"f1":null}
- CONTEXT:  COPY check_con_tbl, line 2: "\N"
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":0}
- CONTEXT:  COPY check_con_tbl, line 1: "0"
  ERROR:  new row for relation "check_con_tbl" violates check constraint "check_con_tbl_check"
  DETAIL:  Failing row contains (0).
  CONTEXT:  COPY check_con_tbl, line 1: "0"
--- 447,455 ----
diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
new file mode 100644
index e70c315..05ac0ad
*** a/src/test/regress/expected/event_trigger.out
--- b/src/test/regress/expected/event_trigger.out
*************** drop cascades to table schema_one.table_
*** 234,248 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
--- 234,243 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
! SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
*************** drop cascades to table schema_one.table_
*** 255,277 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object schema_one.table_three of type table cannot be dropped
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
--- 250,261 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  NOTICE:  table "schema_one_table_one" does not exist, skipping
  NOTICE:  table "schema_one_table two" does not exist, skipping
  NOTICE:  table "schema_one_table_three" does not exist, skipping
  ERROR:  object schema_one.table_three of type table cannot be dropped
+ CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
*************** drop cascades to table schema_one.table_
*** 283,304 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
       type     |   schema   |               object                
  --------------+------------+-------------------------------------
--- 267,276 ----
*************** SELECT * FROM dropped_objects WHERE sche
*** 329,336 ****
  
  DROP OWNED BY regression_bob;
  NOTICE:  schema "audit_tbls" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_one_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE type = 'schema';
    type  | schema |   object   
  --------+--------+------------
--- 301,306 ----
*************** insert into rewriteme
*** 402,409 ****
--- 372,381 ----
       select x * 1.001 from generate_series(1, 500) as t(x);
  alter table rewriteme alter column foo type numeric;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  alter table rewriteme add column baz int default 0;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  -- test with more than one reason to rewrite a single table
  CREATE OR REPLACE FUNCTION test_evtrig_no_rewrite() RETURNS event_trigger
  LANGUAGE plpgsql AS $$
diff --git a/src/test/regress/expected/plancache.out b/src/test/regress/expected/plancache.out
new file mode 100644
index 864f70f..3f3db33
*** a/src/test/regress/expected/plancache.out
--- b/src/test/regress/expected/plancache.out
*************** begin
*** 234,241 ****
  end$$ language plpgsql;
  select cachebug();
  NOTICE:  table "temptable" does not exist, skipping
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 234,239 ----
*************** NOTICE:  3
*** 246,253 ****
  
  select cachebug();
  NOTICE:  drop cascades to view vv
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 244,249 ----
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
new file mode 100644
index 7ce5415..a19424d
*** a/src/test/regress/expected/plpgsql.out
--- b/src/test/regress/expected/plpgsql.out
*************** ERROR:  duplicate key value violates uni
*** 1518,1544 ****
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
--- 1518,1552 ----
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 47 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 77 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_biu() line 12 at RAISE
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_bd() line 12 at RAISE
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 8 at RAISE
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 14 at RAISE
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
*************** NOTICE:  should see this
*** 1963,1968 ****
--- 1971,1977 ----
  NOTICE:  should see this only if -100 <> 0
  NOTICE:  should see this only if -100 fits in smallint
  ERROR:  -100 is less than zero
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 12 at RAISE
  create function trap_matching_test(int) returns int as $$
  declare x int;
  	sx smallint;
*************** begin
*** 2066,2079 ****
  end$$ language plpgsql;
  select test_variable_storage();
  NOTICE:  should see this
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 <> 0
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 fits in smallint
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
   test_variable_storage 
  -----------------------
   123456789012
--- 2075,2082 ----
*************** DETAIL:  some detail info
*** 4052,4057 ****
--- 4055,4061 ----
  HINT:  some hint
  ERROR:  1 2 3
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 5 at RAISE
  -- Since we can't actually see the thrown SQLSTATE in default psql output,
  -- test it like this; this also tests re-RAISE
  create or replace function raise_test() returns void as $$
*************** select raise_test();
*** 4068,4073 ****
--- 4072,4078 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise 'check me'
*************** select raise_test();
*** 4082,4087 ****
--- 4087,4093 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- SQLSTATE specification in WHEN
  create or replace function raise_test() returns void as $$
  begin
*************** select raise_test();
*** 4097,4102 ****
--- 4103,4109 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using detail = 'some detail info';
*************** select raise_test();
*** 4110,4115 ****
--- 4117,4123 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: division_by_zero
  ERROR:  division_by_zero
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero;
*************** end;
*** 4117,4122 ****
--- 4125,4131 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  division_by_zero
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise sqlstate '1234F';
*************** end;
*** 4124,4129 ****
--- 4133,4139 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  1234F
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using message = 'custom' || ' message';
*************** end;
*** 4131,4136 ****
--- 4141,4147 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise using message = 'custom' || ' message', errcode = '22012';
*************** end;
*** 4138,4143 ****
--- 4149,4155 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- conflict on message
  create or replace function raise_test() returns void as $$
  begin
*************** $$ language plpgsql;
*** 4254,4259 ****
--- 4266,4272 ----
  select raise_test();
  NOTICE:  22012
  ERROR:  substitute message
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  drop function raise_test();
  -- test passing column_name, constraint_name, datatype_name, table_name
  -- and schema_name error fields
*************** LINE 1: SELECT 'foo\\bar\041baz'
*** 4744,4750 ****
                 ^
  HINT:  Use the escape string syntax for backslashes, e.g., E'\\'.
  QUERY:  SELECT 'foo\\bar\041baz'
- CONTEXT:  PL/pgSQL function strtest() line 4 at RETURN
     strtest   
  -------------
   foo\bar!baz
--- 4757,4762 ----
*************** $$ language plpgsql;
*** 5260,5281 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5272,5285 ----
*************** NOTICE:  outer_func() done
*** 5286,5307 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5290,5303 ----
*************** $$ language plpgsql;
*** 5358,5379 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5354,5367 ----
*************** NOTICE:  outer_func() done
*** 5384,5405 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5372,5385 ----
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
new file mode 100644
index c0cd9fa..88bdc2c
*** a/src/test/regress/expected/privileges.out
--- b/src/test/regress/expected/privileges.out
*************** GRANT regressgroup2 TO regressuser5; --
*** 1023,1029 ****
  ERROR:  must have admin option on role "regressgroup2"
  SELECT dogrant_ok();			-- ok: SECURITY DEFINER conveys ADMIN
  NOTICE:  role "regressuser5" is already a member of role "regressgroup2"
- CONTEXT:  SQL function "dogrant_ok" statement 1
   dogrant_ok 
  ------------
   
--- 1023,1028 ----
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
new file mode 100644
index 6dabe50..00ef421
*** a/src/test/regress/expected/rangefuncs.out
--- b/src/test/regress/expected/rangefuncs.out
*************** create trigger tnoticetrigger after inse
*** 1704,1712 ****
  execute procedure noticetrigger();
  select insert_tt2('foolme','barme') limit 1;
  NOTICE:  noticetrigger 11 foolme
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 12 barme
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           11
--- 1704,1710 ----
*************** create rule insert_tt_rule as on insert
*** 1735,1743 ****
    insert into tt_log values(new.*);
  select insert_tt2('foollog','barlog') limit 1;
  NOTICE:  noticetrigger 13 foollog
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 14 barlog
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           13
--- 1733,1739 ----
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
new file mode 100644
index 3b32e8f..cd43e46
*** a/src/test/regress/expected/triggers.out
--- b/src/test/regress/expected/triggers.out
*************** NOTICE:  main_view BEFORE INSERT STATEME
*** 958,968 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (20,30)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
  INSERT 0 1
  INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
--- 958,964 ----
*************** NOTICE:  main_view BEFORE INSERT STATEME
*** 970,980 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (21,31)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
   a  | b  
  ----+----
--- 966,972 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 988,1004 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 0
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 980,988 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1006,1022 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a | b 
  ---+---
--- 990,998 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1031,1050 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 1
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 1007,1016 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1052,1071 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a  | b  
  ----+----
--- 1018,1027 ----
*************** INSERT 0 1
*** 1277,1282 ****
--- 1233,1239 ----
  -- UPDATE .. RETURNING
  UPDATE city_view SET country_name = 'Japon' WHERE city_name = 'Tokyo'; -- error
  ERROR:  No such country: "Japon"
+ CONTEXT:  PL/pgSQL function city_update() line 9 at RAISE
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Takyo'; -- no match
  UPDATE 0
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Tokyo' RETURNING *; -- OK
*************** select pg_trigger_depth();
*** 1489,1514 ****
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  SQLSTATE = U9999: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  ERROR:  U9999
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
--- 1446,1458 ----
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  NOTICE:  SQLSTATE = U9999: depth = 2
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  ERROR:  U9999
! CONTEXT:  PL/pgSQL function depth_c_tf() line 5 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
*************** select pg_trigger_depth();
*** 1521,1541 ****
  insert into depth_a values (2);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_a_tr: depth = 1
  select pg_trigger_depth();
   pg_trigger_depth 
--- 1465,1473 ----
diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
new file mode 100644
index 9b2d264..5691e47
*** a/src/test/regress/expected/xml.out
--- b/src/test/regress/expected/xml.out
*************** SELECT xpath('/*', '<relativens xmlns=''
*** 934,940 ****
  WARNING:  line 1: xmlns: URI relative is not absolute
  <relativens xmlns='relative'/>
                              ^
- CONTEXT:  SQL function "xpath" statement 1
                  xpath                 
  --------------------------------------
   {"<relativens xmlns=\"relative\"/>"}
--- 934,939 ----

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
new file mode 100644
index 6181a61..7168809
*** a/src/bin/psql/command.c
--- b/src/bin/psql/command.c
*************** SyncVariables(void)
*** 2029,2034 ****
--- 2029,2035 ----
  
  	/* send stuff to it, too */
  	PQsetErrorVerbosity(pset.db, pset.verbosity);
+ 	PQsetErrorContextVisibility(pset.db, pset.show_context);
  }
  
  /*
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
new file mode 100644
index d3e3114..0bc97de
*** a/src/bin/psql/help.c
--- b/src/bin/psql/help.c
*************** helpVariables(unsigned short int pager)
*** 307,313 ****
  {
  	FILE	   *output;
  
! 	output = PageOutput(85, pager ? &(pset.popt.topt) : NULL);
  
  	fprintf(output, _("List of specially treated variables.\n"));
  
--- 307,313 ----
  {
  	FILE	   *output;
  
! 	output = PageOutput(86, pager ? &(pset.popt.topt) : NULL);
  
  	fprintf(output, _("List of specially treated variables.\n"));
  
*************** helpVariables(unsigned short int pager)
*** 339,344 ****
--- 339,345 ----
  	fprintf(output, _("  PROMPT2            specify the prompt used when a statement continues from a previous line\n"));
  	fprintf(output, _("  PROMPT3            specify the prompt used during COPY ... FROM STDIN\n"));
  	fprintf(output, _("  QUIET              run quietly (same as -q option)\n"));
+ 	fprintf(output, _("  SHOW_CONTEXT       when a error context will be displayed [always, error, none]\n"));
  	fprintf(output, _("  SINGLELINE         end of line terminates SQL command mode (same as -S option)\n"));
  	fprintf(output, _("  SINGLESTEP         single-step mode (same as -s option)\n"));
  	fprintf(output, _("  USER               the currently connected database user\n"));
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
new file mode 100644
index d34dc28..5b49059
*** a/src/bin/psql/settings.h
--- b/src/bin/psql/settings.h
*************** typedef struct _psqlSettings
*** 129,134 ****
--- 129,135 ----
  	const char *prompt2;
  	const char *prompt3;
  	PGVerbosity verbosity;		/* current error verbosity level */
+ 	bool		show_context;
  } PsqlSettings;
  
  extern PsqlSettings pset;
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
new file mode 100644
index 28ba75a..534c914
*** a/src/bin/psql/startup.c
--- b/src/bin/psql/startup.c
*************** main(int argc, char *argv[])
*** 157,162 ****
--- 157,163 ----
  	SetVariable(pset.vars, "PROMPT1", DEFAULT_PROMPT1);
  	SetVariable(pset.vars, "PROMPT2", DEFAULT_PROMPT2);
  	SetVariable(pset.vars, "PROMPT3", DEFAULT_PROMPT3);
+ 	SetVariable(pset.vars, "SHOW_CONTEXT", "error");;
  
  	parse_psql_options(argc, argv, &options);
  
*************** verbosity_hook(const char *newval)
*** 868,873 ****
--- 869,895 ----
  		PQsetErrorVerbosity(pset.db, pset.verbosity);
  }
  
+ static void
+ show_context_hook(const char *newval)
+ {
+ 	if (newval == NULL)
+ 		pset.show_context = PQSHOW_CONTEXT_ERROR;
+ 	else if (pg_strcasecmp(newval, "always") == 0)
+ 		pset.show_context = PQSHOW_CONTEXT_ALL;
+ 	else if (pg_strcasecmp(newval, "error") == 0)
+ 		pset.show_context = PQSHOW_CONTEXT_ERROR;
+ 	else if (pg_strcasecmp(newval, "none") == 0)
+ 		pset.show_context = PQSHOW_CONTEXT_NONE;
+ 	else
+ 	{
+ 		psql_error("unrecognized value \"%s\" for \"%s\"; assuming \"%s\"\n",
+ 				   newval, "SHOW_CONTEXT", "error");
+ 		pset.show_context = PQSHOW_CONTEXT_ERROR;
+ 	}
+ 
+ 	if (pset.db)
+ 		PQsetErrorContextVisibility(pset.db, pset.show_context);
+ }
  
  static void
  EstablishVariableSpace(void)
*************** EstablishVariableSpace(void)
*** 889,892 ****
--- 911,915 ----
  	SetVariableAssignHook(pset.vars, "PROMPT2", prompt2_hook);
  	SetVariableAssignHook(pset.vars, "PROMPT3", prompt3_hook);
  	SetVariableAssignHook(pset.vars, "VERBOSITY", verbosity_hook);
+ 	SetVariableAssignHook(pset.vars, "SHOW_CONTEXT", show_context_hook);
  }
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
new file mode 100644
index 9596af6..681e561
*** a/src/bin/psql/tab-complete.c
--- b/src/bin/psql/tab-complete.c
*************** psql_completion(const char *text, int st
*** 3934,3939 ****
--- 3934,3946 ----
  			COMPLETE_WITH_LIST_CS(boolean_value_list);
  		else if (strcmp(prev_wd, "SINGLESTEP") == 0)
  			COMPLETE_WITH_LIST_CS(boolean_value_list);
+ 		else if (strcmp(prev_wd, "SHOW_CONTEXT") == 0)
+ 		{
+ 			static const char *const my_list[] =
+ 			{"always", "error", "none", NULL};
+ 
+ 			COMPLETE_WITH_LIST_CS(my_list);
+ 		}
  		else if (strcmp(prev_wd, "VERBOSITY") == 0)
  		{
  			static const char *const my_list[] =
diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt
new file mode 100644
index 4a21bf1..0bbcae5
*** a/src/interfaces/libpq/exports.txt
--- b/src/interfaces/libpq/exports.txt
*************** PQsslInUse                166
*** 169,171 ****
--- 169,172 ----
  PQsslStruct               167
  PQsslAttributes           168
  PQsslAttribute            169
+ PQsetErrorContextVisibility 170
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
new file mode 100644
index a45f4cb..81d6eb4
*** a/src/interfaces/libpq/fe-connect.c
--- b/src/interfaces/libpq/fe-connect.c
*************** PQsetErrorVerbosity(PGconn *conn, PGVerb
*** 5553,5558 ****
--- 5553,5570 ----
  	return old;
  }
  
+ PGContextVisibility
+ PQsetErrorContextVisibility(PGconn *conn, PGContextVisibility show_context)
+ {
+ 	bool	old;
+ 
+ 	if (!conn)
+ 		return PQSHOW_CONTEXT_ERROR;;
+ 	old = conn->show_context;
+ 	conn->show_context = show_context;
+ 	return old;
+ }
+ 
  void
  PQtrace(PGconn *conn, FILE *debug_port)
  {
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
new file mode 100644
index dbc0d89..38fa9ad
*** a/src/interfaces/libpq/fe-protocol3.c
--- b/src/interfaces/libpq/fe-protocol3.c
*************** pqGetErrorNotice3(PGconn *conn, bool isE
*** 935,941 ****
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("QUERY:  %s\n"), val);
  		val = PQresultErrorField(res, PG_DIAG_CONTEXT);
! 		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("CONTEXT:  %s\n"), val);
  	}
  	if (conn->verbosity == PQERRORS_VERBOSE)
--- 935,942 ----
  		if (val)
  			appendPQExpBuffer(&workBuf, libpq_gettext("QUERY:  %s\n"), val);
  		val = PQresultErrorField(res, PG_DIAG_CONTEXT);
! 		if (val && (conn->show_context == PQSHOW_CONTEXT_ALL
! 				 || (conn->show_context == PQSHOW_CONTEXT_ERROR && isError)))
  			appendPQExpBuffer(&workBuf, libpq_gettext("CONTEXT:  %s\n"), val);
  	}
  	if (conn->verbosity == PQERRORS_VERBOSE)
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
new file mode 100644
index a73eae2..030ad59
*** a/src/interfaces/libpq/libpq-fe.h
--- b/src/interfaces/libpq/libpq-fe.h
*************** typedef enum
*** 110,115 ****
--- 110,122 ----
  	PQERRORS_VERBOSE			/* all the facts, ma'am */
  } PGVerbosity;
  
+ typedef enum
+ {
+ 	PQSHOW_CONTEXT_ALL,		/* errors, warnings, notices */
+ 	PQSHOW_CONTEXT_ERROR,		/* errors only, default */
+ 	PQSHOW_CONTEXT_NONE		/* hide error context */
+ } PGContextVisibility;
+ 
  /*
   * PGPing - The ordering of this enum should not be altered because the
   * values are exposed externally via pg_isready.
*************** extern void PQinitOpenSSL(int do_ssl, in
*** 337,342 ****
--- 344,353 ----
  /* Set verbosity for PQerrorMessage and PQresultErrorMessage */
  extern PGVerbosity PQsetErrorVerbosity(PGconn *conn, PGVerbosity verbosity);
  
+ /* Hide a context of error message */
+ extern PGContextVisibility PQsetErrorContextVisibility(PGconn *conn,
+ 						    PGContextVisibility show_context);
+ 
  /* Enable/disable tracing */
  extern void PQtrace(PGconn *conn, FILE *debug_port);
  extern void PQuntrace(PGconn *conn);
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
new file mode 100644
index 2175957..0c5e4b5
*** a/src/interfaces/libpq/libpq-int.h
--- b/src/interfaces/libpq/libpq-int.h
*************** struct pg_conn
*** 395,400 ****
--- 395,401 ----
  	bool		std_strings;	/* standard_conforming_strings */
  	PGVerbosity verbosity;		/* error/notice message verbosity */
  	PGlobjfuncs *lobjfuncs;		/* private state for large-object access fns */
+ 	PGContextVisibility	show_context;	/* controll a error context visibility */
  
  	/* Buffer for data received from backend and not yet processed */
  	char	   *inBuffer;		/* currently allocated buffer */
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
new file mode 100644
index b7f6360..60e5d8d
*** a/src/pl/plpgsql/src/pl_exec.c
--- b/src/pl/plpgsql/src/pl_exec.c
***************
*** 42,49 ****
  #include "utils/typcache.h"
  
  
- static const char *const raise_skip_msg = "RAISE";
- 
  typedef struct
  {
  	int			nargs;			/* number of arguments */
--- 42,47 ----
*************** plpgsql_exec_error_callback(void *arg)
*** 957,966 ****
  {
  	PLpgSQL_execstate *estate = (PLpgSQL_execstate *) arg;
  
- 	/* if we are doing RAISE, don't report its location */
- 	if (estate->err_text == raise_skip_msg)
- 		return;
- 
  	if (estate->err_text != NULL)
  	{
  		/*
--- 955,960 ----
*************** exec_stmt_raise(PLpgSQL_execstate *estat
*** 3176,3183 ****
  	/*
  	 * Throw the error (may or may not come back)
  	 */
- 	estate->err_text = raise_skip_msg;	/* suppress traceback of raise */
- 
  	ereport(stmt->elog_level,
  			(err_code ? errcode(err_code) : 0,
  			 errmsg_internal("%s", err_message),
--- 3170,3175 ----
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
new file mode 100644
index 5e31737..72ada21
*** a/src/test/regress/expected/copy2.out
--- b/src/test/regress/expected/copy2.out
*************** Check constraints:
*** 447,458 ****
  
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":1}
- CONTEXT:  COPY check_con_tbl, line 1: "1"
  NOTICE:  input = {"f1":null}
- CONTEXT:  COPY check_con_tbl, line 2: "\N"
  copy check_con_tbl from stdin;
  NOTICE:  input = {"f1":0}
- CONTEXT:  COPY check_con_tbl, line 1: "0"
  ERROR:  new row for relation "check_con_tbl" violates check constraint "check_con_tbl_check"
  DETAIL:  Failing row contains (0).
  CONTEXT:  COPY check_con_tbl, line 1: "0"
--- 447,455 ----
diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
new file mode 100644
index e70c315..05ac0ad
*** a/src/test/regress/expected/event_trigger.out
--- b/src/test/regress/expected/event_trigger.out
*************** drop cascades to table schema_one.table_
*** 234,248 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
--- 234,243 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  ERROR:  object audit_tbls.schema_two_table_three of type table cannot be dropped
! CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
! SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
  PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  DELETE FROM undroppable_objs WHERE object_identity = 'audit_tbls.schema_two_table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
*************** drop cascades to table schema_one.table_
*** 255,277 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  ERROR:  object schema_one.table_three of type table cannot be dropped
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
--- 250,261 ----
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
  NOTICE:  table "schema_one_table_one" does not exist, skipping
  NOTICE:  table "schema_one_table two" does not exist, skipping
  NOTICE:  table "schema_one_table_three" does not exist, skipping
  ERROR:  object schema_one.table_three of type table cannot be dropped
+ CONTEXT:  PL/pgSQL function undroppable() line 14 at RAISE
  DELETE FROM undroppable_objs WHERE object_identity = 'schema_one.table_three';
  DROP SCHEMA schema_one, schema_two CASCADE;
  NOTICE:  drop cascades to 7 other objects
*************** drop cascades to table schema_one.table_
*** 283,304 ****
  drop cascades to table schema_one."table two"
  drop cascades to table schema_one.table_three
  NOTICE:  table "schema_two_table_two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "audit_tbls_schema_two_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
- SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_two_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_one" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_one"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table two" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls."schema_one_table two""
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  NOTICE:  table "schema_one_table_three" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.schema_one_table_three"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE schema IS NULL OR schema <> 'pg_toast';
       type     |   schema   |               object                
  --------------+------------+-------------------------------------
--- 267,276 ----
*************** SELECT * FROM dropped_objects WHERE sche
*** 329,336 ****
  
  DROP OWNED BY regression_bob;
  NOTICE:  schema "audit_tbls" does not exist, skipping
- CONTEXT:  SQL statement "DROP TABLE IF EXISTS audit_tbls.audit_tbls_schema_one_table_two"
- PL/pgSQL function test_evtrig_dropped_objects() line 8 at EXECUTE statement
  SELECT * FROM dropped_objects WHERE type = 'schema';
    type  | schema |   object   
  --------+--------+------------
--- 301,306 ----
*************** insert into rewriteme
*** 402,409 ****
--- 372,381 ----
       select x * 1.001 from generate_series(1, 500) as t(x);
  alter table rewriteme alter column foo type numeric;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  alter table rewriteme add column baz int default 0;
  ERROR:  I'm sorry Sir, No Rewrite Allowed.
+ CONTEXT:  PL/pgSQL function test_evtrig_no_rewrite() line 3 at RAISE
  -- test with more than one reason to rewrite a single table
  CREATE OR REPLACE FUNCTION test_evtrig_no_rewrite() RETURNS event_trigger
  LANGUAGE plpgsql AS $$
diff --git a/src/test/regress/expected/plancache.out b/src/test/regress/expected/plancache.out
new file mode 100644
index 864f70f..3f3db33
*** a/src/test/regress/expected/plancache.out
--- b/src/test/regress/expected/plancache.out
*************** begin
*** 234,241 ****
  end$$ language plpgsql;
  select cachebug();
  NOTICE:  table "temptable" does not exist, skipping
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 234,239 ----
*************** NOTICE:  3
*** 246,253 ****
  
  select cachebug();
  NOTICE:  drop cascades to view vv
- CONTEXT:  SQL statement "drop table if exists temptable cascade"
- PL/pgSQL function cachebug() line 4 at SQL statement
  NOTICE:  1
  NOTICE:  2
  NOTICE:  3
--- 244,249 ----
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
new file mode 100644
index 31182db..97105e5
*** a/src/test/regress/expected/plpgsql.out
--- b/src/test/regress/expected/plpgsql.out
*************** ERROR:  duplicate key value violates uni
*** 1518,1544 ****
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
--- 1518,1552 ----
  DETAIL:  Key (name)=(PF1_1) already exists.
  update PSlot set backlink = 'WS.not.there' where slotname = 'PS.base.a1';
  ERROR:  WS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set backlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal backlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_backlink_set(character,character) line 47 at RAISE
! PL/pgSQL function tg_backlink_a() line 17 at assignment
  update PSlot set slotlink = 'PS.not.there' where slotname = 'PS.base.a1';
  ERROR:  PS.not.there         does not exist
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 30 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  update PSlot set slotlink = 'XX.illegal' where slotname = 'PS.base.a1';
  ERROR:  illegal slotlink beginning with XX
! CONTEXT:  PL/pgSQL function tg_slotlink_set(character,character) line 77 at RAISE
! PL/pgSQL function tg_slotlink_a() line 17 at assignment
  insert into HSlot values ('HS', 'base.hub1', 1, '');
  ERROR:  duplicate key value violates unique constraint "hslot_name"
  DETAIL:  Key (slotname)=(HS.base.hub1.1      ) already exists.
  insert into HSlot values ('HS', 'base.hub1', 20, '');
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_biu() line 12 at RAISE
  delete from HSlot;
  ERROR:  no manual manipulation of HSlot
+ CONTEXT:  PL/pgSQL function tg_hslot_bd() line 12 at RAISE
  insert into IFace values ('IF', 'notthere', 'eth0', '');
  ERROR:  system "notthere" does not exist
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 8 at RAISE
  insert into IFace values ('IF', 'orion', 'ethernet_interface_name_too_long', '');
  ERROR:  IFace slotname "IF.orion.ethernet_interface_name_too_long" too long (20 char max)
+ CONTEXT:  PL/pgSQL function tg_iface_biu() line 14 at RAISE
  --
  -- The following tests are unrelated to the scenario outlined above;
  -- they merely exercise specific parts of PL/pgSQL
*************** NOTICE:  should see this
*** 1963,1968 ****
--- 1971,1977 ----
  NOTICE:  should see this only if -100 <> 0
  NOTICE:  should see this only if -100 fits in smallint
  ERROR:  -100 is less than zero
+ CONTEXT:  PL/pgSQL function trap_zero_divide(integer) line 12 at RAISE
  create function trap_matching_test(int) returns int as $$
  declare x int;
  	sx smallint;
*************** begin
*** 2066,2079 ****
  end$$ language plpgsql;
  select test_variable_storage();
  NOTICE:  should see this
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 <> 0
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
  NOTICE:  should see this only if -100 fits in smallint
- CONTEXT:  SQL statement "SELECT trap_zero_divide(-100)"
- PL/pgSQL function test_variable_storage() line 8 at PERFORM
   test_variable_storage 
  -----------------------
   123456789012
--- 2075,2082 ----
*************** DETAIL:  some detail info
*** 4052,4057 ****
--- 4055,4061 ----
  HINT:  some hint
  ERROR:  1 2 3
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 5 at RAISE
  -- Since we can't actually see the thrown SQLSTATE in default psql output,
  -- test it like this; this also tests re-RAISE
  create or replace function raise_test() returns void as $$
*************** select raise_test();
*** 4068,4073 ****
--- 4072,4078 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise 'check me'
*************** select raise_test();
*** 4082,4087 ****
--- 4087,4093 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- SQLSTATE specification in WHEN
  create or replace function raise_test() returns void as $$
  begin
*************** select raise_test();
*** 4097,4102 ****
--- 4103,4109 ----
  NOTICE:  SQLSTATE: 1234F SQLERRM: check me
  ERROR:  check me
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using detail = 'some detail info';
*************** select raise_test();
*** 4110,4115 ****
--- 4117,4123 ----
  NOTICE:  SQLSTATE: 22012 SQLERRM: division_by_zero
  ERROR:  division_by_zero
  DETAIL:  some detail info
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero;
*************** end;
*** 4117,4122 ****
--- 4125,4131 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  division_by_zero
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise sqlstate '1234F';
*************** end;
*** 4124,4129 ****
--- 4133,4139 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  1234F
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise division_by_zero using message = 'custom' || ' message';
*************** end;
*** 4131,4136 ****
--- 4141,4147 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  create or replace function raise_test() returns void as $$
  begin
    raise using message = 'custom' || ' message', errcode = '22012';
*************** end;
*** 4138,4143 ****
--- 4149,4155 ----
  $$ language plpgsql;
  select raise_test();
  ERROR:  custom message
+ CONTEXT:  PL/pgSQL function raise_test() line 3 at RAISE
  -- conflict on message
  create or replace function raise_test() returns void as $$
  begin
*************** $$ language plpgsql;
*** 4254,4259 ****
--- 4266,4272 ----
  select raise_test();
  NOTICE:  22012
  ERROR:  substitute message
+ CONTEXT:  PL/pgSQL function raise_test() line 7 at RAISE
  drop function raise_test();
  -- test passing column_name, constraint_name, datatype_name, table_name
  -- and schema_name error fields
*************** LINE 1: SELECT 'foo\\bar\041baz'
*** 4806,4812 ****
                 ^
  HINT:  Use the escape string syntax for backslashes, e.g., E'\\'.
  QUERY:  SELECT 'foo\\bar\041baz'
- CONTEXT:  PL/pgSQL function strtest() line 4 at RETURN
     strtest   
  -------------
   foo\bar!baz
--- 4819,4824 ----
*************** $$ language plpgsql;
*** 5322,5343 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5334,5347 ----
*************** NOTICE:  outer_func() done
*** 5348,5369 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 4 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 7 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5352,5365 ----
*************** $$ language plpgsql;
*** 5420,5441 ****
  select outer_outer_func(10);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5416,5429 ----
*************** NOTICE:  outer_func() done
*** 5446,5467 ****
  select outer_outer_func(20);
  NOTICE:  calling down into outer_func()
  NOTICE:  calling down into inner_func()
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 10 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  ***PL/pgSQL function inner_func(integer) line 15 at GET DIAGNOSTICS
  PL/pgSQL function outer_func(integer) line 6 at assignment
  PL/pgSQL function outer_outer_func(integer) line 6 at assignment***
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  lets make sure we didnt break anything
- CONTEXT:  PL/pgSQL function outer_func(integer) line 6 at assignment
- PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  inner_func() done
- CONTEXT:  PL/pgSQL function outer_outer_func(integer) line 6 at assignment
  NOTICE:  outer_func() done
   outer_outer_func 
  ------------------
--- 5434,5447 ----
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
new file mode 100644
index c0cd9fa..88bdc2c
*** a/src/test/regress/expected/privileges.out
--- b/src/test/regress/expected/privileges.out
*************** GRANT regressgroup2 TO regressuser5; --
*** 1023,1029 ****
  ERROR:  must have admin option on role "regressgroup2"
  SELECT dogrant_ok();			-- ok: SECURITY DEFINER conveys ADMIN
  NOTICE:  role "regressuser5" is already a member of role "regressgroup2"
- CONTEXT:  SQL function "dogrant_ok" statement 1
   dogrant_ok 
  ------------
   
--- 1023,1028 ----
diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out
new file mode 100644
index 6dabe50..00ef421
*** a/src/test/regress/expected/rangefuncs.out
--- b/src/test/regress/expected/rangefuncs.out
*************** create trigger tnoticetrigger after inse
*** 1704,1712 ****
  execute procedure noticetrigger();
  select insert_tt2('foolme','barme') limit 1;
  NOTICE:  noticetrigger 11 foolme
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 12 barme
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           11
--- 1704,1710 ----
*************** create rule insert_tt_rule as on insert
*** 1735,1743 ****
    insert into tt_log values(new.*);
  select insert_tt2('foollog','barlog') limit 1;
  NOTICE:  noticetrigger 13 foollog
- CONTEXT:  SQL function "insert_tt2" statement 1
  NOTICE:  noticetrigger 14 barlog
- CONTEXT:  SQL function "insert_tt2" statement 1
   insert_tt2 
  ------------
           13
--- 1733,1739 ----
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
new file mode 100644
index 3b32e8f..cd43e46
*** a/src/test/regress/expected/triggers.out
--- b/src/test/regress/expected/triggers.out
*************** NOTICE:  main_view BEFORE INSERT STATEME
*** 958,968 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (20,30)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
  INSERT 0 1
  INSERT INTO main_view VALUES (21, 31) RETURNING a, b;
--- 958,964 ----
*************** NOTICE:  main_view BEFORE INSERT STATEME
*** 970,980 ****
  NOTICE:  main_view INSTEAD OF INSERT ROW (instead_of_ins)
  NOTICE:  NEW: (21,31)
  NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  trigger_func(after_ins_stmt) called: action = INSERT, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "INSERT INTO main_table VALUES (NEW.a, NEW.b)"
- PL/pgSQL function view_trigger() line 17 at SQL statement
  NOTICE:  main_view AFTER INSERT STATEMENT (after_view_ins_stmt)
   a  | b  
  ----+----
--- 966,972 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 988,1004 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 0
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 980,988 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1006,1022 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(before_upd_a_row) called: action = UPDATE, when = BEFORE, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a | b 
  ---+---
--- 990,998 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1031,1050 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (20,30), NEW: (20,31)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
  UPDATE 1
  UPDATE main_view SET b = 32 WHERE a = 21 AND b = 31 RETURNING a, b;
--- 1007,1016 ----
*************** NOTICE:  main_view BEFORE UPDATE STATEME
*** 1052,1071 ****
  NOTICE:  main_view INSTEAD OF UPDATE ROW (instead_of_upd)
  NOTICE:  OLD: (21,31), NEW: (21,32)
  NOTICE:  trigger_func(before_upd_a_stmt) called: action = UPDATE, when = BEFORE, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_a_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_row) called: action = UPDATE, when = AFTER, level = ROW
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_b_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  trigger_func(after_upd_stmt) called: action = UPDATE, when = AFTER, level = STATEMENT
- CONTEXT:  SQL statement "UPDATE main_table SET a = NEW.a, b = NEW.b WHERE a = OLD.a AND b = OLD.b"
- PL/pgSQL function view_trigger() line 23 at SQL statement
  NOTICE:  main_view AFTER UPDATE STATEMENT (after_view_upd_stmt)
   a  | b  
  ----+----
--- 1018,1027 ----
*************** INSERT 0 1
*** 1277,1282 ****
--- 1233,1239 ----
  -- UPDATE .. RETURNING
  UPDATE city_view SET country_name = 'Japon' WHERE city_name = 'Tokyo'; -- error
  ERROR:  No such country: "Japon"
+ CONTEXT:  PL/pgSQL function city_update() line 9 at RAISE
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Takyo'; -- no match
  UPDATE 0
  UPDATE city_view SET country_name = 'Japan' WHERE city_name = 'Tokyo' RETURNING *; -- OK
*************** select pg_trigger_depth();
*** 1489,1514 ****
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  SQLSTATE = U9999: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (1)"
- PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  ERROR:  U9999
! CONTEXT:  SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
--- 1446,1458 ----
  insert into depth_a values (1);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  NOTICE:  SQLSTATE = U9999: depth = 2
  NOTICE:  depth_b_tr: depth = 2
  NOTICE:  depth_c_tr: depth = 3
  ERROR:  U9999
! CONTEXT:  PL/pgSQL function depth_c_tf() line 5 at RAISE
! SQL statement "insert into depth_c values (1)"
  PL/pgSQL function depth_b_tf() line 12 at EXECUTE statement
  SQL statement "insert into depth_b values (new.id)"
  PL/pgSQL function depth_a_tf() line 4 at SQL statement
*************** select pg_trigger_depth();
*** 1521,1541 ****
  insert into depth_a values (2);
  NOTICE:  depth_a_tr: depth = 1
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_c_tr: depth = 3
- CONTEXT:  SQL statement "insert into depth_c values (2)"
- PL/pgSQL function depth_b_tf() line 5 at EXECUTE statement
- SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_b_tr: depth = 2
- CONTEXT:  SQL statement "insert into depth_b values (new.id)"
- PL/pgSQL function depth_a_tf() line 4 at SQL statement
  NOTICE:  depth_a_tr: depth = 1
  select pg_trigger_depth();
   pg_trigger_depth 
--- 1465,1473 ----
diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
new file mode 100644
index 9b2d264..5691e47
*** a/src/test/regress/expected/xml.out
--- b/src/test/regress/expected/xml.out
*************** SELECT xpath('/*', '<relativens xmlns=''
*** 934,940 ****
  WARNING:  line 1: xmlns: URI relative is not absolute
  <relativens xmlns='relative'/>
                              ^
- CONTEXT:  SQL function "xpath" statement 1
                  xpath                 
  --------------------------------------
   {"<relativens xmlns=\"relative\"/>"}
--- 934,939 ----

diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index cab9e6e..5e2ff09 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -2725,6 +2725,12 @@ print_troff_ms_vertical(const printTableContent *cont, FILE *fout)
 /* Public functions		*/
 /********************************/
 
+#ifdef USE_ASSERT_CHECKING
+#define MAX_PAGEOUTPUT_LINES 1000
+#define MAX_PAGEOUTPUT_BUF (1000 * 80 * 2)
+static char *PageOutputBuf;
+static int expected_lines;
+#endif
 
 /*
  * PageOutput
@@ -2770,6 +2776,21 @@ PageOutput(int lines, const printTableOpt *topt)
 #endif
 	}
 
+#ifdef USE_ASSERT_CHECKING
+	if (lines < MAX_PAGEOUTPUT_LINES)
+	{
+		fflush(stdout);
+		expected_lines = lines;
+		if (!PageOutputBuf)
+		{
+			PageOutputBuf = pg_malloc0(MAX_PAGEOUTPUT_BUF);
+			setvbuf(stdout, PageOutputBuf, _IOFBF, MAX_PAGEOUTPUT_BUF);
+		} else {
+			memset(PageOutputBuf, MAX_PAGEOUTPUT_BUF, 0);
+		}
+	}
+#endif
+
 	return stdout;
 }
 
@@ -2799,6 +2820,33 @@ ClosePager(FILE *pagerpipe)
 		pqsignal(SIGPIPE, SIG_DFL);
 #endif
 	}
+
+#ifdef USE_ASSERT_CHECKING
+	if (PageOutputBuf && expected_lines)
+	{
+		int n_newlines = 0;
+		int i;
+		for (i=0;i<MAX_PAGEOUTPUT_BUF;i++)
+		{
+			if (PageOutputBuf[i]=='\n')
+			{
+				n_newlines++;
+			}
+		}
+		fprintf(stderr, "Expected %d lines, actually printed %d lines\n",
+				expected_lines, n_newlines);
+		Assert(n_newlines == expected_lines);
+
+		expected_lines = 0;
+		fflush(stdout);
+
+		/* XXX leave this set? not sure. */
+		setbuffer(stdout, NULL, 0);
+		pg_free(PageOutputBuf);
+		PageOutputBuf = 0;
+		
+	}
+#endif
 }
 
 /*

diff --git a/contrib/sepgsql/expected/label.out b/contrib/sepgsql/expected/label.out
index c84aef7..7af5189 100644
--- a/contrib/sepgsql/expected/label.out
+++ b/contrib/sepgsql/expected/label.out
@@ -156,6 +156,7 @@ LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_re
 LOG:  SELinux: allowed { entrypoint } scontext=unconfined_u:unconfined_r:sepgsql_regtest_user_t:s0 tcontext=system_u:object_r:sepgsql_trusted_proc_exec_t:s0 tclass=db_procedure name="function f3()"
 LOG:  SELinux: allowed { transition } scontext=unconfined_u:unconfined_r:sepgsql_regtest_user_t:s0 tcontext=unconfined_u:unconfined_r:sepgsql_trusted_proc_t:s0 tclass=process
 ERROR:  an exception from f3()
+CONTEXT:  PL/pgSQL function f3() line 2 at RAISE
 SELECT f4();			-- failed on domain transition
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_user_t:s0 tcontext=system_u:object_r:sepgsql_nosuch_trusted_proc_exec_t:s0 tclass=db_procedure name="public.f4()"
 LOG:  SELinux: allowed { entrypoint } scontext=unconfined_u:unconfined_r:sepgsql_regtest_user_t:s0 tcontext=system_u:object_r:sepgsql_nosuch_trusted_proc_exec_t:s0 tclass=db_procedure name="function f4()"