Author: bdaw Date: 2009-11-16 08:05:06 -0500 (Mon, 16 Nov 2009) New Revision: 957 Modified: idm/trunk/idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml idm/trunk/idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java Log: - more for sybase Modified: idm/trunk/idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml =================================================================== --- idm/trunk/idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-16 11:04:22 UTC (rev 956) +++ idm/trunk/idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectAttribute.hbm.xml 2009-11-16 13:05:06 UTC (rev 957) @@ -46,7 +46,7 @@ class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttributeBinaryValue" not-null="false" column="BIN_VALUE_ID" - unique="true" + unique="false" lazy="proxy" access="field" fetch="select" Modified: idm/trunk/idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml =================================================================== --- idm/trunk/idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-16 11:04:22 UTC (rev 956) +++ idm/trunk/idm-hibernate/src/main/resources/sybase-mappings/HibernateIdentityObjectCredential.hbm.xml 2009-11-16 13:05:06 UTC (rev 957) @@ -16,7 +16,7 @@ class="org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialBinaryValue" not-null="false" column="BIN_VALUE_ID" - unique="true" + unique="false" lazy="proxy" access="field" fetch="select" Modified: idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java =================================================================== --- idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java 2009-11-16 11:04:22 UTC (rev 956) +++ idm/trunk/idm-testsuite/src/test/java/org/jboss/identity/idm/impl/store/hibernate/EvilBinaryTestCase.java 2009-11-16 13:05:06 UTC (rev 957) @@ -83,6 +83,7 @@ attr.setTextValues(values1); user1.getAttributes().add(attr); + commit(); begin(); @@ -101,6 +102,21 @@ attr.setBinaryValue(new HibernateIdentityObjectAttributeBinaryValue(picture)); user1.addAttribute(attr); + values1 = new HashSet<String>(); + values1.add("Val1"); + + attr = new HibernateIdentityObjectAttribute(user1, "simple3", HibernateIdentityObjectAttribute.TYPE_TEXT); + attr.setTextValues(values1); + user1.getAttributes().add(attr); + + values1 = new HashSet<String>(); + values1.add("Val8"); + values1.add("Val15"); + + attr = new HibernateIdentityObjectAttribute(user1, "simple4", HibernateIdentityObjectAttribute.TYPE_TEXT); + attr.setTextValues(values1); + user1.getAttributes().add(attr); + commit(); begin(); @@ -115,7 +131,7 @@ random.nextBytes(picture); - attr = new HibernateIdentityObjectAttribute(user1, "simple3", HibernateIdentityObjectAttribute.TYPE_BINARY); + attr = new HibernateIdentityObjectAttribute(user1, "simple5", HibernateIdentityObjectAttribute.TYPE_BINARY); attr.setBinaryValue(new HibernateIdentityObjectAttributeBinaryValue(picture)); user1.getAttributes().add(attr); @@ -127,15 +143,25 @@ user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new Long(user1.getId())); - assertEquals(3, user1.getAttributes().size()); + assertEquals(5, user1.getAttributes().size()); int binaryCount = ((Integer)session.createCriteria(HibernateIdentityObjectAttributeBinaryValue.class). setProjection(Projections.rowCount()).uniqueResult()).intValue(); assertEquals(2,binaryCount); + int attrCount = ((Integer)session.createCriteria(HibernateIdentityObjectAttribute.class). + setProjection(Projections.rowCount()).uniqueResult()).intValue(); + + assertEquals(5,attrCount); + session.delete(user1); + attrCount = ((Integer)session.createCriteria(HibernateIdentityObjectAttribute.class). + setProjection(Projections.rowCount()).uniqueResult()).intValue(); + + assertEquals(0,attrCount); + binaryCount = ((Integer)session.createCriteria(HibernateIdentityObjectAttributeBinaryValue.class). setProjection(Projections.rowCount()).uniqueResult()).intValue();