From 76044f6a6c0cd424a04ebcad51a3ae240c13626d Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 25 Jul 2013 12:01:02 +0200
Subject: [PATCH] OO-678: adapt the alter scripts for mysql and postgresql to
be correctly parsed by our upgrader
---
.../database/mysql/alter_8_4_0_to_9_0_0.sql | 10 ++++------
.../database/postgresql/alter_8_4_0_to_9_0_0.sql | 12 +++++-------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/database/mysql/alter_8_4_0_to_9_0_0.sql b/src/main/resources/database/mysql/alter_8_4_0_to_9_0_0.sql
index 27c584869ce..8b714042b67 100644
--- a/src/main/resources/database/mysql/alter_8_4_0_to_9_0_0.sql
+++ b/src/main/resources/database/mysql/alter_8_4_0_to_9_0_0.sql
@@ -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_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)
- 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
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_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)
- 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
select
@@ -464,11 +462,11 @@ create or replace view o_gp_member_v as
gp.descr as bg_desc,
membership.identity_id as member_id
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
drop view o_gp_business_v;
+
create or replace view o_gp_business_v as (
select
gp.group_id as group_id,
diff --git a/src/main/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql b/src/main/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql
index 0d3712b697c..c740a8eafb3 100644
--- a/src/main/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql
+++ b/src/main/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql
@@ -566,8 +566,7 @@ union select
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 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
select
@@ -581,10 +580,9 @@ union select
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 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
gp.group_id as bg_id,
gp.groupname as bg_name,
@@ -593,11 +591,11 @@ create or replace view o_gp_member_v as
gp.descr as bg_desc,
membership.identity_id as member_id
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
drop view o_gp_business_v;
+
create or replace view o_gp_business_v as (
select
gp.group_id as group_id,
--
GitLab