[jboss-identity-commits] JBoss Identity SVN: r434 - in idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl: store/hibernate and 1 other directory.

Author: bdaw Date: 2009-04-08 10:47:21 -0400 (Wed, 08 Apr 2009) New Revision: 434 Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java Log: correct HQL queries to satisfy postgresql 8.3 purism... Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-04-08 08:43:29 UTC (rev 433) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObject.java 2009-04-08 14:47:21 UTC (rev 434) @@ -59,21 +59,21 @@ public class HibernateIdentityObject implements IdentityObject { public static final String findIdentityObjectByNameAndType = - "select o from HibernateIdentityObject o where o.realm like :realm and o.name like :name and o.identityType.name like :typeName"; + "select o from HibernateIdentityObject o where o.realm = :realm and o.name like :name and o.identityType.name like :typeName"; public static final String findIdentityObjectsByType = - "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName"; + "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm = :realm and o.identityType.name like :typeName"; public static final String findIdentityObjectsByTypeOrderedByNameAsc = - "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName " + + "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm = :realm and o.identityType.name like :typeName " + "order by o.name asc"; public static final String findIdentityObjectsByTypeOrderedByNameDesc = - "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm like :realm and o.identityType.name like :typeName " + + "select o from HibernateIdentityObject o where o.name like :nameFilter and o.realm = :realm and o.identityType.name like :typeName " + "order by o.name desc"; public static final String countIdentityObjectsByType = - "select count(o.id) from HibernateIdentityObject o where o.realm like :realm and o.identityType.name like :typeName"; + "select count(o.id) from HibernateIdentityObject o where o.realm = :realm and o.identityType.name like :typeName"; @Id Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-04-08 08:43:29 UTC (rev 433) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-04-08 14:47:21 UTC (rev 434) @@ -50,7 +50,7 @@ { public static final String findIdentityObjectCredentialByIOAndTypeNAme = - "select c from HibernateIdentityObjectCredential c where c.type.name like :typeName and c.identityObject like :identityObject"; + "select c from HibernateIdentityObjectCredential c where c.type.name like :typeName and c.identityObject = :identityObject"; @Id Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-04-08 08:43:29 UTC (rev 433) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectRelationshipName.java 2009-04-08 14:47:21 UTC (rev 434) @@ -43,31 +43,31 @@ { public static final String findIdentityObjectRelationshipNameByName = - "select rn from HibernateIdentityObjectRelationshipName rn where rn.name like :name and rn.realm like :realm"; + "select rn from HibernateIdentityObjectRelationshipName rn where rn.name like :name and rn.realm = :realm"; public static final String findIdentityObjectRelationshipNames = - "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm"; + "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm = :realm"; public static final String findIdentityObjectRelationshipNamesOrderedByNameAsc = - "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm " + + "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm = :realm " + "order by rn.name asc"; public static final String findIdentityObjectRelationshipNamesOrderedByNameDesc = - "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm like :realm " + + "select rn.name from HibernateIdentityObjectRelationshipName rn where rn.name like :nameFilter and rn.realm = :realm " + "order by rn.name desc"; public static final String findIdentityObjectRelationshipNamesForIdentityObject = "select r.name.name from HibernateIdentityObjectRelationship r where " + - "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject"; + "r.fromIdentityObject = :identityObject or r.toIdentityObject = :identityObject"; public static final String findIdentityObjectRelationshipNamesForIdentityObjectOrderedByNameAsc = "select r.name.name from HibernateIdentityObjectRelationship r where " + - "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject " + + "r.fromIdentityObject = :identityObject or r.toIdentityObject = :identityObject " + "order by r.name.name asc"; public static final String findIdentityObjectRelationshipNamesForIdentityObjectOrdereByNameDesc = "select r.name.name from HibernateIdentityObjectRelationship r where " + - "r.fromIdentityObject like :identityObject or r.toIdentityObject like :identityObject " + + "r.fromIdentityObject = :identityObject or r.toIdentityObject = :identityObject " + "order by r.name.name desc"; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-04-08 08:43:29 UTC (rev 433) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-04-08 14:47:21 UTC (rev 434) @@ -88,21 +88,21 @@ //TODO: logging private final String QUERY_RELATIONSHIP_BY_FROM_TO = - "select r from HibernateIdentityObjectRelationship r where r.fromIdentityObject like :fromIO and " + - "r.toIdentityObject like :toIO"; + "select r from HibernateIdentityObjectRelationship r where r.fromIdentityObject = :fromIO and " + + "r.toIdentityObject = :toIO"; private final String QUERY_RELATIONSHIP_BY_FROM_TO_TYPE = - "select r from HibernateIdentityObjectRelationship r where r.fromIdentityObject like :fromIO and " + - "r.toIdentityObject like :toIO and r.type.name like :typeName"; + "select r from HibernateIdentityObjectRelationship r where r.fromIdentityObject = :fromIO and " + + "r.toIdentityObject = :toIO and r.type.name like :typeName"; private final String QUERY_RELATIONSHIP_BY_FROM_TO_TYPE_NAME = - "select r from HibernateIdentityObjectRelationship r where r.fromIdentityObject like :fromIO and " + - "r.toIdentityObject like :toIO and r.type.name like :typeName and r.name.name like :name"; + "select r from HibernateIdentityObjectRelationship r where r.fromIdentityObject = :fromIO and " + + "r.toIdentityObject = :toIO and r.type.name like :typeName and r.name.name like :name"; private final String QUERY_RELATIONSHIP_BY_IDENTITIES = "select r from HibernateIdentityObjectRelationship r where " + - "(r.fromIdentityObject like :IO1 and r.toIdentityObject like :IO2) or " + - "(r.fromIdentityObject like :IO2 and r.toIdentityObject like :IO1)"; + "(r.fromIdentityObject = :IO1 and r.toIdentityObject = :IO2) or " + + "(r.fromIdentityObject = :IO2 and r.toIdentityObject = :IO1)"; public static final String HIBERNATE_SESSION_FACTORY_REGISTRY_NAME = "hibernateSessionFactoryRegistryName"; @@ -725,12 +725,12 @@ { hqlString.append("select distinct ior.toIdentityObject from HibernateIdentityObjectRelationship ior where " + - "ior.toIdentityObject.name like :nameFilter and ior.type.name like :relType and ior.fromIdentityObject like :identity"); + "ior.toIdentityObject.name like :nameFilter and ior.type.name like :relType and ior.fromIdentityObject = :identity"); } else { hqlString.append("select distinct ior.toIdentityObject from HibernateIdentityObjectRelationship ior where " + - "ior.toIdentityObject.name like :nameFilter and ior.fromIdentityObject like :identity"); + "ior.toIdentityObject.name like :nameFilter and ior.fromIdentityObject = :identity"); } if (orderByName) { @@ -746,12 +746,12 @@ if (relationshipType != null) { hqlString.append("select distinct ior.fromIdentityObject from HibernateIdentityObjectRelationship ior where " + - "ior.fromIdentityObject.name like :nameFilter and ior.type.name like :relType and ior.toIdentityObject like :identity"); + "ior.fromIdentityObject.name like :nameFilter and ior.type.name like :relType and ior.toIdentityObject = :identity"); } else { hqlString.append("select distinct ior.fromIdentityObject from HibernateIdentityObjectRelationship ior where " + - "ior.fromIdentityObject.name like :nameFilter and ior.toIdentityObject like :identity"); + "ior.fromIdentityObject.name like :nameFilter and ior.toIdentityObject = :identity"); } if (orderByName)