diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-10-03 18:40:02 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-10-03 18:40:02 +0000 |
| commit | 9886a46e76eed65d331c6bc250680249c4748a6c (patch) | |
| tree | 4b178efb300c17c05e410c83ebce684e869c2e9a /src | |
| parent | 793a4ba35e96e8b36b3589e251524d0ec71624aa (diff) | |
| download | postgresql-9886a46e76eed65d331c6bc250680249c4748a6c.tar.gz postgresql-9886a46e76eed65d331c6bc250680249c4748a6c.zip | |
Restore NOTICEs that were mistakenly removed from triggers regression
test expected output. Tweak contrib/spi Makefile so that refint.so is
by default built with appropriate NOTICE support for regression testing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/GNUmakefile | 4 | ||||
| -rw-r--r-- | src/test/regress/expected/triggers.out | 6 |
2 files changed, 8 insertions, 2 deletions
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; |