Index: openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql	27 Jun 2007 18:54:47 -0000	1.15
+++ openacs-4/packages/notifications/sql/postgresql/notifications-core-create.sql	7 Jun 2008 20:29:00 -0000	1.16
@@ -13,127 +13,127 @@
 -- taken into account. For now we're going to make them just intervals
 create table notification_intervals (
     interval_id                     integer
-                                    constraint notif_interv_id_fk
+                                    constraint notification_intervals_interval_id_fk
                                     references acs_objects (object_id)
-                                    constraint notif_interv_id_pk
+                                    constraint notification_intervals_interval_id_pk
                                     primary key,
     name                            varchar(200)
-                                    constraint notif_interv_name_nn
+                                    constraint notification_intervals_name_nn
                                     not null
-                                    constraint notif_interv_name_un
+                                    constraint notification_intervals_name_un
                                     unique,
     -- how to schedule this
     n_seconds                       integer
-                                    constraint notif_interv_n_seconds_nn
+                                    constraint notification_intervals_n_seconds_nn
                                     not null
 );
 
 -- delivery methods should be service contracts, too.
 create table notification_delivery_methods (
     delivery_method_id              integer
-                                    constraint notif_deliv_meth_fk
+                                    constraint notification_delivery_methods_fk
                                     references acs_objects (object_id)
-                                    constraint notif_deliv_meth_pk
+                                    constraint notification_delivery_methods_pk
                                     primary key,
     sc_impl_id                      integer not null
-                                    constraint notif_deliv_meth_impl_id_fk
+                                    constraint notification_delivery_methods_impl_id_fk
                                     references acs_sc_impls(impl_id),
     short_name                      varchar(100)
-                                    constraint notif_deliv_short_name_nn
+                                    constraint notification_delivery_methods_short_name_nn
                                     not null
-                                    constraint notif_deliv_short_name_un
+                                    constraint notifications_delivery_methods_short_name_un
                                     unique,
     pretty_name                     varchar(200)
                                     not null
 );
 
 create table notification_types (
     type_id                         integer
-                                    constraint notif_type_type_id_fk
+                                    constraint notification_types_type_id_fk
                                     references acs_objects (object_id)
-                                    constraint notif_type_type_id_pk
+                                    constraint notification_types_type_id_pk
                                     primary key,
     sc_impl_id                      integer not null
-                                    constraint notif_deliv_meth_impl_id_fk
+                                    constraint notification_delivery_method_impl_id_fk
                                     references acs_sc_impls(impl_id),
     short_name                      varchar(100)
-                                    constraint notif_type_short_name_nn
+                                    constraint notification_type_short_name_nn
                                     not null
-                                    constraint notif_type_short_name_un
+                                    constraint notification_type_short_name_un
                                     unique,
     pretty_name                     varchar(200)
-                                    constraint notif_type_pretty_name_nn
+                                    constraint notification_type_pretty_name_nn
                                     not null,
     description                     varchar(2000)
 );
 
 -- what's allowed for a given notification type?
 create table notification_types_intervals (
     type_id                         integer
-                                    constraint notif_type_int_type_id_fk
+                                    constraint notifications_type_int_type_id_fk
                                     references notification_types (type_id)
                                     on delete cascade,
     interval_id                     integer
-                                    constraint notif_type_int_int_id_fk
+                                    constraint notifications_type_int_int_id_fk
                                     references notification_intervals (interval_id)
                                     on delete cascade,
-    constraint notif_type_int_pk
+    constraint notifications_type_int_pk
     primary key (type_id, interval_id)
 );
 
 -- allowed delivery methods
 create table notification_types_del_methods (
     type_id                         integer
-                                    constraint notif_type_del_type_id_fk
+                                    constraint notifications_type_del_type_id_fk
                                     references notification_types (type_id)
                                     on delete cascade,
     delivery_method_id              integer
-                                    constraint notif_type_del_meth_id_fk
+                                    constraint notifications_type_del_meth_id_fk
                                     references notification_delivery_methods (delivery_method_id)
                                     on delete cascade,
-    constraint notif_type_deliv_pk
+    constraint notifications_type_deliv_pk
     primary key (type_id, delivery_method_id)
 );
 
 -- Requests for Notifications
 create table notification_requests (
     request_id                      integer
-                                    constraint notif_request_id_fk
+                                    constraint notification_requests_id_fk
                                     references acs_objects (object_id)
                                     on delete cascade
-                                    constraint notif_request_id_pk
+                                    constraint notifications_request_id_pk
                                     primary key,
     type_id                         integer
-                                    constraint notif_request_type_id_fk
+                                    constraint notifications_request_type_id_fk
                                     references notification_types (type_id)
                                     on delete cascade,
     user_id                         integer
-                                    constraint notif_request_user_id_fk
+                                    constraint notifications_request_user_id_fk
                                     references users (user_id)
                                     on delete cascade,
     -- The object this request pertains to
     object_id                       integer
-                                    constraint notif_request_object_id_fk
+                                    constraint notifications_request_object_id_fk
                                     references acs_objects (object_id)
                                     on delete cascade,
     -- the interval must be allowed for this type
     interval_id                     integer
-                                    constraint notif_request_interv_id_nn
+                                    constraint notifications_request_interv_id_nn
                                     not null,
-    constraint notif_request_interv_fk
+    constraint notifications_request_interv_fk
     foreign key (type_id, interval_id)
     references notification_types_intervals (type_id, interval_id),
     -- the delivery method must be allowed for this type
     delivery_method_id              integer
-                                    constraint notif_request_delivery_meth_nn
+                                    constraint notifications_request_delivery_meth_nn
                                     not null,
-    constraint notif_request_deliv_fk
+    constraint notifications_request_deliv_fk
     foreign key (type_id, delivery_method_id)
     references notification_types_del_methods (type_id, delivery_method_id),
     -- the format of the notification should be...
     format                          varchar(100)
                                     default 'text'
-                                    constraint notif_request_format_ch
+                                    constraint notifications_request_format_ck
                                     check (format in ('text', 'html')),
     dynamic_p                       bool default 'f'
 );
@@ -149,30 +149,30 @@
 -- the actual stuff that has to go out
 create table notifications (
     notification_id                 integer
-                                    constraint notif_notif_id_fk
+                                    constraint notifications_notification_id_fk
                                     references acs_objects (object_id)
                                     on delete cascade
-                                    constraint notif_notif_id_pk
+                                    constraint notifications_notification_id_pk
                                     primary key,
     type_id                         integer
-                                    constraint notif_type_id_fk
+                                    constraint notifications_type_id_fk
                                     references notification_types(type_id),
     -- the object this notification pertains to
     object_id                       integer
-                                    constraint notif_object_id_fk
+                                    constraint notifications_object_id_fk
                                     references acs_objects(object_id)
                                     on delete cascade,
     notif_date                      timestamptz
-                                    constraint notif_notif_date_nn
+                                    constraint notifications_notif_date_nn
                                     not null,
     -- this is to allow responses to notifications
     response_id                     integer
-                                    constraint notif_reponse_id_fk
+                                    constraint notifications_response_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
+                                    constraint notifications_notif_user_fk
                                     references users(user_id),
     notif_subject                   varchar(1000),
     notif_text                      text,
