Merge remote-tracking branch 'remotes/origin/samurey' into Cecilia

1 files changed, 4 insertions, 1 deletions

diff --git a/EjercitarJPA/src/model/Sesion.java b/EjercitarJPA/src/model/Sesion.java
index c5906cf..ea161c2 100644
--- a/EjercitarJPA/src/model/Sesion.java
+++ b/EjercitarJPA/src/model/Sesion.java
@@ -16,6 +16,7 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
@@ -75,7 +76,9 @@ public class Sesion implements Serializable {
     private Alumno alumno;
     @Column(name = "cantidad_ejercicios_resueltos")
     private Integer cantidadEjerciciosResueltos;
-    
+    @JoinTable(name = "ejercicio_sesion", joinColumns = {
+            @JoinColumn(name = "id_sesion", referencedColumnName = "id_sesion")}, inverseJoinColumns = {
+            @JoinColumn(name = "id_ejercicio", referencedColumnName = "id_ejercicio")})
     @ManyToMany
     private List<Ejercicio> ejercicioList;