summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorTom Lane2002-10-03 18:40:02 +0000
committerTom Lane2002-10-03 18:40:02 +0000
commit9886a46e76eed65d331c6bc250680249c4748a6c (patch)
tree4b178efb300c17c05e410c83ebce684e869c2e9a /contrib
parent793a4ba35e96e8b36b3589e251524d0ec71624aa (diff)
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 'contrib')
-rw-r--r--contrib/spi/Makefile6
-rw-r--r--contrib/spi/refint.c6
2 files changed, 7 insertions, 5 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 */
}