Add table_name and table_schema to plpython trigger data, plus docs and regression...

diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index c3f27e844bfe1f975604c699516ed84afa926f0b..ccccf66155db430904befb229a4b59924c4de3f8 100644 (file)
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  PL/Python - Python Procedural Language
@@ -123,6 +123,9 @@ def __plpython_procedure_myfunc_23456():
    AFTER, and UNKNOWN.
    TD["level"] contains one of ROW,
    STATEMENT, and UNKNOWN.
+   TD["name"] contains the trigger name,
+   TD["table_name"] contains the name of the table on which the trigger occurred,
+   TD["table_schema"] contains the schema of the table on which the trigger occurred,
    TD["name"] contains the trigger name, and
    TD["relid"] contains the OID of the table on
    which the trigger occurred.  If the CREATE TRIGGER command

diff --git a/src/pl/plpython/expected/plpython_function.out b/src/pl/plpython/expected/plpython_function.out
index a536ae7fe9a48029a28e1b5ebaa259c858d723a6..d8646b675a2f991517563b927540c1e93ccb7902 100644 (file)
--- a/src/pl/plpython/expected/plpython_function.out
+++ b/src/pl/plpython/expected/plpython_function.out
@@ -115,6 +115,61 @@ CREATE TRIGGER users_update_trig BEFORE UPDATE ON users FOR EACH ROW
    EXECUTE PROCEDURE users_update ('willem');
 CREATE TRIGGER users_delete_trig BEFORE DELETE ON users FOR EACH ROW
    EXECUTE PROCEDURE users_delete ('willem');
+-- dump trigger data
+CREATE TABLE trigger_test
+   (i int, v text );
+CREATE FUNCTION trigger_data() returns trigger language plpythonu as $$
+
+if TD.has_key('relid'):
+   TD['relid'] = "bogus:12345"
+
+for key in sorted(TD.keys()):
+   val = TD[key]
+   plpy.notice("TD[" + key + "] => " + str(val))
+
+return None  
+
+$$;
+CREATE TRIGGER show_trigger_data_trig 
+BEFORE INSERT OR UPDATE OR DELETE ON trigger_test
+FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
+insert into trigger_test values(1,'insert');
+NOTICE:  ("TD[args] => ['23', 'skidoo']",)
+NOTICE:  ('TD[event] => INSERT',)
+NOTICE:  ('TD[level] => ROW',)
+NOTICE:  ('TD[name] => show_trigger_data_trig',)
+NOTICE:  ("TD[new] => {'i': 1, 'v': 'insert'}",)
+NOTICE:  ('TD[old] => None',)
+NOTICE:  ('TD[relid] => bogus:12345',)
+NOTICE:  ('TD[table_name] => trigger_test',)
+NOTICE:  ('TD[table_schema] => public',)
+NOTICE:  ('TD[when] => BEFORE',)
+update trigger_test set v = 'update' where i = 1;
+NOTICE:  ("TD[args] => ['23', 'skidoo']",)
+NOTICE:  ('TD[event] => UPDATE',)
+NOTICE:  ('TD[level] => ROW',)
+NOTICE:  ('TD[name] => show_trigger_data_trig',)
+NOTICE:  ("TD[new] => {'i': 1, 'v': 'update'}",)
+NOTICE:  ("TD[old] => {'i': 1, 'v': 'insert'}",)
+NOTICE:  ('TD[relid] => bogus:12345',)
+NOTICE:  ('TD[table_name] => trigger_test',)
+NOTICE:  ('TD[table_schema] => public',)
+NOTICE:  ('TD[when] => BEFORE',)
+delete from trigger_test;
+NOTICE:  ("TD[args] => ['23', 'skidoo']",)
+NOTICE:  ('TD[event] => DELETE',)
+NOTICE:  ('TD[level] => ROW',)
+NOTICE:  ('TD[name] => show_trigger_data_trig',)
+NOTICE:  ('TD[new] => None',)
+NOTICE:  ("TD[old] => {'i': 1, 'v': 'update'}",)
+NOTICE:  ('TD[relid] => bogus:12345',)
+NOTICE:  ('TD[table_name] => trigger_test',)
+NOTICE:  ('TD[table_schema] => public',)
+NOTICE:  ('TD[when] => BEFORE',)
+      
+DROP TRIGGER show_trigger_data_trig on trigger_test;
+      
+DROP FUNCTION trigger_data();
 -- nested calls
 --
 CREATE FUNCTION nested_call_one(text) RETURNS text

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index dc36c9f88795636d15b10c3e7ff5822e08762a6d..7ac3f89c146cce0a061ba9793130c2bec2185818 100644 (file)
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plpython.c - python as a procedural language for PostgreSQL
  *
- * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.79 2006/04/27 14:18:07 momjian Exp $
+ * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.80 2006/05/26 19:23:09 adunstan Exp $
  *
  *********************************************************************
  */
@@ -560,7 +560,9 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure * proc, HeapTuple *
               *pltevent,
               *pltwhen,
               *pltlevel,
-              *pltrelid;
+              *pltrelid,
+              *plttablename,
+              *plttableschema;
    PyObject   *pltargs,
               *pytnew,
               *pytold;
@@ -584,6 +586,19 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure * proc, HeapTuple *
        Py_DECREF(pltrelid);
        pfree(stroid);
 
+       stroid = SPI_getrelname(tdata->tg_relation);
+       plttablename = PyString_FromString(stroid);
+       PyDict_SetItemString(pltdata, "table_name", plttablename);
+       Py_DECREF(plttablename);
+       pfree(stroid);
+       
+       stroid = SPI_getnspname(tdata->tg_relation);
+       plttableschema = PyString_FromString(stroid);
+       PyDict_SetItemString(pltdata, "table_schema", plttableschema);
+       Py_DECREF(plttableschema);
+       pfree(stroid);
+       
+
        if (TRIGGER_FIRED_BEFORE(tdata->tg_event))
            pltwhen = PyString_FromString("BEFORE");
        else if (TRIGGER_FIRED_AFTER(tdata->tg_event))

diff --git a/src/pl/plpython/sql/plpython_function.sql b/src/pl/plpython/sql/plpython_function.sql
index c5920685d9617889191b6a03aa58d81d7dbec4e1..73b1a6540559d0fd5fae6f35696a13afa3c17486 100644 (file)
--- a/src/pl/plpython/sql/plpython_function.sql
+++ b/src/pl/plpython/sql/plpython_function.sql
@@ -140,6 +140,37 @@ CREATE TRIGGER users_delete_trig BEFORE DELETE ON users FOR EACH ROW
    EXECUTE PROCEDURE users_delete ('willem');
 
 
+
+-- dump trigger data
+
+CREATE TABLE trigger_test
+   (i int, v text );
+
+CREATE FUNCTION trigger_data() returns trigger language plpythonu as $$
+
+if TD.has_key('relid'):
+   TD['relid'] = "bogus:12345"
+
+for key in sorted(TD.keys()):
+   val = TD[key]
+   plpy.notice("TD[" + key + "] => " + str(val))
+
+return None  
+
+$$;
+
+CREATE TRIGGER show_trigger_data_trig 
+BEFORE INSERT OR UPDATE OR DELETE ON trigger_test
+FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
+
+insert into trigger_test values(1,'insert');
+update trigger_test set v = 'update' where i = 1;
+delete from trigger_test;
+      
+DROP TRIGGER show_trigger_data_trig on trigger_test;
+      
+DROP FUNCTION trigger_data();
+
 -- nested calls
 --