Skip to content
Snippets Groups Projects
Commit 76044f6a authored by srosse's avatar srosse
Browse files

OO-678: adapt the alter scripts for mysql and postgresql to be correctly parsed by our upgrader

parent 3171ef0d
No related branches found
No related tags found
No related merge requests found
...@@ -429,8 +429,7 @@ select ...@@ -429,8 +429,7 @@ select
left join o_gp_business_to_resource as bgroup_rel on (bgroup.group_id = bgroup_rel.fk_group) left join o_gp_business_to_resource as bgroup_rel on (bgroup.group_id = bgroup_rel.fk_group)
left join o_repositoryentry as re1 on (bs_member.secgroup_id = re1.fk_participantgroup) left join o_repositoryentry as re1 on (bs_member.secgroup_id = re1.fk_participantgroup)
left join o_repositoryentry as re2 on (re2.fk_olatresource = bgroup_rel.fk_resource) left join o_repositoryentry as re2 on (re2.fk_olatresource = bgroup_rel.fk_resource)
where re1.repositoryentry_id is not null or re2.repositoryentry_id is not null where re1.repositoryentry_id is not null or re2.repositoryentry_id is not null;
;
create or replace view o_re_tutor_v as create or replace view o_re_tutor_v as
select select
...@@ -443,8 +442,7 @@ select ...@@ -443,8 +442,7 @@ select
left join o_gp_business_to_resource as bgroup_rel on (bgroup.group_id = bgroup_rel.fk_group) left join o_gp_business_to_resource as bgroup_rel on (bgroup.group_id = bgroup_rel.fk_group)
left join o_repositoryentry as re1 on (bs_member.secgroup_id = re1.fk_tutorgroup) left join o_repositoryentry as re1 on (bs_member.secgroup_id = re1.fk_tutorgroup)
left join o_repositoryentry as re2 on (re2.fk_olatresource = bgroup_rel.fk_resource) left join o_repositoryentry as re2 on (re2.fk_olatresource = bgroup_rel.fk_resource)
where re1.repositoryentry_id is not null or re2.repositoryentry_id is not null where re1.repositoryentry_id is not null or re2.repositoryentry_id is not null;
;
create or replace view o_gp_member_v as create or replace view o_gp_member_v as
select select
...@@ -464,11 +462,11 @@ create or replace view o_gp_member_v as ...@@ -464,11 +462,11 @@ create or replace view o_gp_member_v as
gp.descr as bg_desc, gp.descr as bg_desc,
membership.identity_id as member_id membership.identity_id as member_id
from o_bs_membership membership from o_bs_membership membership
inner join o_gp_business gp on (membership.secgroup_id = gp.fk_partipiciantgroup) inner join o_gp_business gp on (membership.secgroup_id = gp.fk_partipiciantgroup);
;
-- managed groups -- managed groups
drop view o_gp_business_v; drop view o_gp_business_v;
create or replace view o_gp_business_v as ( create or replace view o_gp_business_v as (
select select
gp.group_id as group_id, gp.group_id as group_id,
......
...@@ -566,8 +566,7 @@ union select ...@@ -566,8 +566,7 @@ union select
from o_repositoryentry re from o_repositoryentry re
inner join o_gp_business_to_resource bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource) inner join o_gp_business_to_resource bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
inner join o_gp_business bgroup on (bgroup.group_id = bgroup_rel.fk_group) inner join o_gp_business bgroup on (bgroup.group_id = bgroup_rel.fk_group)
inner join o_bs_membership bg_member on (bg_member.secgroup_id = bgroup.fk_partipiciantgroup) inner join o_bs_membership bg_member on (bg_member.secgroup_id = bgroup.fk_partipiciantgroup);
;
create or replace view o_re_tutor_v as create or replace view o_re_tutor_v as
select select
...@@ -581,10 +580,9 @@ union select ...@@ -581,10 +580,9 @@ union select
from o_repositoryentry re from o_repositoryentry re
inner join o_gp_business_to_resource bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource) inner join o_gp_business_to_resource bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
inner join o_gp_business bgroup on (bgroup.group_id = bgroup_rel.fk_group) inner join o_gp_business bgroup on (bgroup.group_id = bgroup_rel.fk_group)
inner join o_bs_membership bg_member on (bg_member.secgroup_id = bgroup.fk_ownergroup) inner join o_bs_membership bg_member on (bg_member.secgroup_id = bgroup.fk_ownergroup);
;
create or replace view o_gp_member_v as create or replace view o_gp_member_v as (
select select
gp.group_id as bg_id, gp.group_id as bg_id,
gp.groupname as bg_name, gp.groupname as bg_name,
...@@ -593,11 +591,11 @@ create or replace view o_gp_member_v as ...@@ -593,11 +591,11 @@ create or replace view o_gp_member_v as
gp.descr as bg_desc, gp.descr as bg_desc,
membership.identity_id as member_id membership.identity_id as member_id
from o_bs_membership as membership from o_bs_membership as membership
inner join o_gp_business as gp on (membership.secgroup_id = gp.fk_ownergroup or membership.secgroup_id = gp.fk_partipiciantgroup) inner join o_gp_business as gp on (membership.secgroup_id = gp.fk_ownergroup or membership.secgroup_id = gp.fk_partipiciantgroup));
;
-- managed groups -- managed groups
drop view o_gp_business_v; drop view o_gp_business_v;
create or replace view o_gp_business_v as ( create or replace view o_gp_business_v as (
select select
gp.group_id as group_id, gp.group_id as group_id,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment