1 files changed, 15 insertions, 14 deletions
diff --git a/EjercitarJPA/src/model/Curso.java b/EjercitarJPA/src/model/Curso.java
index 585fb80..79eafe0 100644
--- a/EjercitarJPA/src/model/Curso.java
+++ b/EjercitarJPA/src/model/Curso.java
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -29,7 +30,7 @@ import javax.xml.bind.annotation.XmlTransient;
  * @author Ceci
  */
 @Entity
-@Table(name = "curso")
+@Table(name = "CURSO")
 @XmlRootElement
 @NamedQueries({
     @NamedQuery(name = "Curso.findAll", query = "SELECT c FROM Curso c"),
@@ -49,16 +50,16 @@ public class Curso implements Serializable {
     @Size(max = 1)
     @Column(name = "turno")
     private String turno;
-    @JoinTable(name = "curso_profesor", joinColumns = {
+    @JoinTable(name = "CURSO_PROFESOR", joinColumns = {
         @JoinColumn(name = "id_curso", referencedColumnName = "id_curso")}, inverseJoinColumns = {
         @JoinColumn(name = "id_profesor", referencedColumnName = "id_profesor")})
     @ManyToMany
     private List<Profesor> profesorList;
-    @JoinColumn(name = "escuela", referencedColumnName = "id_escuela")
-    @ManyToOne
-    private Escuela escuela;
-    @OneToMany(mappedBy = "curso")
+    @OneToMany(mappedBy = "curso", fetch = FetchType.EAGER)
     private List<Tarea> tareaList;
+    @JoinColumn(name = "id_escuela", referencedColumnName = "id_escuela")
+    @ManyToOne
+    private Escuela idEscuela;
     @OneToMany(mappedBy = "curso")
     private List<Alumno> alumnoList;
 
@@ -102,14 +103,6 @@ public class Curso implements Serializable {
         this.profesorList = profesorList;
     }
 
-    public Escuela getEscuela() {
-        return escuela;
-    }
-
-    public void setEscuela(Escuela escuela) {
-        this.escuela = escuela;
-    }
-
     @XmlTransient
     public List<Tarea> getTareaList() {
         return tareaList;
@@ -119,6 +112,14 @@ public class Curso implements Serializable {
         this.tareaList = tareaList;
     }
 
+    public Escuela getIdEscuela() {
+        return idEscuela;
+    }
+
+    public void setIdEscuela(Escuela idEscuela) {
+        this.idEscuela = idEscuela;
+    }
+
     @XmlTransient
     public List<Alumno> getAlumnoList() {
         return alumnoList;