From 8fcd269800fa62c1dad9d9df6bd8a019911cd0cb Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 1 Oct 2014 10:36:37 +0200
Subject: [PATCH] no-jira: update version to 10.1 alpha, remove unused views
---
pom.xml | 2 +-
.../database/mysql/alter_10_0_0_to_10_1_0.sql | 4 +
.../database/mysql/setupDatabase.sql | 158 +-----------------
.../oracle/alter_10_0_0_to_10_1_0.sql | 4 +
.../database/oracle/setupDatabase.sql | 156 -----------------
.../postgresql/alter_10_0_0_to_10_1_0.sql | 4 +
.../database/postgresql/setupDatabase.sql | 158 +-----------------
.../resources/serviceconfig/olat.properties | 4 +-
.../org/olat/test/ArquillianDeployments.java | 2 +-
9 files changed, 18 insertions(+), 474 deletions(-)
create mode 100644 src/main/resources/database/mysql/alter_10_0_0_to_10_1_0.sql
create mode 100644 src/main/resources/database/oracle/alter_10_0_0_to_10_1_0.sql
create mode 100644 src/main/resources/database/postgresql/alter_10_0_0_to_10_1_0.sql
diff --git a/pom.xml b/pom.xml
index f2d0df642bd..e44ed86529a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openolat</groupId>
<artifactId>openolat-lms</artifactId>
- <version>10.0-SNAPSHOT</version>
+ <version>10.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>OpenOLAT LMS</name>
<url>http://www.openolat.org</url>
diff --git a/src/main/resources/database/mysql/alter_10_0_0_to_10_1_0.sql b/src/main/resources/database/mysql/alter_10_0_0_to_10_1_0.sql
new file mode 100644
index 00000000000..b5655ad7ce6
--- /dev/null
+++ b/src/main/resources/database/mysql/alter_10_0_0_to_10_1_0.sql
@@ -0,0 +1,4 @@
+drop view o_qp_item_shared_v;
+drop view o_qp_item_pool_v;
+drop view o_qp_item_author_v;
+drop view o_qp_item_v;
\ No newline at end of file
diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql
index 644624675f2..e89c601650b 100644
--- a/src/main/resources/database/mysql/setupDatabase.sql
+++ b/src/main/resources/database/mysql/setupDatabase.sql
@@ -1593,124 +1593,7 @@ create or replace view o_im_roster_entry_v as (
inner join o_bs_identity as ident on (entry.fk_identity_id = ident.id)
);
--- views with rating
-create or replace view o_qp_item_v as (
- select
- item.id as item_id,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- ownership.identity_id as owner_id,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then 0 else 1 end) as marked,
- (select avg(rating.rating) from o_userrating as rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item as item
- inner join o_bs_secgroup as ownergroup on (ownergroup.id = item.fk_ownergroup)
- left join o_bs_membership as ownership on (ownergroup.id = ownership.secgroup_id)
- left join o_qp_taxonomy_level as taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type as itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context as educontext on (item.fk_edu_context = educontext.id)
- left join o_mark as mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
-);
-
-create or replace view o_qp_item_author_v as (
- select
- item.id as item_id,
- ownership.identity_id as item_author,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then 0 else 1 end) as marked,
- (select avg(rating.rating) from o_userrating as rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item as item
- inner join o_bs_secgroup as ownergroup on (ownergroup.id = item.fk_ownergroup)
- inner join o_bs_membership as ownership on (ownergroup.id = ownership.secgroup_id)
- left join o_mark as mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
- left join o_qp_taxonomy_level as taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type as itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context as educontext on (item.fk_edu_context = educontext.id)
-);
-
-create or replace view o_qp_item_pool_v as (
- select
- item.id as item_id,
- pool2item.q_editable as item_editable,
- pool2item.fk_pool_id as item_pool,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then 0 else 1 end) as marked,
- (select avg(rating.rating) from o_userrating as rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item as item
- inner join o_qp_pool_2_item as pool2item on (pool2item.fk_item_id = item.id)
- left join o_mark as mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
- left join o_qp_taxonomy_level as taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type as itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context as educontext on (item.fk_edu_context = educontext.id)
-);
-
+-- question pool
create or replace view o_qp_pool_2_item_short_v as (
select
pool2item.id as item_to_pool_id,
@@ -1724,45 +1607,6 @@ create or replace view o_qp_pool_2_item_short_v as (
inner join o_qp_pool as pool on (pool2item.fk_pool_id = pool.id)
);
-create or replace view o_qp_item_shared_v as (
- select
- item.id as item_id,
- shareditem.q_editable as item_editable,
- shareditem.fk_resource_id as item_resource_id,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then 0 else 1 end) as marked,
- (select avg(rating.rating) from o_userrating as rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item as item
- inner join o_qp_share_item as shareditem on (shareditem.fk_item_id = item.id)
- left join o_mark as mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
- left join o_qp_taxonomy_level as taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type as itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context as educontext on (item.fk_edu_context = educontext.id)
-);
-
create or replace view o_qp_share_2_item_short_v as (
select
shareditem.id as item_to_share_id,
diff --git a/src/main/resources/database/oracle/alter_10_0_0_to_10_1_0.sql b/src/main/resources/database/oracle/alter_10_0_0_to_10_1_0.sql
new file mode 100644
index 00000000000..b5655ad7ce6
--- /dev/null
+++ b/src/main/resources/database/oracle/alter_10_0_0_to_10_1_0.sql
@@ -0,0 +1,4 @@
+drop view o_qp_item_shared_v;
+drop view o_qp_item_pool_v;
+drop view o_qp_item_author_v;
+drop view o_qp_item_v;
\ No newline at end of file
diff --git a/src/main/resources/database/oracle/setupDatabase.sql b/src/main/resources/database/oracle/setupDatabase.sql
index 081b7fdcd47..cf8cb7a7d06 100644
--- a/src/main/resources/database/oracle/setupDatabase.sql
+++ b/src/main/resources/database/oracle/setupDatabase.sql
@@ -1645,123 +1645,6 @@ create or replace view o_im_roster_entry_v as (
);
-create or replace view o_qp_item_v as (
- select
- item.id as item_id,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- ownership.identity_id as owner_id,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then 0 else 1 end) as marked,
- (select avg(rating.rating) from o_userrating rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item item
- inner join o_bs_secgroup ownergroup on (ownergroup.id = item.fk_ownergroup)
- left join o_bs_membership ownership on (ownergroup.id = ownership.secgroup_id)
- left join o_qp_taxonomy_level taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context educontext on (item.fk_edu_context = educontext.id)
- left join o_mark mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
-);
-
-create or replace view o_qp_item_author_v as (
- select
- item.id as item_id,
- ownership.identity_id as item_author,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then 0 else 1 end) as marked,
- (select avg(rating.rating) from o_userrating rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item item
- inner join o_bs_secgroup ownergroup on (ownergroup.id = item.fk_ownergroup)
- inner join o_bs_membership ownership on (ownergroup.id = ownership.secgroup_id)
- left join o_mark mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
- left join o_qp_taxonomy_level taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context educontext on (item.fk_edu_context = educontext.id)
-);
-
-create or replace view o_qp_item_pool_v as (
- select
- item.id as item_id,
- pool2item.q_editable as item_editable,
- pool2item.fk_pool_id as item_pool,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then 0 else 1 end) as marked,
- (select avg(rating.rating) from o_userrating rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item item
- inner join o_qp_pool_2_item pool2item on (pool2item.fk_item_id = item.id)
- left join o_mark mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
- left join o_qp_taxonomy_level taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context educontext on (item.fk_edu_context = educontext.id)
-);
-
create or replace view o_qp_pool_2_item_short_v as (
select
pool2item.id as item_to_pool_id,
@@ -1775,45 +1658,6 @@ create or replace view o_qp_pool_2_item_short_v as (
inner join o_qp_pool pool on (pool2item.fk_pool_id = pool.id)
);
-create or replace view o_qp_item_shared_v as (
- select
- item.id as item_id,
- shareditem.q_editable as item_editable,
- shareditem.fk_resource_id as item_resource_id,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then 0 else 1 end) as marked,
- (select avg(rating.rating) from o_userrating rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item item
- inner join o_qp_share_item shareditem on (shareditem.fk_item_id = item.id)
- left join o_mark mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
- left join o_qp_taxonomy_level taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context educontext on (item.fk_edu_context = educontext.id)
-);
-
create or replace view o_qp_share_2_item_short_v as (
select
shareditem.id as item_to_share_id,
diff --git a/src/main/resources/database/postgresql/alter_10_0_0_to_10_1_0.sql b/src/main/resources/database/postgresql/alter_10_0_0_to_10_1_0.sql
new file mode 100644
index 00000000000..b5655ad7ce6
--- /dev/null
+++ b/src/main/resources/database/postgresql/alter_10_0_0_to_10_1_0.sql
@@ -0,0 +1,4 @@
+drop view o_qp_item_shared_v;
+drop view o_qp_item_pool_v;
+drop view o_qp_item_author_v;
+drop view o_qp_item_v;
\ No newline at end of file
diff --git a/src/main/resources/database/postgresql/setupDatabase.sql b/src/main/resources/database/postgresql/setupDatabase.sql
index 1aa36142649..d458f240be7 100644
--- a/src/main/resources/database/postgresql/setupDatabase.sql
+++ b/src/main/resources/database/postgresql/setupDatabase.sql
@@ -1594,124 +1594,7 @@ create or replace view o_im_roster_entry_v as (
inner join o_bs_identity as ident on (entry.fk_identity_id = ident.id)
);
--- views with rating
-create or replace view o_qp_item_v as (
- select
- item.id as item_id,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- ownership.identity_id as owner_id,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then false else true end) as marked,
- (select avg(rating.rating) from o_userrating as rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item as item
- inner join o_bs_secgroup as ownergroup on (ownergroup.id = item.fk_ownergroup)
- left join o_bs_membership as ownership on (ownergroup.id = ownership.secgroup_id)
- left join o_qp_taxonomy_level as taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type as itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context as educontext on (item.fk_edu_context = educontext.id)
- left join o_mark as mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
-);
-
-create or replace view o_qp_item_author_v as (
- select
- item.id as item_id,
- ownership.identity_id as item_author,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then false else true end) as marked,
- (select avg(rating.rating) from o_userrating as rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item as item
- inner join o_bs_secgroup as ownergroup on (ownergroup.id = item.fk_ownergroup)
- inner join o_bs_membership as ownership on (ownergroup.id = ownership.secgroup_id)
- left join o_mark as mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
- left join o_qp_taxonomy_level as taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type as itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context as educontext on (item.fk_edu_context = educontext.id)
-);
-
-create or replace view o_qp_item_pool_v as (
- select
- item.id as item_id,
- pool2item.q_editable as item_editable,
- pool2item.fk_pool_id as item_pool,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then false else true end) as marked,
- (select avg(rating.rating) from o_userrating as rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item as item
- inner join o_qp_pool_2_item as pool2item on (pool2item.fk_item_id = item.id)
- left join o_mark as mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
- left join o_qp_taxonomy_level as taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type as itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context as educontext on (item.fk_edu_context = educontext.id)
-);
-
+-- question pool
create or replace view o_qp_pool_2_item_short_v as (
select
pool2item.id as item_to_pool_id,
@@ -1725,45 +1608,6 @@ create or replace view o_qp_pool_2_item_short_v as (
inner join o_qp_pool as pool on (pool2item.fk_pool_id = pool.id)
);
-create or replace view o_qp_item_shared_v as (
- select
- item.id as item_id,
- shareditem.q_editable as item_editable,
- shareditem.fk_resource_id as item_resource_id,
- item.q_identifier as item_identifier,
- item.q_master_identifier as item_master_identifier,
- item.q_title as item_title,
- item.q_language as item_language,
- item.q_keywords as item_keywords,
- item.q_coverage as item_coverage,
- item.q_additional_informations as item_additional_informations,
- taxlevel.q_field as item_taxonomy_level,
- educontext.q_level as item_edu_context,
- item.q_educational_learningtime as item_educational_learningtime,
- itemtype.q_type as item_type,
- item.q_difficulty as item_difficulty,
- item.q_stdev_difficulty as item_stdev_difficulty,
- item.q_differentiation as item_differentiation,
- item.q_num_of_answers_alt as item_num_of_answers_alt,
- item.q_usage as item_usage,
- item.q_version as item_version,
- item.q_status as item_status,
- item.q_format as item_format,
- item.creationdate as item_creationdate,
- item.lastmodified as item_lastmodified,
- mark.creator_id as mark_creator,
- (case when mark.creator_id is null then false else true end) as marked,
- (select avg(rating.rating) from o_userrating as rating
- where rating.resid=item.id and rating.resname='QuestionItem' and rating.ressubpath is null
- ) as item_rating
- from o_qp_item as item
- inner join o_qp_share_item as shareditem on (shareditem.fk_item_id = item.id)
- left join o_mark as mark on (mark.resid = item.id and mark.resname = 'QuestionItem')
- left join o_qp_taxonomy_level as taxlevel on (item.fk_taxonomy_level = taxlevel.id)
- left join o_qp_item_type as itemtype on (item.fk_type = itemtype.id)
- left join o_qp_edu_context as educontext on (item.fk_edu_context = educontext.id)
-);
-
create or replace view o_qp_share_2_item_short_v as (
select
shareditem.id as item_to_share_id,
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 33b4a955adc..32ad97e9e50 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -864,8 +864,8 @@ ldap.attrib.sync.once.olatkey3=
# Build properties
#####
application.name=OpenOLAT
-build.version=10.0.5
-build.identifier=openolat1005-dev
+build.version=10.1a
+build.identifier=openolat101-dev
build.repo.revision=local-devel
#####
diff --git a/src/test/java/org/olat/test/ArquillianDeployments.java b/src/test/java/org/olat/test/ArquillianDeployments.java
index 9d1d6600ad0..34a19f1b604 100644
--- a/src/test/java/org/olat/test/ArquillianDeployments.java
+++ b/src/test/java/org/olat/test/ArquillianDeployments.java
@@ -35,7 +35,7 @@ public class ArquillianDeployments {
public static final String WEBINF = "src/main/webapp/WEB-INF";
public static final String WEBINF_TOMCAT = "src/main/webapp-tomcat/WEB-INF";
public static final String TEST_RSRC = "src/test/resources";
- public static final String LIB_DIR = "target/openolat-lms-10.0-SNAPSHOT/WEB-INF/lib";
+ public static final String LIB_DIR = "target/openolat-lms-10.1-SNAPSHOT/WEB-INF/lib";
public static WebArchive createDeployment() {
--
GitLab