Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -N -r1.145 -r1.146
--- openacs-4/packages/dotlrn/dotlrn.info	5 Jul 2018 11:16:16 -0000	1.145
+++ openacs-4/packages/dotlrn/dotlrn.info	12 Jul 2018 11:13:31 -0000	1.146
@@ -7,15 +7,15 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.10.0d2" url="http://openacs.org/repository/download/apm/dotlrn-2.10.0d2.apm">
+    <version name="2.10.0d3" url="http://openacs.org/repository/download/apm/dotlrn-2.10.0d3.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>A Course Management System</summary>
         <release-date>2017-08-06</release-date>
         <vendor url="http://dotlrn.org">DotLRN Consortium</vendor>
 	<maturity>2</maturity>
         <description format="text/html">Course Management</description>
 
-        <provides url="dotlrn" version="2.10.0d2"/>
+        <provides url="dotlrn" version="2.10.0d3"/>
         <requires url="acs-kernel" version="5.9.1"/>
 	<requires url="acs-tcl" version="5.10.0d10"/>
         <requires url="acs-subsite" version="5.9.1"/>
Index: openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql,v
diff -u -N -r1.33 -r1.34
--- openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql	5 Jul 2018 11:16:16 -0000	1.33
+++ openacs-4/packages/dotlrn/sql/oracle/dotlrn-init.sql	12 Jul 2018 11:13:31 -0000	1.34
@@ -112,9 +112,11 @@
         description => '#dotlrn.dotlrn_club_description#'
     );
 
-    update acs_object_types set table_name = 'dotlrn_community', package_name = 'dotlrn_community' where object_type = 'dotlrn_community';
-    update acs_object_types set table_name = 'dotlrn_class_instance', package_name = 'dotlrn_class_instance' where object_type = 'dotlrn_class_instance';
-    update acs_object_types set table_name = 'dotlrn_club', package_name = 'dotlrn_club' where object_type = 'dotlrn_club';
+    -- dotlrn_communities is a view and cannot be used as
+    -- table_name.
+    update acs_object_types set table_name = 'dotlrn_communities_all', package_name = 'dotlrn_community' where object_type = 'dotlrn_community';
+    update acs_object_types set table_name = 'dotlrn_class_instances', package_name = 'dotlrn_class_instance' where object_type = 'dotlrn_class_instance';
+    update acs_object_types set table_name = 'dotlrn_clubs', package_name = 'dotlrn_club' where object_type = 'dotlrn_club';
 
     bar := acs_attribute.create_attribute(
         object_type => 'dotlrn_community',
Index: openacs-4/packages/dotlrn/sql/oracle/privacy-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/privacy-init.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/oracle/privacy-init.sql	20 Apr 2004 21:13:17 -0000	1.2
+++ openacs-4/packages/dotlrn/sql/oracle/privacy-init.sql	12 Jul 2018 11:13:31 -0000	1.3
@@ -31,8 +31,8 @@
         pretty_name => '.LRN Guest',
         pretty_plural => '.LRN Guests',
         supertype => 'membership_rel',
-        table_name => 'dotlrn_guest_rels',
-        id_column => 'rel_id',
+        table_name => null,
+        id_column => null,
         package_name => 'dotlrn_guest_rel',
         object_type_one => 'group',
         role_one => null,
@@ -59,8 +59,8 @@
         pretty_name => '.LRN Non-Guest',
         pretty_plural => '.LRN Non-Guests',
         supertype => 'membership_rel',
-        table_name => 'dotlrn_non_guest_rels',
-        id_column => 'rel_id',
+        table_name => null,
+        id_column => null,
         package_name => 'dotlrn_non_guest_rel',
         object_type_one => 'group',
         role_one => null,
Index: openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.10.0d2-2.10.0d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.10.0d2-2.10.0d3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.10.0d2-2.10.0d3.sql	12 Jul 2018 11:13:31 -0000	1.1
@@ -0,0 +1,29 @@
+begin;
+
+    -- dotlrn_communities is a view and cannot be used as
+    -- table_name.
+    update acs_object_types set
+       table_name = 'dotlrn_communities_all'
+     where object_type = 'dotlrn_community';
+
+    update acs_object_types set
+       table_name = 'dotlrn_class_instances'
+     where object_type = 'dotlrn_class_instance';
+
+    update acs_object_types set
+       table_name = 'dotlrn_clubs'
+     where object_type = 'dotlrn_club';
+
+    -- Tables defined for these objects don't really exist, as they
+    -- are just plain relational segments without additional
+    -- meatadata.
+    update acs_object_types set
+       table_name = null, id_column = null
+     where object_type = 'dotlrn_guest_rel';
+
+    update acs_object_types set
+       table_name = null, id_column = null
+     where object_type = 'dotlrn_non_guest_rel';
+    -- ----
+
+end;
Index: openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql,v
diff -u -N -r1.16 -r1.17
--- openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql	5 Jul 2018 11:16:16 -0000	1.16
+++ openacs-4/packages/dotlrn/sql/postgresql/dotlrn-init.sql	12 Jul 2018 11:13:31 -0000	1.17
@@ -128,9 +128,24 @@
         '#dotlrn.dotlrn_club_description#'
     );
 
