Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
76044f6a
Commit
76044f6a
authored
11 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/resources/database/mysql/alter_8_4_0_to_9_0_0.sql
+4
-6
4 additions, 6 deletions
src/main/resources/database/mysql/alter_8_4_0_to_9_0_0.sql
src/main/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql
+5
-7
5 additions, 7 deletions
...in/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql
with
9 additions
and
13 deletions
src/main/resources/database/mysql/alter_8_4_0_to_9_0_0.sql
+
4
−
6
View file @
76044f6a
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql
+
5
−
7
View file @
76044f6a
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment