From: mj <mj>
Date: Thu, 27 Sep 2001 22:04:50 +0000 (+0000)
Subject: Added support for PostgreSQL 7.0
X-Git-Tag: prexmlproducerconfig~404
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=ca4d7e91c194064388c47bed1bb80a37fab9487b;p=mir.git

Added support for PostgreSQL 7.0
---

diff --git a/dbscripts/dupetrigger/Makefile b/dbscripts/dupetrigger/Makefile
index 6185ec2d..1d16e394 100755
--- a/dbscripts/dupetrigger/Makefile
+++ b/dbscripts/dupetrigger/Makefile
@@ -2,7 +2,9 @@
 
 CC=gcc
 PGINC=/usr/include/postgresql
-CFLAGS=-I$(PGINC)
+PGVERSION=-DPG70
+#PGVERSION=-DPG71
+CFLAGS=-I$(PGINC) $(PGVERSION)
 
 # If changed, also change postgresql.script
 INSTALLDIR=../../../Mir/src
diff --git a/dbscripts/dupetrigger/dupetrigger.c b/dbscripts/dupetrigger/dupetrigger.c
index 11315c6f..0bd94ea8 100755
--- a/dbscripts/dupetrigger/dupetrigger.c
+++ b/dbscripts/dupetrigger/dupetrigger.c
@@ -103,7 +103,11 @@ static u_long crc32(u_char *buf, unsigned len)
 
 Datum dupecheck(PG_FUNCTION_ARGS)
 {
+#ifdef PG71
 	TriggerData *trigdata = (TriggerData *) fcinfo->context;
+#else
+	TriggerData *trigdata = CurrentTrigerData;
+#endif
 	TupleDesc	tupdesc;
 	HeapTuple	rettuple;
 	bool		isnull;
@@ -116,11 +120,13 @@ Datum dupecheck(PG_FUNCTION_ARGS)
 		*rowstring,
 		*query;
 	
-
 	/* Make sure trigdata is pointing at what I expect */
+#ifdef PG70
+	if (!CurrentTriggerData)
+#else		
 	if (!CALLED_AS_TRIGGER(fcinfo))
+#endif	
 		elog(ERROR, "dupecheck: not fired by trigger manager");
-	
 	/* tuple to return to Executor */
 	if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
 		rettuple = trigdata->tg_newtuple;