-    update acs_object_types set table_name = 'dotlrn_community', package_name = 'dotlrn_community' where object_type = 'dotlrn_community';
-    update acs_object_types set table_name = 'dotlrn_class_instance', package_name = 'dotlrn_class_instance' where object_type = 'dotlrn_class_instance';
-    update acs_object_types set table_name = 'dotlrn_club', package_name = 'dotlrn_club' where object_type = 'dotlrn_club';
+    -- dotlrn_communities is a view and cannot be used as
+    -- table_name. I know there are cases downstream where
+    -- dotlrn_communities_all is also a view, but at least here on
+    -- valilla it's a table.
+    update acs_object_types set
+       table_name = 'dotlrn_communities_all',
+       package_name = 'dotlrn_community'
+     where object_type = 'dotlrn_community';
+     
+    update acs_object_types set
+       table_name = 'dotlrn_class_instances',
+       package_name = 'dotlrn_class_instance'
+     where object_type = 'dotlrn_class_instance';
+     
+    update acs_object_types set
+       table_name = 'dotlrn_clubs',
+       package_name = 'dotlrn_club'
+     where object_type = 'dotlrn_club';
 
     perform acs_attribute__create_attribute(
 	   'dotlrn_community',
Index: openacs-4/packages/dotlrn/sql/postgresql/privacy-init.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/privacy-init.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/dotlrn/sql/postgresql/privacy-init.sql	7 Aug 2017 23:48:09 -0000	1.4
+++ openacs-4/packages/dotlrn/sql/postgresql/privacy-init.sql	12 Jul 2018 11:13:31 -0000	1.5
@@ -39,8 +39,8 @@
         '.LRN Guest',
         '.LRN Guests',
         'membership_rel',
-        'dotlrn_guest_rels',
-        'rel_id',
+        cast(null as varchar), -- table_name
+        cast(null as varchar), -- id_column
         'dotlrn_guest_rel',
         'group',
         null,
@@ -67,8 +67,8 @@
         '.LRN Non-Guest',
         '.LRN Non-Guests',
         'membership_rel',
-        'dotlrn_non_guest_rels',
-        'rel_id',
+        cast(null as varchar), -- table_name
+        cast(null as varchar), -- id_column
         'dotlrn_non_guest_rel',
         'group',
         null,
Index: openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.10.0d2-2.10.0d3.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.10.0d2-2.10.0d3.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.10.0d2-2.10.0d3.sql	12 Jul 2018 11:13:31 -0000	1.1
@@ -0,0 +1,31 @@
+begin;
+
+    -- dotlrn_communities is a view and cannot be used as
+    -- table_name. I know there are cases downstream where
+    -- dotlrn_communities_all is also a view, but at least here on
+    -- valilla it's a table.
+    update acs_object_types set
+       table_name = 'dotlrn_communities_all'
+     where object_type = 'dotlrn_community';
+
+    update acs_object_types set
+       table_name = 'dotlrn_class_instances'
+     where object_type = 'dotlrn_class_instance';
+
+    update acs_object_types set
+       table_name = 'dotlrn_clubs'
+     where object_type = 'dotlrn_club';
+
+    -- Tables defined for these objects don't really exist, as they
+    -- are just plain relational segments without additional
+    -- meatadata.
+    update acs_object_types set
+       table_name = null, id_column = null
+     where object_type = 'dotlrn_guest_rel';
+
+    update acs_object_types set
+       table_name = null, id_column = null
+     where object_type = 'dotlrn_non_guest_rel';
+    -- ----
+
+end;