[hibernate-commits] Hibernate SVN: r11644 - in trunk/Hibernate3/code: core/src/main/java/org/hibernate/event/def and 3 other directories.

Author: steve.ebersole(a)jboss.com Date: 2007-06-06 17:33:10 -0400 (Wed, 06 Jun 2007) New Revision: 11644 Added: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/NaturalIdSuite.java trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/User.hbm.xml trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/User.java trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.hbm.xml trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.java Removed: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.hbm.xml trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.java Modified: trunk/Hibernate3/code/core/src/main/java/org/hibernate/engine/PersistenceContext.java trunk/Hibernate3/code/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java Log: HHH-1569 : natural-id checks Modified: trunk/Hibernate3/code/core/src/main/java/org/hibernate/engine/PersistenceContext.java =================================================================== --- trunk/Hibernate3/code/core/src/main/java/org/hibernate/engine/PersistenceContext.java 2007-06-06 19:59:19 UTC (rev 11643) +++ trunk/Hibernate3/code/core/src/main/java/org/hibernate/engine/PersistenceContext.java 2007-06-06 21:33:10 UTC (rev 11644) @@ -83,8 +83,13 @@ public Object[] getCachedDatabaseSnapshot(EntityKey key); + /** + * Get the values of the natural id fields as known to the underlying + * database, or null if the entity has no natural id or there is no + * corresponding row. + */ public Object[] getNaturalIdSnapshot(Serializable id, EntityPersister persister) - throws HibernateException; + throws HibernateException; /** * Add a canonical mapping from entity key to entity instance @@ -437,4 +442,4 @@ public void setReadOnly(Object entity, boolean readOnly); void replaceDelayedEntityIdentityInsertKeys(EntityKey oldKey, Serializable generatedId); -} \ No newline at end of file +} Modified: trunk/Hibernate3/code/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java =================================================================== --- trunk/Hibernate3/code/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java 2007-06-06 19:59:19 UTC (rev 11643) +++ trunk/Hibernate3/code/core/src/main/java/org/hibernate/event/def/DefaultFlushEntityEventListener.java 2007-06-06 21:33:10 UTC (rev 11644) @@ -74,16 +74,23 @@ EntityMode entityMode, SessionImplementor session) { if ( persister.hasNaturalIdentifier() ) { - if ( loaded == null ) { - loaded = session.getPersistenceContext().getNaturalIdSnapshot( identifier, persister ); - } + Object[] snapshot = null; Type[] types = persister.getPropertyTypes(); int[] props = persister.getNaturalIdentifierProperties(); boolean[] updateable = persister.getPropertyUpdateability(); for ( int i=0; i<props.length; i++ ) { int prop = props[i]; if ( !updateable[prop] ) { - if ( !types[prop].isEqual( current[prop], loaded[prop], entityMode ) ) { + Object loadedVal; + if ( loaded == null ) { + if ( snapshot == null) { + snapshot = session.getPersistenceContext().getNaturalIdSnapshot( identifier, persister ); + } + loadedVal = snapshot[i]; + } else { + loadedVal = loaded[prop]; + } + if ( !types[prop].isEqual( current[prop], loadedVal, entityMode ) ) { throw new HibernateException( "immutable natural identifier of an instance of " + persister.getEntityName() + Added: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/NaturalIdSuite.java =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/NaturalIdSuite.java (rev 0) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/NaturalIdSuite.java 2007-06-06 21:33:10 UTC (rev 11644) @@ -0,0 +1,21 @@ +package org.hibernate.test.naturalid; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.hibernate.test.naturalid.immutable.ImmutableNaturalIdTest; +import org.hibernate.test.naturalid.mutable.MutableNaturalIdTest; + +/** + * {@inheritDoc} + * + * @author Steve Ebersole + */ +public class NaturalIdSuite { + public static Test suite() { + TestSuite suite = new TestSuite( "natural ids" ); + suite.addTest( MutableNaturalIdTest.suite() ); + suite.addTest( ImmutableNaturalIdTest.suite() ); + return suite; + } +} Deleted: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.hbm.xml =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.hbm.xml 2007-06-06 19:59:19 UTC (rev 11643) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.hbm.xml 2007-06-06 21:33:10 UTC (rev 11644) @@ -1,27 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<!-- - - This mapping illustrates use of <natural-id>. - ---> - -<hibernate-mapping - package="org.hibernate.test.naturalid" - default-access="field"> - - <class name="User" table="SystemUserInfo"> - <id name="id"> - <generator class="increment"/> - </id> - <natural-id> - <property name="name"/> - <property name="org"/> - </natural-id> - <property name="password"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.java =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.java 2007-06-06 19:59:19 UTC (rev 11643) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.java 2007-06-06 21:33:10 UTC (rev 11644) @@ -1,34 +0,0 @@ -//$Id: User.java 6900 2005-05-25 01:24:22Z oneovthafew $ -package org.hibernate.test.naturalid; - -/** - * @author Gavin King - */ -public class User { - - private Long id; - private String name; - private String org; - private String password; - - User() {} - - public User(String name, String org, String password) { - this.name = name; - this.org = org; - this.password = password; - } - - public String getName() { - return name; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getOrg() { - return org; - } - -} Added: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java (rev 0) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/ImmutableNaturalIdTest.java 2007-06-06 21:33:10 UTC (rev 11644) @@ -0,0 +1,57 @@ +package org.hibernate.test.naturalid.immutable; + +import junit.framework.Test; + +import org.hibernate.Session; +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; + +/** + * {@inheritDoc} + * + * @author Steve Ebersole + */ +public class ImmutableNaturalIdTest extends FunctionalTestCase { + public ImmutableNaturalIdTest(String string) { + super( string ); + } + + public String[] getMappings() { + return new String[] { "naturalid/immutable/User.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( ImmutableNaturalIdTest.class ); + } + + public void testUpdate() { + // prepare some test data... + Session session = openSession(); + session.beginTransaction(); + User user = new User(); + user.setUserName( "steve" ); + user.setEmail( &quot;steve(a)hibernate.org&quot; ); + user.setFirstName( "Steve" ); + user.setInitial( null); + user.setLastName( "Ebersole" ); + user.setPassword( "brewhaha" ); + session.save( user ); + session.getTransaction().commit(); + session.close(); + + // 'user' is now a detached entity, so lets change a property and reattch... + user.setPassword( "homebrew" ); + session = openSession(); + session.beginTransaction(); + session.update( user ); + session.getTransaction().commit(); + session.close(); + + // clean up + session = openSession(); + session.beginTransaction(); + session.delete( user ); + session.getTransaction().commit(); + session.close(); + } +} Added: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/User.hbm.xml =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/User.hbm.xml (rev 0) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/User.hbm.xml 2007-06-06 21:33:10 UTC (rev 11644) @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.hibernate.test.naturalid.immutable"> + + <class name="User" table="IMM_NAT_ID_USER" lazy="true"> + <comment>Users may bid for or sell auction items.</comment> + <id name="myUserId" type="java.lang.Integer"> + <generator class="increment"/> + </id> + <natural-id mutable="false"> + <property name="userName" length="10"/> + </natural-id> + <version name="version"/> + <property name="password" not-null="true" length="15" column="`password`"/> + <property name="email"/> + <property name="firstName" length="50" not-null="true"/> + <property name="initial" column="`initial`"/> + <property name="lastName" length="50" not-null="true"/> + </class> + +</hibernate-mapping> \ No newline at end of file Added: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/User.java =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/User.java (rev 0) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/immutable/User.java 2007-06-06 21:33:10 UTC (rev 11644) @@ -0,0 +1,86 @@ +package org.hibernate.test.naturalid.immutable; + +/** + * {@inheritDoc} + * + * @author Steve Ebersole + */ +public class User implements java.io.Serializable { + + private Integer myUserId; + private Integer version; + private String userName; + private String password; + private String email; + private String firstName; + private Character initial; + private String lastName; + + public User() { + } + + public Integer getMyUserId() { + return this.myUserId; + } + + public void setMyUserId(Integer myUserId) { + this.myUserId = myUserId; + } + + public String getUserName() { + return this.userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getPassword() { + return this.password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getEmail() { + return this.email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getFirstName() { + return this.firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public Character getInitial() { + return this.initial; + } + + public void setInitial(Character initial) { + this.initial = initial; + } + + public String getLastName() { + return this.lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public Integer getVersion() { + return this.version; + } + + public void setVersion(Integer version) { + this.version = version; + } + +} Copied: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java (from rev 11592, trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/NaturalIdTest.java) =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java (rev 0) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java 2007-06-06 21:33:10 UTC (rev 11644) @@ -0,0 +1,249 @@ +//$Id: MutableNaturalIdTest.java 10977 2006-12-12 23:28:04Z steve.ebersole(a)jboss.com $ +package org.hibernate.test.naturalid.mutable; + +import java.lang.reflect.Field; + +import junit.framework.Test; + +import org.hibernate.HibernateException; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.test.naturalid.mutable.User; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.criterion.Restrictions; +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; + +/** + * @author Gavin King + */ +public class MutableNaturalIdTest extends FunctionalTestCase { + + public MutableNaturalIdTest(String str) { + super(str); + } + + public String[] getMappings() { + return new String[] { "naturalid/mutable/User.hbm.xml" }; + } + + public void configure(Configuration cfg) { + cfg.setProperty(Environment.USE_SECOND_LEVEL_CACHE, "true"); + cfg.setProperty(Environment.USE_QUERY_CACHE, "true"); + cfg.setProperty(Environment.GENERATE_STATISTICS, "true"); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( MutableNaturalIdTest.class ); + } + + public void testNaturalIdCheck() throws Exception { + Session s = openSession(); + Transaction t = s.beginTransaction(); + + User u = new User("gavin", "hb", "secret"); + s.persist(u); + Field name = u.getClass().getDeclaredField("name"); + name.setAccessible(true); + name.set(u, "Gavin"); + try { + s.flush(); + fail(); + } + catch (HibernateException he) {} + name.set(u, "gavin"); + s.delete(u); + t.commit(); + s.close(); + } + + public void testNonexistentNaturalIdCache() { + getSessions().getStatistics().clear(); + + Session s = openSession(); + Transaction t = s.beginTransaction(); + + Object nullUser = s.createCriteria(User.class) + .add( Restrictions.naturalId() + .set("name", "gavin") + .set("org", "hb") + ) + .setCacheable(true) + .uniqueResult(); + + assertNull(nullUser); + + t.commit(); + s.close(); + + assertEquals( getSessions().getStatistics().getQueryExecutionCount(), 1 ); + assertEquals( getSessions().getStatistics().getQueryCacheHitCount(), 0 ); + assertEquals( getSessions().getStatistics().getQueryCachePutCount(), 0 ); + + s = openSession(); + t = s.beginTransaction(); + + User u = new User("gavin", "hb", "secret"); + s.persist(u); + + t.commit(); + s.close(); + + getSessions().getStatistics().clear(); + + s = openSession(); + t = s.beginTransaction(); + + u = (User) s.createCriteria(User.class) + .add( Restrictions.naturalId() + .set("name", "gavin") + .set("org", "hb") + ) + .setCacheable(true) + .uniqueResult(); + + assertNotNull(u); + + t.commit(); + s.close(); + + assertEquals( getSessions().getStatistics().getQueryExecutionCount(), 1 ); + assertEquals( getSessions().getStatistics().getQueryCacheHitCount(), 0 ); + assertEquals( getSessions().getStatistics().getQueryCachePutCount(), 1 ); + + getSessions().getStatistics().clear(); + + s = openSession(); + t = s.beginTransaction(); + + u = (User) s.createCriteria(User.class) + .add( Restrictions.naturalId() + .set("name", "gavin") + .set("org", "hb") + ).setCacheable(true) + .uniqueResult(); + + s.delete(u); + + t.commit(); + s.close(); + + assertEquals( getSessions().getStatistics().getQueryExecutionCount(), 0 ); + assertEquals( getSessions().getStatistics().getQueryCacheHitCount(), 1 ); + + getSessions().getStatistics().clear(); + + s = openSession(); + t = s.beginTransaction(); + + nullUser = s.createCriteria(User.class) + .add( Restrictions.naturalId() + .set("name", "gavin") + .set("org", "hb") + ) + .setCacheable(true) + .uniqueResult(); + + assertNull(nullUser); + + t.commit(); + s.close(); + + assertEquals( getSessions().getStatistics().getQueryExecutionCount(), 1 ); + assertEquals( getSessions().getStatistics().getQueryCacheHitCount(), 0 ); + assertEquals( getSessions().getStatistics().getQueryCachePutCount(), 0 ); + + } + + public void testNaturalIdCache() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + + User u = new User("gavin", "hb", "secret"); + s.persist(u); + + t.commit(); + s.close(); + + getSessions().getStatistics().clear(); + + s = openSession(); + t = s.beginTransaction(); + + u = (User) s.createCriteria(User.class) + .add( Restrictions.naturalId() + .set("name", "gavin") + .set("org", "hb") + ) + .setCacheable(true) + .uniqueResult(); + + assertNotNull(u); + + t.commit(); + s.close(); + + assertEquals( getSessions().getStatistics().getQueryExecutionCount(), 1 ); + assertEquals( getSessions().getStatistics().getQueryCacheHitCount(), 0 ); + assertEquals( getSessions().getStatistics().getQueryCachePutCount(), 1 ); + + s = openSession(); + t = s.beginTransaction(); + + User v = new User("xam", "hb", "foobar"); + s.persist(v); + + t.commit(); + s.close(); + + getSessions().getStatistics().clear(); + + s = openSession(); + t = s.beginTransaction(); + + u = (User) s.createCriteria(User.class) + .add( Restrictions.naturalId() + .set("name", "gavin") + .set("org", "hb") + ).setCacheable(true) + .uniqueResult(); + + assertNotNull(u); + + t.commit(); + s.close(); + + assertEquals( getSessions().getStatistics().getQueryExecutionCount(), 0 ); + assertEquals( getSessions().getStatistics().getQueryCacheHitCount(), 1 ); + + s = openSession(); + t = s.beginTransaction(); + s.createQuery("delete User").executeUpdate(); + t.commit(); + s.close(); + } + + public void testQuerying() throws Exception { + Session s = openSession(); + Transaction t = s.beginTransaction(); + + User u = new User("emmanuel", "hb", "bh"); + s.persist(u); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + u = (User) s.createQuery( "from User u where u.name = :name" ) + .setParameter( "name", "emmanuel" ).uniqueResult(); + assertEquals( "emmanuel", u.getName() ); + s.delete( u ); + + t.commit(); + s.close(); + } +} + Property changes on: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/MutableNaturalIdTest.java ___________________________________________________________________ Name: svn:executable + * Copied: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.hbm.xml (from rev 11592, trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.hbm.xml) =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.hbm.xml (rev 0) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.hbm.xml 2007-06-06 21:33:10 UTC (rev 11644) @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<!-- + + This mapping illustrates use of <natural-id>. + +--> + +<hibernate-mapping + package="org.hibernate.test.naturalid" + default-access="field"> + + <class name="org.hibernate.test.naturalid.mutable.User" table="SystemUserInfo"> + <id name="id"> + <generator class="increment"/> + </id> + <natural-id> + <property name="name"/> + <property name="org"/> + </natural-id> + <property name="password"/> + </class> + +</hibernate-mapping> \ No newline at end of file Property changes on: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.hbm.xml ___________________________________________________________________ Name: svn:executable + * Copied: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.java (from rev 11592, trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/User.java) =================================================================== --- trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.java (rev 0) +++ trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.java 2007-06-06 21:33:10 UTC (rev 11644) @@ -0,0 +1,34 @@ +//$Id: User.java 6900 2005-05-25 01:24:22Z oneovthafew $ +package org.hibernate.test.naturalid.mutable; + +/** + * @author Gavin King + */ +public class User { + + private Long id; + private String name; + private String org; + private String password; + + User() {} + + public User(String name, String org, String password) { + this.name = name; + this.org = org; + this.password = password; + } + + public String getName() { + return name; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getOrg() { + return org; + } + +} Property changes on: trunk/Hibernate3/code/testsuite/src/test/java/org/hibernate/test/naturalid/mutable/User.java ___________________________________________________________________ Name: svn:executable + *