From 2cf577a4239349e83830fc6946fb48c4b553f26e Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 6 Mar 2020 17:23:16 +0100
Subject: [PATCH] no-jira: try to fix the unit test on MySQL
---
.../assessment/manager/AssessmentEntryDAO.java | 2 +-
.../modules/assessment/model/AssessmentEntryImpl.java | 11 ++++-------
.../org/olat/modules/coach/manager/CoachingDAO.java | 5 ++---
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java b/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java
index 088a9510add..c5392972bda 100644
--- a/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java
+++ b/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java
@@ -215,7 +215,7 @@ public class AssessmentEntryDAO {
impl.setObligation(obligation.getCurrent());
impl.setObligationOriginal(obligation.getOriginal());
impl.setObligationModIdentity(obligation.getModBy());
- impl.setObligationModDate(obligation.getModDate());;
+ impl.setObligationModDate(obligation.getModDate());
}
return dbInstance.getCurrentEntityManager().merge(nodeAssessment);
diff --git a/src/main/java/org/olat/modules/assessment/model/AssessmentEntryImpl.java b/src/main/java/org/olat/modules/assessment/model/AssessmentEntryImpl.java
index dd76c7b06a1..bf532ee61ef 100644
--- a/src/main/java/org/olat/modules/assessment/model/AssessmentEntryImpl.java
+++ b/src/main/java/org/olat/modules/assessment/model/AssessmentEntryImpl.java
@@ -33,7 +33,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Temporal;
@@ -58,12 +57,10 @@ import org.olat.repository.RepositoryEntry;
*/
@Entity(name="assessmententry")
@Table(name="o_as_entry")
-@NamedQueries({
- @NamedQuery(name="loadAssessmentEntryById",
- query="select data from assessmententry data where data.key=:key"),
- @NamedQuery(name="loadAssessmentEntryByRepositoryEntryAndSubIdent",
- query="select data from assessmententry data where data.repositoryEntry.key=:repositoryEntryKey and data.subIdent=:subIdent")
-})
+@NamedQuery(name="loadAssessmentEntryById",
+ query="select data from assessmententry data where data.key=:key")
+@NamedQuery(name="loadAssessmentEntryByRepositoryEntryAndSubIdent",
+ query="select data from assessmententry data where data.repositoryEntry.key=:repositoryEntryKey and data.subIdent=:subIdent")
public class AssessmentEntryImpl implements Persistable, ModifiedInfo, CreateInfo, AssessmentEntry {
private static final long serialVersionUID = 2934783777645549412L;
diff --git a/src/main/java/org/olat/modules/coach/manager/CoachingDAO.java b/src/main/java/org/olat/modules/coach/manager/CoachingDAO.java
index 6c00ffbcf85..7aeac2cc1e0 100644
--- a/src/main/java/org/olat/modules/coach/manager/CoachingDAO.java
+++ b/src/main/java/org/olat/modules/coach/manager/CoachingDAO.java
@@ -878,7 +878,7 @@ public class CoachingDAO {
.append(" inner join o_as_entry sg_ae")
.append(" on (sg_ae.fk_identity = sg_participant.fk_identity_id and sg_ae.fk_entry = sg_re.repositoryentry_id)")
.append(" where sg_re.status ").in(RepositoryEntryStatusEnum.coachPublishedToClosed())
- .append(" and sg_ae.a_entry_root=").appendTrue();
+ .append(" and sg_ae.a_entry_root=").appendTrue().append(" and sg_ae.a_completion is not null");
}
if(hasOwned) {
if(hasCoached) {
@@ -895,10 +895,9 @@ public class CoachingDAO {
.append(" inner join o_as_entry sg_ae ")
.append(" on (sg_ae.fk_identity = sg_participant.fk_identity_id and sg_ae.fk_entry = sg_re.repositoryentry_id)")
.append(" where sg_re.status ").in(RepositoryEntryStatusEnum.coachPublishedToClosed())
- .append(" and sg_ae.a_entry_root=").appendTrue();
+ .append(" and sg_ae.a_entry_root=").appendTrue().append(" and sg_ae.a_completion is not null");
}
sb.append(")")
- .append(" and ae.a_completion is not null")
.append(" group by ae.fk_identity");
List<?> rawList = dbInstance.getCurrentEntityManager()
--
GitLab