Skip to content

Commit 0a269db

Browse files
adunstanadunstan
committed
Add table_name and table_schema to plpython trigger data, plus docs and regression test.
1 parent 777f72c commit 0a269db

File tree

4 files changed

+107
-3
lines changed

4 files changed

+107
-3
lines changed

‎doc/src/sgml/plpython.sgml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.29 2005/05/20 01:52:25 neilc Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/plpython.sgml,v 1.30 2006/05/26 19:23:09 adunstan Exp $ -->
22

33
<chapter id="plpython">
44
<title>PL/Python - Python Procedural Language</title>
@@ -123,6 +123,9 @@ def __plpython_procedure_myfunc_23456():
123123
<literal>AFTER</>, and <literal>UNKNOWN</>.
124124
<literal>TD["level"]</> contains one of <literal>ROW</>,
125125
<literal>STATEMENT</>, and <literal>UNKNOWN</>.
126+
<literal>TD["name"]</> contains the trigger name,
127+
<literal>TD["table_name"]</> contains the name of the table on which the trigger occurred,
128+
<literal>TD["table_schema"]</> contains the schema of the table on which the trigger occurred,
126129
<literal>TD["name"]</> contains the trigger name, and
127130
<literal>TD["relid"]</> contains the OID of the table on
128131
which the trigger occurred. If the <command>CREATE TRIGGER</> command

‎src/pl/plpython/expected/plpython_function.out

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,61 @@ CREATE TRIGGER users_update_trig BEFORE UPDATE ON users FOR EACH ROW
115115
EXECUTE PROCEDURE users_update ('willem');
116116
CREATE TRIGGER users_delete_trig BEFORE DELETE ON users FOR EACH ROW
117117
EXECUTE PROCEDURE users_delete ('willem');
118+
-- dump trigger data
119+
CREATE TABLE trigger_test
120+
(i int, v text );
121+
CREATE FUNCTION trigger_data() returns trigger language plpythonu as $$
122+
123+
if TD.has_key('relid'):
124+
TD['relid'] = "bogus:12345"
125+
126+
for key in sorted(TD.keys()):
127+
val = TD[key]
128+
plpy.notice("TD[" + key + "] => " + str(val))
129+
130+
return None
131+
132+
$$;
133+
CREATE TRIGGER show_trigger_data_trig
134+
BEFORE INSERT OR UPDATE OR DELETE ON trigger_test
135+
FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
136+
insert into trigger_test values(1,'insert');
137+
NOTICE: ("TD[args] => ['23', 'skidoo']",)
138+
NOTICE: ('TD[event] => INSERT',)
139+
NOTICE: ('TD[level] => ROW',)
140+
NOTICE: ('TD[name] => show_trigger_data_trig',)
141+
NOTICE: ("TD[new] => {'i': 1, 'v': 'insert'}",)
142+
NOTICE: ('TD[old] => None',)
143+
NOTICE: ('TD[relid] => bogus:12345',)
144+
NOTICE: ('TD[table_name] => trigger_test',)
145+
NOTICE: ('TD[table_schema] => public',)
146+
NOTICE: ('TD[when] => BEFORE',)
147+
update trigger_test set v = 'update' where i = 1;
148+
NOTICE: ("TD[args] => ['23', 'skidoo']",)
149+
NOTICE: ('TD[event] => UPDATE',)
150+
NOTICE: ('TD[level] => ROW',)
151+
NOTICE: ('TD[name] => show_trigger_data_trig',)
152+
NOTICE: ("TD[new] => {'i': 1, 'v': 'update'}",)
153+
NOTICE: ("TD[old] => {'i': 1, 'v': 'insert'}",)
154+
NOTICE: ('TD[relid] => bogus:12345',)
155+
NOTICE: ('TD[table_name] => trigger_test',)
156+
NOTICE: ('TD[table_schema] => public',)
157+
NOTICE: ('TD[when] => BEFORE',)
158+
delete from trigger_test;
159+
NOTICE: ("TD[args] => ['23', 'skidoo']",)
160+
NOTICE: ('TD[event] => DELETE',)
161+
NOTICE: ('TD[level] => ROW',)
162+
NOTICE: ('TD[name] => show_trigger_data_trig',)
163+
NOTICE: ('TD[new] => None',)
164+
NOTICE: ("TD[old] => {'i': 1, 'v': 'update'}",)
165+
NOTICE: ('TD[relid] => bogus:12345',)
166+
NOTICE: ('TD[table_name] => trigger_test',)
167+
NOTICE: ('TD[table_schema] => public',)
168+
NOTICE: ('TD[when] => BEFORE',)
169+
170+
DROP TRIGGER show_trigger_data_trig on trigger_test;
171+
172+
DROP FUNCTION trigger_data();
118173
-- nested calls
119174
--
120175
CREATE FUNCTION nested_call_one(text) RETURNS text

