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.29.2.1 -r1.29.2.2
--- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql	12 Apr 2020 08:52:42 -0000	1.29.2.1
+++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql	5 Jan 2021 08:51:45 -0000	1.29.2.2
@@ -104,11 +104,11 @@
    'group',
    'composite',
     0, 
-    null,
+    null::integer,
    'group',
    'component',
    0,
-   null,
+   null::integer,
    't'
    );
 
@@ -127,13 +127,13 @@
    'rel_id',                         -- id_column
    'membership_rel',                 -- package_name
    'group',                          -- object_type_one
-   null,                               -- role_one
-   0,                                  -- min_n_rels_one
-   null,                               -- max_n_rels_one
+   null,                             -- role_one
+   0,                                -- min_n_rels_one
+   null::integer,                    -- max_n_rels_one
    'person',                         -- object_type_two
    'member',                         -- role_two
-   0,                                  -- min_n_rels_two
-   null,                                -- max_n_rels_two
+   0,                                -- min_n_rels_two
+   null::integer,                    -- max_n_rels_two
    't'
    );
 
@@ -153,11 +153,11 @@
    'group',                          -- object_type_one
    null,                             -- role_one
    0,                                -- min_n_rels_one
-   null,                             -- max_n_rels_one
+   null::integer,                    -- max_n_rels_one
    'person',                         -- object_type_two
    'admin',                          -- role_two
    0,                                -- min_n_rels_two
-   null,                             -- max_n_rels_two
+   null::integer,                    -- max_n_rels_two
    false                             -- composable_p
    );
 
Index: openacs-4/packages/acs-kernel/sql/postgresql/test/rel-segments-test-types-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/test/rel-segments-test-types-create.sql,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-kernel/sql/postgresql/test/rel-segments-test-types-create.sql	7 Aug 2017 23:47:56 -0000	1.4
+++ openacs-4/packages/acs-kernel/sql/postgresql/test/rel-segments-test-types-create.sql	5 Jan 2021 08:51:45 -0000	1.4.2.1
@@ -12,12 +12,12 @@
 		'group',
                 null,
 		0,
-		null,
+		null::integer,
 		'party',
                 'member',
 		0,
-		null,
-        't'
+		null::integer,
+                't'
 		);
 
 
@@ -32,12 +32,12 @@
 		'group',
 		null,
 		0,
-		null,
+		null::integer,
 		'party',
                 'member',
 		0,
-		null,
-        't'
+		null::integer,
+                't'
 		);
 
         return null;
Index: openacs-4/packages/acs-subsite/sql/postgresql/user-profiles-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/sql/postgresql/user-profiles-create.sql,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-subsite/sql/postgresql/user-profiles-create.sql	7 Aug 2017 23:47:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/sql/postgresql/user-profiles-create.sql	5 Jan 2021 08:51:46 -0000	1.8.2.1
@@ -20,20 +20,20 @@
 --                              'Application Group', 'Application Group');
 
 --     acs_rel_type.create_type(
---       rel_type			=> 'user_profile',
+--       rel_type		=> 'user_profile',
 --       pretty_name		=> 'User Profile',
 --       pretty_plural		=> 'User Profiles',
---       supertype			=> 'membership_rel',
+--       supertype		=> 'membership_rel',
 --       table_name		=> 'user_profiles',
---       id_column			=> 'profile_id',
+--       id_column		=> 'profile_id',
 --       package_name		=> 'user_profile',
 --       abstract_p		=> 'f',
---       object_type_one		=> 'application_group',
---       role_one			=> 'application',
+--       object_type_one	=> 'application_group',
+--       role_one		=> 'application',
 --       min_n_rels_one		=> 0,
 --       max_n_rels_one		=> null,
---       object_type_two		=> 'user',
---       role_two			=> 'user',
+--       object_type_two	=> 'user',
+--       role_two		=> 'user',
 --       min_n_rels_two		=> 0,
 --       max_n_rels_two		=> null
 --     );
@@ -61,12 +61,12 @@
 	'application_group',
 	'application',
 	0,
-	null,
+	null::integer,
 	'user',
 	'user',
 	0,
-	null,
-	'f'
+	null::integer,
+        'f'
     );
 
     return 0;
Index: openacs-4/packages/dotlrn/sql/postgresql/class-memberships-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/class-memberships-create.sql,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/dotlrn/sql/postgresql/class-memberships-create.sql	7 Aug 2017 23:48:09 -0000	1.5
+++ openacs-4/packages/dotlrn/sql/postgresql/class-memberships-create.sql	5 Jan 2021 08:51:46 -0000	1.5.2.1
@@ -136,13 +136,13 @@
         'rel_id',
         'dotlrn_student_rel',
         'dotlrn_class_instance', 
-	null, 
+        null, 
         0, 
-	null::integer,
+        null::integer,
         'user',
-	'student',
+        'student',
         0, 
-	null::integer
+        null::integer
     );
 
     perform acs_rel_type__create_type (
Index: openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.0a3-2.0.2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.0a3-2.0.2.sql,v
diff -u -r1.3 -r1.3.6.1
--- openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.0a3-2.0.2.sql	1 Nov 2013 21:08:30 -0000	1.3
+++ openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.0a3-2.0.2.sql	5 Jan 2021 08:51:46 -0000	1.3.6.1
@@ -51,7 +51,7 @@
         'group',
         null,
         0,
-        null,
+        null::integer,
         'user',
         null,
         0,
@@ -79,7 +79,7 @@
         'group',
         null,
         0,
-        null,
+        null::integer,
         'user',
         null,
         0,