Index: openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql,v diff -u -r1.7.2.4 -r1.7.2.5 --- openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql 23 Jun 2006 06:50:06 -0000 1.7.2.4 +++ openacs-4/packages/mail-tracking/sql/postgresql/mail-tracking-create.sql 26 Jun 2006 10:27:01 -0000 1.7.2.5 @@ -17,9 +17,7 @@ create table acs_mail_log ( - log_id integer primary key - constraint acs_mail_log_object_id_fk - references acs_objects(object_id), + log_id integer primary key, message_id varchar(300), -- object_id of the object that triggered the sending of the email object_id integer Index: openacs-4/packages/mail-tracking/sql/postgresql/upgrade/upgrade-0.6.1.-0.6.2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/mail-tracking/sql/postgresql/upgrade/upgrade-0.6.1.-0.6.2.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/mail-tracking/sql/postgresql/upgrade/upgrade-0.6.1.-0.6.2.sql 23 Jun 2006 06:50:06 -0000 1.1.2.1 +++ openacs-4/packages/mail-tracking/sql/postgresql/upgrade/upgrade-0.6.1.-0.6.2.sql 26 Jun 2006 10:27:02 -0000 1.1.2.2 @@ -38,6 +38,7 @@ and o.object_type in ('image') and r.object_id_one = m.log_id; +alter table acs_mail_log drop constraint acs_mail_log_object_id_fk; create or replace function acs_mail_log__new (integer,varchar, integer, integer, varchar, varchar,integer,varchar,varchar,varchar) returns integer as ' declare @@ -51,13 +52,12 @@ p_cc alias for $8; p_bcc alias for $9; p_to_addr alias for $10; - v_log_id acs_mail_log.log_id%TYPE; begin insert into acs_mail_log (log_id, message_id, sender_id, package_id, subject, body, sent_date, object_id, cc, bcc, to_addr) values - (v_log_id, p_message_id, p_sender_id, p_package_id, p_subject, p_body, now(), p_object_id, p_cc, p_bcc, p_to_addr); + (p_log_id, p_message_id, p_sender_id, p_package_id, p_subject, p_body, now(), p_object_id, p_cc, p_bcc, p_to_addr); - return v_log_id; + return p_log_id; end;' language 'plpgsql';