Index: openacs-4/packages/acs-kernel/acs-kernel.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v
diff -u -N -r1.117 -r1.118
--- openacs-4/packages/acs-kernel/acs-kernel.info	26 Feb 2011 18:20:47 -0000	1.117
+++ openacs-4/packages/acs-kernel/acs-kernel.info	5 Mar 2011 01:47:04 -0000	1.118
@@ -7,15 +7,15 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.7.0d5" url="http://openacs.org/repository/download/apm/acs-kernel-5.7.0d5.apm">
+    <version name="5.7.0d6" url="http://openacs.org/repository/download/apm/acs-kernel-5.7.0d6.apm">
         <owner url="mailto:oct@openacs.org">OpenACS Core Team</owner>
         <summary>Routines and data models providing the foundation for OpenACS-based Web services.</summary>
         <release-date>2010-06-17</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, partiies and the supporting PL/SQL and PL/pgSQL procedures.</description>
         <maturity>3</maturity>
 
-        <provides url="acs-kernel" version="5.7.0d5"/>
+        <provides url="acs-kernel" version="5.7.0d6"/>
 
         <callbacks>
         </callbacks>
Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql,v
diff -u -N -r1.33 -r1.34
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql	5 Mar 2011 01:31:31 -0000	1.33
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql	5 Mar 2011 01:47:04 -0000	1.34
@@ -655,8 +655,12 @@
         raise exception ''Table "%" already exists'', v_table_name;
       end if;
 
-      select table_name into v_supertype_table from acs_object_types
-      where object_type = v_supertype;
+      loop
+        select table_name,object_type into v_supertype_table,v_supertype
+        from acs_object_types
+        where object_type = v_supertype;
+        exit when v_supertype_table is not null;
+      end loop;
   
       execute ''create table '' || v_table_name || '' ('' ||
         v_id_column || '' integer constraint '' || v_table_name ||
Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.7.0d5-5.7.0d6.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.7.0d5-5.7.0d6.sql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.7.0d5-5.7.0d6.sql	5 Mar 2011 01:31:31 -0000	1.1
+++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.7.0d5-5.7.0d6.sql	5 Mar 2011 01:47:04 -0000	1.2
@@ -82,8 +82,13 @@
         raise exception ''Table "%" already exists'', v_table_name;
       end if;
 
-      select table_name into v_supertype_table from acs_object_types
-      where object_type = v_supertype;
+
+      loop
+        select table_name,object_type into v_supertype_table,v_supertype
+        from acs_object_types
+        where object_type = v_supertype;
+        exit when v_supertype_table is not null;
+      end loop;
   
       execute ''create table '' || v_table_name || '' ('' ||
         v_id_column || '' integer constraint '' || v_table_name ||