Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0b1-5.6.0b2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0b1-5.6.0b2.sql,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0b1-5.6.0b2.sql 16 May 2010 00:09:52 -0000 1.1.2.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0b1-5.6.0b2.sql 18 May 2010 18:04:50 -0000 1.1.2.3 @@ -2,9 +2,13 @@ drop index acs_objects_package_object_idx; -- This is necessary because a previous upgrade script didn't recreate these views. --- The bio code didn't use these views, but they should be created for future use +-- The bio code didn't use this views, but they should be created for future use -- and consistency. +-- Unfortunately, there are some obscure views build on cc_users, so it can not +-- be dropped. PG replace view does not allow for changing the view columns so +-- we can not replace it, either. + drop view acs_users_all; create view acs_users_all as @@ -13,16 +17,3 @@ where pa.party_id = pe.person_id and pe.person_id = u.user_id; -drop view cc_users; -create view cc_users -as -select o.*, pa.*, pe.*, u.*, mr.member_state, mr.rel_id -from acs_objects o, parties pa, persons pe, users u, group_member_map m, membership_rels mr -where o.object_id = pa.party_id - and pa.party_id = pe.person_id - and pe.person_id = u.user_id - and u.user_id = m.member_id - and m.group_id = acs__magic_object_id('registered_users') - and m.rel_id = mr.rel_id - and m.container_id = m.group_id - and m.rel_type = 'membership_rel'; Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0d1-5.6.0d2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0d1-5.6.0d2.sql,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0d1-5.6.0d2.sql 16 May 2010 00:09:52 -0000 1.2.2.1 +++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.6.0d1-5.6.0d2.sql 18 May 2010 18:04:50 -0000 1.2.2.2 @@ -26,20 +26,6 @@ where pa.party_id = pe.person_id and pe.person_id = u.user_id; - drop view cc_users; - create view cc_users - as - select o.*, pa.*, pe.*, u.*, mr.member_state, mr.rel_id - from acs_objects o, parties pa, persons pe, users u, group_member_map m, membership_rels mr - where o.object_id = pa.party_id - and pa.party_id = pe.person_id - and pe.person_id = u.user_id - and u.user_id = m.member_id - and m.group_id = acs__magic_object_id(''registered_users'') - and m.rel_id = mr.rel_id - and m.container_id = m.group_id - and m.rel_type = ''membership_rel''; - bio_id := attribute_id from acs_attributes where object_type = ''person''