‎src/pl/plpython/plpython.c

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**********************************************************************
22
* plpython.c - python as a procedural language for PostgreSQL
33
*
4-
* $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.79 2006/04/27 14:18:07 momjian Exp $
4+
* $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.80 2006/05/26 19:23:09 adunstan Exp $
55
*
66
*********************************************************************
77
*/
@@ -560,7 +560,9 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure * proc, HeapTuple *
560560
*pltevent,
561561
*pltwhen,
562562
*pltlevel,
563-
*pltrelid;
563+
*pltrelid,
564+
*plttablename,
565+
*plttableschema;
564566
PyObject *pltargs,
565567
*pytnew,
566568
*pytold;
@@ -584,6 +586,19 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure * proc, HeapTuple *
584586
Py_DECREF(pltrelid);
585587
pfree(stroid);
586588

589+
stroid = SPI_getrelname(tdata->tg_relation);
590+
plttablename = PyString_FromString(stroid);
591+
PyDict_SetItemString(pltdata, "table_name", plttablename);
592+
Py_DECREF(plttablename);
593+
pfree(stroid);
594+
595+
stroid = SPI_getnspname(tdata->tg_relation);
596+
plttableschema = PyString_FromString(stroid);
597+
PyDict_SetItemString(pltdata, "table_schema", plttableschema);
598+
Py_DECREF(plttableschema);
599+
pfree(stroid);
600+
601+
587602
if (TRIGGER_FIRED_BEFORE(tdata->tg_event))
588603
pltwhen = PyString_FromString("BEFORE");
589604
else if (TRIGGER_FIRED_AFTER(tdata->tg_event))

‎src/pl/plpython/sql/plpython_function.sql

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,37 @@ CREATE TRIGGER users_delete_trig BEFORE DELETE ON users FOR EACH ROW
140140
EXECUTE PROCEDURE users_delete ('willem');
141141

142142

143+
144+
-- dump trigger data
145+
146+
CREATE TABLE trigger_test
147+
(i int, v text );
148+
149+
CREATE FUNCTION trigger_data() returns trigger language plpythonu as $$
150+
151+
if TD.has_key('relid'):
152+
TD['relid'] = "bogus:12345"
153+
154+
for key in sorted(TD.keys()):
155+
val = TD[key]
156+
plpy.notice("TD[" + key + "] => " + str(val))
157+
158+
return None
159+
160+
$$;
161+
162+
CREATE TRIGGER show_trigger_data_trig
163+
BEFORE INSERT OR UPDATE OR DELETE ON trigger_test
164+
FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
165+
166+
insert into trigger_test values(1,'insert');
167+
update trigger_test set v = 'update' where i = 1;
168+
delete from trigger_test;
169+
170+
DROP TRIGGER show_trigger_data_trig on trigger_test;
171+
172+
DROP FUNCTION trigger_data();
173+
143174
-- nested calls
144175
--
145176

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy