Index: openacs-4/packages/simulation/sql/postgresql/upgrade/upgrade-1.0.0b5-1.1.0b1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/sql/postgresql/upgrade/Attic/upgrade-1.0.0b5-1.1.0b1.sql,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/simulation/sql/postgresql/upgrade/upgrade-1.0.0b5-1.1.0b1.sql	2 Nov 2006 07:17:11 -0000	1.1.2.2
+++ openacs-4/packages/simulation/sql/postgresql/upgrade/upgrade-1.0.0b5-1.1.0b1.sql	2 Nov 2006 10:44:12 -0000	1.1.2.3
@@ -1,19 +1,19 @@
 create table sim_messages_trash (
-  message_id            integer         constraint sim_trash_id_nn
+  message_id            integer         constraint sim_messages_trash_id_nn
                                         not null
-                                        constraint sim_trash_id_fk
+                                        constraint sim_messages_trash_id_fk
                                         references sim_messages,
-  role_id               integer         constraint sim_trash_role_nn
+  role_id               integer         constraint sim_messages_trash_role_nn
                                         not null,
-  case_id               integer         constraint sim_trash_case_nn
+  case_id               integer         constraint sim_messages_trash_case_nn
                                         not null,
   PRIMARY KEY (message_id, role_id, case_id)
 );
 
 comment on table sim_messages_trash is 'For storing trashed messages per role per case.';
 
 create table sim_portfolio_trash (
-  object_id             integer         constraint sim_trash_id_nn
+  object_id             integer         constraint sim_pt_id_nn
                                         not null
                                         constraint sim_pt_object_id_fk
                                         references acs_objects ON DELETE CASCADE,