Index: openacs-4/packages/acs-events/acs-events.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/acs-events.info,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/acs-events/acs-events.info	12 Jul 2018 11:31:06 -0000	1.31
+++ openacs-4/packages/acs-events/acs-events.info	12 Jul 2018 11:50:16 -0000	1.32
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
 
-    <version name="0.6.2d4" url="http://openacs.org/repository/download/apm/acs-events-0.6.2d4.apm">
+    <version name="0.6.2d5" url="http://openacs.org/repository/download/apm/acs-events-0.6.2d5.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>API support for relationships between intervals in time, activities, and parties.</summary>
         <release-date>2017-08-06</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">The events service is primarily intended for use by writers of application packages and other service packages. The service allows developers to specify and manipulate relationships (possibly recurring) between an object and another object.</description>
         <maturity>2</maturity>
-        <provides url="acs-events" version="0.6.2d4"/>
+        <provides url="acs-events" version="0.6.2d5"/>
         <requires url="acs-kernel" version="5.9.1"/>
 
         <callbacks>
Index: openacs-4/packages/acs-events/sql/oracle/acs-events-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/oracle/acs-events-create.sql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-events/sql/oracle/acs-events-create.sql	12 Jul 2018 11:46:37 -0000	1.15
+++ openacs-4/packages/acs-events/sql/oracle/acs-events-create.sql	12 Jul 2018 11:50:16 -0000	1.16
@@ -117,8 +117,8 @@
 
 create table acs_events (
     event_id            integer
-                        constraint acs_events_fk references acs_objects(object_id) on delete cascade
-                        constraint acs_events_pk primary key,
+                        constraint acs_events_event_id_fk references acs_objects(object_id) on delete cascade
+                        constraint acs_events_event_id_pk primary key,
     --
     -- Need additional columns for attributes not inherited from activity, e.g.
     -- activity.name = "Bootcamp" and event.name = "December Bootcamp"
Index: openacs-4/packages/acs-events/sql/oracle/activity-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/oracle/activity-create.sql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-events/sql/oracle/activity-create.sql	12 Jul 2018 11:46:37 -0000	1.7
+++ openacs-4/packages/acs-events/sql/oracle/activity-create.sql	12 Jul 2018 11:50:16 -0000	1.8
@@ -61,10 +61,10 @@
 
 create table acs_activities (
     activity_id         integer
-                        constraint acs_activities_fk
+                        constraint acs_activities_activity_id_fk
                         references acs_objects(object_id)
                         on delete cascade
-                        constraint acs_activities_pk
+                        constraint acs_activities_activity_id_pk
                         primary key,
     name                varchar2(255) not null,
     description         varchar2(4000),
Index: openacs-4/packages/acs-events/sql/oracle/upgrade/upgrade-0.6.2d4-0.6.2d5.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/oracle/upgrade/upgrade-0.6.2d4-0.6.2d5.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-events/sql/oracle/upgrade/upgrade-0.6.2d4-0.6.2d5.sql	12 Jul 2018 11:50:16 -0000	1.1
@@ -0,0 +1,10 @@
+begin;
+
+   -- renaming a constraint is supported by Oracle since version 9i Release 2
+   alter table acs_activities rename constraint acs_activities_fk to acs_activities_activity_id_fk;
+   alter table acs_activities rename constraint acs_activities_pk to acs_activities_activity_id_pk;
+
+   alter table acs_events rename constraint acs_events_fk to acs_events_event_id_fk;
+   alter table acs_events rename constraint acs_events_pk to acs_events_event_id_pk;
+
+end;
Index: openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql	12 Jul 2018 11:24:55 -0000	1.26
+++ openacs-4/packages/acs-events/sql/postgresql/acs-events-create.sql	12 Jul 2018 11:50:16 -0000	1.27
@@ -217,8 +217,8 @@
 -- Events table
 create table acs_events (
     event_id            integer
-                        constraint acs_events_fk references acs_objects(object_id) on delete cascade
-                        constraint acs_events_pk primary key,
+                        constraint acs_events_event_id_fk references acs_objects(object_id) on delete cascade
+                        constraint acs_events_event_id_pk primary key,
     --
     -- Need additional columns for attributes not inherited from activity, e.g.
     -- activity.name = "Bootcamp" and event.name = "December Bootcamp"
Index: openacs-4/packages/acs-events/sql/postgresql/activity-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/activity-create.sql,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-events/sql/postgresql/activity-create.sql	12 Jul 2018 11:20:50 -0000	1.10
+++ openacs-4/packages/acs-events/sql/postgresql/activity-create.sql	12 Jul 2018 11:50:16 -0000	1.11
@@ -111,10 +111,10 @@
 -- The activities table
 create table acs_activities (
     activity_id         integer
-                        constraint acs_activities_fk
+                        constraint acs_activities_activity_id_fk
                         references acs_objects(object_id)
                         on delete cascade
-                        constraint acs_activities_pk
+                        constraint acs_activities_activity_id_pk
                         primary key,
     name                varchar(255) not null,
     description         text,
Index: openacs-4/packages/acs-events/sql/postgresql/upgrade/upgrade-0.6.2d4-0.6.2d5.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-events/sql/postgresql/upgrade/upgrade-0.6.2d4-0.6.2d5.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-events/sql/postgresql/upgrade/upgrade-0.6.2d4-0.6.2d5.sql	12 Jul 2018 11:50:16 -0000	1.1
@@ -0,0 +1,10 @@
+begin;
+
+   -- renaming a constraint is supported by Postgres since version 9.2
+   alter table acs_activities rename constraint acs_activities_fk to acs_activities_activity_id_fk;
+   alter table acs_activities rename constraint acs_activities_pk to acs_activities_activity_id_pk;
+
+   alter table acs_events rename constraint acs_events_fk to acs_events_event_id_fk;
+   alter table acs_events rename constraint acs_events_pk to acs_events_event_id_pk;
+
+end;