Index: openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql	28 Nov 2003 14:52:46 -0000	1.1.2.2
+++ openacs-4/packages/notifications/sql/postgresql/upgrade/upgrade-5.0.0a5-5.0.0a6.sql	2 Dec 2003 10:45:27 -0000	1.1.2.3
@@ -1,46 +1,15 @@
--- Add the on delete cascade to response_id column,
+-- Add on delete cascade to the notifications.response_id column foreign key constraint
 -- see Bug http://openacs.org/bugtracker/openacs/bug?filter%2estatus=resolved&filter%2eactionby=6815&bug%5fnumber=260
 -- @author Peter Marklund
+alter table notifications drop constraint notif_reponse_id_fk;
+alter table notifications add constraint notif_reponse_id_fk
+                              foreign key (response_id)
+                              references acs_objects (object_id)
+                              on delete cascade;
 
-alter table notifications rename to notifications_bak;
-
--- Before we create the new table we need to drop constraints
--- to avoid naming conflicts
+-- Add on delete cascade to notification_user_map.notification_in foreign key constraint
 alter table notification_user_map drop constraint notif_user_map_notif_id_fk;
-alter table notifications_bak drop constraint notif_notif_id_pk;
-
-create table notifications (
-    notification_id                 integer
-                                    constraint notif_notif_id_fk
-                                    references acs_objects (object_id)
-                                    constraint notif_notif_id_pk
-                                    primary key,
-    type_id                         integer
-                                    constraint notif_type_id_fk
-                                    references notification_types(type_id),
-    -- the object this notification pertains to
-    object_id                       integer
-                                    constraint notif_object_id_fk
-                                    references acs_objects(object_id)
-                                    on delete cascade,
-    notif_date                      timestamptz
-                                    constraint notif_notif_date_nn
-                                    not null,
-    -- this is to allow responses to notifications
-    response_id                     integer
-                                    constraint notif_reponse_id_fk
-                                    references acs_objects (object_id)
-                                    on delete cascade,
-    -- this is the user that caused the notification to go out
-    notif_user                      integer
-                                    constraint notif_user_id_fk
-                                    references users(user_id),
-    notif_subject                   varchar(1000),
-    notif_text                      text,
-    notif_html                      text
-);
-
-insert into notifications select * from notifications_bak;
-
-alter table notification_user_map add constraint notif_user_map_notif_id_fk FOREIGN KEY (notification_id) REFERENCES notifications(notification_id) ON delete cascade;
-
+alter table notification_user_map add constraint notif_user_map_notif_id_fk 
+                                      foreign key (notification_id) 
+                                      references notifications(notification_id) 
+                                      on delete cascade;