OO-1000: fix some issues with the MySQL update

src/main/resources/database/mysql/alter_9_4_0_to_10_0_0.sql

@@ -85,7 +85,6 @@ alter table o_gp_business add constraint gp_to_group_business_ctx foreign key (f
 
 
 -- managed groups
-drop view o_gp_business_v;
 create or replace view o_gp_business_v  as (
    select
       gp.group_id as group_id,
@@ -127,20 +126,18 @@ create or replace view o_gp_business_v  as (
    from o_gp_business as gp
 );
 
-drop view o_bs_gp_membership_v;
 create or replace view o_bs_gp_membership_v as (
    select
+      gp.group_id as group_id,
       membership.id as membership_id,
       membership.fk_identity_id as fk_identity_id,
       membership.lastmodified as lastmodified,
       membership.creationdate as creationdate,
-      membership.g_role as g_role,
-      gp.group_id as group_id
+      membership.g_role as g_role
    from o_bs_group_member as membership
    inner join o_gp_business as gp on (gp.fk_group_id=membership.fk_group_id)
 );
 
-drop view o_gp_member_v;
 create or replace view o_gp_member_v as (
    select
       gp.group_id as bg_id,
@@ -153,7 +150,6 @@ create or replace view o_gp_member_v as (
    inner join o_bs_group_member as membership on (membership.fk_group_id = gp.fk_group_id and membership.g_role in ('coach','participant'))
 );
 
-drop view o_gp_business_to_repository_v;
 create or replace view o_gp_business_to_repository_v as (
 	select 
 		grp.group_id as grp_id,
@@ -165,7 +161,6 @@ create or replace view o_gp_business_to_repository_v as (
 );
 
 -- contacts
-drop view o_gp_contactkey_v;
 create view o_gp_contactkey_v as (
    select
       bg_member.id as membership_id,
@@ -182,7 +177,6 @@ create view o_gp_contactkey_v as (
       (bgroup.participantsintern=true and bg_member.g_role='participant')
 );
 
-drop view o_gp_contactext_v;
 create view o_gp_contactext_v as (
    select
       bg_member.id as membership_id,
@@ -207,7 +201,6 @@ create view o_gp_contactext_v as (
       (bgroup.participantsintern=true and bg_member.g_role='participant')
 );
 
-drop view o_re_membership_v;
 create or replace view o_re_membership_v as (
    select
       bmember.id as membership_id,
@@ -222,8 +215,7 @@ create or replace view o_re_membership_v as (
 );
 
 -- coaching
-drop view o_as_eff_statement_students_v;
-create view o_as_eff_statement_students_v as (
+create or replace view o_as_eff_statement_students_v as (
    select
       sg_re.repositoryentry_id as re_id,
       sg_coach.fk_identity_id as tutor_id,
@@ -242,8 +234,7 @@ create view o_as_eff_statement_students_v as (
    left join o_as_user_course_infos as pg_initial_launch on (pg_initial_launch.fk_resource_id = sg_re.fk_olatresource and pg_initial_launch.fk_identity = sg_participant.fk_identity_id)
 );
 
-drop view o_as_eff_statement_courses_v;
-create view o_as_eff_statement_courses_v as (
+create or replace view o_as_eff_statement_courses_v as (
    select
       sg_re.repositoryentry_id as re_id,
       sg_re.displayname as re_name,
@@ -263,8 +254,7 @@ create view o_as_eff_statement_courses_v as (
    left join o_as_user_course_infos as pg_initial_launch on (pg_initial_launch.fk_resource_id = sg_re.fk_olatresource and pg_initial_launch.fk_identity = sg_participant.fk_identity_id)
 );
 
-drop view o_as_eff_statement_groups_v;
-create view o_as_eff_statement_groups_v as (
+create or replace view o_as_eff_statement_groups_v as (
    select
       sg_re.repositoryentry_id as re_id,
       sg_re.displayname as re_name,
@@ -288,8 +278,7 @@ create view o_as_eff_statement_groups_v as (
 );
 
 -- new views
-drop view o_repositoryentry_my_v;
-create view o_repositoryentry_my_v as (
+create or replace view o_repositoryentry_my_v as (
    select
       re.repositoryentry_id as re_id,
       re.creationdate as re_creationdate,
@@ -333,8 +322,7 @@ create view o_repositoryentry_my_v as (
    left join o_as_user_course_infos as courseinfos on (courseinfos.fk_identity=ident.id and re.fk_olatresource=courseinfos.fk_resource_id)
 );
 
-drop view o_repositoryentry_author_v;
-create view o_repositoryentry_author_v as (
+create or replace view o_repositoryentry_author_v as (
    select
       re.repositoryentry_id as re_id,
       re.creationdate as re_creationdate,

src/main/resources/database/postgresql/alter_9_4_0_to_10_0_0.sql

@@ -136,12 +136,12 @@ create or replace view o_gp_business_v  as (
 drop view o_bs_gp_membership_v;
 create or replace view o_bs_gp_membership_v as (
    select
+      gp.group_id as group_id,
       membership.id as membership_id,
       membership.fk_identity_id as fk_identity_id,
       membership.lastmodified as lastmodified,
       membership.creationdate as creationdate,
-      membership.g_role as g_role,
-      gp.group_id as group_id
+      membership.g_role as g_role
    from o_bs_group_member as membership
    inner join o_gp_business as gp on (gp.fk_group_id=membership.fk_group_id)
 );
@@ -171,7 +171,6 @@ create or replace view o_gp_business_to_repository_v as (
 );
 
 -- contacts
-drop view o_gp_contactkey_v;
 create view o_gp_contactkey_v as (
    select
       bg_member.id as membership_id,
@@ -188,7 +187,6 @@ create view o_gp_contactkey_v as (
       (bgroup.participantsintern=true and bg_member.g_role='participant')
 );
 
-drop view o_gp_contactext_v;
 create view o_gp_contactext_v as (
    select
       bg_member.id as membership_id,
@@ -228,7 +226,6 @@ create or replace view o_re_membership_v as (
 );
 
 -- coaching
-drop view o_as_eff_statement_students_v;
 create view o_as_eff_statement_students_v as (
    select
       sg_re.repositoryentry_id as re_id,
@@ -248,7 +245,6 @@ create view o_as_eff_statement_students_v as (
    left join o_as_user_course_infos as pg_initial_launch on (pg_initial_launch.fk_resource_id = sg_re.fk_olatresource and pg_initial_launch.fk_identity = sg_participant.fk_identity_id)
 );
 
-drop view o_as_eff_statement_courses_v;
 create view o_as_eff_statement_courses_v as (
    select
       sg_re.repositoryentry_id as re_id,
@@ -294,7 +290,6 @@ create view o_as_eff_statement_groups_v as (
 );
 
 -- new views
-drop view o_repositoryentry_my_v;
 create view o_repositoryentry_my_v as (
    select
       re.repositoryentry_id as re_id,
@@ -339,7 +334,6 @@ create view o_repositoryentry_my_v as (
    left join o_as_user_course_infos as courseinfos on (courseinfos.fk_identity=ident.id and re.fk_olatresource=courseinfos.fk_resource_id)
 );
 
-drop view o_repositoryentry_author_v;
 create view o_repositoryentry_author_v as (
    select
       re.repositoryentry_id as re_id,
@@ -376,7 +370,6 @@ create view o_repositoryentry_author_v as (
    left join o_mark as mark on (mark.creator_id=ident.id and re.repositoryentry_id=mark.resid and mark.resname='RepositoryEntry')
 );
 
-
 -- drop views
 drop view o_gp_visible_participant_v;
 drop view o_gp_contact_participant_v;