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.5 -r1.6
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql	21 Mar 2001 05:46:40 -0000	1.5
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql	22 Mar 2001 00:09:24 -0000	1.6
@@ -198,37 +198,34 @@
 
 
 -- procedure create_type
-create function acs_rel_type__create_type (varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar,integer,integer,varchar,varchar,integer,integer)
+create function acs_rel_type__create_type (varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar,varchar,integer,integer,varchar,varchar,integer,integer)
 returns integer as '
 declare
   create_type__rel_type               alias for $1;  
   create_type__pretty_name            alias for $2;  
   create_type__pretty_plural          alias for $3;  
-  create_type__table_name             alias for $4;  
-  create_type__id_column              alias for $5;  
-  create_type__package_name           alias for $6;  
-  create_type__object_type_one        alias for $7; 
-  create_type__role_one               alias for $8; 
+  create_type__supertype              alias for $4;
+  create_type__table_name             alias for $5;  
+  create_type__id_column              alias for $6;  
+  create_type__package_name           alias for $7;  
+  create_type__object_type_one        alias for $8; 
+  create_type__role_one               alias for $9; 
+  create_type__min_n_rels_one         alias for $10; 
+  create_type__max_n_rels_one         alias for $11; 
+  create_type__object_type_two        alias for $12; 
+  create_type__role_two               alias for $13; 
+  create_type__min_n_rels_two         alias for $14; 
+  create_type__max_n_rels_two         alias for $15; 
 
-  create_type__min_n_rels_one         alias for $9; 
-  create_type__max_n_rels_one         alias for $10; 
-
-  create_type__object_type_two        alias for $11; 
-  create_type__role_two               alias for $12; 
-
-  create_type__min_n_rels_two         alias for $13; 
-  create_type__max_n_rels_two         alias for $14; 
-
   type_extension_table acs_object_types.type_extension_table%TYPE default null;
-  supertype    acs_object_types.supertype%TYPE       default ''relationship'';
   abstract_p   acs_object_types.abstract_p%TYPE      default ''f'';
   name_method  acs_object_types.name_method%TYPE     default null;     
 begin
     PERFORM acs_object_type__create_type(
       create_type__rel_type,
       create_type__pretty_name,
       create_type__pretty_plural,
-      supertype,
+      create_type__supertype,
       create_type__table_name,
       create_type__id_column,
       create_type__package_name,
Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql	21 Mar 2001 05:46:40 -0000	1.5
+++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql	22 Mar 2001 00:09:24 -0000	1.6
@@ -81,6 +81,7 @@
    ''composition_rel'',
    ''Composition Relation'',
    ''Composition Relationships'',
+   ''relationship'',
    ''composition_rels'',
    ''rel_id'',
    ''composition_rel'',
@@ -104,6 +105,7 @@
    ''membership_rel'',
    ''Membership Relation'',
    ''Membership Relationships'',
+   ''relationship'',
    ''membership_rels'',
    ''rel_id'',
    ''membership_rel'',
Index: openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql	20 Mar 2001 04:12:10 -0000	1.2
+++ openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql	22 Mar 2001 00:09:24 -0000	1.3
@@ -34,8 +34,8 @@
       new__constraint_type,
       now(),
       new__creation_user,
-      new__creation_ip
-      new__context_id,
+      new__creation_ip,
+      new__context_id
     );
 
     insert into rel_constraints