diff options
| -rw-r--r-- | contrib/spi/Makefile | 6 | ||||
| -rw-r--r-- | contrib/spi/refint.c | 6 | ||||
| -rw-r--r-- | src/test/regress/GNUmakefile | 4 | ||||
| -rw-r--r-- | src/test/regress/expected/triggers.out | 6 |
4 files changed, 15 insertions, 7 deletions
diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile index cf4c0d1dbf5..09fad53503e 100644 --- a/contrib/spi/Makefile +++ b/contrib/spi/Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.21 2001/09/06 10:49:30 petere Exp $ +# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.22 2002/10/03 18:40:02 tgl Exp $ subdir = contrib/spi top_builddir = ../.. @@ -8,8 +8,8 @@ MODULES = autoinc insert_username moddatetime refint timetravel DATA_built = $(addsuffix .sql, $(MODULES)) DOCS = README.spi $(addsuffix .example, $(MODULES)) -ifdef REFINT_VERBOSE +# this is needed for the regression tests; +# comment out if you want a quieter refint package for other uses PG_CPPFLAGS = -DREFINT_VERBOSE -endif include $(top_srcdir)/contrib/contrib-global.mk diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c index 61c9e71fea6..c3259e49b71 100644 --- a/contrib/spi/refint.c +++ b/contrib/spi/refint.c @@ -563,12 +563,14 @@ check_foreign_key(PG_FUNCTION_ARGS) elog(ERROR, "%s: tuple referenced in %s", trigger->tgname, relname); } -#ifdef REFINT_VERBOSE else - elog(DEBUG3, "%s: %d tuple(s) of %s are %s", + { +#ifdef REFINT_VERBOSE + elog(NOTICE, "%s: %d tuple(s) of %s are %s", trigger->tgname, SPI_processed, relname, (action == 'c') ? "deleted" : "setted to null"); #endif + } args += nkeys + 1; /* to the next relation */ } diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index dc42e20ae83..ebf14e54bf9 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.40 2002/09/05 18:28:46 petere Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.41 2002/10/03 18:40:02 tgl Exp $ # #------------------------------------------------------------------------- @@ -105,7 +105,7 @@ all: all-spi .PHONY: all-spi all-spi: - $(MAKE) -C $(contribdir)/spi REFINT_VERBOSE=1 refint$(DLSUFFIX) autoinc$(DLSUFFIX) + $(MAKE) -C $(contribdir)/spi refint$(DLSUFFIX) autoinc$(DLSUFFIX) ## diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out index 9bc8fdf383e..b5a62dace1b 100644 --- a/src/test/regress/expected/triggers.out +++ b/src/test/regress/expected/triggers.out @@ -75,11 +75,17 @@ ERROR: check_fkeys_pkey_exist: tuple references non-existing key in pkeys insert into fkeys values (60, '6', 4); ERROR: check_fkeys_pkey2_exist: tuple references non-existing key in fkeys2 delete from pkeys where pkey1 = 30 and pkey2 = '3'; +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys delete from pkeys where pkey1 = 40 and pkey2 = '4'; +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 50 and pkey2 = '5'; +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 10 and pkey2 = '1'; +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted DROP TABLE pkeys; DROP TABLE fkeys; DROP TABLE fkeys2; |