Commit3ca7edd

committed

Fix bug with multiple evaluation of tsearch2 compatibility trigger, trigger

data should be restored.Backpatch only for 8.3 because previous versions haven't such layer.

1 parent61fd2c5 commit3ca7eddCopy full SHA for 3ca7edd

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.c,v 1.8 2009/01/01 17:23:32momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.c,v 1.9 2009/01/28 18:31:32teodor Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -367,8 +367,10 @@ tsa_tsearch2(PG_FUNCTION_ARGS)`
`367`	`367`	`{`
`368`	`368`	`TriggerData*trigdata;`
`369`	`369`	`Trigger*trigger;`
`370`		`-char**tgargs;`
	`370`	`+char**tgargs,`
	`371`	`+**tgargs_old;`
`371`	`372`	`inti;`
	`373`	`+Datumres;`
`372`	`374`
`373`	`375`	`/* Check call context */`
`374`	`376`	`if (!CALLED_AS_TRIGGER(fcinfo))/* internal error */`
`@@ -388,10 +390,20 @@ tsa_tsearch2(PG_FUNCTION_ARGS)`
`388`	`390`
`389`	`391`	`tgargs[1]=pstrdup(GetConfigOptionByName("default_text_search_config",`
`390`	`392`	`NULL));`
	`393`	`+tgargs_old=trigger->tgargs;`
`391`	`394`	`trigger->tgargs=tgargs;`
`392`	`395`	`trigger->tgnargs++;`
`393`	`396`
`394`		`-returntsvector_update_trigger_byid(fcinfo);`
	`397`	`+res=tsvector_update_trigger_byid(fcinfo);`
	`398`	`+`
	`399`	`+/* restore old trigger data */`
	`400`	`+trigger->tgargs=tgargs_old;`
	`401`	`+trigger->tgnargs--;`
	`402`	`+`
	`403`	`+pfree(tgargs[1]);`
	`404`	`+pfree(tgargs);`
	`405`	`+`
	`406`	`+returnres;`
`395`	`407`	`}`
`396`	`408`
`397`	`409`

Comments

(0)