group model

model/api/src/main/java/org/keycloak/migration/MigrationModel.java

@@ -11,7 +11,7 @@ public interface MigrationModel {
     /**
      * Must have the form of major.minor.micro as the version is parsed and numbers are compared
      */
-    public static final String LATEST_VERSION = "1.6.0";
+    public static final String LATEST_VERSION = "1.7.0";
 
     String getStoredVersion();
     void setStoredVersion(String version);

model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java

@@ -103,6 +103,14 @@ public class JpaRealmProvider implements RealmProvider {
             adapter.removeClient(a.getId());
         }
 
+        int num = em.createNamedQuery("deleteGroupRoleMappingsByRealm")
+                .setParameter("realm", realm).executeUpdate();
+        num = em.createNamedQuery("deleteGroupAttributesByRealm")
+                .setParameter("realm", realm).executeUpdate();
+        num = em.createNamedQuery("deleteGroupsByRealm")
+                .setParameter("realm", realm).executeUpdate();
+
+
         em.remove(realm);
         return true;
     }

model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupAttributeEntity.java

@@ -17,9 +17,9 @@ import javax.persistence.Table;
 @NamedQueries({
         @NamedQuery(name="getGroupAttributesByNameAndValue", query="select attr from GroupAttributeEntity attr where attr.name = :name and attr.value = :value"),
         @NamedQuery(name="deleteGroupAttributesByGroup", query="delete from  GroupAttributeEntity attr where attr.group = :group"),
-        @NamedQuery(name="deleteGroupAttributesByRealm", query="delete from  GroupAttributeEntity attr where attr.group IN (select u from GroupEntity u where u.realmId=:realmId)")
+        @NamedQuery(name="deleteGroupAttributesByRealm", query="delete from  GroupAttributeEntity attr where attr.group IN (select u from GroupEntity u where u.realm=:realm)")
 })
-@Table(name="USER_ATTRIBUTE")
+@Table(name="GROUP_ATTRIBUTE")
 @Entity
 public class GroupAttributeEntity {
 

model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java

@@ -22,15 +22,14 @@ import java.util.Collection;
  * @version $Revision: 1 $
  */
 @NamedQueries({
-        @NamedQuery(name="getAllGroupsByRealm", query="select u from GroupEntity u where u.realmId = :realmId order by u.name"),
-        @NamedQuery(name="getGroupById", query="select u from GroupEntity u where u.id = :id and u.realmId = :realmId"),
+        @NamedQuery(name="getAllGroupsByRealm", query="select u from GroupEntity u where u.realm = :realm order by u.name"),
+        @NamedQuery(name="getGroupById", query="select u from GroupEntity u where u.id = :id and u.realm = :realm"),
         @NamedQuery(name="getGroupIdsByParent", query="select u.id from GroupEntity u where u.parent = :parent"),
-        @NamedQuery(name="getGroupByName", query="select u from GroupEntity u where u.name = :name and u.realmId = :realmId"),
-        @NamedQuery(name="getGroupCount", query="select count(u) from GroupEntity u where u.realmId = :realmId"),
-        @NamedQuery(name="deleteGroupsByRealm", query="delete from GroupEntity u where u.realmId = :realmId")
+        @NamedQuery(name="getGroupCount", query="select count(u) from GroupEntity u where u.realm = :realm"),
+        @NamedQuery(name="deleteGroupsByRealm", query="delete from GroupEntity u where u.realm = :realm")
 })
 @Entity
-@Table(name="GROUP_ENTITY")
+@Table(name="KEYCLOAK_GROUP")
 public class GroupEntity {
     @Id
     @Column(name="ID", length = 36)
@@ -44,7 +43,7 @@ public class GroupEntity {
     private GroupEntity parent;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "REALM")
+    @JoinColumn(name = "REALM_ID")
     private RealmEntity realm;
 
     @OneToMany(cascade = CascadeType.REMOVE, orphanRemoval = true, mappedBy="group")

model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupRoleMappingEntity.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
         @NamedQuery(name="groupHasRole", query="select m from GroupRoleMappingEntity m where m.group = :group and m.roleId = :roleId"),
         @NamedQuery(name="groupRoleMappings", query="select m from GroupRoleMappingEntity m where m.group = :group"),
         @NamedQuery(name="groupRoleMappingIds", query="select m.roleId from GroupRoleMappingEntity m where m.group = :group"),
-        @NamedQuery(name="deleteGroupRoleMappingsByRealm", query="delete from  GroupRoleMappingEntity mapping where mapping.group IN (select u from GroupEntity u where u.realmId=:realmId)"),
+        @NamedQuery(name="deleteGroupRoleMappingsByRealm", query="delete from  GroupRoleMappingEntity mapping where mapping.group IN (select u from GroupEntity u where u.realm=:realm)"),
         @NamedQuery(name="deleteGroupRoleMappingsByRole", query="delete from GroupRoleMappingEntity m where m.roleId = :roleId"),
         @NamedQuery(name="deleteGroupRoleMappingsByGroup", query="delete from GroupRoleMappingEntity m where m.group = :group")
 
@@ -55,7 +55,6 @@ public class GroupRoleMappingEntity {
         this.roleId = roleId;
     }
 
-
     public static class Key implements Serializable {
 
         protected GroupEntity group;