Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role.java

@@ -47,8 +47,8 @@ public class Role implements EventChildInterface {
     private List<User> users;
     private List<User> users;
     @ManyToMany
     @ManyToMany
     @JoinTable(name = "role_chlidren", joinColumns = {
     @JoinTable(name = "role_chlidren", joinColumns = {
-        @JoinColumn(name = "role_id", referencedColumnName = "entity_id", nullable = false, updatable = false, insertable = false),
-        @JoinColumn(name = "role_event_id", referencedColumnName = "events_pk_id", nullable = false, updatable = false, insertable = false)})
+        @JoinColumn(name = "role_id", referencedColumnName = "entity_id", updatable = false, insertable = false),
+        @JoinColumn(name = "role_event_id", referencedColumnName = "events_pk_id", updatable = false, insertable = false)})
     private List<Role> children = new ArrayList<Role>();
     private List<Role> children = new ArrayList<Role>();
     @ManyToMany(mappedBy = "children")
     @ManyToMany(mappedBy = "children")
     private List<Role> parents = new ArrayList<Role>();
     private List<Role> parents = new ArrayList<Role>();