Index: openacs-4/packages/acs-mail/acs-mail.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/acs-mail.info,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-mail/acs-mail.info	30 Nov 2002 17:19:36 -0000	1.9
+++ openacs-4/packages/acs-mail/acs-mail.info	17 Jan 2003 14:32:30 -0000	1.10
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="4.6" url="http://www.arsdigita.com/acs-repository/download/apm/acs-mail-4.6.apm">
+    <version name="4.6.1" url="http://www.arsdigita.com/acs-repository/download/apm/acs-mail-4.6.1.apm">
     <database-support>
         <database>oracle</database>
         <database>postgresql</database>
@@ -19,7 +19,7 @@
         <vendor url="http://www.openacs.org/">OpenACS</vendor>
         <description format="text/html">Provides generic message services, with email sending.</description>
 
-        <provides url="acs-mail" version="4.6"/>
+        <provides url="acs-mail" version="4.6.1"/>
         <requires url="acs-content-repository" version="4.1"/>
         <requires url="acs-kernel" version="4.1"/>
 
@@ -34,13 +34,15 @@
             <file type="data_model" db_type="oracle" path="sql/oracle/acs-mail-packages-create.sql"/>
             <file type="data_model" db_type="oracle" path="sql/oracle/acs-mail-queue-create.sql"/>
             <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.5-4.6.sql"/>
+            <file type="data_model_upgrade" db_type="oracle" path="sql/oracle/upgrade/upgrade-4.6-4.6.1.sql"/>
             <file type="data_model_create" db_type="postgresql" path="sql/postgresql/acs-mail-create.sql"/>
             <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/acs-mail-drop.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/acs-mail-nt-create.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/acs-mail-nt-drop.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/acs-mail-packages-create.sql"/>
             <file type="data_model" db_type="postgresql" path="sql/postgresql/acs-mail-queue-create.sql"/>
             <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.5-4.6.sql"/>
+            <file type="data_model_upgrade" db_type="postgresql" path="sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql"/>
             <file type="tcl_init" path="tcl/acs-mail-init.tcl"/>
             <file type="query_file" db_type="oracle" path="tcl/acs-mail-procs-oracle.xql"/>
             <file type="query_file" db_type="postgresql" path="tcl/acs-mail-procs-postgresql.xql"/>
Index: openacs-4/packages/acs-mail/sql/oracle/acs-mail-queue-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/oracle/acs-mail-queue-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-mail/sql/oracle/acs-mail-queue-create.sql	19 Sep 2002 13:40:00 -0000	1.3
+++ openacs-4/packages/acs-mail/sql/oracle/acs-mail-queue-create.sql	17 Jan 2003 14:32:32 -0000	1.4
@@ -38,11 +38,12 @@
 
 create table acs_mail_queue_outgoing (
     message_id integer
-        constraint acs_mail_queue_out_mlid_pk primary key
         constraint acs_mail_queue_out_mlid_fk
             references acs_mail_queue_messages on delete cascade,
     envelope_from varchar2(4000),
-    envelope_to varchar2(4000)
+    envelope_to		varchar2(4000),
+	constraint acs_mail_queue_out_pk
+	primary key (message_id, envelope_to)
 );
 
 -- API -----------------------------------------------------------------
Index: openacs-4/packages/acs-mail/sql/oracle/upgrade/upgrade-4.6-4.6.1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/oracle/upgrade/upgrade-4.6-4.6.1.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail/sql/oracle/upgrade/upgrade-4.6-4.6.1.sql	17 Jan 2003 14:32:33 -0000	1.1
@@ -0,0 +1,21 @@
+-- @author Vinod Kurup vinod@kurup.com
+-- @creation-date 2002-12-15
+
+-- fix the primary key on the outgoing queue
+create table acs_mail_o_tmp as select * from acs_mail_queue_outgoing;
+
+drop table acs_mail_queue_outgoing;
+
+create table acs_mail_queue_outgoing (
+    message_id		integer
+					constraint acs_mail_queue_out_mlid_fk
+					references acs_mail_queue_messages on delete cascade,
+    envelope_from	varchar2(4000),
+    envelope_to		varchar2(4000),
+	constraint acs_mail_queue_out_pk
+	primary key (message_id, envelope_to)
+);
+
+insert into acs_mail_queue_outgoing select * from acs_mail_o_tmp;
+
+drop table acs_mail_o_tmp;
Index: openacs-4/packages/acs-mail/sql/postgresql/acs-mail-queue-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/postgresql/acs-mail-queue-create.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-mail/sql/postgresql/acs-mail-queue-create.sql	21 Dec 2002 22:30:51 -0000	1.6
+++ openacs-4/packages/acs-mail/sql/postgresql/acs-mail-queue-create.sql	17 Jan 2003 14:32:33 -0000	1.7
@@ -39,12 +39,12 @@
 
 create table acs_mail_queue_outgoing (
     message_id		integer
-					constraint acs_mail_queue_out_mlid_pk 
-					primary key
 					constraint acs_mail_queue_out_mlid_fk
 					references acs_mail_queue_messages on delete cascade,
     envelope_from	text,
-    envelope_to		text
+    envelope_to		text,
+	constraint acs_mail_queue_out_pk
+	primary key (message_id, envelope_to)
 );
 
 -- API -----------------------------------------------------------------
Index: openacs-4/packages/acs-mail/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-mail/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-mail/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql	17 Jan 2003 14:32:33 -0000	1.1
@@ -0,0 +1,21 @@
+-- @author Vinod Kurup vinod@kurup.com
+-- @creation-date 2002-12-15
+
+-- fix the primary key on the outgoing queue
+create table acs_mail_o_tmp as select * from acs_mail_queue_outgoing;
+
+drop table acs_mail_queue_outgoing;
+
+create table acs_mail_queue_outgoing (
+    message_id		integer
+					constraint acs_mail_queue_out_mlid_fk
+					references acs_mail_queue_messages on delete cascade,
+    envelope_from	text,
+    envelope_to		text,
+	constraint acs_mail_queue_out_pk
+	primary key (message_id, envelope_to)
+);
+
+insert into acs_mail_queue_outgoing select * from acs_mail_o_tmp;
+
+drop table acs_mail_o_tmp;