Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql	4 Jun 2006 00:45:38 -0000	1.22
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql	25 Sep 2006 17:59:16 -0000	1.23
@@ -16,20 +16,20 @@
 
 create table acs_rel_roles (
 	role		varchar(100) not null
-			constraint acs_rel_roles_pk primary key,
+			constraint acs_rel_roles_role_pk primary key,
         pretty_name	varchar(100) not null,
         pretty_plural	varchar(100) not null
 );
 
 create table acs_rel_types (
 	rel_type	varchar(100) not null
-			constraint acs_rel_types_pk primary key
+			constraint acs_rel_types_rel_type_pk primary key
 			constraint acs_rel_types_rel_type_fk
 			references acs_object_types(object_type),
 	object_type_one	varchar(100) not null
 			constraint acs_rel_types_obj_type_1_fk
 			references acs_object_types (object_type),
-	role_one	varchar(100) constraint acs_rel_types_role_1_fk
+	role_one	varchar(100) constraint acs_rel_types_role_one_fk
 			references acs_rel_roles (role),
 	min_n_rels_one	integer default 0 not null
 			constraint acs_rel_types_min_n_1_ck
@@ -40,7 +40,7 @@
 	object_type_two	varchar(100) not null
 			constraint acs_rel_types_obj_type_2_fk
 			references acs_object_types (object_type),
-	role_two	varchar(100) constraint acs_rel_types_role_2_fk
+	role_two	varchar(100) constraint acs_rel_types_role_two_fk
 			references acs_rel_roles (role),
 	min_n_rels_two	integer default 0 not null
 			constraint acs_rel_types_min_n_2_ck
@@ -323,16 +323,16 @@
 			constraint acs_rels_rel_id_fk
 			references acs_objects (object_id)
                         on delete cascade
-			constraint acs_rels_pk primary key,
+			constraint acs_rels_rel_id_pk primary key,
 	rel_type	varchar(100) not null
 			constraint acs_rels_rel_type_fk
 			references acs_rel_types (rel_type),
 	object_id_one	integer not null
-			constraint acs_object_rels_one_fk
+			constraint acs_rels_object_id_one_fk
 			references acs_objects (object_id)
                         on delete cascade,
 	object_id_two	integer not null
-			constraint acs_object_rels_two_fk
+			constraint acs_rels_object_id_two_fk
 			references acs_objects (object_id)
                         on delete cascade,
 	constraint acs_object_rels_un unique
@@ -369,13 +369,13 @@
 
 create table acs_data_links (
         rel_id          integer not null
-                        constraint acs_data_links_pk primary key,
+                        constraint acs_data_links_rel_id_pk primary key,
         object_id_one   integer not null
-                        constraint acs_data_links_one_fk
+                        constraint acs_data_links_obj_one_fk
                         references acs_objects (object_id)
                         on delete cascade,
         object_id_two   integer not null
-                        constraint acs_data_links_two_fk
+                        constraint acs_data_links_obj_two_fk
                         references acs_objects (object_id)
                         on delete cascade,
         constraint acs_data_links_un unique
