Changeset 1006

Timestamp:

07/08/08 14:30:45 (1 month ago)

Author:

laurentj

Message:

ticket #643: fixed bug on events generated by daos. p=Thomas

Files:

branches/1.0.x/build/manifests/testapp.mn (modified) (3 diffs)
branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
branches/1.0.x/lib/jelix/dao/jDaoFactoryBase.class.php (modified) (2 diffs)
branches/1.0.x/lib/jelix/dao/jDaoGenerator.class.php (modified) (4 diffs)
branches/1.0.x/testapp/modules/jelix_tests/classes/testdaoevents.listener.php (added)
branches/1.0.x/testapp/modules/jelix_tests/daos/products_events.dao.xml (added)
branches/1.0.x/testapp/modules/jelix_tests/events.xml (modified) (1 diff)
branches/1.0.x/testapp/modules/jelix_tests/tests/jdao.events.html_cli.php (added)
trunk/build/manifests/testapp.mn (modified) (3 diffs)
trunk/lib/jelix/CREDITS (modified) (1 diff)
trunk/lib/jelix/dao/jDaoFactoryBase.class.php (modified) (2 diffs)
trunk/lib/jelix/dao/jDaoGenerator.class.php (modified) (4 diffs)
trunk/testapp/modules/jelix_tests/classes/testdaoevents.listener.php (added)
trunk/testapp/modules/jelix_tests/daos/products_events.dao.xml (added)
trunk/testapp/modules/jelix_tests/events.xml (modified) (1 diff)
trunk/testapp/modules/jelix_tests/tests/jdao.events.html_cli.php (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

branches/1.0.x/build/manifests/testapp.mn

r960	r1006
76	76	urlsig.urlhandler.php
77	77	testevents.listener.php
	78	testdaoevents.listener.php
78	79	test.iface.php
79	80	myclass.class.php
…	…
117	118	cd testapp/modules/jelix_tests/daos
118	119	products.dao.xml
	120	products_events.dao.xml
119	121	product_tags.dao.xml
120	122	description.dao.xml
…	…
140	142	jdao.main_api.html_cli.php
141	143	jdao.main_api_with_pdo.html_cli.php
	144	jdao.events.html_cli.php
142	145	jdao.parser.html_cli.php
143	146	jdao.parser2.html_cli.php

branches/1.0.x/lib/jelix/CREDITS

r1005 r1006

140 140
141 141 Thomas
142 - fixed bugs in jDao (#576)
142 - fixed bugs in jDao (#576, #643)
143 143
144 144 Christian Tritten

branches/1.0.x/lib/jelix/dao/jDaoFactoryBase.class.php

r727	r1006
206	206
207	207	if ($this->_deleteBeforeEvent) {
208		jEvent::notify("daoDeleteBefore", array('dao'=>$this->_daoselector, 'keys'=>$keys));
	208	jEvent::notify("daoDeleteBefore", array('dao'=>$this->_daoSelector, 'keys'=>$keys));
209	209	}
210	210	$result = $this->_conn->exec ($q);
211	211	if ($this->_deleteAfterEvent) {
212		jEvent::notify("daoDeleteAfter", array('dao'=>$this->_daoselector, 'keys'=>$keys, 'result'=>$result));
	212	jEvent::notify("daoDeleteAfter", array('dao'=>$this->_daoSelector, 'keys'=>$keys, 'result'=>$result));
213	213	}
214	214	return $result;
…	…
290	290
291	291	if ($this->_deleteByBeforeEvent) {
292		jEvent::notify("daoDeleteByBefore", array('dao'=>$this->_daoselector, 'criterias'=>$searchcond));
	292	jEvent::notify("daoDeleteByBefore", array('dao'=>$this->_daoSelector, 'criterias'=>$searchcond));
293	293	}
294	294	$result = $this->_conn->exec($query);
295	295	if ($this->_deleteByAfterEvent) {
296		jEvent::notify("daoDeleteByAfter", array('dao'=>$this->_daoselector, 'criterias'=>$searchcond, 'result'=>$result));
	296	jEvent::notify("daoDeleteByAfter", array('dao'=>$this->_daoSelector, 'criterias'=>$searchcond, 'result'=>$result));
297	297	}
298	298	return $result;

branches/1.0.x/lib/jelix/dao/jDaoGenerator.class.php

r1005	r1006
199	199
200	200	if($this->_datasParser->hasEvent('insertbefore') \|\| $this->_datasParser->hasEvent('insert')){
201		$src[] = ' jEvent::notify("daoInsertBefore", array(\'dao\'=>$this->_daoselector, \'record\'=>$record));';
	201	$src[] = ' jEvent::notify("daoInsertBefore", array(\'dao\'=>$this->_daoSelector, \'record\'=>$record));';
202	202	}
203	203	$src[] = ' $result = $this->_conn->exec ($query);';
…	…
231	231
232	232	if($this->_datasParser->hasEvent('insertafter') \|\| $this->_datasParser->hasEvent('insert')){
233		$src[] = ' jEvent::notify("daoInsertAfter", array(\'dao\'=>$this->_daoselector, \'record\'=>$record));';
	233	$src[] = ' jEvent::notify("daoInsertAfter", array(\'dao\'=>$this->_daoSelector, \'record\'=>$record));';
234	234	}
235	235
…	…
255	255	$src[] = "';";
256	256	if($this->_datasParser->hasEvent('updatebefore') \|\| $this->_datasParser->hasEvent('update')){
257		$src[] = ' jEvent::notify("daoUpdateBefore", array(\'dao\'=>$this->_daoselector, \'record\'=>$record));';
	257	$src[] = ' jEvent::notify("daoUpdateBefore", array(\'dao\'=>$this->_daoSelector, \'record\'=>$record));';
258	258	}
259	259	if($this->_datasParser->hasEvent('updateafter') \|\| $this->_datasParser->hasEvent('update')){
260	260	$src[] = ' $result = $this->_conn->exec ($query);';
261		$src[] = ' jEvent::notify("daoUpdateAfter", array(\'dao\'=>$this->_daoselector, \'record\'=>$record));';
	261	$src[] = ' jEvent::notify("daoUpdateAfter", array(\'dao\'=>$this->_daoSelector, \'record\'=>$record));';
262	262	$src[] = ' return $result;';
263	263	}
…	…
379	379	case 'update' :
380	380	if ($method->eventBeforeEnabled \|\| $method->eventAfterEnabled) {
381		$methname = ($method->type == 'update'?'Update':'Insert');
	381	$src[] = ' $args = func_get_args();';
	382	$methname = ($method->type == 'update'?'Update':'Delete');
382	383	if ($method->eventBeforeEnabled) {
383		$src[] = ' jEvent::notify("daoSpecific'.$methname.'Before", array(\'dao\'=>$this->_daoselector,\'method\'=>\''.
384		$method->name.'\', \'params\'=>~~func_get_args()~~));';
	384	$src[] = ' jEvent::notify("daoSpecific'.$methname.'Before", array(\'dao\'=>$this->_daoSelector,\'method\'=>\''.
	385	$method->name.'\', \'params\'=>$args));';
385	386	}
386	387	if ($method->eventAfterEnabled) {
387	388	$src[] = ' $result = $this->_conn->exec ($__query);';
388		$src[] = ' jEvent::notify("daoSpecific'.$methname.'After", array(\'dao\'=>$this->_daoselector,\'method\'=>\''.
389		$method->name.'\', \'params\'=>~~func_get_args()~~));';
	389	$src[] = ' jEvent::notify("daoSpecific'.$methname.'After", array(\'dao\'=>$this->_daoSelector,\'method\'=>\''.
	390	$method->name.'\', \'params\'=>$args));';
390	391	$src[] = ' return $result;';
391	392	} else {

branches/1.0.x/testapp/modules/jelix_tests/events.xml

r55	r1006
5	5	<event name="TestEvent" />
6	6	</listener>
	7	<listener name="testdaoevents">
	8	<event name="daoDeleteBefore" />
	9	<event name="daoDeleteAfter" />
	10	<event name="daoUpdateBefore" />
	11	<event name="daoUpdateAfter" />
	12	<event name="daoInsertBefore" />
	13	<event name="daoInsertAfter" />
	14	<event name="daoDeleteByBefore" />
	15	<event name="daoDeleteByAfter" />
	16	</listener>
7	17	</events>

trunk/build/manifests/testapp.mn

r960	r1006
82	82	urlsig.urlhandler.php
83	83	testevents.listener.php
	84	testdaoevents.listener.php
84	85	test.iface.php
85	86	myclass.class.php
…	…
126	127	cd testapp/modules/jelix_tests/daos
127	128	products.dao.xml
	129	products_events.dao.xml
128	130	product_tags.dao.xml
129	131	description.dao.xml
…	…
151	153	jacl2.users_and_groups.html_cli.php
152	154	jdao.conditions.html_cli.php
	155	jdao.events.html_cli.php
153	156	jdao.main_api.html_cli.php
154	157	jdao.main_api_with_pdo.html_cli.php

trunk/lib/jelix/CREDITS

r1005 r1006

162 162
163 163 Thomas
164 - fixed bugs in jDao (#576)
164 - fixed bugs in jDao (#576, #643)
165 165
166 166 Christian Tritten

trunk/lib/jelix/dao/jDaoFactoryBase.class.php

r727	r1006
206	206
207	207	if ($this->_deleteBeforeEvent) {
208		jEvent::notify("daoDeleteBefore", array('dao'=>$this->_daoselector, 'keys'=>$keys));
	208	jEvent::notify("daoDeleteBefore", array('dao'=>$this->_daoSelector, 'keys'=>$keys));
209	209	}
210	210	$result = $this->_conn->exec ($q);
211	211	if ($this->_deleteAfterEvent) {
212		jEvent::notify("daoDeleteAfter", array('dao'=>$this->_daoselector, 'keys'=>$keys, 'result'=>$result));
	212	jEvent::notify("daoDeleteAfter", array('dao'=>$this->_daoSelector, 'keys'=>$keys, 'result'=>$result));
213	213	}
214	214	return $result;
…	…
290	290
291	291	if ($this->_deleteByBeforeEvent) {
292		jEvent::notify("daoDeleteByBefore", array('dao'=>$this->_daoselector, 'criterias'=>$searchcond));
	292	jEvent::notify("daoDeleteByBefore", array('dao'=>$this->_daoSelector, 'criterias'=>$searchcond));
293	293	}
294	294	$result = $this->_conn->exec($query);
295	295	if ($this->_deleteByAfterEvent) {
296		jEvent::notify("daoDeleteByAfter", array('dao'=>$this->_daoselector, 'criterias'=>$searchcond, 'result'=>$result));
	296	jEvent::notify("daoDeleteByAfter", array('dao'=>$this->_daoSelector, 'criterias'=>$searchcond, 'result'=>$result));
297	297	}
298	298	return $result;

trunk/lib/jelix/dao/jDaoGenerator.class.php

r1005	r1006
199	199
200	200	if($this->_dataParser->hasEvent('insertbefore') \|\| $this->_dataParser->hasEvent('insert')){
201		$src[] = ' jEvent::notify("daoInsertBefore", array(\'dao\'=>$this->_daoselector, \'record\'=>$record));';
	201	$src[] = ' jEvent::notify("daoInsertBefore", array(\'dao\'=>$this->_daoSelector, \'record\'=>$record));';
202	202	}
203	203	$src[] = ' $result = $this->_conn->exec ($query);';
…	…
231	231
232	232	if($this->_dataParser->hasEvent('insertafter') \|\| $this->_dataParser->hasEvent('insert')){
233		$src[] = ' jEvent::notify("daoInsertAfter", array(\'dao\'=>$this->_daoselector, \'record\'=>$record));';
	233	$src[] = ' jEvent::notify("daoInsertAfter", array(\'dao\'=>$this->_daoSelector, \'record\'=>$record));';
234	234	}
235	235
…	…
255	255	$src[] = "';";
256	256	if($this->_dataParser->hasEvent('updatebefore') \|\| $this->_dataParser->hasEvent('update')){
257		$src[] = ' jEvent::notify("daoUpdateBefore", array(\'dao\'=>$this->_daoselector, \'record\'=>$record));';
	257	$src[] = ' jEvent::notify("daoUpdateBefore", array(\'dao\'=>$this->_daoSelector, \'record\'=>$record));';
258	258	}
259	259	if($this->_dataParser->hasEvent('updateafter') \|\| $this->_dataParser->hasEvent('update')){
260	260	$src[] = ' $result = $this->_conn->exec ($query);';
261		$src[] = ' jEvent::notify("daoUpdateAfter", array(\'dao\'=>$this->_daoselector, \'record\'=>$record));';
	261	$src[] = ' jEvent::notify("daoUpdateAfter", array(\'dao\'=>$this->_daoSelector, \'record\'=>$record));';
262	262	$src[] = ' return $result;';
263	263	}
…	…
379	379	case 'update' :
380	380	if ($method->eventBeforeEnabled \|\| $method->eventAfterEnabled) {
381		$methname = ($method->type == 'update'?'Update':'Insert');
	381	$src[] = ' $args = func_get_args();';
	382	$methname = ($method->type == 'update'?'Update':'Delete');
382	383	if ($method->eventBeforeEnabled) {
383		$src[] = ' jEvent::notify("daoSpecific'.$methname.'Before", array(\'dao\'=>$this->_daoselector,\'method\'=>\''.
384		$method->name.'\', \'params\'=>~~func_get_args()~~));';
	384	$src[] = ' jEvent::notify("daoSpecific'.$methname.'Before", array(\'dao\'=>$this->_daoSelector,\'method\'=>\''.
	385	$method->name.'\', \'params\'=>$args));';
385	386	}
386	387	if ($method->eventAfterEnabled) {
387	388	$src[] = ' $result = $this->_conn->exec ($__query);';
388		$src[] = ' jEvent::notify("daoSpecific'.$methname.'After", array(\'dao\'=>$this->_daoselector,\'method\'=>\''.
389		$method->name.'\', \'params\'=>~~func_get_args()~~));';
	389	$src[] = ' jEvent::notify("daoSpecific'.$methname.'After", array(\'dao\'=>$this->_daoSelector,\'method\'=>\''.
	390	$method->name.'\', \'params\'=>$args));';
390	391	$src[] = ' return $result;';
391	392	} else {

trunk/testapp/modules/jelix_tests/events.xml

r55	r1006
5	5	<event name="TestEvent" />
6	6	</listener>
	7	<listener name="testdaoevents">
	8	<event name="daoDeleteBefore" />
	9	<event name="daoDeleteAfter" />
	10	<event name="daoUpdateBefore" />
	11	<event name="daoUpdateAfter" />
	12	<event name="daoInsertBefore" />
	13	<event name="daoInsertAfter" />
	14	<event name="daoDeleteByBefore" />
	15	<event name="daoDeleteByAfter" />
	16	</listener>
7	17	</events>

Download in other formats: Unified Diff Zip Archive

r1005	r1006
140	140
141	141	Thomas
142		- fixed bugs in jDao (#576)
	142	- fixed bugs in jDao (#576, #643)
143	143
144	144	Christian Tritten

Developers' Corner

Changeset 1006

Legend: