Commit9886a46

committed

Restore NOTICEs that were mistakenly removed from triggers regression

test expected output. Tweak contrib/spi Makefile so that refint.so isby default built with appropriate NOTICE support for regression testing.

1 parent793a4ba commit9886a46Copy full SHA for 9886a46

File tree

+15

-7

lines changed

+15

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.21 2001/09/06 10:49:30 petere Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.22 2002/10/03 18:40:02 tgl Exp $`
`2`	`2`
`3`	`3`	`subdir = contrib/spi`
`4`	`4`	`top_builddir = ../..`
`@@ -8,8 +8,8 @@ MODULES = autoinc insert_username moddatetime refint timetravel`
`8`	`8`	`DATA_built =$(addsuffix .sql,$(MODULES))`
`9`	`9`	`DOCS= README.spi$(addsuffix .example,$(MODULES))`
`10`	`10`
`11`		`-ifdefREFINT_VERBOSE`
	`11`	`+# this is needed for the regression tests;`
	`12`	`+# comment out if you want a quieter refint package for other uses`
`12`	`13`	`PG_CPPFLAGS = -DREFINT_VERBOSE`
`13`		`-endif`
`14`	`14`
`15`	`15`	`include$(top_srcdir)/contrib/contrib-global.mk`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -563,12 +563,14 @@ check_foreign_key(PG_FUNCTION_ARGS)`
`563`	`563`	`elog(ERROR,"%s: tuple referenced in %s",`
`564`	`564`	`trigger->tgname,relname);`
`565`	`565`	`}`
`566`		`-#ifdefREFINT_VERBOSE`
`567`	`566`	`else`
`568`		`-elog(DEBUG3,"%s: %d tuple(s) of %s are %s",`
	`567`	`+{`
	`568`	`+#ifdefREFINT_VERBOSE`
	`569`	`+elog(NOTICE,"%s: %d tuple(s) of %s are %s",`
`569`	`570`	`trigger->tgname,SPI_processed,relname,`
`570`	`571`	`(action=='c') ?"deleted" :"setted to null");`
`571`	`572`	`#endif`
	`573`	`+}`
`572`	`574`	`args+=nkeys+1;/* to the next relation */`
`573`	`575`	`}`
`574`	`576`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.40 2002/09/05 18:28:46 petere Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.41 2002/10/03 18:40:02 tgl Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`@@ -105,7 +105,7 @@ all: all-spi`
`105`	`105`
`106`	`106`	`.PHONY: all-spi`
`107`	`107`	`all-spi:`
`108`		`-$(MAKE) -C$(contribdir)/spiREFINT_VERBOSE=1refint$(DLSUFFIX) autoinc$(DLSUFFIX)`
	`108`	`+$(MAKE) -C$(contribdir)/spi refint$(DLSUFFIX) autoinc$(DLSUFFIX)`
`109`	`109`
`110`	`110`
`111`	`111`	`##`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,11 +75,17 @@ ERROR: check_fkeys_pkey_exist: tuple references non-existing key in pkeys`
`75`	`75`	`insert into fkeys values (60, '6', 4);`
`76`	`76`	`ERROR: check_fkeys_pkey2_exist: tuple references non-existing key in fkeys2`
`77`	`77`	`delete from pkeys where pkey1 = 30 and pkey2 = '3';`
	`78`	`+NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted`
`78`	`79`	`ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys`
`79`	`80`	`delete from pkeys where pkey1 = 40 and pkey2 = '4';`
	`81`	`+NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted`
	`82`	`+NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted`
`80`	`83`	`update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 50 and pkey2 = '5';`
	`84`	`+NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted`
`81`	`85`	`ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys`
`82`	`86`	`update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 10 and pkey2 = '1';`
	`87`	`+NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted`
	`88`	`+NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted`
`83`	`89`	`DROP TABLE pkeys;`
`84`	`90`	`DROP TABLE fkeys;`
`85`	`91`	`DROP TABLE fkeys2;`

Comments

(0)