Index: openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql	11 Aug 2002 22:19:20 -0000	1.2
+++ openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql	12 Aug 2002 17:20:31 -0000	1.3
@@ -68,4 +68,10 @@
         </querytext>
     </fullquery>
 
+<fullquery name="delete_notification">
+<querytext>
+select notification__delete(:notification_id)
+</querytext>
+</fullquery>
+
 </queryset>
Index: openacs.org-dev/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/packages/forums/tcl/messages-procs.tcl	25 Jul 2002 20:15:19 -0000	1.3
+++ openacs.org-dev/packages/forums/tcl/messages-procs.tcl	12 Aug 2002 17:20:31 -0000	1.4
@@ -162,7 +162,10 @@
         db_transaction {
             # Remove the notifications
             notification::request::delete_all -object_id $message_id
-
+	    #delete all rows in notifications table also -DaveB
+	    db_foreach get_notifications_for_delete {} {
+		db_exec_plsql delete_notification {}
+	    }
             # Remove the message
             db_exec_plsql delete_message {}
         }
Index: openacs.org-dev/packages/forums/tcl/messages-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/messages-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/tcl/messages-procs.xql	9 Jul 2002 17:35:09 -0000	1.1
+++ openacs.org-dev/packages/forums/tcl/messages-procs.xql	12 Aug 2002 17:20:31 -0000	1.2
@@ -27,4 +27,10 @@
         </querytext>
     </fullquery>
 
+    <fullquery name="forum::message::get_notifications_for_delete">
+        <querytext>
+            select notification_id from notifications
+	    where object_id=:message_id or response_id=:message_id
+	</querytext>
+    </fullquery>
 </queryset>