Index: openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.0a3-2.0.2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.0a3-2.0.2.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.0a3-2.0.2.sql 1 Mar 2004 16:40:41 -0000 1.1.2.1 +++ openacs-4/packages/dotlrn/sql/oracle/upgrade/upgrade-2.0a3-2.0.2.sql 15 Mar 2004 20:59:06 -0000 1.1.2.2 @@ -7,7 +7,102 @@ -- prompt Creating relationships, relational segments, helper views and package... -@@../privacy-init.sql + +-- Copied in from privacy-init.sql (v1.1.2.2) but +-- given an extra "if" condition. We could have put the "if" directly +-- in privacy-init.sql but it doesn't really belong there. +declare + v_guest_segment_id integer; + v_non_guest_segment_id integer; + v_object_id integer; + v_count integer; +begin + + -- + -- Only run this code if the new rel_types haven't been created. + -- Fix for bug #1633. + -- + select count(*) into v_count + from acs_object_types + where object_type = 'dotlrn_guest_rel'; + + if v_count = 0 then + + -- + -- Guests + -- + + acs_rel_type.create_type( + rel_type => 'dotlrn_guest_rel', + pretty_name => '.LRN Guest', + pretty_plural => '.LRN Guests', + supertype => 'membership_rel', + table_name => 'dotlrn_guest_rels', + id_column => 'rel_id', + package_name => 'dotlrn_guest_rel', + object_type_one => 'group', + role_one => null, + min_n_rels_one => 0, + max_n_rels_one => null, + object_type_two => 'user', + role_two => null, + min_n_rels_two => 0, + max_n_rels_two => 1 + ); + + v_guest_segment_id := rel_segment.new( + segment_name => 'Registered .LRN Guests', + group_id => acs.magic_object_id('registered_users'), + rel_type => 'dotlrn_guest_rel' + ); + + -- + -- Non Guests + -- + + acs_rel_type.create_type( + rel_type => 'dotlrn_non_guest_rel', + pretty_name => '.LRN Non-Guest', + pretty_plural => '.LRN Non-Guests', + supertype => 'membership_rel', + table_name => 'dotlrn_non_guest_rels', + id_column => 'rel_id', + package_name => 'dotlrn_non_guest_rel', + object_type_one => 'group', + role_one => null, + min_n_rels_one => 0, + max_n_rels_one => null, + object_type_two => 'user', + role_two => null, + min_n_rels_two => 0, + max_n_rels_two => 1 + ); + + v_non_guest_segment_id := rel_segment.new( + segment_name => 'Registered .LRN Non-Guests', + group_id => acs.magic_object_id('registered_users'), + rel_type => 'dotlrn_non_guest_rel' + ); + + end if; + +end; +/ +show errors + +-- Copied in from privacy-init.sql (v.1.1.2.2) +create or replace view dotlrn_guest_status +as +select r.object_id_two as user_id, + case when r.rel_type = 'dotlrn_guest_rel' then 't' else 'f' end as guest_p + from acs_rels r, + membership_rels m +where m.rel_id = r.rel_id + and (r.rel_type = 'dotlrn_guest_rel' + or r.rel_type = 'dotlrn_non_guest_rel') + and r.object_id_one = acs.magic_object_id('registered_users'); + + @@../privacy-package-create.sql prompt Establishing non-guest or guest status for each user... 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.1.2.1 -r1.1.2.2 --- openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.0a3-2.0.2.sql 1 Mar 2004 16:42:27 -0000 1.1.2.1 +++ openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.0a3-2.0.2.sql 15 Mar 2004 20:59:06 -0000 1.1.2.2 @@ -7,7 +7,107 @@ -- -- prompt Creating relationships, relational segments, helper views and package... -\i ../privacy-init.sql + +-- This function was copied in from privacy-init.sql (v1.1.2.3) but +-- given an extra "if" condition. We could have put the "if" directly +-- in privacy-init.sql but it doesn't really belong there. +create function inline_1() +returns integer as ' +declare + v_guest_segment_id integer; + v_non_guest_segment_id integer; + v_object_id integer; + v_count integer; +begin + + -- + -- Only run this code if the new rel_types haven''t been created. + -- Fix for bug #1633. + -- + select count(*) into v_count + from acs_object_types + where object_type = ''dotlrn_guest_rel''; + + if v_count = 0 then + + -- + -- Guests + -- + + perform acs_rel_type__create_type( + ''dotlrn_guest_rel'', + ''.LRN Guest'', + ''.LRN Guests'', + ''membership_rel'', + ''dotlrn_guest_rels'', + ''rel_id'', + ''dotlrn_guest_rel'', + ''group'', + null, + 0, + null, + ''user'', + null, + 0, + 1 + ); + + v_guest_segment_id := rel_segment__new( + ''Registered .LRN Guests'', + acs__magic_object_id(''registered_users''), + ''dotlrn_guest_rel'' + ); + + -- + -- Non Guests + -- + + perform acs_rel_type__create_type( + ''dotlrn_non_guest_rel'', + ''.LRN Non-Guest'', + ''.LRN Non-Guests'', + ''membership_rel'', + ''dotlrn_non_guest_rels'', + ''rel_id'', + ''dotlrn_non_guest_rel'', + ''group'', + null, + 0, + null, + ''user'', + null, + 0, + 1 + ); + + v_non_guest_segment_id := rel_segment__new( + ''Registered .LRN Non-Guests'', + acs__magic_object_id(''registered_users''), + ''dotlrn_non_guest_rel'' + ); + + end if; + + return(0); +end; +' language 'plpgsql'; + +select inline_1(); +drop function inline_1(); + +-- Copied in from privacy-init.sql (v.1.1.2.3) +create or replace view dotlrn_guest_status +as +select r.object_id_two as user_id, + case when r.rel_type = 'dotlrn_guest_rel' then 't' else 'f' end as guest_p + from acs_rels r, + membership_rels m +where m.rel_id = r.rel_id + and (r.rel_type = 'dotlrn_guest_rel' + or r.rel_type = 'dotlrn_non_guest_rel') + and r.object_id_one = acs__magic_object_id('registered_users'); + + \i ../privacy-package-create.sql -- prompt Establishing non-guest or guest status for each user...