hibernate-commits May 2007

hibernate-commits@lists.jboss.org

1 participants
165 discussions

Hibernate SVN: r11491 - branches/Branch_3_2/Hibernate3/src/org/hibernate/cache.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-05-08 21:56:57 -0400 (Tue, 08 May 2007) New Revision: 11491 Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/cache/CacheException.java Log: have ctor take Throwable, not Exception Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/cache/CacheException.java =================================================================== --- branches/Branch_3_2/Hibernate3/src/org/hibernate/cache/CacheException.java 2007-05-09 01:43:11 UTC (rev 11490) +++ branches/Branch_3_2/Hibernate3/src/org/hibernate/cache/CacheException.java 2007-05-09 01:56:57 UTC (rev 11491) @@ -12,18 +12,12 @@ super(s); } - public CacheException(String s, Exception e) { + public CacheException(String s, Throwable e) { super(s, e); } - - public CacheException(Exception e) { + + public CacheException(Throwable e) { super(e); } } - - - - - -

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11490 - in trunk/Hibernate3: test/org/hibernate/test and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-05-08 21:43:11 -0400 (Tue, 08 May 2007) New Revision: 11490 Added: trunk/Hibernate3/test/org/hibernate/test/reattachment/ trunk/Hibernate3/test/org/hibernate/test/reattachment/Child.java trunk/Hibernate3/test/org/hibernate/test/reattachment/CollectionReattachmentTest.java trunk/Hibernate3/test/org/hibernate/test/reattachment/Mappings.hbm.xml trunk/Hibernate3/test/org/hibernate/test/reattachment/Parent.java trunk/Hibernate3/test/org/hibernate/test/reattachment/ProxyReattachmentTest.java trunk/Hibernate3/test/org/hibernate/test/reattachment/ReattachmentSuite.java Modified: trunk/Hibernate3/src/org/hibernate/engine/StatefulPersistenceContext.java trunk/Hibernate3/test/org/hibernate/test/AllTests.java Log: HHH-511 : collection reattachment Modified: trunk/Hibernate3/src/org/hibernate/engine/StatefulPersistenceContext.java =================================================================== --- trunk/Hibernate3/src/org/hibernate/engine/StatefulPersistenceContext.java 2007-05-09 01:42:44 UTC (rev 11489) +++ trunk/Hibernate3/src/org/hibernate/engine/StatefulPersistenceContext.java 2007-05-09 01:43:11 UTC (rev 11490) @@ -178,6 +178,15 @@ } public void clear() { + Iterator itr = proxiesByKey.values().iterator(); + while ( itr.hasNext() ) { + final LazyInitializer li = ( ( HibernateProxy ) itr.next() ).getHibernateLazyInitializer(); + li.setSession( null ); + } + Map.Entry[] collectionEntryArray = IdentityMap.concurrentEntries( collectionEntries ); + for ( int i = 0; i < collectionEntryArray.length; i++ ) { + ( ( PersistentCollection ) collectionEntryArray[i].getKey() ).unsetSession( getSession() ); + } arrayHolders.clear(); entitiesByKey.clear(); entitiesByUniqueKey.clear(); Modified: trunk/Hibernate3/test/org/hibernate/test/AllTests.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/AllTests.java 2007-05-09 01:42:44 UTC (rev 11489) +++ trunk/Hibernate3/test/org/hibernate/test/AllTests.java 2007-05-09 01:43:11 UTC (rev 11490) @@ -130,6 +130,7 @@ import org.hibernate.test.version.sybase.SybaseTimestampVersioningTest; import org.hibernate.test.where.WhereTest; import org.hibernate.test.insertordering.InsertOrderingTest; +import org.hibernate.test.reattachment.ReattachmentSuite; /** * @author Gavin King @@ -302,6 +303,7 @@ suite.addTest( DialectFunctionalTestsSuite.suite() ); suite.addTest( DialectUnitTestsSuite.suite() ); suite.addTest( InsertOrderingTest.suite() ); + suite.addTest( ReattachmentSuite.suite() ); return suite; } Added: trunk/Hibernate3/test/org/hibernate/test/reattachment/Child.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/reattachment/Child.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/reattachment/Child.java 2007-05-09 01:43:11 UTC (rev 11490) @@ -0,0 +1,34 @@ +package org.hibernate.test.reattachment; + +/** + * Child entity + * + * @author Steve Ebersole + */ +public class Child { + private String name; + private Parent parent; + + public Child() { + } + + public Child(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Parent getParent() { + return parent; + } + + public void setParent(Parent parent) { + this.parent = parent; + } +} Added: trunk/Hibernate3/test/org/hibernate/test/reattachment/CollectionReattachmentTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/reattachment/CollectionReattachmentTest.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/reattachment/CollectionReattachmentTest.java 2007-05-09 01:43:11 UTC (rev 11490) @@ -0,0 +1,78 @@ +package org.hibernate.test.reattachment; + +import junit.framework.Test; + +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.Session; + +/** + * Test of collection reattachment semantics + * + * @author Steve Ebersole + */ +public class CollectionReattachmentTest extends FunctionalTestCase { + public CollectionReattachmentTest(String string) { + super( string ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( CollectionReattachmentTest.class ); + } + + public String[] getMappings() { + return new String[] { "reattachment/Mappings.hbm.xml" }; + } + + public void testUpdateOwnerAfterClear() { + Session s = openSession(); + s.beginTransaction(); + Parent p = new Parent( "p" ); + p.getChildren().add( new Child( "c" ) ); + s.save( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + p = ( Parent ) s.get( Parent.class, "p" ); + // clear... + s.clear(); + // now try to reattach... + s.update( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.delete( p ); + s.getTransaction().commit(); + s.close(); + } + + public void testUpdateOwnerAfterEvict() { + Session s = openSession(); + s.beginTransaction(); + Parent p = new Parent( "p" ); + p.getChildren().add( new Child( "c" ) ); + s.save( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + p = ( Parent ) s.get( Parent.class, "p" ); + // evict... + s.evict( p ); + // now try to reattach... + s.update( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.delete( p ); + s.getTransaction().commit(); + s.close(); + } +} Added: trunk/Hibernate3/test/org/hibernate/test/reattachment/Mappings.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/reattachment/Mappings.hbm.xml (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/reattachment/Mappings.hbm.xml 2007-05-09 01:43:11 UTC (rev 11490) @@ -0,0 +1,22 @@ +<?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.reattachment"> + + <class name="Parent"> + <id name="name" column="NAME" type="string" /> + <set name="children" inverse="true" cascade="all"> + <key column="PARENT" /> + <one-to-many class="Child" /> + </set> + </class> + + <class name="Child"> + <id name="name" column="NAME" type="string"/> + <many-to-one name="parent" class="Parent" cascade="none" /> + </class> + +</hibernate-mapping> Added: trunk/Hibernate3/test/org/hibernate/test/reattachment/Parent.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/reattachment/Parent.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/reattachment/Parent.java 2007-05-09 01:43:11 UTC (rev 11490) @@ -0,0 +1,37 @@ +package org.hibernate.test.reattachment; + +import java.util.Set; +import java.util.HashSet; + +/** + * Parent entity + * + * @author Steve Ebersole + */ +public class Parent { + private String name; + private Set children = new HashSet(); + + public Parent() { + } + + public Parent(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Set getChildren() { + return children; + } + + public void setChildren(Set children) { + this.children = children; + } +} Added: trunk/Hibernate3/test/org/hibernate/test/reattachment/ProxyReattachmentTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/reattachment/ProxyReattachmentTest.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/reattachment/ProxyReattachmentTest.java 2007-05-09 01:43:11 UTC (rev 11490) @@ -0,0 +1,76 @@ +package org.hibernate.test.reattachment; + +import junit.framework.Test; + +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.Session; + +/** + * Test of proxy reattachment semantics + * + * @author Steve Ebersole + */ +public class ProxyReattachmentTest extends FunctionalTestCase { + public ProxyReattachmentTest(String string) { + super( string ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( ProxyReattachmentTest.class ); + } + + public String[] getMappings() { + return new String[] { "reattachment/Mappings.hbm.xml" }; + } + + public void testUpdateAfterEvict() { + Session s = openSession(); + s.beginTransaction(); + Parent p = new Parent( "p" ); + s.save( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + p = ( Parent ) s.load( Parent.class, "p" ); + // evict... + s.evict( p ); + // now try to reattach... + s.update( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.delete( p ); + s.getTransaction().commit(); + s.close(); + } + + public void testUpdateAfterClear() { + Session s = openSession(); + s.beginTransaction(); + Parent p = new Parent( "p" ); + s.save( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + p = ( Parent ) s.load( Parent.class, "p" ); + // clear... + s.clear(); + // now try to reattach... + s.update( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.delete( p ); + s.getTransaction().commit(); + s.close(); + } +} Added: trunk/Hibernate3/test/org/hibernate/test/reattachment/ReattachmentSuite.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/reattachment/ReattachmentSuite.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/reattachment/ReattachmentSuite.java 2007-05-09 01:43:11 UTC (rev 11490) @@ -0,0 +1,18 @@ +package org.hibernate.test.reattachment; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * Suite of reattachment specific tests. + * + * @author Steve Ebersole + */ +public class ReattachmentSuite { + public static Test suite() { + TestSuite suite = new TestSuite( "reattachment semantics" ); + suite.addTest( CollectionReattachmentTest.suite() ); + suite.addTest( ProxyReattachmentTest.suite() ); + return suite; + } +}

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11489 - in branches/Branch_3_2/Hibernate3: test/org/hibernate/test and 1 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-05-08 21:42:44 -0400 (Tue, 08 May 2007) New Revision: 11489 Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Child.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/CollectionReattachmentTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Mappings.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Parent.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/ProxyReattachmentTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/ReattachmentSuite.java Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/engine/StatefulPersistenceContext.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/AllTests.java Log: HHH-511 : collection reattachment Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/engine/StatefulPersistenceContext.java =================================================================== --- branches/Branch_3_2/Hibernate3/src/org/hibernate/engine/StatefulPersistenceContext.java 2007-05-08 22:21:46 UTC (rev 11488) +++ branches/Branch_3_2/Hibernate3/src/org/hibernate/engine/StatefulPersistenceContext.java 2007-05-09 01:42:44 UTC (rev 11489) @@ -178,6 +178,15 @@ } public void clear() { + Iterator itr = proxiesByKey.values().iterator(); + while ( itr.hasNext() ) { + final LazyInitializer li = ( ( HibernateProxy ) itr.next() ).getHibernateLazyInitializer(); + li.setSession( null ); + } + Map.Entry[] collectionEntryArray = IdentityMap.concurrentEntries( collectionEntries ); + for ( int i = 0; i < collectionEntryArray.length; i++ ) { + ( ( PersistentCollection ) collectionEntryArray[i].getKey() ).unsetSession( getSession() ); + } arrayHolders.clear(); entitiesByKey.clear(); entitiesByUniqueKey.clear(); Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/AllTests.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/AllTests.java 2007-05-08 22:21:46 UTC (rev 11488) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/AllTests.java 2007-05-09 01:42:44 UTC (rev 11489) @@ -130,6 +130,7 @@ import org.hibernate.test.version.sybase.SybaseTimestampVersioningTest; import org.hibernate.test.where.WhereTest; import org.hibernate.test.insertordering.InsertOrderingTest; +import org.hibernate.test.reattachment.ReattachmentSuite; /** * @author Gavin King @@ -303,6 +304,7 @@ suite.addTest( DialectFunctionalTestsSuite.suite() ); suite.addTest( DialectUnitTestsSuite.suite() ); suite.addTest( InsertOrderingTest.suite() ); + suite.addTest( ReattachmentSuite.suite() ); return suite; } Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Child.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Child.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Child.java 2007-05-09 01:42:44 UTC (rev 11489) @@ -0,0 +1,34 @@ +package org.hibernate.test.reattachment; + +/** + * Child entity + * + * @author Steve Ebersole + */ +public class Child { + private String name; + private Parent parent; + + public Child() { + } + + public Child(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Parent getParent() { + return parent; + } + + public void setParent(Parent parent) { + this.parent = parent; + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/CollectionReattachmentTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/CollectionReattachmentTest.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/CollectionReattachmentTest.java 2007-05-09 01:42:44 UTC (rev 11489) @@ -0,0 +1,78 @@ +package org.hibernate.test.reattachment; + +import junit.framework.Test; + +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.Session; + +/** + * Test of collection reattachment semantics + * + * @author Steve Ebersole + */ +public class CollectionReattachmentTest extends FunctionalTestCase { + public CollectionReattachmentTest(String string) { + super( string ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( CollectionReattachmentTest.class ); + } + + public String[] getMappings() { + return new String[] { "reattachment/Mappings.hbm.xml" }; + } + + public void testUpdateOwnerAfterClear() { + Session s = openSession(); + s.beginTransaction(); + Parent p = new Parent( "p" ); + p.getChildren().add( new Child( "c" ) ); + s.save( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + p = ( Parent ) s.get( Parent.class, "p" ); + // clear... + s.clear(); + // now try to reattach... + s.update( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.delete( p ); + s.getTransaction().commit(); + s.close(); + } + + public void testUpdateOwnerAfterEvict() { + Session s = openSession(); + s.beginTransaction(); + Parent p = new Parent( "p" ); + p.getChildren().add( new Child( "c" ) ); + s.save( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + p = ( Parent ) s.get( Parent.class, "p" ); + // evict... + s.evict( p ); + // now try to reattach... + s.update( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.delete( p ); + s.getTransaction().commit(); + s.close(); + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Mappings.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Mappings.hbm.xml (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Mappings.hbm.xml 2007-05-09 01:42:44 UTC (rev 11489) @@ -0,0 +1,23 @@ +<?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.reattachment"> + + <class name="Parent"> + <id name="name" column="NAME" type="string" /> + <many-to-one name="other" class="Parent" column="OTHER_ID" lazy="proxy"/> + <set name="children" inverse="true" cascade="all"> + <key column="PARENT" /> + <one-to-many class="Child" /> + </set> + </class> + + <class name="Child"> + <id name="name" column="NAME" type="string"/> + <many-to-one name="parent" class="Parent" cascade="none" /> + </class> + +</hibernate-mapping> Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Parent.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Parent.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/Parent.java 2007-05-09 01:42:44 UTC (rev 11489) @@ -0,0 +1,51 @@ +package org.hibernate.test.reattachment; + +import java.util.Set; +import java.util.HashSet; + +/** + * Parent entity + * + * @author Steve Ebersole + */ +public class Parent { + private String name; + private Parent other; + private Set children = new HashSet(); + + public Parent() { + } + + public Parent(String name) { + this.name = name; + } + + public Parent(String name, Parent other) { + this.name = name; + this.other = other; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Parent getOther() { + return other; + } + + public void setOther(Parent other) { + this.other = other; + } + + public Set getChildren() { + return children; + } + + public void setChildren(Set children) { + this.children = children; + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/ProxyReattachmentTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/ProxyReattachmentTest.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/ProxyReattachmentTest.java 2007-05-09 01:42:44 UTC (rev 11489) @@ -0,0 +1,76 @@ +package org.hibernate.test.reattachment; + +import junit.framework.Test; + +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.Session; + +/** + * Test of proxy reattachment semantics + * + * @author Steve Ebersole + */ +public class ProxyReattachmentTest extends FunctionalTestCase { + public ProxyReattachmentTest(String string) { + super( string ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( ProxyReattachmentTest.class ); + } + + public String[] getMappings() { + return new String[] { "reattachment/Mappings.hbm.xml" }; + } + + public void testUpdateAfterEvict() { + Session s = openSession(); + s.beginTransaction(); + Parent p = new Parent( "p" ); + s.save( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + p = ( Parent ) s.load( Parent.class, "p" ); + // evict... + s.evict( p ); + // now try to reattach... + s.update( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.delete( p ); + s.getTransaction().commit(); + s.close(); + } + + public void testUpdateAfterClear() { + Session s = openSession(); + s.beginTransaction(); + Parent p = new Parent( "p" ); + s.save( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + p = ( Parent ) s.load( Parent.class, "p" ); + // clear... + s.clear(); + // now try to reattach... + s.update( p ); + s.getTransaction().commit(); + s.close(); + + s = openSession(); + s.beginTransaction(); + s.delete( p ); + s.getTransaction().commit(); + s.close(); + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/ReattachmentSuite.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/ReattachmentSuite.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/reattachment/ReattachmentSuite.java 2007-05-09 01:42:44 UTC (rev 11489) @@ -0,0 +1,18 @@ +package org.hibernate.test.reattachment; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * Suite of reattachment specific tests. + * + * @author Steve Ebersole + */ +public class ReattachmentSuite { + public static Test suite() { + TestSuite suite = new TestSuite( "reattachment semantics" ); + suite.addTest( CollectionReattachmentTest.suite() ); + suite.addTest( ProxyReattachmentTest.suite() ); + return suite; + } +}

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11488 - trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-05-08 18:21:46 -0400 (Tue, 08 May 2007) New Revision: 11488 Added: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java Log: HHH-2301 : IDENTITY + custom insert SQL (Scott Rankin and Gail Badner) Added: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java 2007-05-08 22:21:46 UTC (rev 11488) @@ -0,0 +1,83 @@ +package org.hibernate.test.sql.hand.custom; + +import java.sql.SQLException; +import java.util.List; + +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.test.sql.hand.Employment; +import org.hibernate.test.sql.hand.Organization; +import org.hibernate.test.sql.hand.Person; + +/** + * Abstract test case defining tests of stored procedure support. + * + * @author Gail Badner + */ +public abstract class CustomStoredProcTestSupport extends CustomSQLTestSupport { + + public CustomStoredProcTestSupport(String name) { + super( name ); + } + + public void testScalarStoredProcedure() throws HibernateException, SQLException { + Session s = openSession(); + Query namedQuery = s.getNamedQuery( "simpleScalar" ); + namedQuery.setLong( "number", 43 ); + List list = namedQuery.list(); + Object o[] = ( Object[] ) list.get( 0 ); + assertEquals( o[0], "getAll" ); + assertEquals( o[1], new Long( 43 ) ); + s.close(); + } + + public void testParameterHandling() throws HibernateException, SQLException { + Session s = openSession(); + + Query namedQuery = s.getNamedQuery( "paramhandling" ); + namedQuery.setLong( 0, 10 ); + namedQuery.setLong( 1, 20 ); + List list = namedQuery.list(); + Object[] o = ( Object[] ) list.get( 0 ); + assertEquals( o[0], new Long( 10 ) ); + assertEquals( o[1], new Long( 20 ) ); + + namedQuery = s.getNamedQuery( "paramhandling_mixed" ); + namedQuery.setLong( 0, 10 ); + namedQuery.setLong( "second", 20 ); + list = namedQuery.list(); + o = ( Object[] ) list.get( 0 ); + assertEquals( o[0], new Long( 10 ) ); + assertEquals( o[1], new Long( 20 ) ); + s.close(); + } + + public void testEntityStoredProcedure() throws HibernateException, SQLException { + Session s = openSession(); + Transaction t = s.beginTransaction(); + + Organization ifa = new Organization( "IFA" ); + Organization jboss = new Organization( "JBoss" ); + Person gavin = new Person( "Gavin" ); + Employment emp = new Employment( gavin, jboss, "AU" ); + s.persist( ifa ); + s.persist( jboss ); + s.persist( gavin ); + s.persist( emp ); + + Query namedQuery = s.getNamedQuery( "selectAllEmployments" ); + List list = namedQuery.list(); + assertTrue( list.get( 0 ) instanceof Employment ); + s.delete( emp ); + s.delete( ifa ); + s.delete( jboss ); + s.delete( gavin ); + + t.commit(); + s.close(); + } + + +}

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11487 - trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-05-08 18:21:25 -0400 (Tue, 08 May 2007) New Revision: 11487 Added: trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml Log: HHH-2301 : IDENTITY + custom insert SQL (Scott Rankin and Gail Badner) Added: trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java 2007-05-08 22:21:25 UTC (rev 11487) @@ -0,0 +1,50 @@ +package org.hibernate.test.sql.hand.identity; + +import junit.framework.Test; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.dialect.Dialect; +import org.hibernate.Session; +import org.hibernate.JDBCException; +import org.hibernate.test.sql.hand.Organization; + +/** + * Custom SQL tests for combined usage of custom insert SQL and identity columns + * + * @author Gail Badner + */ +public class CustomInsertSQLWithIdentityColumnTest extends DatabaseSpecificFunctionalTestCase { + + public CustomInsertSQLWithIdentityColumnTest(String str) { + super( str ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( CustomInsertSQLWithIdentityColumnTest.class ); + } + + public String[] getMappings() { + return new String[] {"sql/hand/identity/Mappings.hbm.xml"}; + } + + public boolean appliesTo(Dialect dialect) { + return dialect.supportsIdentityColumns(); + } + + public void testBadInsertionFails() { + Session session = openSession(); + session.beginTransaction(); + Organization org = new Organization( "hola!" ); + try { + session.save( org ); + session.delete( org ); + fail( "expecting bad custom insert statement to fail" ); + } + catch( JDBCException e ) { + // expected failure + } + + session.getTransaction().rollback(); + session.close(); + } +} Added: trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml 2007-05-08 22:21:25 UTC (rev 11487) @@ -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.sql.hand" default-access="field"> + + <class name="Organization" table="ORGANIZATION"> + <id name="id" column="ORG_ID"> + <generator class="identity"/> + </id> + <property name="name" not-null="true"/> +  + <sql-insert>INSERT INTO PERSON WHERE x=y</sql-insert> + </class> + +</hibernate-mapping>

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11486 - in trunk/Hibernate3: test/org/hibernate/test/sql and 10 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-05-08 17:57:24 -0400 (Tue, 08 May 2007) New Revision: 11486 Added: trunk/Hibernate3/test/org/hibernate/test/sql/check/CheckSuite.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/Dimension.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/Employment.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmount.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmountUserType.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/Order.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/Organization.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/Person.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/Product.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/SpaceShip.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/Speech.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/hand/identity/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/ trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java Removed: trunk/Hibernate3/test/org/hibernate/test/sql/DataDirectOracleSQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/Db2Employment.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/Db2SQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/Dimension.java trunk/Hibernate3/test/org/hibernate/test/sql/Employment.java trunk/Hibernate3/test/org/hibernate/test/sql/General.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java trunk/Hibernate3/test/org/hibernate/test/sql/HandSQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLEmployment.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmount.java trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmountUserType.java trunk/Hibernate3/test/org/hibernate/test/sql/MySQLEmployment.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/MySQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/OracleDataDirectDriverStoredProcedures.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/OracleDriverStoredProcedures.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml trunk/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java trunk/Hibernate3/test/org/hibernate/test/sql/Order.java trunk/Hibernate3/test/org/hibernate/test/sql/Organization.java trunk/Hibernate3/test/org/hibernate/test/sql/Person.java trunk/Hibernate3/test/org/hibernate/test/sql/Product.java trunk/Hibernate3/test/org/hibernate/test/sql/SpaceShip.java trunk/Hibernate3/test/org/hibernate/test/sql/Speech.java Modified: trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java trunk/Hibernate3/test/org/hibernate/test/sql/NativeSqlSupportSuite.java Log: HHH-2301 : IDENTITY + custom insert SQL (Scott Rankin and Gail Badner) Modified: trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java =================================================================== --- trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -2960,7 +2960,9 @@ if ( isIdentifierAssignedByInsert() ) { identityDelegate = ( ( PostInsertIdentifierGenerator ) getIdentifierGenerator() ) .getInsertGeneratedIdentifierDelegate( this, getFactory().getDialect(), useGetGeneratedKeys() ); - sqlIdentityInsertString = generateIdentityInsertString( getPropertyInsertability() ); + sqlIdentityInsertString = customSQLInsert[0] == null + ? generateIdentityInsertString( getPropertyInsertability() ) + : customSQLInsert[0]; } else { sqlIdentityInsertString = null; Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/DataDirectOracleSQLTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/DataDirectOracleSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/DataDirectOracleSQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,32 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.DataDirectOracle9Dialect; -import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Max Rydahl Andersen - */ -public class DataDirectOracleSQLTest extends HandSQLTest { - - public DataDirectOracleSQLTest(String str) { - super(str); - } - - public String[] getMappings() { - return new String[] { "sql/OracleEmployment.hbm.xml", "sql/OracleDataDirectDriverStoredProcedures.hbm.xml" }; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( DataDirectOracleSQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof DataDirectOracle9Dialect ); - } - -} - Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/Db2Employment.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/Db2Employment.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/Db2Employment.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,240 +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"> - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <class name="Organization" table="ORGANIZATION"> - <id name="id" unsaved-value="0" column="ORGID"> - <generator class="increment"/> - </id> - <property name="name" not-null="true" column="NAME"/> - <set name="employments" - inverse="true" - order-by="DUMMY"> - <key column="EMPLOYER"/>  - <one-to-many class="Employment"/> - <loader query-ref="organizationEmployments"/> - </set> -  - <loader query-ref="organization"/> - <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(? || ''), ? )</sql-insert> - <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(? || '') WHERE ORGID=?</sql-update> - <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> - </class> - - <class name="Person" table="PERSON"> - <id name="id" unsaved-value="0" column="PERID"> - <generator class="increment"/> - </id> - <property name="name" not-null="true" column="NAME"/> - <loader query-ref="person"/> - <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(? || ''), ? )</sql-insert> - <sql-update>UPDATE PERSON SET NAME=UPPER(? || '') WHERE PERID=?</sql-update> - <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> - </class> - - <class name="Employment" table="EMPLOYMENT"> - <id name="employmentId" unsaved-value="0" column="EMPID"> - <generator class="increment"/> - </id> - <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> - <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> - <property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/> - <property name="endDate" column="ENDDATE" insert="false"/> - <property name="regionCode" column="REGIONCODE" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - <loader query-ref="employment"/> - <sql-insert> - INSERT INTO EMPLOYMENT - (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) -  - VALUES (?, ?, TIMESTAMP ('2006-02-28 11:39:00'), UPPER(? || ''), ?, ?, ?) - </sql-insert> - <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> - <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - <sql-query name="person"> - <return alias="p" class="Person" lock-mode="upgrade"/> - SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ - </sql-query> - - <sql-query name="organization"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT {org.*}, {emp.*} - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - WHERE org.ORGID=? - </sql-query> - - -  - - <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> - <return alias="org" class="Organization"/> - SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID - </sql-query> - - - - - - <sql-query name="employment"> - <return alias="emp" class="Employment"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} - FROM EMPLOYMENT - WHERE EMPID = ? - </sql-query> - - <sql-query name="organizationEmployments"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT {empcol.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - - <sql-query name="organizationCurrentEmployments"> - <return alias="emp" class="Employment"> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> -  - <return-property name="endDate" column="myEndDate"/> - </return> - <synchronize table="EMPLOYMENT"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY - FROM EMPLOYMENT - WHERE EMPLOYER = :id AND ENDDATE IS NULL - ORDER BY STARTDATE ASC - </sql-query> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { call HIBDB2TST.simpleScalar(:number) } - </sql-query> - - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { call HIBDB2TST.paramHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call HIBDB2TST.paramHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="id" column="EMPID"/> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { call HIBDB2TST.selectAllEmployments() } - </sql-query> - -  - <database-object> - <create>CREATE SCHEMA HIBDB2TST</create> - <drop>DROP SCHEMA HIBDB2TST RESTRICT</drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE HIBDB2TST.selectAllEmployments () - P1: BEGIN - DECLARE C1 CURSOR WITH RETURN FOR - SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, - REGIONCODE, EMPID, VALUE, CURRENCY - FROM EMPLOYMENT; - OPEN C1; - END P1 - </create> - <drop> - DROP PROCEDURE HIBDB2TST.selectAllEmployments - </drop> - </database-object> - - - <database-object> - <create> - CREATE PROCEDURE HIBDB2TST.paramHandling (IN j SMALLINT, IN i SMALLINT) - P1: BEGIN - DECLARE C1 CURSOR WITH RETURN FOR - SELECT j as value, i as value2 from sysibm.sysdummy1; - OPEN C1; - END P1 - </create> - <drop> - DROP PROCEDURE HIBDB2TST.paramHandling - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE HIBDB2TST.simpleScalar (IN j SMALLINT) - P1: BEGIN - DECLARE C1 CURSOR WITH RETURN FOR - SELECT j as value, 'getAll' as name from sysibm.sysdummy1; - OPEN C1; - END P1 - </create> - <drop> - DROP PROCEDURE HIBDB2TST.simpleScalar - </drop> - </database-object> -</hibernate-mapping> Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/Db2SQLTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/Db2SQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/Db2SQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,32 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.DB2Dialect; -import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Max Rydahl Andersen - */ -public class Db2SQLTest extends HandSQLTest { - - public Db2SQLTest(String str) { - super(str); - } - - public String[] getMappings() { - return new String[] { "sql/Db2Employment.hbm.xml" }; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( Db2SQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof DB2Dialect); - } - -} - Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/Dimension.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/Dimension.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/Dimension.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,31 +0,0 @@ -package org.hibernate.test.sql; - -/** - * Used to mimic some tests from the JPA testsuite... - * - * @author Steve Ebersole - */ -public class Dimension { - private Long id; - private int length; - private int width; - - public Dimension() {} - - public Dimension(int length, int width) { - this.length = length; - this.width = width; - } - - public Long getId() { - return id; - } - - public int getLength() { - return length; - } - - public int getWidth() { - return width; - } -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/Employment.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/Employment.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/Employment.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,107 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import java.util.Date; - -/** - * @author Gavin King - */ -public class Employment { - private long employmentId; - private Person employee; - private Organization employer; - private Date startDate; - private Date endDate; - private String regionCode; - private MonetaryAmount salary; - - public Employment() {} - - public Employment(Person employee, Organization employer, String regionCode) { - this.employee = employee; - this.employer = employer; - this.startDate = new Date(); - this.regionCode = regionCode; - employer.getEmployments().add(this); - } - /** - * @return Returns the employee. - */ - public Person getEmployee() { - return employee; - } - /** - * @param employee The employee to set. - */ - public void setEmployee(Person employee) { - this.employee = employee; - } - /** - * @return Returns the employer. - */ - public Organization getEmployer() { - return employer; - } - /** - * @param employer The employer to set. - */ - public void setEmployer(Organization employer) { - this.employer = employer; - } - /** - * @return Returns the endDate. - */ - public Date getEndDate() { - return endDate; - } - /** - * @param endDate The endDate to set. - */ - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - /** - * @return Returns the id. - */ - public long getEmploymentId() { - return employmentId; - } - /** - * @param id The id to set. - */ - public void setEmploymentId(long id) { - this.employmentId = id; - } - /** - * @return Returns the startDate. - */ - public Date getStartDate() { - return startDate; - } - /** - * @param startDate The startDate to set. - */ - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - /** - * @return Returns the regionCode. - */ - public String getRegionCode() { - return regionCode; - } - /** - * @param regionCode The regionCode to set. - */ - public void setRegionCode(String regionCode) { - this.regionCode = regionCode; - } - - public MonetaryAmount getSalary() { - return salary; - } - - public void setSalary(MonetaryAmount salary) { - this.salary = salary; - } -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/General.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/General.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/General.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,264 +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"> - - - -<hibernate-mapping package="org.hibernate.test.sql" default-access="field"> - - <class name="Organization" table="ORGANIZATION"> - <id name="id" unsaved-value="0" column="ORGID"> - <generator class="increment"/> - </id> - <property name="name" column="NAME" not-null="true"/> - <set lazy="true" name="employments" - inverse="true"> - <key column="EMPLOYER"/>  - <one-to-many class="Employment"/> - </set> - </class> - - <class name="Person" table="PERSON"> - <id name="id" unsaved-value="0" column="PERID"> - <generator class="increment"/> - </id> - <property name="name" column="NAME" not-null="true"/> - - </class> - - <class name="Employment" table="EMPLOYMENT"> - <id name="employmentId" unsaved-value="0" column="EMPID"> - <generator class="increment"/> - </id> - <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> - <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> - <property name="startDate" column="STARTDATE" not-null="false"/> - <property name="endDate" column="ENDDATE" insert="false"/> - <property name="regionCode" column="REGIONCODE" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - </class> - - <class name="Order" table="TBL_ORDER"> - <composite-id name="orderId" class="Order$OrderId"> - <key-property name="orgid"/> - <key-property name="ordernumber"/> - </composite-id> - - <many-to-one name="product"> - <column name="PROD_ORGID"/> - <column name="PROD_NO"/> - </many-to-one> - <many-to-one name="person"/> - </class> - - <class name="Product"> - <composite-id name="productId" class="Product$ProductId"> - <key-property name="orgid"/> - <key-property name="productnumber"/> - </composite-id> - - <property name="name"/> - - <set name="orders" inverse="true"> - <key> - <column name="PROD_ORGID"/> - <column name="PROD_NO"/> - </key> - <one-to-many class="Order"/> - </set> - </class> - - <class name="Dimension"> - <id name="id" type="long"> - <generator class="increment"/> - </id> - <property name="length" column="d_len"/> - <property name="width" column="d_width"/> - </class> - - <class name="SpaceShip"> - <id name="id" type="integer"> - <generator class="increment"/> - </id> - <property name="name" column="fld_name"/> - <property name="model" column="fld_model"/> - <property name="speed" column="fld_speed"/> - <component name="dimensions"> - <property name="length" column="fld_length"/> - <property name="width" column="fld_width"/> - </component> - </class> - - <class name="Speech"> - <id name="id" type="integer"> - <generator class="increment"/> - </id> - <property name="name" column="name"/> - <property name="length" column="flength"/> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - - <resultset name="org-description"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="spaceship-vol"> - <return alias="sps" class="SpaceShip"> - <return-property name="id" column="id"/> - <return-property name="name" column="name"/> - <return-property name="model" column="model"/> - <return-property name="speed" column="speed"/> - <return-property name="dimensions.length" column="length"/> - <return-property name="dimensions.width" column="width"/> - </return> - <return-scalar column="surface"/> - <return-scalar column="volume"/> - </resultset> - - <resultset name="speech"> - <return alias="sp" class="Speech"> - <return-property name="id" column="id"/> - <return-property name="name" column="name"/> - <return-property name="length" column="flength"/> - </return> - <return-scalar column="scalarName"/> - </resultset> - - <sql-query name="spaceship" resultset-ref="spaceship-vol"> - select id as id, - fld_name as name, - fld_model as model, - fld_speed as speed, - fld_length as length, - fld_width as width, - fld_length * fld_width as surface, - fld_length * fld_width *10 as volume - from SpaceShip - </sql-query> - - <sql-query name="orgNamesOnly"> - <return-scalar column="NAME" type="string"/> - SELECT org.NAME FROM ORGANIZATION org - </sql-query> - - <sql-query name="orgNamesAndOrgs"> - <return-scalar column="thename" type="string"/> - <return alias="org" class="Organization"/> - SELECT org.NAME AS thename, org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - ORDER BY thename - </sql-query> - - <sql-query name="orgsAndOrgNames"> - <return alias="org" class="Organization"/> - <return-scalar column="thename" type="string"/> - SELECT org.NAME AS thename, org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - ORDER BY thename - </sql-query> - - <sql-query name="orgIdsAndOrgNames"> - <return-scalar column="orgid" type="long"/> - <return-scalar column="thename" type="string"/> - SELECT NAME AS thename, ORGID AS orgid - FROM ORGANIZATION - ORDER BY thename - </sql-query> - - <sql-query name="AllEmploymentAsMapped"> - <return class="Employment"/> - SELECT * FROM EMPLOYMENT - </sql-query> - - <sql-query name="EmploymentAndPerson"> - <return class="Employment"/> - <return class="Person"/> - SELECT * FROM EMPLOYMENT, PERSON - </sql-query> - - <sql-query name="organizationEmploymentsExplicitAliases"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT empcol.EMPLOYER as {empcol.key}, empcol.EMPID as {empcol.element}, {empcol.element.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - <sql-query name="organizationreturnproperty"> - <return alias="org" class="Organization"> - <return-property name="id" column="ORGID"/> - <return-property name="name" column="NAME"/> - </return> - <return-join alias="emp" property="org.employments"> - <return-property name="key" column="EMPLOYER"/> - <return-property name="element" column="EMPID"/> - <return-property name="element.employee" column="EMPLOYEE"/> - <return-property name="element.employer" column="EMPLOYER"/> - <return-property name="element.startDate" column="XSTARTDATE"/> - <return-property name="element.endDate" column="ENDDATE"/> - <return-property name="element.regionCode" column="REGIONCODE"/> - <return-property name="element.employmentId" column="EMPID"/> - <return-property name="element.salary"> - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return-join> - SELECT org.ORGID as orgid, - org.NAME as name, - emp.EMPLOYER as employer, - emp.EMPID as empid, - emp.EMPLOYEE as employee, - emp.EMPLOYER as employer, - emp.STARTDATE as xstartDate, - emp.ENDDATE as endDate, - emp.REGIONCODE as regionCode, - emp.VALUE as VALUE, - emp.CURRENCY as CURRENCY - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - </sql-query> - - - <sql-query name="organizationautodetect" resultset-ref="org-description"> -  - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT org.ORGID as orgid, - org.NAME as name, - emp.EMPLOYER as employer, - emp.EMPID as empid, - emp.EMPLOYEE as employee, - emp.EMPLOYER as employer, - emp.STARTDATE as startDate, - emp.ENDDATE as endDate, - emp.REGIONCODE as regionCode, - emp.VALUE as VALUE, - emp.CURRENCY as CURRENCY - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - </sql-query> - -</hibernate-mapping> \ No newline at end of file Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,608 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import junit.framework.Test; - -import org.hibernate.Hibernate; -import org.hibernate.HibernateException; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.transform.DistinctRootEntityResultTransformer; -import org.hibernate.transform.Transformers; -import org.hibernate.transform.AliasToEntityMapResultTransformer; - -/** - * @author Steve Ebersole - */ -public class GeneralTest extends FunctionalTestCase { - - public GeneralTest(String x) { - super( x ); - } - - public String[] getMappings() { - return new String[] { "sql/General.hbm.xml" }; - } - - public void configure(Configuration cfg) { - super.configure( cfg ); - cfg.setProperty( Environment.GENERATE_STATISTICS, "true" ); - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( GeneralTest.class ); - } - - protected String getOrganizationFetchJoinEmploymentSQL() { - return "SELECT org.ORGID as {org.id}, " + - " org.NAME as {org.name}, " + - " emp.EMPLOYER as {emp.key}, " + - " emp.EMPID as {emp.element}, " + - " {emp.element.*} " + - "FROM ORGANIZATION org " + - " LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER"; - } - - protected String getOrganizationJoinEmploymentSQL() { - return "SELECT org.ORGID as {org.id}, " + - " org.NAME as {org.name}, " + - " {emp.*} " + - "FROM ORGANIZATION org " + - " LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER"; - } - - protected String getEmploymentSQL() { - return "SELECT * FROM EMPLOYMENT"; - } - - protected String getEmploymentSQLMixedScalarEntity() { - return "SELECT e.*, e.employer as employerid FROM EMPLOYMENT e" ; - } - - protected String getOrgEmpRegionSQL() { - return "select {org.*}, {emp.*}, emp.REGIONCODE " + - "from ORGANIZATION org " + - " left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER"; - } - - protected String getOrgEmpPersonSQL() { - return "select {org.*}, {emp.*}, {pers.*} " + - "from ORGANIZATION org " + - " join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER " + - " join PERSON pers on pers.PERID = emp.EMPLOYEE "; - } - - public void testFailOnNoAddEntityOrScalar() { - // Note: this passes, but for the wrong reason. - // there is actually an exception thrown, but it is the database - // throwing a sql exception because the SQL gets passed - // "un-processed"... - Session s = openSession(); - try { - String sql = "select {org.*} " + - "from organization org"; - s.createSQLQuery( sql ).list(); - fail( "Should throw an exception since no addEntity nor addScalar has been performed." ); - } - catch( HibernateException he) { - // expected behavior - } - finally { - s.close(); - } - } - - public void testManualSynchronization() { - Session s = openSession(); - s.beginTransaction(); - - sfi().getStatistics().clear(); - - // create an Organization... - Organization jboss = new Organization( "JBoss" ); - s.persist( jboss ); - - // now query on Employment, this should not cause an auto-flush - s.createSQLQuery( getEmploymentSQL() ).list(); - assertEquals( 0, sfi().getStatistics().getEntityInsertCount() ); - - // now try to query on Employment but this time add Organization as a synchronized query space... - s.createSQLQuery( getEmploymentSQL() ).addSynchronizedEntityClass( Organization.class ).list(); - assertEquals( 1, sfi().getStatistics().getEntityInsertCount() ); - - // clean up - s.delete( jboss ); - s.getTransaction().commit(); - s.close(); - } - - public void testSQLQueryInterface() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization("IFA"); - Organization jboss = new Organization("JBoss"); - Person gavin = new Person("Gavin"); - Employment emp = new Employment(gavin, jboss, "AU"); - - s.persist(ifa); - s.persist(jboss); - s.persist(gavin); - s.persist(emp); - - List l = s.createSQLQuery( getOrgEmpRegionSQL() ) - .addEntity("org", Organization.class) - .addJoin("emp", "org.employments") - .addScalar("regionCode", Hibernate.STRING) - .list(); - assertEquals( 2, l.size() ); - - l = s.createSQLQuery( getOrgEmpPersonSQL() ) - .addEntity("org", Organization.class) - .addJoin("emp", "org.employments") - .addJoin("pers", "emp.employee") - .list(); - assertEquals( l.size(), 1 ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - l = s.createSQLQuery( "select {org.*}, {emp.*} " + - "from ORGANIZATION org " + - " left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2" ) - .addEntity("org", Organization.class) - .addJoin("emp", "org.employments") - .setResultTransformer(new DistinctRootEntityResultTransformer()) - .list(); - assertEquals( l.size(), 2 ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - s.delete(emp); - s.delete(gavin); - s.delete(ifa); - s.delete(jboss); - - t.commit(); - s.close(); - } - - public void testResultSetMappingDefinition() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization("IFA"); - Organization jboss = new Organization("JBoss"); - Person gavin = new Person("Gavin"); - Employment emp = new Employment(gavin, jboss, "AU"); - - s.persist(ifa); - s.persist(jboss); - s.persist(gavin); - s.persist(emp); - - List l = s.createSQLQuery( getOrgEmpRegionSQL() ) - .setResultSetMapping( "org-emp-regionCode" ) - .list(); - assertEquals( l.size(), 2 ); - - l = s.createSQLQuery( getOrgEmpPersonSQL() ) - .setResultSetMapping( "org-emp-person" ) - .list(); - assertEquals( l.size(), 1 ); - - s.delete(emp); - s.delete(gavin); - s.delete(ifa); - s.delete(jboss); - - t.commit(); - s.close(); - } - - public void testScalarValues() throws Exception { - Session s = openSession(); - Transaction t = s.beginTransaction(); - - Organization ifa = new Organization( "IFA" ); - Organization jboss = new Organization( "JBoss" ); - - Serializable idIfa = s.save( ifa ); - Serializable idJBoss = s.save( jboss ); - - s.flush(); - - List result = s.getNamedQuery( "orgNamesOnly" ).list(); - assertTrue( result.contains( "IFA" ) ); - assertTrue( result.contains( "JBoss" ) ); - - result = s.getNamedQuery( "orgNamesOnly" ).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP).list(); - Map m = (Map) result.get(0); - assertEquals( 2, result.size() ); - assertEquals( 1, m.size() ); - assertTrue( m.containsKey("NAME") ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - Iterator iter = s.getNamedQuery( "orgNamesAndOrgs" ).list().iterator(); - Object[] o = ( Object[] ) iter.next(); - assertEquals( o[0], "IFA" ); - assertEquals( ( ( Organization ) o[1] ).getName(), "IFA" ); - o = ( Object[] ) iter.next(); - assertEquals( o[0], "JBoss" ); - assertEquals( ( ( Organization ) o[1] ).getName(), "JBoss" ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - // test that the ordering of the results is truly based on the order in which they were defined - iter = s.getNamedQuery( "orgsAndOrgNames" ).list().iterator(); - Object[] row = ( Object[] ) iter.next(); - assertEquals( "expecting non-scalar result first", Organization.class, row[0].getClass() ); - assertEquals( "expecting scalar result second", String.class, row[1].getClass() ); - assertEquals( ( ( Organization ) row[0] ).getName(), "IFA" ); - assertEquals( row[1], "IFA" ); - row = ( Object[] ) iter.next(); - assertEquals( "expecting non-scalar result first", Organization.class, row[0].getClass() ); - assertEquals( "expecting scalar result second", String.class, row[1].getClass() ); - assertEquals( ( ( Organization ) row[0] ).getName(), "JBoss" ); - assertEquals( row[1], "JBoss" ); - assertFalse( iter.hasNext() ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - iter = s.getNamedQuery( "orgIdsAndOrgNames" ).list().iterator(); - o = ( Object[] ) iter.next(); - assertEquals( o[1], "IFA" ); - assertEquals( o[0], idIfa ); - o = ( Object[] ) iter.next(); - assertEquals( o[1], "JBoss" ); - assertEquals( o[0], idJBoss ); - - s.delete( ifa ); - s.delete( jboss ); - t.commit(); - s.close(); - } - - public void testMappedAliasStrategy() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization("IFA"); - Organization jboss = new Organization("JBoss"); - Person gavin = new Person("Gavin"); - Employment emp = new Employment(gavin, jboss, "AU"); - Serializable orgId = s.save(jboss); - Serializable orgId2 = s.save(ifa); - s.save(gavin); - s.save(emp); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Query namedQuery = s.getNamedQuery("AllEmploymentAsMapped"); - List list = namedQuery.list(); - assertEquals(1,list.size()); - Employment emp2 = (Employment) list.get(0); - assertEquals(emp2.getEmploymentId(), emp.getEmploymentId() ); - assertEquals(emp2.getStartDate().getDate(), emp.getStartDate().getDate() ); - assertEquals(emp2.getEndDate(), emp.getEndDate() ); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Query sqlQuery = s.getNamedQuery("EmploymentAndPerson"); - sqlQuery.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); - list = sqlQuery.list(); - assertEquals(1,list.size() ); - Object res = list.get(0); - assertClassAssignability(res.getClass(),Map.class); - Map m = (Map) res; - assertEquals(2,m.size()); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - sqlQuery = s.getNamedQuery("organizationreturnproperty"); - sqlQuery.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); - list = sqlQuery.list(); - assertEquals(2,list.size() ); - m = (Map) list.get(0); - assertTrue(m.containsKey("org")); - assertClassAssignability(m.get("org").getClass(), Organization.class); - assertTrue(m.containsKey("emp")); - assertClassAssignability(m.get("emp").getClass(), Employment.class); - assertEquals(2, m.size()); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - namedQuery = s.getNamedQuery("EmploymentAndPerson"); - list = namedQuery.list(); - assertEquals(1,list.size() ); - Object[] objs = (Object[]) list.get(0); - assertEquals(2, objs.length); - emp2 = (Employment) objs[0]; - gavin = (Person) objs[1]; - s.delete(emp2); - s.delete(jboss); - s.delete(gavin); - s.delete(ifa); - t.commit(); - s.close(); - } - - /* test for native sql composite id joins which has never been implemented */ - public void testCompositeIdJoinsFailureExpected() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Person person = new Person(); - person.setName( "Noob" ); - - Product product = new Product(); - product.setProductId( new Product.ProductId() ); - product.getProductId().setOrgid( "x" ); - product.getProductId().setProductnumber( "1234" ); - product.setName( "Hibernate 3" ); - - Order order = new Order(); - order.setOrderId( new Order.OrderId() ); - order.getOrderId().setOrdernumber( "1" ); - order.getOrderId().setOrgid( "y" ); - - product.getOrders().add( order ); - order.setProduct( product ); - order.setPerson( person ); - - s.save( product ); - s.save( order); - s.save( person ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Product p = (Product) s.createQuery( "from Product p join fetch p.orders" ).list().get(0); - assertTrue(Hibernate.isInitialized( p.getOrders())); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Object[] o = (Object[]) s.createSQLQuery( "select\r\n" + - " product.orgid as {product.id.orgid}," + - " product.productnumber as {product.id.productnumber}," + - " {prod_orders}.orgid as orgid3_1_,\r\n" + - " {prod_orders}.ordernumber as ordernum2_3_1_,\r\n" + - " product.name as {product.name}," + - " {prod_orders.element.*}" + - /*" orders.PROD_NO as PROD4_3_1_,\r\n" + - " orders.person as person3_1_,\r\n" + - " orders.PROD_ORGID as PROD3_0__,\r\n" + - " orders.PROD_NO as PROD4_0__,\r\n" + - " orders.orgid as orgid0__,\r\n" + - " orders.ordernumber as ordernum2_0__ \r\n" +*/ - " from\r\n" + - " Product product \r\n" + - " inner join\r\n" + - " TBL_ORDER {prod_orders} \r\n" + - " on product.orgid={prod_orders}.PROD_ORGID \r\n" + - " and product.productnumber={prod_orders}.PROD_NO" ) - .addEntity( "product", Product.class ) - .addJoin( "prod_orders", "product.orders" ) - .list().get(0); - - p = (Product) o[0]; - assertTrue(Hibernate.isInitialized( p.getOrders() )); - assertNotNull(p.getOrders().iterator().next()); - t.commit(); - s.close(); - } - - public void testAutoDetectAliasing() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization("IFA"); - Organization jboss = new Organization("JBoss"); - Person gavin = new Person("Gavin"); - Employment emp = new Employment(gavin, jboss, "AU"); - Serializable orgId = s.save(jboss); - Serializable orgId2 = s.save(ifa); - s.save(gavin); - s.save(emp); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - List list = s.createSQLQuery( getEmploymentSQL() ) - .addEntity( Employment.class.getName() ) - .list(); - assertEquals( 1,list.size() ); - - Employment emp2 = (Employment) list.get(0); - assertEquals(emp2.getEmploymentId(), emp.getEmploymentId() ); - assertEquals(emp2.getStartDate().getDate(), emp.getStartDate().getDate() ); - assertEquals(emp2.getEndDate(), emp.getEndDate() ); - - s.clear(); - - list = s.createSQLQuery( getEmploymentSQL() ) - .addEntity( Employment.class.getName() ) - .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP) - .list(); - assertEquals( 1,list.size() ); - Map m = (Map) list.get(0); - assertTrue(m.containsKey("Employment")); - assertEquals(1,m.size()); - - list = s.createSQLQuery(getEmploymentSQL()).list(); - assertEquals(1, list.size()); - Object[] o = (Object[]) list.get(0); - assertEquals(8, o.length); - - list = s.createSQLQuery( getEmploymentSQL() ).setResultTransformer( new UpperCasedAliasToEntityMapResultTransformer() ).list(); - assertEquals(1, list.size()); - m = (Map) list.get(0); - assertTrue(m.containsKey("EMPID")); - assertTrue(m.containsKey("VALUE")); - assertTrue(m.containsKey("ENDDATE")); - assertEquals(8, m.size()); - - list = s.createSQLQuery( getEmploymentSQLMixedScalarEntity() ).addScalar( "employerid" ).addEntity( Employment.class ).list(); - assertEquals(1, list.size()); - o = (Object[]) list.get(0); - assertEquals(2, o.length); - assertClassAssignability( o[0].getClass(), Number.class); - assertClassAssignability( o[1].getClass(), Employment.class); - - - - Query queryWithCollection = s.getNamedQuery("organizationEmploymentsExplicitAliases"); - queryWithCollection.setLong("id", jboss.getId() ); - list = queryWithCollection.list(); - assertEquals(list.size(),1); - - s.clear(); - - list = s.createSQLQuery( getOrganizationJoinEmploymentSQL() ) - .addEntity( "org", Organization.class ) - .addJoin( "emp", "org.employments" ) - .list(); - assertEquals( 2,list.size() ); - - s.clear(); - - list = s.createSQLQuery( getOrganizationFetchJoinEmploymentSQL() ) - .addEntity( "org", Organization.class ) - .addJoin( "emp", "org.employments" ) - .list(); - assertEquals( 2,list.size() ); - - s.clear(); - - // TODO : why twice? - s.getNamedQuery( "organizationreturnproperty" ).list(); - list = s.getNamedQuery( "organizationreturnproperty" ).list(); - assertEquals( 2,list.size() ); - - s.clear(); - - list = s.getNamedQuery( "organizationautodetect" ).list(); - assertEquals( 2,list.size() ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - s.delete(emp2); - - s.delete(jboss); - s.delete(gavin); - s.delete(ifa); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Dimension dim = new Dimension( 3, Integer.MAX_VALUE ); - s.save( dim ); - list = s.createSQLQuery( "select d_len * d_width as surface, d_len * d_width * 10 as volume from Dimension" ).list(); - s.delete( dim ); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - SpaceShip enterprise = new SpaceShip(); - enterprise.setModel( "USS" ); - enterprise.setName( "Entreprise" ); - enterprise.setSpeed( 50d ); - Dimension d = new Dimension(45, 10); - enterprise.setDimensions( d ); - s.save( enterprise ); - Object[] result = (Object[]) s.getNamedQuery( "spaceship" ).uniqueResult(); - enterprise = (SpaceShip) result[0]; - assertTrue(50d == enterprise.getSpeed() ); - assertTrue( 450d == extractDoubleValue( result[1] ) ); - assertTrue( 4500d == extractDoubleValue( result[2] ) ); - s.delete( enterprise ); - t.commit(); - s.close(); - - } - - public void testMixAndMatchEntityScalar() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Speech speech = new Speech(); - speech.setLength( new Double( 23d ) ); - speech.setName( "Mine" ); - s.persist( speech ); - s.flush(); - s.clear(); - - List l = s.createSQLQuery( "select name, id, flength, name as scalarName from Speech" ) - .setResultSetMapping( "speech" ) - .list(); - assertEquals( l.size(), 1 ); - - t.rollback(); - s.close(); - } - - private double extractDoubleValue(Object value) { - if ( value instanceof BigInteger ) { - return ( ( BigInteger ) value ).doubleValue(); - } - else if ( value instanceof BigDecimal ) { - return ( ( BigDecimal ) value ).doubleValue(); - } - else { - return Double.valueOf( value.toString() ).doubleValue(); - } - } - - private static class UpperCasedAliasToEntityMapResultTransformer extends AliasToEntityMapResultTransformer { - public Object transformTuple(Object[] tuple, String[] aliases) { - String[] ucAliases = new String[aliases.length]; - for ( int i = 0; i < aliases.length; i++ ) { - ucAliases[i] = aliases[i].toUpperCase(); - } - return super.transformTuple( tuple, ucAliases ); - } - } -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/HandSQLTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/HandSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/HandSQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,150 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; -import java.sql.SQLException; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import org.hibernate.HibernateException; -import org.hibernate.LockMode; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; - -/** - * @author Steve Ebersole - */ -public abstract class HandSQLTest extends DatabaseSpecificFunctionalTestCase { - - public HandSQLTest(String name) { - super( name ); - } - - public String getCacheConcurrencyStrategy() { - return null; - } - - public void testHandSQL() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization( "IFA" ); - Organization jboss = new Organization( "JBoss" ); - Person gavin = new Person( "Gavin" ); - Employment emp = new Employment( gavin, jboss, "AU" ); - Serializable orgId = s.save( jboss ); - s.save( ifa ); - s.save( gavin ); - s.save( emp ); - t.commit(); - - t = s.beginTransaction(); - Person christian = new Person( "Christian" ); - s.save( christian ); - Employment emp2 = new Employment( christian, jboss, "EU" ); - s.save( emp2 ); - t.commit(); - s.close(); - - getSessions().evict( Organization.class ); - getSessions().evict( Person.class ); - getSessions().evict( Employment.class ); - - s = openSession(); - t = s.beginTransaction(); - jboss = ( Organization ) s.get( Organization.class, orgId ); - assertEquals( jboss.getEmployments().size(), 2 ); - emp = ( Employment ) jboss.getEmployments().iterator().next(); - gavin = emp.getEmployee(); - assertEquals( gavin.getName(), "GAVIN" ); - assertEquals( s.getCurrentLockMode( gavin ), LockMode.UPGRADE ); - emp.setEndDate( new Date() ); - Employment emp3 = new Employment( gavin, jboss, "US" ); - s.save( emp3 ); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Iterator iter = s.getNamedQuery( "allOrganizationsWithEmployees" ).list().iterator(); - assertTrue( iter.hasNext() ); - Organization o = ( Organization ) iter.next(); - assertEquals( o.getEmployments().size(), 3 ); - Iterator iter2 = o.getEmployments().iterator(); - while ( iter2.hasNext() ) { - Employment e = ( Employment ) iter2.next(); - s.delete( e ); - } - iter2 = o.getEmployments().iterator(); - while ( iter2.hasNext() ) { - Employment e = ( Employment ) iter2.next(); - s.delete( e.getEmployee() ); - } - s.delete( o ); - assertFalse( iter.hasNext() ); - s.delete( ifa ); - t.commit(); - s.close(); - } - - - public void testScalarStoredProcedure() throws HibernateException, SQLException { - Session s = openSession(); - Query namedQuery = s.getNamedQuery( "simpleScalar" ); - namedQuery.setLong( "number", 43 ); - List list = namedQuery.list(); - Object o[] = ( Object[] ) list.get( 0 ); - assertEquals( o[0], "getAll" ); - assertEquals( o[1], new Long( 43 ) ); - s.close(); - } - - public void testParameterHandling() throws HibernateException, SQLException { - Session s = openSession(); - - Query namedQuery = s.getNamedQuery( "paramhandling" ); - namedQuery.setLong( 0, 10 ); - namedQuery.setLong( 1, 20 ); - List list = namedQuery.list(); - Object[] o = ( Object[] ) list.get( 0 ); - assertEquals( o[0], new Long( 10 ) ); - assertEquals( o[1], new Long( 20 ) ); - - namedQuery = s.getNamedQuery( "paramhandling_mixed" ); - namedQuery.setLong( 0, 10 ); - namedQuery.setLong( "second", 20 ); - list = namedQuery.list(); - o = ( Object[] ) list.get( 0 ); - assertEquals( o[0], new Long( 10 ) ); - assertEquals( o[1], new Long( 20 ) ); - s.close(); - } - - public void testEntityStoredProcedure() throws HibernateException, SQLException { - Session s = openSession(); - Transaction t = s.beginTransaction(); - - Organization ifa = new Organization( "IFA" ); - Organization jboss = new Organization( "JBoss" ); - Person gavin = new Person( "Gavin" ); - Employment emp = new Employment( gavin, jboss, "AU" ); - s.persist( ifa ); - s.persist( jboss ); - s.persist( gavin ); - s.persist( emp ); - - Query namedQuery = s.getNamedQuery( "selectAllEmployments" ); - List list = namedQuery.list(); - assertTrue( list.get( 0 ) instanceof Employment ); - s.delete( emp ); - s.delete( ifa ); - s.delete( jboss ); - s.delete( gavin ); - - t.commit(); - s.close(); - } - - -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLEmployment.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLEmployment.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLEmployment.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,221 +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"> - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <class name="Organization" table="ORGANIZATION"> - <id name="id" unsaved-value="0" column="ORGID"> - <generator class="increment"/> - </id> - <property name="name" not-null="true" column="NAME"/> - <set name="employments" - inverse="true" - order-by="DUMMY"> - <key column="EMPLOYER"/>  - <one-to-many class="Employment"/> - <loader query-ref="organizationEmployments"/> - </set> -  - <loader query-ref="organization"/> - <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> - <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> - </class> - - <class name="Person" table="PERSON"> - <id name="id" unsaved-value="0" column="PERID"> - <generator class="increment"/> - </id> - <property name="name" not-null="true" column="NAME"/> - <loader query-ref="person"/> - <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> - <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> - </class> - - <class name="Employment" table="EMPLOYMENT"> - <id name="employmentId" unsaved-value="0" column="EMPID"> - <generator class="increment"/> - </id> - <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> - <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> - <property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/> - <property name="endDate" column="ENDDATE" insert="false"/> - <property name="regionCode" column="REGIONCODE" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - <loader query-ref="employment"/> - <sql-insert> - INSERT INTO EMPLOYMENT - (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) - VALUES (?, ?, getdate(), UPPER(?), ?, ?, ?) - </sql-insert> - <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> - <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - <sql-query name="person"> - <return alias="p" class="Person" lock-mode="upgrade"/> - SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ - </sql-query> - - <sql-query name="organization"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT {org.*}, {emp.*} - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - WHERE org.ORGID=? - </sql-query> - - -  - - <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> - <return alias="org" class="Organization"/> - SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID - </sql-query> - - - - - - <sql-query name="employment"> - <return alias="emp" class="Employment"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} - FROM EMPLOYMENT - WHERE EMPID = ? - </sql-query> - - <sql-query name="organizationEmployments"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT {empcol.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - - <sql-query name="organizationCurrentEmployments"> - <return alias="emp" class="Employment"> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> -  - <return-property name="endDate" column="myEndDate"/> - </return> - <synchronize table="EMPLOYMENT"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY - FROM EMPLOYMENT - WHERE EMPLOYER = :id AND ENDDATE IS NULL - ORDER BY STARTDATE ASC - </sql-query> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { call simpleScalar(:number) } - </sql-query> - - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { call paramHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call paramHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="id" column="EMPID"/> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { call selectAllEmployments() } - </sql-query> - - <database-object> - <create> - CREATE PROCEDURE selectAllEmployments AS - SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, - REGIONCODE, EMPID, VALUE, CURRENCY - FROM EMPLOYMENT - </create> - <drop> - DROP PROCEDURE selectAllEmployments - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE paramHandling @j int, @i int AS - SELECT @j as value, @i as value2 - </create> - <drop> - DROP PROCEDURE paramHandling - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE simpleScalar @number int AS - SELECT @number as value, 'getAll' as name - </create> - <drop> - DROP PROCEDURE simpleScalar - </drop> - </database-object> - -</hibernate-mapping> Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,31 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.SybaseDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Gavin King - */ -public class MSSQLTest extends HandSQLTest { - - public MSSQLTest(String str) { - super( str ); - } - - public String[] getMappings() { - return new String[] {"sql/MSSQLEmployment.hbm.xml"}; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( MSSQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof SybaseDialect ); - } -} - Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmount.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmount.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmount.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,78 +0,0 @@ -package org.hibernate.test.sql; - -import java.math.BigDecimal; -import java.util.Currency; -import java.io.Serializable; - -/** - * Represents a monetary amount as value and currency. - * - * @author Gavin King <gavin(a)hibernate.org> - * @author Christian Bauer <christian(a)hibernate.org> - */ -public class MonetaryAmount implements Serializable { - - private final BigDecimal value; - private final Currency currency; - - public MonetaryAmount(BigDecimal value, Currency currency) { - this.value = value; - this.currency = currency; - } - - public Currency getCurrency() { - return currency; - } - - public BigDecimal getValue() { - return value; - } - - // ********************** Common Methods ********************** // - - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof MonetaryAmount)) return false; - - final MonetaryAmount monetaryAmount = (MonetaryAmount) o; - - if (!currency.equals(monetaryAmount.currency)) return false; - if (!value.equals(monetaryAmount.value)) return false; - - return true; - } - - public int hashCode() { - int result; - result = value.hashCode(); - result = 29 * result + currency.hashCode(); - return result; - } - - public String toString() { - return "Value: '" + getValue() + "', " + - "Currency: '" + getCurrency() + "'"; - } - - public int compareTo(Object o) { - if (o instanceof MonetaryAmount) { - // TODO: This would actually require some currency conversion magic - return this.getValue().compareTo(((MonetaryAmount) o).getValue()); - } - return 0; - } - - // ********************** Business Methods ********************** // - - public static MonetaryAmount fromString(String amount, String currencyCode) { - return new MonetaryAmount(new BigDecimal(amount), - Currency.getInstance(currencyCode)); - } - - public static MonetaryAmount convert(MonetaryAmount amount, - Currency toConcurrency) { - // TODO: This requires some conversion magic and is therefore broken - return new MonetaryAmount(amount.getValue(), toConcurrency); - } - -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmountUserType.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmountUserType.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmountUserType.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,85 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; -import java.util.Currency; - -import org.hibernate.HibernateException; -import org.hibernate.usertype.UserType; - -/** - * This is a simple Hibernate custom mapping type for MonetaryAmount value types. - * - * - * @author Max & Christian - */ -public class MonetaryAmountUserType - implements UserType { - - private static final int[] SQL_TYPES = {Types.NUMERIC, Types.VARCHAR }; - - public int[] sqlTypes() { return SQL_TYPES; } - - public Class returnedClass() { return MonetaryAmount.class; } - - public boolean isMutable() { return false; } - - public Object deepCopy(Object value) { - return value; // MonetaryAmount is immutable - } - - public boolean equals(Object x, Object y) { - if (x == y) return true; - if (x == null || y == null) return false; - return x.equals(y); - } - - public Object nullSafeGet(ResultSet resultSet, - String[] names, - Object owner) - throws HibernateException, SQLException { - - BigDecimal value = resultSet.getBigDecimal(names[0]); - if (resultSet.wasNull()) return null; - String cur = resultSet.getString(names[1]); - Currency userCurrency = Currency.getInstance(cur); - - return new MonetaryAmount(value, userCurrency); - } - - public void nullSafeSet(PreparedStatement statement, - Object value, - int index) - throws HibernateException, SQLException { - - if (value == null) { - statement.setNull(index, Types.NUMERIC); - statement.setNull(index+1, Types.VARCHAR); - } else { - MonetaryAmount currency = (MonetaryAmount)value; - statement.setBigDecimal(index, currency.getValue()); - statement.setString(index+1, currency.getCurrency().getCurrencyCode()); - } - } - - public Serializable disassemble(Object value) throws HibernateException { - return (Serializable) value; - } - - public Object assemble(Serializable cached, Object owner) throws HibernateException { - return cached; - } - - public Object replace(Object original, Object target, Object owner) - throws HibernateException { - return original; - } - - public int hashCode(Object x) throws HibernateException { - return x.hashCode(); - } -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/MySQLEmployment.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/MySQLEmployment.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/MySQLEmployment.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,220 +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"> - - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <class name="Organization"> - <id name="id" unsaved-value="0" column="orgid"> - <generator class="increment"/> - </id> - <property name="name" not-null="true"/> - <set name="employments" - inverse="true" - order-by="DUMMY"> - <key column="employer"/>  - <one-to-many class="Employment"/> - <loader query-ref="organizationEmployments"/> - </set> -  - <loader query-ref="organization"/> - <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> - <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> - </class> - - <class name="Person"> - <id name="id" unsaved-value="0" column="perid"> - <generator class="increment"/> - </id> - <property name="name" not-null="true"/> - <loader query-ref="person"/> - <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> - <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> - </class> - - <class name="Employment"> - <id name="employmentId" unsaved-value="0" column="empid"> - <generator class="increment"/> - </id> - <many-to-one name="employee" not-null="true" update="false"/> - <many-to-one name="employer" not-null="true" update="false"/> - <property name="startDate" not-null="true" update="false" insert="false"/> - <property name="endDate" insert="false"/> - <property name="regionCode" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - <loader query-ref="employment"/> - <sql-insert> - INSERT INTO EMPLOYMENT - (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) - VALUES (?, ?, now(), UPPER(?), ?, ?, ?) - </sql-insert> - <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> - <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - <sql-query name="person"> - <return alias="p" class="Person" lock-mode="upgrade"/> - SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ - </sql-query> - - <sql-query name="organization"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT {org.*}, {emp.*} - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - WHERE org.ORGID=? - </sql-query> - - - -  - - <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> - <return alias="org" class="Organization"/> - SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID - </sql-query> - - <sql-query name="employment"> - <return alias="emp" class="Employment"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} - FROM EMPLOYMENT - WHERE EMPID = ? - </sql-query> - - - <sql-query name="organizationEmployments"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT {empcol.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - - <sql-query name="organizationCurrentEmployments"> - <return alias="emp" class="Employment"> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> -  - <return-property name="endDate" column="myEndDate"/> - </return> - <synchronize table="EMPLOYMENT"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY - FROM EMPLOYMENT - WHERE EMPLOYER = :id AND ENDDATE IS NULL - ORDER BY STARTDATE ASC - </sql-query> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { call simpleScalar(:number) } - </sql-query> - - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { call paramHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call paramHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="id" column="EMPID"/> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { call selectAllEmployments() } - </sql-query> - - <database-object> - <create> - CREATE PROCEDURE selectAllEmployments () - SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, - REGIONCODE, EMPID, VALUE, CURRENCY - FROM EMPLOYMENT - </create> - <drop> - DROP PROCEDURE selectAllEmployments - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE paramHandling (j int, i int) - SELECT j AS value, i AS value2 - </create> - <drop> - DROP PROCEDURE paramHandling - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE simpleScalar (number int) - SELECT number AS value, 'getAll' AS name - </create> - <drop> - DROP PROCEDURE simpleScalar - </drop> - </database-object> - -</hibernate-mapping> Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/MySQLTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/MySQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/MySQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,31 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.MySQLDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Gavin King - */ -public class MySQLTest extends HandSQLTest { - - public MySQLTest(String str) { - super(str); - } - - public String[] getMappings() { - return new String[] { "sql/MySQLEmployment.hbm.xml" }; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( MySQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof MySQLDialect ); - } -} - Modified: trunk/Hibernate3/test/org/hibernate/test/sql/NativeSqlSupportSuite.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/NativeSqlSupportSuite.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/NativeSqlSupportSuite.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -2,23 +2,32 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.test.sql.check.OracleCheckStyleTest; +import org.hibernate.test.sql.check.CheckSuite; +import org.hibernate.test.sql.hand.custom.datadirect.oracle.DataDirectOracleCustomSQLTest; +import org.hibernate.test.sql.hand.custom.db2.DB2CustomSQLTest; +import org.hibernate.test.sql.hand.custom.mysql.MySQLCustomSQLTest; +import org.hibernate.test.sql.hand.custom.oracle.OracleCustomSQLTest; +import org.hibernate.test.sql.hand.custom.sybase.SybaseCustomSQLTest; +import org.hibernate.test.sql.hand.query.NativeSQLQueriesTest; +import org.hibernate.test.sql.hand.identity.CustomInsertSQLWithIdentityColumnTest; + /** - * todo: describe NativeSqlSupportSuite + * Suite for testing aspects of native SQL support. * * @author Steve Ebersole */ public class NativeSqlSupportSuite { public static Test suite() { TestSuite suite = new TestSuite( "Native SQL support tests" ); - suite.addTest( Db2SQLTest.suite() ); - suite.addTest( DataDirectOracleSQLTest.suite() ); - suite.addTest( OracleSQLTest.suite() ); - suite.addTest( MSSQLTest.suite() ); - suite.addTest( MySQLTest.suite() ); - suite.addTest( GeneralTest.suite() ); - suite.addTest( OracleCheckStyleTest.suite() ); + suite.addTest( DB2CustomSQLTest.suite() ); + suite.addTest( DataDirectOracleCustomSQLTest.suite() ); + suite.addTest( OracleCustomSQLTest.suite() ); + suite.addTest( SybaseCustomSQLTest.suite() ); + suite.addTest( MySQLCustomSQLTest.suite() ); + suite.addTest( NativeSQLQueriesTest.suite() ); + suite.addTest( CheckSuite.suite() ); + suite.addTest( CustomInsertSQLWithIdentityColumnTest.suite() ); return suite; } } Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/OracleDataDirectDriverStoredProcedures.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/OracleDataDirectDriverStoredProcedures.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/OracleDataDirectDriverStoredProcedures.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,48 +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"> - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { call simpleScalar(:number) } - </sql-query> - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call testParamHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call testParamHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="emp" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="employmentId" column="EMPID"/> - <return-property name="salary"> - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { call allEmployments() } - </sql-query> - -</hibernate-mapping> Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/OracleDriverStoredProcedures.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/OracleDriverStoredProcedures.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/OracleDriverStoredProcedures.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,47 +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"> - - -<hibernate-mapping package="org.hibernate.test.sql" default-access="field"> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { ? = call simpleScalar(:number) } - </sql-query> - - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { ? = call testParamHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { ? = call testParamHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="emp" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="employmentId" column="EMPID"/> - <return-property name="salary"> - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { ? = call allEmployments() } - </sql-query> - -</hibernate-mapping> Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,214 +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"> - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <class name="Organization"> - <id name="id" unsaved-value="0" column="orgid"> - <generator class="increment"/> - </id> - <property name="name" not-null="true"/> - <set name="employments" - inverse="true" - order-by="DUMMY"> - <key column="employer"/> -  - <one-to-many class="Employment"/> - <loader query-ref="organizationEmployments"/> - </set> -  - <loader query-ref="organization"/> - <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> - <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> - </class> - - <class name="Person"> - <id name="id" unsaved-value="0" column="perid"> - <generator class="increment"/> - </id> - <property name="name" not-null="true"/> - <loader query-ref="person"/> - <sql-insert callable="true" check="none">{call createPerson(?,?)}</sql-insert> - <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> - <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> - </class> - - <class name="Employment"> - <id name="employmentId" unsaved-value="0" column="empid"> - <generator class="increment"/> - </id> - <many-to-one name="employee" not-null="true" update="false"/> - <many-to-one name="employer" not-null="true" update="false"/> - <property name="startDate" not-null="true" update="false" insert="false"/> - <property name="endDate" insert="false"/> - <property name="regionCode" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - <loader query-ref="employment"/> - <sql-insert> - INSERT INTO EMPLOYMENT - (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) - VALUES (?, ?, CURRENT_DATE, UPPER(?), ?, ?, ?) - </sql-insert> - <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> - <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - <sql-query name="person"> - <return alias="p" class="Person" lock-mode="upgrade"/> - SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ - </sql-query> - - <sql-query name="organization"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT {org.*}, {emp.*} - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - WHERE org.ORGID=? - </sql-query> - - - <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> - <return alias="org" class="Organization"/> - SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID - </sql-query> - - - <sql-query name="employment"> - <return alias="emp" class="Employment"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} - FROM EMPLOYMENT - WHERE EMPID = ? - </sql-query> - - - <sql-query name="organizationEmployments"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT {empcol.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - - <sql-query name="organizationCurrentEmployments"> - <return alias="emp" class="Employment"> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> -  - <return-property name="endDate" column="myEndDate"/> - </return> - <synchronize table="EMPLOYMENT"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY - FROM EMPLOYMENT - WHERE EMPLOYER = :id AND ENDDATE IS NULL - ORDER BY STARTDATE ASC - </sql-query> - - <database-object> - <create> - CREATE OR REPLACE FUNCTION testParamHandling (j number, i number) - RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; - BEGIN - OPEN st_cursor FOR - SELECT j as value, i as value2 from dual; - RETURN st_cursor; - END; - </create> - <drop> - DROP FUNCTION testParamHandling - </drop> - </database-object> - - <database-object> - <create> - CREATE OR REPLACE FUNCTION simpleScalar (j number) - RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; - BEGIN - OPEN st_cursor FOR - SELECT j as value, 'getAll' as name from dual; - RETURN st_cursor; - END; - </create> - <drop> - DROP FUNCTION simpleScalar - </drop> - </database-object> - - <database-object> - <create> - CREATE OR REPLACE FUNCTION allEmployments - RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; - BEGIN - OPEN st_cursor FOR - SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, - REGIONCODE, EMPID, VALUE, CURRENCY - FROM EMPLOYMENT; - RETURN st_cursor; - END; - </create> - <drop> - DROP FUNCTION allEmployments - </drop> - </database-object> - - <database-object> - <create> - CREATE OR REPLACE PROCEDURE createPerson(p_name PERSON.NAME%TYPE, p_id PERSON.PERID%TYPE) - AS - rowcount INTEGER; - BEGIN - INSERT INTO PERSON ( PERID, NAME ) VALUES ( p_id, UPPER( p_name ) ); - rowcount := SQL%ROWCOUNT; - IF rowcount = 1 THEN - NULL; - ELSE - RAISE_APPLICATION_ERROR( -20001, 'Unexpected rowcount [' || rowcount || ']' ); - END IF; - END; - </create> - <drop> - DROP PROCEDURE createPerson; - </drop> - </database-object> - -</hibernate-mapping> Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,33 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.DataDirectOracle9Dialect; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.Oracle9Dialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Gavin King - */ -public class OracleSQLTest extends HandSQLTest { - - public OracleSQLTest(String str) { - super(str); - } - - public String[] getMappings() { - return new String[] { "sql/OracleEmployment.hbm.xml", "sql/OracleDriverStoredProcedures.hbm.xml" }; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( OracleSQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof Oracle9Dialect ) && !( dialect instanceof DataDirectOracle9Dialect ); - } - -} - Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/Order.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/Order.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/Order.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,55 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; - -public class Order { - - static public class OrderId implements Serializable { - String orgid; - String ordernumber; - public String getOrdernumber() { - return ordernumber; - } - public void setOrdernumber(String ordernumber) { - this.ordernumber = ordernumber; - } - public String getOrgid() { - return orgid; - } - public void setOrgid(String orgid) { - this.orgid = orgid; - } - - - } - - OrderId orderId; - - Product product; - - Person person; - - public Person getPerson() { - return person; - } - - public void setPerson(Person person) { - this.person = person; - } - public OrderId getOrderId() { - return orderId; - } - - public void setOrderId(OrderId orderId) { - this.orderId = orderId; - } - - public Product getProduct() { - return product; - } - - public void setProduct(Product product) { - this.product = product; - } - -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/Organization.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/Organization.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/Organization.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,59 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import java.util.Collection; -import java.util.HashSet; - -/** - * @author Gavin King - */ -public class Organization { - private long id; - private String name; - private Collection employments; - - public Organization(String name) { - this.name = name; - employments = new HashSet(); - } - - public Organization() {} - - /** - * @return Returns the employments. - */ - public Collection getEmployments() { - return employments; - } - /** - * @param employments The employments to set. - */ - public void setEmployments(Collection employments) { - this.employments = employments; - } - /** - * @return Returns the id. - */ - public long getId() { - return id; - } - /** - * @param id The id to set. - */ - public void setId(long id) { - this.id = id; - } - /** - * @return Returns the name. - */ - public String getName() { - return name; - } - /** - * @param name The name to set. - */ - public void setName(String name) { - this.name = name; - } - -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/Person.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/Person.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/Person.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,41 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -/** - * @author Gavin King - */ -public class Person { - private long id; - private String name; - - public Person(String name) { - this.name = name; - } - - public Person() {} - -/** - * @return Returns the id. - */ - public long getId() { - return id; - } - /** - * @param id The id to set. - */ - public void setId(long id) { - this.id = id; - } - /** - * @return Returns the name. - */ - public String getName() { - return name; - } - /** - * @param name The name to set. - */ - public void setName(String name) { - this.name = name; - } -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/Product.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/Product.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/Product.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,66 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - -public class Product { - - static public class ProductId implements Serializable { - String orgid; - String productnumber; - public String getProductnumber() { - return productnumber; - } - public void setProductnumber(String ordernumber) { - this.productnumber = ordernumber; - } - public String getOrgid() { - return orgid; - } - public void setOrgid(String orgid) { - this.orgid = orgid; - } - - - } - - ProductId productId; - - String name; - - Person person; - - Set orders = new HashSet(); - - public Set getOrders() { - return orders; - } - - public void setOrders(Set orders) { - this.orders = orders; - } - public Person getPerson() { - return person; - } - - public void setPerson(Person person) { - this.person = person; - } - public ProductId getProductId() { - return productId; - } - - public void setProductId(ProductId orderId) { - this.productId = orderId; - } - - public String getName() { - return name; - } - - public void setName(String product) { - this.name = product; - } - -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/SpaceShip.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/SpaceShip.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/SpaceShip.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,53 +0,0 @@ -//$Id: $ -package org.hibernate.test.sql; - -/** - * @author Emmanuel Bernard - */ -public class SpaceShip { - private Integer id; - private String name; - private String model; - private double speed; - private Dimension dimensions; - - public Dimension getDimensions() { - return dimensions; - } - - public void setDimensions(Dimension dimensions) { - this.dimensions = dimensions; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getModel() { - return model; - } - - public void setModel(String model) { - this.model = model; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public double getSpeed() { - return speed; - } - - public void setSpeed(double speed) { - this.speed = speed; - } -} Deleted: trunk/Hibernate3/test/org/hibernate/test/sql/Speech.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/Speech.java 2007-05-08 21:56:00 UTC (rev 11485) +++ trunk/Hibernate3/test/org/hibernate/test/sql/Speech.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -1,35 +0,0 @@ -//$Id: $ -package org.hibernate.test.sql; - -/** - * @author Emmanuel Bernard - */ -public class Speech { - private Integer id; - private String name; - private Double length; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Double getLength() { - return length; - } - - public void setLength(Double length) { - this.length = length; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} Added: trunk/Hibernate3/test/org/hibernate/test/sql/check/CheckSuite.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/check/CheckSuite.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/check/CheckSuite.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,19 @@ +package org.hibernate.test.sql.check; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * Suite for testing custom SQL result checking strategies. + * + * Yes, currently there is only one actual test... + * + * @author Steve Ebersole + */ +public class CheckSuite { + public static Test suite() { + TestSuite suite = new TestSuite( "native sql result checking" ); + suite.addTest( OracleCheckStyleTest.suite() ); + return suite; + } +} Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Dimension.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/Dimension.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/Dimension.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/Dimension.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,31 @@ +package org.hibernate.test.sql.hand; + +/** + * Used to mimic some tests from the JPA testsuite... + * + * @author Steve Ebersole + */ +public class Dimension { + private Long id; + private int length; + private int width; + + public Dimension() {} + + public Dimension(int length, int width) { + this.length = length; + this.width = width; + } + + public Long getId() { + return id; + } + + public int getLength() { + return length; + } + + public int getWidth() { + return width; + } +} Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Employment.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/Employment.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/Employment.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/Employment.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,107 @@ +//$Id$ +package org.hibernate.test.sql.hand; + +import java.util.Date; + +/** + * @author Gavin King + */ +public class Employment { + private long employmentId; + private Person employee; + private Organization employer; + private Date startDate; + private Date endDate; + private String regionCode; + private MonetaryAmount salary; + + public Employment() {} + + public Employment(Person employee, Organization employer, String regionCode) { + this.employee = employee; + this.employer = employer; + this.startDate = new Date(); + this.regionCode = regionCode; + employer.getEmployments().add(this); + } + /** + * @return Returns the employee. + */ + public Person getEmployee() { + return employee; + } + /** + * @param employee The employee to set. + */ + public void setEmployee(Person employee) { + this.employee = employee; + } + /** + * @return Returns the employer. + */ + public Organization getEmployer() { + return employer; + } + /** + * @param employer The employer to set. + */ + public void setEmployer(Organization employer) { + this.employer = employer; + } + /** + * @return Returns the endDate. + */ + public Date getEndDate() { + return endDate; + } + /** + * @param endDate The endDate to set. + */ + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + /** + * @return Returns the id. + */ + public long getEmploymentId() { + return employmentId; + } + /** + * @param id The id to set. + */ + public void setEmploymentId(long id) { + this.employmentId = id; + } + /** + * @return Returns the startDate. + */ + public Date getStartDate() { + return startDate; + } + /** + * @param startDate The startDate to set. + */ + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + /** + * @return Returns the regionCode. + */ + public String getRegionCode() { + return regionCode; + } + /** + * @param regionCode The regionCode to set. + */ + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public MonetaryAmount getSalary() { + return salary; + } + + public void setSalary(MonetaryAmount salary) { + this.salary = salary; + } +} Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Employment.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmount.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmount.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmount.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmount.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,78 @@ +package org.hibernate.test.sql.hand; + +import java.math.BigDecimal; +import java.util.Currency; +import java.io.Serializable; + +/** + * Represents a monetary amount as value and currency. + * + * @author Gavin King <gavin(a)hibernate.org> + * @author Christian Bauer <christian(a)hibernate.org> + */ +public class MonetaryAmount implements Serializable { + + private final BigDecimal value; + private final Currency currency; + + public MonetaryAmount(BigDecimal value, Currency currency) { + this.value = value; + this.currency = currency; + } + + public Currency getCurrency() { + return currency; + } + + public BigDecimal getValue() { + return value; + } + + // ********************** Common Methods ********************** // + + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MonetaryAmount)) return false; + + final MonetaryAmount monetaryAmount = (MonetaryAmount) o; + + if (!currency.equals(monetaryAmount.currency)) return false; + if (!value.equals(monetaryAmount.value)) return false; + + return true; + } + + public int hashCode() { + int result; + result = value.hashCode(); + result = 29 * result + currency.hashCode(); + return result; + } + + public String toString() { + return "Value: '" + getValue() + "', " + + "Currency: '" + getCurrency() + "'"; + } + + public int compareTo(Object o) { + if (o instanceof MonetaryAmount) { + // TODO: This would actually require some currency conversion magic + return this.getValue().compareTo(((MonetaryAmount) o).getValue()); + } + return 0; + } + + // ********************** Business Methods ********************** // + + public static MonetaryAmount fromString(String amount, String currencyCode) { + return new MonetaryAmount(new BigDecimal(amount), + Currency.getInstance(currencyCode)); + } + + public static MonetaryAmount convert(MonetaryAmount amount, + Currency toConcurrency) { + // TODO: This requires some conversion magic and is therefore broken + return new MonetaryAmount(amount.getValue(), toConcurrency); + } + +} Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmount.java ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmountUserType.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/MonetaryAmountUserType.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmountUserType.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmountUserType.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,85 @@ +package org.hibernate.test.sql.hand; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import java.util.Currency; + +import org.hibernate.HibernateException; +import org.hibernate.usertype.UserType; + +/** + * This is a simple Hibernate custom mapping type for MonetaryAmount value types. + * + * + * @author Max & Christian + */ +public class MonetaryAmountUserType + implements UserType { + + private static final int[] SQL_TYPES = {Types.NUMERIC, Types.VARCHAR }; + + public int[] sqlTypes() { return SQL_TYPES; } + + public Class returnedClass() { return MonetaryAmount.class; } + + public boolean isMutable() { return false; } + + public Object deepCopy(Object value) { + return value; // MonetaryAmount is immutable + } + + public boolean equals(Object x, Object y) { + if (x == y) return true; + if (x == null || y == null) return false; + return x.equals(y); + } + + public Object nullSafeGet(ResultSet resultSet, + String[] names, + Object owner) + throws HibernateException, SQLException { + + BigDecimal value = resultSet.getBigDecimal(names[0]); + if (resultSet.wasNull()) return null; + String cur = resultSet.getString(names[1]); + Currency userCurrency = Currency.getInstance(cur); + + return new MonetaryAmount(value, userCurrency); + } + + public void nullSafeSet(PreparedStatement statement, + Object value, + int index) + throws HibernateException, SQLException { + + if (value == null) { + statement.setNull(index, Types.NUMERIC); + statement.setNull(index+1, Types.VARCHAR); + } else { + MonetaryAmount currency = (MonetaryAmount)value; + statement.setBigDecimal(index, currency.getValue()); + statement.setString(index+1, currency.getCurrency().getCurrencyCode()); + } + } + + public Serializable disassemble(Object value) throws HibernateException { + return (Serializable) value; + } + + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + public Object replace(Object original, Object target, Object owner) + throws HibernateException { + return original; + } + + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); + } +} Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmountUserType.java ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Order.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/Order.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/Order.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/Order.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,55 @@ +package org.hibernate.test.sql.hand; + +import java.io.Serializable; + +public class Order { + + static public class OrderId implements Serializable { + String orgid; + String ordernumber; + public String getOrdernumber() { + return ordernumber; + } + public void setOrdernumber(String ordernumber) { + this.ordernumber = ordernumber; + } + public String getOrgid() { + return orgid; + } + public void setOrgid(String orgid) { + this.orgid = orgid; + } + + + } + + OrderId orderId; + + Product product; + + Person person; + + public Person getPerson() { + return person; + } + + public void setPerson(Person person) { + this.person = person; + } + public OrderId getOrderId() { + return orderId; + } + + public void setOrderId(OrderId orderId) { + this.orderId = orderId; + } + + public Product getProduct() { + return product; + } + + public void setProduct(Product product) { + this.product = product; + } + +} Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Organization.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/Organization.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/Organization.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/Organization.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,59 @@ +//$Id$ +package org.hibernate.test.sql.hand; + +import java.util.Collection; +import java.util.HashSet; + +/** + * @author Gavin King + */ +public class Organization { + private long id; + private String name; + private Collection employments; + + public Organization(String name) { + this.name = name; + employments = new HashSet(); + } + + public Organization() {} + + /** + * @return Returns the employments. + */ + public Collection getEmployments() { + return employments; + } + /** + * @param employments The employments to set. + */ + public void setEmployments(Collection employments) { + this.employments = employments; + } + /** + * @return Returns the id. + */ + public long getId() { + return id; + } + /** + * @param id The id to set. + */ + public void setId(long id) { + this.id = id; + } + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } + +} Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Organization.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Person.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/Person.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/Person.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/Person.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,41 @@ +//$Id$ +package org.hibernate.test.sql.hand; + +/** + * @author Gavin King + */ +public class Person { + private long id; + private String name; + + public Person(String name) { + this.name = name; + } + + public Person() {} + +/** + * @return Returns the id. + */ + public long getId() { + return id; + } + /** + * @param id The id to set. + */ + public void setId(long id) { + this.id = id; + } + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } +} Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Person.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Product.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/Product.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/Product.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/Product.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,66 @@ +package org.hibernate.test.sql.hand; + +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +public class Product { + + static public class ProductId implements Serializable { + String orgid; + String productnumber; + public String getProductnumber() { + return productnumber; + } + public void setProductnumber(String ordernumber) { + this.productnumber = ordernumber; + } + public String getOrgid() { + return orgid; + } + public void setOrgid(String orgid) { + this.orgid = orgid; + } + + + } + + ProductId productId; + + String name; + + Person person; + + Set orders = new HashSet(); + + public Set getOrders() { + return orders; + } + + public void setOrders(Set orders) { + this.orders = orders; + } + public Person getPerson() { + return person; + } + + public void setPerson(Person person) { + this.person = person; + } + public ProductId getProductId() { + return productId; + } + + public void setProductId(ProductId orderId) { + this.productId = orderId; + } + + public String getName() { + return name; + } + + public void setName(String product) { + this.name = product; + } + +} Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/SpaceShip.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/SpaceShip.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/SpaceShip.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/SpaceShip.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,53 @@ +//$Id: $ +package org.hibernate.test.sql.hand; + +/** + * @author Emmanuel Bernard + */ +public class SpaceShip { + private Integer id; + private String name; + private String model; + private double speed; + private Dimension dimensions; + + public Dimension getDimensions() { + return dimensions; + } + + public void setDimensions(Dimension dimensions) { + this.dimensions = dimensions; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getSpeed() { + return speed; + } + + public void setSpeed(double speed) { + this.speed = speed; + } +} Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/Speech.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/Speech.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/Speech.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/Speech.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,35 @@ +//$Id: $ +package org.hibernate.test.sql.hand; + +/** + * @author Emmanuel Bernard + */ +public class Speech { + private Integer id; + private String name; + private Double length; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Double getLength() { + return length; + } + + public void setLength(Double length) { + this.length = length; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/HandSQLTest.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,94 @@ +package org.hibernate.test.sql.hand.custom; + +import java.io.Serializable; +import java.util.Date; +import java.util.Iterator; + +import org.hibernate.LockMode; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.test.sql.hand.Employment; +import org.hibernate.test.sql.hand.Organization; +import org.hibernate.test.sql.hand.Person; +import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; + +/** + * Abstract test case defining tests for the support for user-supplied (aka + * custom) insert, update, delete SQL. + * + * @author Steve Ebersole + */ +public abstract class CustomSQLTestSupport extends DatabaseSpecificFunctionalTestCase { + + public CustomSQLTestSupport(String name) { + super( name ); + } + + public String getCacheConcurrencyStrategy() { + return null; + } + + public void testHandSQL() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization( "IFA" ); + Organization jboss = new Organization( "JBoss" ); + Person gavin = new Person( "Gavin" ); + Employment emp = new Employment( gavin, jboss, "AU" ); + Serializable orgId = s.save( jboss ); + s.save( ifa ); + s.save( gavin ); + s.save( emp ); + t.commit(); + + t = s.beginTransaction(); + Person christian = new Person( "Christian" ); + s.save( christian ); + Employment emp2 = new Employment( christian, jboss, "EU" ); + s.save( emp2 ); + t.commit(); + s.close(); + + getSessions().evict( Organization.class ); + getSessions().evict( Person.class ); + getSessions().evict( Employment.class ); + + s = openSession(); + t = s.beginTransaction(); + jboss = ( Organization ) s.get( Organization.class, orgId ); + assertEquals( jboss.getEmployments().size(), 2 ); + assertEquals( jboss.getName(), "JBOSS" ); + emp = ( Employment ) jboss.getEmployments().iterator().next(); + gavin = emp.getEmployee(); + assertEquals( gavin.getName(), "GAVIN" ); + assertEquals( s.getCurrentLockMode( gavin ), LockMode.UPGRADE ); + emp.setEndDate( new Date() ); + Employment emp3 = new Employment( gavin, jboss, "US" ); + s.save( emp3 ); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Iterator iter = s.getNamedQuery( "allOrganizationsWithEmployees" ).list().iterator(); + assertTrue( iter.hasNext() ); + Organization o = ( Organization ) iter.next(); + assertEquals( o.getEmployments().size(), 3 ); + Iterator iter2 = o.getEmployments().iterator(); + while ( iter2.hasNext() ) { + Employment e = ( Employment ) iter2.next(); + s.delete( e ); + } + iter2 = o.getEmployments().iterator(); + while ( iter2.hasNext() ) { + Employment e = ( Employment ) iter2.next(); + s.delete( e.getEmployee() ); + } + s.delete( o ); + assertFalse( iter.hasNext() ); + s.delete( ifa ); + t.commit(); + s.close(); + } + +} Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/DataDirectOracleSQLTest.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,35 @@ +//$Id$ +package org.hibernate.test.sql.hand.custom.datadirect.oracle; + +import junit.framework.Test; + +import org.hibernate.dialect.DataDirectOracle9Dialect; +import org.hibernate.dialect.Dialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for Oracle via the DataDirect drivers. + * + * @author Max Rydahl Andersen + */ +public class DataDirectOracleCustomSQLTest extends CustomStoredProcTestSupport { + + public DataDirectOracleCustomSQLTest(String str) { + super(str); + } + + public String[] getMappings() { + return new String[] { "sql/hand/custom/oracle/Mappings.hbm.xml", "sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( DataDirectOracleCustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof DataDirectOracle9Dialect ); + } + +} + Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/OracleDataDirectDriverStoredProcedures.hbm.xml) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,44 @@ +<?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.sql.hand" default-access="field"> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { call simpleScalar(:number) } + </sql-query> + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call testParamHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call testParamHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="emp" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="employmentId" column="EMPID"/> + <return-property name="salary"> + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { call allEmployments() } + </sql-query> + +</hibernate-mapping> Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/Db2SQLTest.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,35 @@ +//$Id$ +package org.hibernate.test.sql.hand.custom.db2; + +import junit.framework.Test; + +import org.hibernate.dialect.DB2Dialect; +import org.hibernate.dialect.Dialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for DB2 + * + * @author Max Rydahl Andersen + */ +public class DB2CustomSQLTest extends CustomStoredProcTestSupport { + + public DB2CustomSQLTest(String str) { + super(str); + } + + public String[] getMappings() { + return new String[] { "sql/hand/custom/db2/Mappings.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( DB2CustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof DB2Dialect); + } + +} + Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/Db2Employment.hbm.xml) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,236 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization" table="ORGANIZATION"> + <id name="id" unsaved-value="0" column="ORGID"> + <generator class="increment"/> + </id> + <property name="name" not-null="true" column="NAME"/> + <set name="employments" + inverse="true" + order-by="DUMMY"> + <key column="EMPLOYER"/>  + <one-to-many class="Employment"/> + <loader query-ref="organizationEmployments"/> + </set> +  + <loader query-ref="organization"/> + <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(? || ''), ? )</sql-insert> + <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(? || '') WHERE ORGID=?</sql-update> + <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> + </class> + + <class name="Person" table="PERSON"> + <id name="id" unsaved-value="0" column="PERID"> + <generator class="increment"/> + </id> + <property name="name" not-null="true" column="NAME"/> + <loader query-ref="person"/> + <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(? || ''), ? )</sql-insert> + <sql-update>UPDATE PERSON SET NAME=UPPER(? || '') WHERE PERID=?</sql-update> + <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> + </class> + + <class name="Employment" table="EMPLOYMENT"> + <id name="employmentId" unsaved-value="0" column="EMPID"> + <generator class="increment"/> + </id> + <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> + <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> + <property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/> + <property name="endDate" column="ENDDATE" insert="false"/> + <property name="regionCode" column="REGIONCODE" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + <loader query-ref="employment"/> + <sql-insert> + INSERT INTO EMPLOYMENT + (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) +  + VALUES (?, ?, TIMESTAMP ('2006-02-28 11:39:00'), UPPER(? || ''), ?, ?, ?) + </sql-insert> + <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> + <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + <sql-query name="person"> + <return alias="p" class="Person" lock-mode="upgrade"/> + SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ + </sql-query> + + <sql-query name="organization"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT {org.*}, {emp.*} + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + WHERE org.ORGID=? + </sql-query> + + +  + + <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> + <return alias="org" class="Organization"/> + SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID + </sql-query> + + + + + + <sql-query name="employment"> + <return alias="emp" class="Employment"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} + FROM EMPLOYMENT + WHERE EMPID = ? + </sql-query> + + <sql-query name="organizationEmployments"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT {empcol.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + + <sql-query name="organizationCurrentEmployments"> + <return alias="emp" class="Employment"> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> +  + <return-property name="endDate" column="myEndDate"/> + </return> + <synchronize table="EMPLOYMENT"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY + FROM EMPLOYMENT + WHERE EMPLOYER = :id AND ENDDATE IS NULL + ORDER BY STARTDATE ASC + </sql-query> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { call HIBDB2TST.simpleScalar(:number) } + </sql-query> + + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { call HIBDB2TST.paramHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call HIBDB2TST.paramHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="id" column="EMPID"/> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { call HIBDB2TST.selectAllEmployments() } + </sql-query> + +  + <database-object> + <create>CREATE SCHEMA HIBDB2TST</create> + <drop>DROP SCHEMA HIBDB2TST RESTRICT</drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE HIBDB2TST.selectAllEmployments () + P1: BEGIN + DECLARE C1 CURSOR WITH RETURN FOR + SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, + REGIONCODE, EMPID, VALUE, CURRENCY + FROM EMPLOYMENT; + OPEN C1; + END P1 + </create> + <drop> + DROP PROCEDURE HIBDB2TST.selectAllEmployments + </drop> + </database-object> + + + <database-object> + <create> + CREATE PROCEDURE HIBDB2TST.paramHandling (IN j SMALLINT, IN i SMALLINT) + P1: BEGIN + DECLARE C1 CURSOR WITH RETURN FOR + SELECT j as value, i as value2 from sysibm.sysdummy1; + OPEN C1; + END P1 + </create> + <drop> + DROP PROCEDURE HIBDB2TST.paramHandling + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE HIBDB2TST.simpleScalar (IN j SMALLINT) + P1: BEGIN + DECLARE C1 CURSOR WITH RETURN FOR + SELECT j as value, 'getAll' as name from sysibm.sysdummy1; + OPEN C1; + END P1 + </create> + <drop> + DROP PROCEDURE HIBDB2TST.simpleScalar + </drop> + </database-object> +</hibernate-mapping> Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/MySQLEmployment.hbm.xml) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,216 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization"> + <id name="id" unsaved-value="0" column="orgid"> + <generator class="increment"/> + </id> + <property name="name" not-null="true"/> + <set name="employments" + inverse="true" + order-by="DUMMY"> + <key column="employer"/>  + <one-to-many class="Employment"/> + <loader query-ref="organizationEmployments"/> + </set> +  + <loader query-ref="organization"/> + <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> + <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> + </class> + + <class name="Person"> + <id name="id" unsaved-value="0" column="perid"> + <generator class="increment"/> + </id> + <property name="name" not-null="true"/> + <loader query-ref="person"/> + <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> + <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> + </class> + + <class name="Employment"> + <id name="employmentId" unsaved-value="0" column="empid"> + <generator class="increment"/> + </id> + <many-to-one name="employee" not-null="true" update="false"/> + <many-to-one name="employer" not-null="true" update="false"/> + <property name="startDate" not-null="true" update="false" insert="false"/> + <property name="endDate" insert="false"/> + <property name="regionCode" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + <loader query-ref="employment"/> + <sql-insert> + INSERT INTO EMPLOYMENT + (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) + VALUES (?, ?, now(), UPPER(?), ?, ?, ?) + </sql-insert> + <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> + <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + <sql-query name="person"> + <return alias="p" class="Person" lock-mode="upgrade"/> + SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ + </sql-query> + + <sql-query name="organization"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT {org.*}, {emp.*} + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + WHERE org.ORGID=? + </sql-query> + + + +  + + <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> + <return alias="org" class="Organization"/> + SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID + </sql-query> + + <sql-query name="employment"> + <return alias="emp" class="Employment"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} + FROM EMPLOYMENT + WHERE EMPID = ? + </sql-query> + + + <sql-query name="organizationEmployments"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT {empcol.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + + <sql-query name="organizationCurrentEmployments"> + <return alias="emp" class="Employment"> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> +  + <return-property name="endDate" column="myEndDate"/> + </return> + <synchronize table="EMPLOYMENT"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY + FROM EMPLOYMENT + WHERE EMPLOYER = :id AND ENDDATE IS NULL + ORDER BY STARTDATE ASC + </sql-query> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { call simpleScalar(:number) } + </sql-query> + + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { call paramHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call paramHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="id" column="EMPID"/> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { call selectAllEmployments() } + </sql-query> + + <database-object> + <create> + CREATE PROCEDURE selectAllEmployments () + SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, + REGIONCODE, EMPID, VALUE, CURRENCY + FROM EMPLOYMENT + </create> + <drop> + DROP PROCEDURE selectAllEmployments + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE paramHandling (j int, i int) + SELECT j AS value, i AS value2 + </create> + <drop> + DROP PROCEDURE paramHandling + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE simpleScalar (number int) + SELECT number AS value, 'getAll' AS name + </create> + <drop> + DROP PROCEDURE simpleScalar + </drop> + </database-object> + +</hibernate-mapping> Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/MySQLTest.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,34 @@ +//$Id$ +package org.hibernate.test.sql.hand.custom.mysql; + +import junit.framework.Test; + +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.MySQLDialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for MySQL + * + * @author Gavin King + */ +public class MySQLCustomSQLTest extends CustomStoredProcTestSupport { + + public MySQLCustomSQLTest(String str) { + super(str); + } + + public String[] getMappings() { + return new String[] { "sql/hand/custom/mysql/Mappings.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( MySQLCustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof MySQLDialect ); + } +} + Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,209 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization"> + <id name="id" unsaved-value="0" column="orgid"> + <generator class="increment"/> + </id> + <property name="name" not-null="true"/> + <set name="employments" + inverse="true" + order-by="DUMMY"> + <key column="employer"/> +  + <one-to-many class="Employment"/> + <loader query-ref="organizationEmployments"/> + </set> +  + <loader query-ref="organization"/> + <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> + <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> + </class> + + <class name="Person"> + <id name="id" unsaved-value="0" column="perid"> + <generator class="increment"/> + </id> + <property name="name" not-null="true"/> + <loader query-ref="person"/> + <sql-insert callable="true" check="none">{call createPerson(?,?)}</sql-insert> + <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> + <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> + </class> + + <class name="Employment"> + <id name="employmentId" unsaved-value="0" column="empid"> + <generator class="increment"/> + </id> + <many-to-one name="employee" not-null="true" update="false"/> + <many-to-one name="employer" not-null="true" update="false"/> + <property name="startDate" not-null="true" update="false" insert="false"/> + <property name="endDate" insert="false"/> + <property name="regionCode" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + <loader query-ref="employment"/> + <sql-insert> + INSERT INTO EMPLOYMENT + (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) + VALUES (?, ?, CURRENT_DATE, UPPER(?), ?, ?, ?) + </sql-insert> + <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> + <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + <sql-query name="person"> + <return alias="p" class="Person" lock-mode="upgrade"/> + SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ + </sql-query> + + <sql-query name="organization"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT {org.*}, {emp.*} + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + WHERE org.ORGID=? + </sql-query> + + + <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> + <return alias="org" class="Organization"/> + SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID + </sql-query> + + + <sql-query name="employment"> + <return alias="emp" class="Employment"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} + FROM EMPLOYMENT + WHERE EMPID = ? + </sql-query> + + + <sql-query name="organizationEmployments"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT {empcol.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + + <sql-query name="organizationCurrentEmployments"> + <return alias="emp" class="Employment"> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> +  + <return-property name="endDate" column="myEndDate"/> + </return> + <synchronize table="EMPLOYMENT"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY + FROM EMPLOYMENT + WHERE EMPLOYER = :id AND ENDDATE IS NULL + ORDER BY STARTDATE ASC + </sql-query> + + <database-object> + <create> + CREATE OR REPLACE FUNCTION testParamHandling (j number, i number) + RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; + BEGIN + OPEN st_cursor FOR + SELECT j as value, i as value2 from dual; + RETURN st_cursor; + END; + </create> + <drop> + DROP FUNCTION testParamHandling + </drop> + </database-object> + + <database-object> + <create> + CREATE OR REPLACE FUNCTION simpleScalar (j number) + RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; + BEGIN + OPEN st_cursor FOR + SELECT j as value, 'getAll' as name from dual; + RETURN st_cursor; + END; + </create> + <drop> + DROP FUNCTION simpleScalar + </drop> + </database-object> + + <database-object> + <create> + CREATE OR REPLACE FUNCTION allEmployments + RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; + BEGIN + OPEN st_cursor FOR + SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, + REGIONCODE, EMPID, VALUE, CURRENCY + FROM EMPLOYMENT; + RETURN st_cursor; + END; + </create> + <drop> + DROP FUNCTION allEmployments + </drop> + </database-object> + + <database-object> + <create> + CREATE OR REPLACE PROCEDURE createPerson(p_name PERSON.NAME%TYPE, p_id PERSON.PERID%TYPE) + AS + rowcount INTEGER; + BEGIN + INSERT INTO PERSON ( PERID, NAME ) VALUES ( p_id, UPPER( p_name ) ); + rowcount := SQL%ROWCOUNT; + IF rowcount = 1 THEN + NULL; + ELSE + RAISE_APPLICATION_ERROR( -20001, 'Unexpected rowcount [' || rowcount || ']' ); + END IF; + END; + </create> + <drop> + DROP PROCEDURE createPerson; + </drop> + </database-object> + +</hibernate-mapping> Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,36 @@ +//$Id$ +package org.hibernate.test.sql.hand.custom.oracle; + +import junit.framework.Test; + +import org.hibernate.dialect.DataDirectOracle9Dialect; +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.Oracle9Dialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for Oracle + * + * @author Gavin King + */ +public class OracleCustomSQLTest extends CustomStoredProcTestSupport { + + public OracleCustomSQLTest(String str) { + super(str); + } + + public String[] getMappings() { + return new String[] { "sql/OracleEmployment.hbm.xml", "sql/OracleDriverStoredProcedures.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( OracleCustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof Oracle9Dialect ) && !( dialect instanceof DataDirectOracle9Dialect ); + } + +} + Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/OracleDriverStoredProcedures.hbm.xml) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,45 @@ +<?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.sql.hand" default-access="field"> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { ? = call simpleScalar(:number) } + </sql-query> + + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { ? = call testParamHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { ? = call testParamHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="emp" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="employmentId" column="EMPID"/> + <return-property name="salary"> + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { ? = call allEmployments() } + </sql-query> + +</hibernate-mapping> Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml ___________________________________________________________________ Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLEmployment.hbm.xml) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,217 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization" table="ORGANIZATION"> + <id name="id" unsaved-value="0" column="ORGID"> + <generator class="increment"/> + </id> + <property name="name" not-null="true" column="NAME"/> + <set name="employments" + inverse="true" + order-by="DUMMY"> + <key column="EMPLOYER"/>  + <one-to-many class="Employment"/> + <loader query-ref="organizationEmployments"/> + </set> +  + <loader query-ref="organization"/> + <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> + <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> + </class> + + <class name="Person" table="PERSON"> + <id name="id" unsaved-value="0" column="PERID"> + <generator class="increment"/> + </id> + <property name="name" not-null="true" column="NAME"/> + <loader query-ref="person"/> + <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> + <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> + </class> + + <class name="Employment" table="EMPLOYMENT"> + <id name="employmentId" unsaved-value="0" column="EMPID"> + <generator class="increment"/> + </id> + <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> + <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> + <property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/> + <property name="endDate" column="ENDDATE" insert="false"/> + <property name="regionCode" column="REGIONCODE" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + <loader query-ref="employment"/> + <sql-insert> + INSERT INTO EMPLOYMENT + (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) + VALUES (?, ?, getdate(), UPPER(?), ?, ?, ?) + </sql-insert> + <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> + <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + <sql-query name="person"> + <return alias="p" class="Person" lock-mode="upgrade"/> + SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ + </sql-query> + + <sql-query name="organization"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT {org.*}, {emp.*} + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + WHERE org.ORGID=? + </sql-query> + + +  + + <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> + <return alias="org" class="Organization"/> + SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID + </sql-query> + + + + + + <sql-query name="employment"> + <return alias="emp" class="Employment"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} + FROM EMPLOYMENT + WHERE EMPID = ? + </sql-query> + + <sql-query name="organizationEmployments"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT {empcol.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + + <sql-query name="organizationCurrentEmployments"> + <return alias="emp" class="Employment"> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> +  + <return-property name="endDate" column="myEndDate"/> + </return> + <synchronize table="EMPLOYMENT"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY + FROM EMPLOYMENT + WHERE EMPLOYER = :id AND ENDDATE IS NULL + ORDER BY STARTDATE ASC + </sql-query> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { call simpleScalar(:number) } + </sql-query> + + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { call paramHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call paramHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="id" column="EMPID"/> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { call selectAllEmployments() } + </sql-query> + + <database-object> + <create> + CREATE PROCEDURE selectAllEmployments AS + SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, + REGIONCODE, EMPID, VALUE, CURRENCY + FROM EMPLOYMENT + </create> + <drop> + DROP PROCEDURE selectAllEmployments + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE paramHandling @j int, @i int AS + SELECT @j as value, @i as value2 + </create> + <drop> + DROP PROCEDURE paramHandling + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE simpleScalar @number int AS + SELECT @number as value, 'getAll' as name + </create> + <drop> + DROP PROCEDURE simpleScalar + </drop> + </database-object> + +</hibernate-mapping> Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java (from rev 11075, trunk/Hibernate3/test/org/hibernate/test/sql/MSSQLTest.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,34 @@ +//$Id$ +package org.hibernate.test.sql.hand.custom.sybase; + +import junit.framework.Test; + +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.SybaseDialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for Sybase/SQLServer (Transact-SQL) + * + * @author Gavin King + */ +public class SybaseCustomSQLTest extends CustomStoredProcTestSupport { + + public SybaseCustomSQLTest(String str) { + super( str ); + } + + public String[] getMappings() { + return new String[] { "sql/hand/custom/sybase/Mappings.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( SybaseCustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof SybaseDialect ); + } +} + Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,262 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization" table="ORGANIZATION"> + <id name="id" unsaved-value="0" column="ORGID"> + <generator class="increment"/> + </id> + <property name="name" column="NAME" not-null="true"/> + <set lazy="true" name="employments" + inverse="true"> + <key column="EMPLOYER"/>  + <one-to-many class="Employment"/> + </set> + </class> + + <class name="Person" table="PERSON"> + <id name="id" unsaved-value="0" column="PERID"> + <generator class="increment"/> + </id> + <property name="name" column="NAME" not-null="true"/> + + </class> + + <class name="Employment" table="EMPLOYMENT"> + <id name="employmentId" unsaved-value="0" column="EMPID"> + <generator class="increment"/> + </id> + <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> + <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> + <property name="startDate" column="STARTDATE" not-null="false"/> + <property name="endDate" column="ENDDATE" insert="false"/> + <property name="regionCode" column="REGIONCODE" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + </class> + + <class name="Order" table="TBL_ORDER"> + <composite-id name="orderId" class="Order$OrderId"> + <key-property name="orgid"/> + <key-property name="ordernumber"/> + </composite-id> + + <many-to-one name="product"> + <column name="PROD_ORGID"/> + <column name="PROD_NO"/> + </many-to-one> + <many-to-one name="person"/> + </class> + + <class name="Product"> + <composite-id name="productId" class="Product$ProductId"> + <key-property name="orgid"/> + <key-property name="productnumber"/> + </composite-id> + + <property name="name"/> + + <set name="orders" inverse="true"> + <key> + <column name="PROD_ORGID"/> + <column name="PROD_NO"/> + </key> + <one-to-many class="Order"/> + </set> + </class> + + <class name="Dimension"> + <id name="id" type="long"> + <generator class="increment"/> + </id> + <property name="length" column="d_len"/> + <property name="width" column="d_width"/> + </class> + + <class name="SpaceShip"> + <id name="id" type="integer"> + <generator class="increment"/> + </id> + <property name="name" column="fld_name"/> + <property name="model" column="fld_model"/> + <property name="speed" column="fld_speed"/> + <component name="dimensions"> + <property name="length" column="fld_length"/> + <property name="width" column="fld_width"/> + </component> + </class> + + <class name="Speech"> + <id name="id" type="integer"> + <generator class="increment"/> + </id> + <property name="name" column="name"/> + <property name="length" column="flength"/> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + + <resultset name="org-description"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="spaceship-vol"> + <return alias="sps" class="SpaceShip"> + <return-property name="id" column="id"/> + <return-property name="name" column="name"/> + <return-property name="model" column="model"/> + <return-property name="speed" column="speed"/> + <return-property name="dimensions.length" column="length"/> + <return-property name="dimensions.width" column="width"/> + </return> + <return-scalar column="surface"/> + <return-scalar column="volume"/> + </resultset> + + <resultset name="speech"> + <return alias="sp" class="Speech"> + <return-property name="id" column="id"/> + <return-property name="name" column="name"/> + <return-property name="length" column="flength"/> + </return> + <return-scalar column="scalarName"/> + </resultset> + + <sql-query name="spaceship" resultset-ref="spaceship-vol"> + select id as id, + fld_name as name, + fld_model as model, + fld_speed as speed, + fld_length as length, + fld_width as width, + fld_length * fld_width as surface, + fld_length * fld_width *10 as volume + from SpaceShip + </sql-query> + + <sql-query name="orgNamesOnly"> + <return-scalar column="NAME" type="string"/> + SELECT org.NAME FROM ORGANIZATION org + </sql-query> + + <sql-query name="orgNamesAndOrgs"> + <return-scalar column="thename" type="string"/> + <return alias="org" class="Organization"/> + SELECT org.NAME AS thename, org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + ORDER BY thename + </sql-query> + + <sql-query name="orgsAndOrgNames"> + <return alias="org" class="Organization"/> + <return-scalar column="thename" type="string"/> + SELECT org.NAME AS thename, org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + ORDER BY thename + </sql-query> + + <sql-query name="orgIdsAndOrgNames"> + <return-scalar column="orgid" type="long"/> + <return-scalar column="thename" type="string"/> + SELECT NAME AS thename, ORGID AS orgid + FROM ORGANIZATION + ORDER BY thename + </sql-query> + + <sql-query name="AllEmploymentAsMapped"> + <return class="Employment"/> + SELECT * FROM EMPLOYMENT + </sql-query> + + <sql-query name="EmploymentAndPerson"> + <return class="Employment"/> + <return class="Person"/> + SELECT * FROM EMPLOYMENT, PERSON + </sql-query> + + <sql-query name="organizationEmploymentsExplicitAliases"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT empcol.EMPLOYER as {empcol.key}, empcol.EMPID as {empcol.element}, {empcol.element.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + <sql-query name="organizationreturnproperty"> + <return alias="org" class="Organization"> + <return-property name="id" column="ORGID"/> + <return-property name="name" column="NAME"/> + </return> + <return-join alias="emp" property="org.employments"> + <return-property name="key" column="EMPLOYER"/> + <return-property name="element" column="EMPID"/> + <return-property name="element.employee" column="EMPLOYEE"/> + <return-property name="element.employer" column="EMPLOYER"/> + <return-property name="element.startDate" column="XSTARTDATE"/> + <return-property name="element.endDate" column="ENDDATE"/> + <return-property name="element.regionCode" column="REGIONCODE"/> + <return-property name="element.employmentId" column="EMPID"/> + <return-property name="element.salary"> + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return-join> + SELECT org.ORGID as orgid, + org.NAME as name, + emp.EMPLOYER as employer, + emp.EMPID as empid, + emp.EMPLOYEE as employee, + emp.EMPLOYER as employer, + emp.STARTDATE as xstartDate, + emp.ENDDATE as endDate, + emp.REGIONCODE as regionCode, + emp.VALUE as VALUE, + emp.CURRENCY as CURRENCY + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + </sql-query> + + + <sql-query name="organizationautodetect" resultset-ref="org-description"> +  + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT org.ORGID as orgid, + org.NAME as name, + emp.EMPLOYER as employer, + emp.EMPID as empid, + emp.EMPLOYEE as employee, + emp.EMPLOYER as employer, + emp.STARTDATE as startDate, + emp.ENDDATE as endDate, + emp.REGIONCODE as regionCode, + emp.VALUE as VALUE, + emp.CURRENCY as CURRENCY + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + </sql-query> + +</hibernate-mapping> \ No newline at end of file Copied: trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java (from rev 11363, trunk/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java) =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java (rev 0) +++ trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2007-05-08 21:57:24 UTC (rev 11486) @@ -0,0 +1,618 @@ +package org.hibernate.test.sql.hand.query; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import junit.framework.Test; + +import org.hibernate.Hibernate; +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.test.sql.hand.Organization; +import org.hibernate.test.sql.hand.Person; +import org.hibernate.test.sql.hand.Employment; +import org.hibernate.test.sql.hand.Product; +import org.hibernate.test.sql.hand.Order; +import org.hibernate.test.sql.hand.Dimension; +import org.hibernate.test.sql.hand.SpaceShip; +import org.hibernate.test.sql.hand.Speech; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.transform.DistinctRootEntityResultTransformer; +import org.hibernate.transform.Transformers; +import org.hibernate.transform.AliasToEntityMapResultTransformer; + +/** + * Tests of various features of native SQL queries. + * + * @author Steve Ebersole + */ +public class NativeSQLQueriesTest extends FunctionalTestCase { + + public NativeSQLQueriesTest(String x) { + super( x ); + } + + public String[] getMappings() { + return new String[] { "sql/hand/query/NativeSQLQueries.hbm.xml" }; + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + cfg.setProperty( Environment.GENERATE_STATISTICS, "true" ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( NativeSQLQueriesTest.class ); + } + + protected String getOrganizationFetchJoinEmploymentSQL() { + return "SELECT org.ORGID as {org.id}, " + + " org.NAME as {org.name}, " + + " emp.EMPLOYER as {emp.key}, " + + " emp.EMPID as {emp.element}, " + + " {emp.element.*} " + + "FROM ORGANIZATION org " + + " LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER"; + } + + protected String getOrganizationJoinEmploymentSQL() { + return "SELECT org.ORGID as {org.id}, " + + " org.NAME as {org.name}, " + + " {emp.*} " + + "FROM ORGANIZATION org " + + " LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER"; + } + + protected String getEmploymentSQL() { + return "SELECT * FROM EMPLOYMENT"; + } + + protected String getEmploymentSQLMixedScalarEntity() { + return "SELECT e.*, e.employer as employerid FROM EMPLOYMENT e" ; + } + + protected String getOrgEmpRegionSQL() { + return "select {org.*}, {emp.*}, emp.REGIONCODE " + + "from ORGANIZATION org " + + " left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER"; + } + + protected String getOrgEmpPersonSQL() { + return "select {org.*}, {emp.*}, {pers.*} " + + "from ORGANIZATION org " + + " join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER " + + " join PERSON pers on pers.PERID = emp.EMPLOYEE "; + } + + public void testFailOnNoAddEntityOrScalar() { + // Note: this passes, but for the wrong reason. + // there is actually an exception thrown, but it is the database + // throwing a sql exception because the SQL gets passed + // "un-processed"... + Session s = openSession(); + try { + String sql = "select {org.*} " + + "from organization org"; + s.createSQLQuery( sql ).list(); + fail( "Should throw an exception since no addEntity nor addScalar has been performed." ); + } + catch( HibernateException he) { + // expected behavior + } + finally { + s.close(); + } + } + + public void testManualSynchronization() { + Session s = openSession(); + s.beginTransaction(); + + sfi().getStatistics().clear(); + + // create an Organization... + Organization jboss = new Organization( "JBoss" ); + s.persist( jboss ); + + // now query on Employment, this should not cause an auto-flush + s.createSQLQuery( getEmploymentSQL() ).list(); + assertEquals( 0, sfi().getStatistics().getEntityInsertCount() ); + + // now try to query on Employment but this time add Organization as a synchronized query space... + s.createSQLQuery( getEmploymentSQL() ).addSynchronizedEntityClass( Organization.class ).list(); + assertEquals( 1, sfi().getStatistics().getEntityInsertCount() ); + + // clean up + s.delete( jboss ); + s.getTransaction().commit(); + s.close(); + } + + public void testSQLQueryInterface() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization("IFA"); + Organization jboss = new Organization("JBoss"); + Person gavin = new Person("Gavin"); + Employment emp = new Employment(gavin, jboss, "AU"); + + s.persist(ifa); + s.persist(jboss); + s.persist(gavin); + s.persist(emp); + + List l = s.createSQLQuery( getOrgEmpRegionSQL() ) + .addEntity("org", Organization.class) + .addJoin("emp", "org.employments") + .addScalar("regionCode", Hibernate.STRING) + .list(); + assertEquals( 2, l.size() ); + + l = s.createSQLQuery( getOrgEmpPersonSQL() ) + .addEntity("org", Organization.class) + .addJoin("emp", "org.employments") + .addJoin("pers", "emp.employee") + .list(); + assertEquals( l.size(), 1 ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + l = s.createSQLQuery( "select {org.*}, {emp.*} " + + "from ORGANIZATION org " + + " left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2" ) + .addEntity("org", Organization.class) + .addJoin("emp", "org.employments") + .setResultTransformer(new DistinctRootEntityResultTransformer()) + .list(); + assertEquals( l.size(), 2 ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + s.delete(emp); + s.delete(gavin); + s.delete(ifa); + s.delete(jboss); + + t.commit(); + s.close(); + } + + public void testResultSetMappingDefinition() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization("IFA"); + Organization jboss = new Organization("JBoss"); + Person gavin = new Person("Gavin"); + Employment emp = new Employment(gavin, jboss, "AU"); + + s.persist(ifa); + s.persist(jboss); + s.persist(gavin); + s.persist(emp); + + List l = s.createSQLQuery( getOrgEmpRegionSQL() ) + .setResultSetMapping( "org-emp-regionCode" ) + .list(); + assertEquals( l.size(), 2 ); + + l = s.createSQLQuery( getOrgEmpPersonSQL() ) + .setResultSetMapping( "org-emp-person" ) + .list(); + assertEquals( l.size(), 1 ); + + s.delete(emp); + s.delete(gavin); + s.delete(ifa); + s.delete(jboss); + + t.commit(); + s.close(); + } + + public void testScalarValues() throws Exception { + Session s = openSession(); + Transaction t = s.beginTransaction(); + + Organization ifa = new Organization( "IFA" ); + Organization jboss = new Organization( "JBoss" ); + + Serializable idIfa = s.save( ifa ); + Serializable idJBoss = s.save( jboss ); + + s.flush(); + + List result = s.getNamedQuery( "orgNamesOnly" ).list(); + assertTrue( result.contains( "IFA" ) ); + assertTrue( result.contains( "JBoss" ) ); + + result = s.getNamedQuery( "orgNamesOnly" ).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP).list(); + Map m = (Map) result.get(0); + assertEquals( 2, result.size() ); + assertEquals( 1, m.size() ); + assertTrue( m.containsKey("NAME") ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + Iterator iter = s.getNamedQuery( "orgNamesAndOrgs" ).list().iterator(); + Object[] o = ( Object[] ) iter.next(); + assertEquals( o[0], "IFA" ); + assertEquals( ( ( Organization ) o[1] ).getName(), "IFA" ); + o = ( Object[] ) iter.next(); + assertEquals( o[0], "JBoss" ); + assertEquals( ( ( Organization ) o[1] ).getName(), "JBoss" ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + // test that the ordering of the results is truly based on the order in which they were defined + iter = s.getNamedQuery( "orgsAndOrgNames" ).list().iterator(); + Object[] row = ( Object[] ) iter.next(); + assertEquals( "expecting non-scalar result first", Organization.class, row[0].getClass() ); + assertEquals( "expecting scalar result second", String.class, row[1].getClass() ); + assertEquals( ( ( Organization ) row[0] ).getName(), "IFA" ); + assertEquals( row[1], "IFA" ); + row = ( Object[] ) iter.next(); + assertEquals( "expecting non-scalar result first", Organization.class, row[0].getClass() ); + assertEquals( "expecting scalar result second", String.class, row[1].getClass() ); + assertEquals( ( ( Organization ) row[0] ).getName(), "JBoss" ); + assertEquals( row[1], "JBoss" ); + assertFalse( iter.hasNext() ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + iter = s.getNamedQuery( "orgIdsAndOrgNames" ).list().iterator(); + o = ( Object[] ) iter.next(); + assertEquals( o[1], "IFA" ); + assertEquals( o[0], idIfa ); + o = ( Object[] ) iter.next(); + assertEquals( o[1], "JBoss" ); + assertEquals( o[0], idJBoss ); + + s.delete( ifa ); + s.delete( jboss ); + t.commit(); + s.close(); + } + + public void testMappedAliasStrategy() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization("IFA"); + Organization jboss = new Organization("JBoss"); + Person gavin = new Person("Gavin"); + Employment emp = new Employment(gavin, jboss, "AU"); + Serializable orgId = s.save(jboss); + Serializable orgId2 = s.save(ifa); + s.save(gavin); + s.save(emp); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Query namedQuery = s.getNamedQuery("AllEmploymentAsMapped"); + List list = namedQuery.list(); + assertEquals(1,list.size()); + Employment emp2 = (Employment) list.get(0); + assertEquals(emp2.getEmploymentId(), emp.getEmploymentId() ); + assertEquals(emp2.getStartDate().getDate(), emp.getStartDate().getDate() ); + assertEquals(emp2.getEndDate(), emp.getEndDate() ); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Query sqlQuery = s.getNamedQuery("EmploymentAndPerson"); + sqlQuery.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + list = sqlQuery.list(); + assertEquals(1,list.size() ); + Object res = list.get(0); + assertClassAssignability(res.getClass(),Map.class); + Map m = (Map) res; + assertEquals(2,m.size()); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + sqlQuery = s.getNamedQuery("organizationreturnproperty"); + sqlQuery.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + list = sqlQuery.list(); + assertEquals(2,list.size() ); + m = (Map) list.get(0); + assertTrue(m.containsKey("org")); + assertClassAssignability(m.get("org").getClass(), Organization.class); + assertTrue(m.containsKey("emp")); + assertClassAssignability(m.get("emp").getClass(), Employment.class); + assertEquals(2, m.size()); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + namedQuery = s.getNamedQuery("EmploymentAndPerson"); + list = namedQuery.list(); + assertEquals(1,list.size() ); + Object[] objs = (Object[]) list.get(0); + assertEquals(2, objs.length); + emp2 = (Employment) objs[0]; + gavin = (Person) objs[1]; + s.delete(emp2); + s.delete(jboss); + s.delete(gavin); + s.delete(ifa); + t.commit(); + s.close(); + } + + /* test for native sql composite id joins which has never been implemented */ + public void testCompositeIdJoinsFailureExpected() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Person person = new Person(); + person.setName( "Noob" ); + + Product product = new Product(); + product.setProductId( new Product.ProductId() ); + product.getProductId().setOrgid( "x" ); + product.getProductId().setProductnumber( "1234" ); + product.setName( "Hibernate 3" ); + + Order order = new Order(); + order.setOrderId( new Order.OrderId() ); + order.getOrderId().setOrdernumber( "1" ); + order.getOrderId().setOrgid( "y" ); + + product.getOrders().add( order ); + order.setProduct( product ); + order.setPerson( person ); + + s.save( product ); + s.save( order); + s.save( person ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Product p = (Product) s.createQuery( "from Product p join fetch p.orders" ).list().get(0); + assertTrue(Hibernate.isInitialized( p.getOrders())); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Object[] o = (Object[]) s.createSQLQuery( "select\r\n" + + " product.orgid as {product.id.orgid}," + + " product.productnumber as {product.id.productnumber}," + + " {prod_orders}.orgid as orgid3_1_,\r\n" + + " {prod_orders}.ordernumber as ordernum2_3_1_,\r\n" + + " product.name as {product.name}," + + " {prod_orders.element.*}" + + /*" orders.PROD_NO as PROD4_3_1_,\r\n" + + " orders.person as person3_1_,\r\n" + + " orders.PROD_ORGID as PROD3_0__,\r\n" + + " orders.PROD_NO as PROD4_0__,\r\n" + + " orders.orgid as orgid0__,\r\n" + + " orders.ordernumber as ordernum2_0__ \r\n" +*/ + " from\r\n" + + " Product product \r\n" + + " inner join\r\n" + + " TBL_ORDER {prod_orders} \r\n" + + " on product.orgid={prod_orders}.PROD_ORGID \r\n" + + " and product.productnumber={prod_orders}.PROD_NO" ) + .addEntity( "product", Product.class ) + .addJoin( "prod_orders", "product.orders" ) + .list().get(0); + + p = (Product) o[0]; + assertTrue(Hibernate.isInitialized( p.getOrders() )); + assertNotNull(p.getOrders().iterator().next()); + t.commit(); + s.close(); + } + + public void testAutoDetectAliasing() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization("IFA"); + Organization jboss = new Organization("JBoss"); + Person gavin = new Person("Gavin"); + Employment emp = new Employment(gavin, jboss, "AU"); + Serializable orgId = s.save(jboss); + Serializable orgId2 = s.save(ifa); + s.save(gavin); + s.save(emp); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + List list = s.createSQLQuery( getEmploymentSQL() ) + .addEntity( Employment.class.getName() ) + .list(); + assertEquals( 1,list.size() ); + + Employment emp2 = (Employment) list.get(0); + assertEquals(emp2.getEmploymentId(), emp.getEmploymentId() ); + assertEquals(emp2.getStartDate().getDate(), emp.getStartDate().getDate() ); + assertEquals(emp2.getEndDate(), emp.getEndDate() ); + + s.clear(); + + list = s.createSQLQuery( getEmploymentSQL() ) + .addEntity( Employment.class.getName() ) + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP) + .list(); + assertEquals( 1,list.size() ); + Map m = (Map) list.get(0); + assertTrue(m.containsKey("Employment")); + assertEquals(1,m.size()); + + list = s.createSQLQuery(getEmploymentSQL()).list(); + assertEquals(1, list.size()); + Object[] o = (Object[]) list.get(0); + assertEquals(8, o.length); + + list = s.createSQLQuery( getEmploymentSQL() ).setResultTransformer( new UpperCasedAliasToEntityMapResultTransformer() ).list(); + assertEquals(1, list.size()); + m = (Map) list.get(0); + assertTrue(m.containsKey("EMPID")); + assertTrue(m.containsKey("VALUE")); + assertTrue(m.containsKey("ENDDATE")); + assertEquals(8, m.size()); + + list = s.createSQLQuery( getEmploymentSQLMixedScalarEntity() ).addScalar( "employerid" ).addEntity( Employment.class ).list(); + assertEquals(1, list.size()); + o = (Object[]) list.get(0); + assertEquals(2, o.length); + assertClassAssignability( o[0].getClass(), Number.class); + assertClassAssignability( o[1].getClass(), Employment.class); + + + + Query queryWithCollection = s.getNamedQuery("organizationEmploymentsExplicitAliases"); + queryWithCollection.setLong("id", jboss.getId() ); + list = queryWithCollection.list(); + assertEquals(list.size(),1); + + s.clear(); + + list = s.createSQLQuery( getOrganizationJoinEmploymentSQL() ) + .addEntity( "org", Organization.class ) + .addJoin( "emp", "org.employments" ) + .list(); + assertEquals( 2,list.size() ); + + s.clear(); + + list = s.createSQLQuery( getOrganizationFetchJoinEmploymentSQL() ) + .addEntity( "org", Organization.class ) + .addJoin( "emp", "org.employments" ) + .list(); + assertEquals( 2,list.size() ); + + s.clear(); + + // TODO : why twice? + s.getNamedQuery( "organizationreturnproperty" ).list(); + list = s.getNamedQuery( "organizationreturnproperty" ).list(); + assertEquals( 2,list.size() ); + + s.clear(); + + list = s.getNamedQuery( "organizationautodetect" ).list(); + assertEquals( 2,list.size() ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + s.delete(emp2); + + s.delete(jboss); + s.delete(gavin); + s.delete(ifa); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Dimension dim = new Dimension( 3, Integer.MAX_VALUE ); + s.save( dim ); + list = s.createSQLQuery( "select d_len * d_width as surface, d_len * d_width * 10 as volume from Dimension" ).list(); + s.delete( dim ); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + SpaceShip enterprise = new SpaceShip(); + enterprise.setModel( "USS" ); + enterprise.setName( "Entreprise" ); + enterprise.setSpeed( 50d ); + Dimension d = new Dimension(45, 10); + enterprise.setDimensions( d ); + s.save( enterprise ); + Object[] result = (Object[]) s.getNamedQuery( "spaceship" ).uniqueResult(); + enterprise = ( SpaceShip ) result[0]; + assertTrue(50d == enterprise.getSpeed() ); + assertTrue( 450d == extractDoubleValue( result[1] ) ); + assertTrue( 4500d == extractDoubleValue( result[2] ) ); + s.delete( enterprise ); + t.commit(); + s.close(); + + } + + public void testMixAndMatchEntityScalar() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Speech speech = new Speech(); + speech.setLength( new Double( 23d ) ); + speech.setName( "Mine" ); + s.persist( speech ); + s.flush(); + s.clear(); + + List l = s.createSQLQuery( "select name, id, flength, name as scalarName from Speech" ) + .setResultSetMapping( "speech" ) + .list(); + assertEquals( l.size(), 1 ); + + t.rollback(); + s.close(); + } + + private double extractDoubleValue(Object value) { + if ( value instanceof BigInteger ) { + return ( ( BigInteger ) value ).doubleValue(); + } + else if ( value instanceof BigDecimal ) { + return ( ( BigDecimal ) value ).doubleValue(); + } + else { + return Double.valueOf( value.toString() ).doubleValue(); + } + } + + private static class UpperCasedAliasToEntityMapResultTransformer extends AliasToEntityMapResultTransformer { + public Object transformTuple(Object[] tuple, String[] aliases) { + String[] ucAliases = new String[aliases.length]; + for ( int i = 0; i < aliases.length; i++ ) { + ucAliases[i] = aliases[i].toUpperCase(); + } + return super.transformTuple( tuple, ucAliases ); + } + } +} Property changes on: trunk/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11485 - in branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql: check and 10 other directories.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-05-08 17:56:00 -0400 (Tue, 08 May 2007) New Revision: 11485 Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/check/CheckSuite.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Dimension.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Employment.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmount.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmountUserType.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Order.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Organization.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Person.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Product.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/SpaceShip.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Speech.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/identity/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java Removed: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/DataDirectOracleSQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Db2Employment.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Db2SQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Dimension.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Employment.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/General.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/HandSQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MSSQLEmployment.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MSSQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MonetaryAmount.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MonetaryAmountUserType.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MySQLEmployment.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MySQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleDataDirectDriverStoredProcedures.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleDriverStoredProcedures.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Order.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Organization.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Person.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Product.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/SpaceShip.java branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Speech.java Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/NativeSqlSupportSuite.java Log: HHH-2301 : IDENTITY + custom insert SQL (Scott Rankin and Gail Badner) Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/DataDirectOracleSQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/DataDirectOracleSQLTest.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/DataDirectOracleSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,32 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.DataDirectOracle9Dialect; -import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Max Rydahl Andersen - */ -public class DataDirectOracleSQLTest extends HandSQLTest { - - public DataDirectOracleSQLTest(String str) { - super(str); - } - - public String[] getMappings() { - return new String[] { "sql/OracleEmployment.hbm.xml", "sql/OracleDataDirectDriverStoredProcedures.hbm.xml" }; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( DataDirectOracleSQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof DataDirectOracle9Dialect ); - } - -} - Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Db2Employment.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Db2Employment.hbm.xml 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Db2Employment.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,240 +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"> - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <class name="Organization" table="ORGANIZATION"> - <id name="id" unsaved-value="0" column="ORGID"> - <generator class="increment"/> - </id> - <property name="name" not-null="true" column="NAME"/> - <set name="employments" - inverse="true" - order-by="DUMMY"> - <key column="EMPLOYER"/>  - <one-to-many class="Employment"/> - <loader query-ref="organizationEmployments"/> - </set> -  - <loader query-ref="organization"/> - <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(? || ''), ? )</sql-insert> - <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(? || '') WHERE ORGID=?</sql-update> - <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> - </class> - - <class name="Person" table="PERSON"> - <id name="id" unsaved-value="0" column="PERID"> - <generator class="increment"/> - </id> - <property name="name" not-null="true" column="NAME"/> - <loader query-ref="person"/> - <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(? || ''), ? )</sql-insert> - <sql-update>UPDATE PERSON SET NAME=UPPER(? || '') WHERE PERID=?</sql-update> - <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> - </class> - - <class name="Employment" table="EMPLOYMENT"> - <id name="employmentId" unsaved-value="0" column="EMPID"> - <generator class="increment"/> - </id> - <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> - <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> - <property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/> - <property name="endDate" column="ENDDATE" insert="false"/> - <property name="regionCode" column="REGIONCODE" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - <loader query-ref="employment"/> - <sql-insert> - INSERT INTO EMPLOYMENT - (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) -  - VALUES (?, ?, TIMESTAMP ('2006-02-28 11:39:00'), UPPER(? || ''), ?, ?, ?) - </sql-insert> - <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> - <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - <sql-query name="person"> - <return alias="p" class="Person" lock-mode="upgrade"/> - SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ - </sql-query> - - <sql-query name="organization"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT {org.*}, {emp.*} - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - WHERE org.ORGID=? - </sql-query> - - -  - - <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> - <return alias="org" class="Organization"/> - SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID - </sql-query> - - - - - - <sql-query name="employment"> - <return alias="emp" class="Employment"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} - FROM EMPLOYMENT - WHERE EMPID = ? - </sql-query> - - <sql-query name="organizationEmployments"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT {empcol.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - - <sql-query name="organizationCurrentEmployments"> - <return alias="emp" class="Employment"> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> -  - <return-property name="endDate" column="myEndDate"/> - </return> - <synchronize table="EMPLOYMENT"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY - FROM EMPLOYMENT - WHERE EMPLOYER = :id AND ENDDATE IS NULL - ORDER BY STARTDATE ASC - </sql-query> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { call HIBDB2TST.simpleScalar(:number) } - </sql-query> - - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { call HIBDB2TST.paramHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call HIBDB2TST.paramHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="id" column="EMPID"/> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { call HIBDB2TST.selectAllEmployments() } - </sql-query> - -  - <database-object> - <create>CREATE SCHEMA HIBDB2TST</create> - <drop>DROP SCHEMA HIBDB2TST RESTRICT</drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE HIBDB2TST.selectAllEmployments () - P1: BEGIN - DECLARE C1 CURSOR WITH RETURN FOR - SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, - REGIONCODE, EMPID, VALUE, CURRENCY - FROM EMPLOYMENT; - OPEN C1; - END P1 - </create> - <drop> - DROP PROCEDURE HIBDB2TST.selectAllEmployments - </drop> - </database-object> - - - <database-object> - <create> - CREATE PROCEDURE HIBDB2TST.paramHandling (IN j SMALLINT, IN i SMALLINT) - P1: BEGIN - DECLARE C1 CURSOR WITH RETURN FOR - SELECT j as value, i as value2 from sysibm.sysdummy1; - OPEN C1; - END P1 - </create> - <drop> - DROP PROCEDURE HIBDB2TST.paramHandling - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE HIBDB2TST.simpleScalar (IN j SMALLINT) - P1: BEGIN - DECLARE C1 CURSOR WITH RETURN FOR - SELECT j as value, 'getAll' as name from sysibm.sysdummy1; - OPEN C1; - END P1 - </create> - <drop> - DROP PROCEDURE HIBDB2TST.simpleScalar - </drop> - </database-object> -</hibernate-mapping> Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Db2SQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Db2SQLTest.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Db2SQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,32 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.DB2Dialect; -import org.hibernate.dialect.Dialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Max Rydahl Andersen - */ -public class Db2SQLTest extends HandSQLTest { - - public Db2SQLTest(String str) { - super(str); - } - - public String[] getMappings() { - return new String[] { "sql/Db2Employment.hbm.xml" }; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( Db2SQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof DB2Dialect); - } - -} - Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Dimension.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Dimension.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Dimension.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,31 +0,0 @@ -package org.hibernate.test.sql; - -/** - * Used to mimic some tests from the JPA testsuite... - * - * @author Steve Ebersole - */ -public class Dimension { - private Long id; - private int length; - private int width; - - public Dimension() {} - - public Dimension(int length, int width) { - this.length = length; - this.width = width; - } - - public Long getId() { - return id; - } - - public int getLength() { - return length; - } - - public int getWidth() { - return width; - } -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Employment.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Employment.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Employment.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,107 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import java.util.Date; - -/** - * @author Gavin King - */ -public class Employment { - private long employmentId; - private Person employee; - private Organization employer; - private Date startDate; - private Date endDate; - private String regionCode; - private MonetaryAmount salary; - - public Employment() {} - - public Employment(Person employee, Organization employer, String regionCode) { - this.employee = employee; - this.employer = employer; - this.startDate = new Date(); - this.regionCode = regionCode; - employer.getEmployments().add(this); - } - /** - * @return Returns the employee. - */ - public Person getEmployee() { - return employee; - } - /** - * @param employee The employee to set. - */ - public void setEmployee(Person employee) { - this.employee = employee; - } - /** - * @return Returns the employer. - */ - public Organization getEmployer() { - return employer; - } - /** - * @param employer The employer to set. - */ - public void setEmployer(Organization employer) { - this.employer = employer; - } - /** - * @return Returns the endDate. - */ - public Date getEndDate() { - return endDate; - } - /** - * @param endDate The endDate to set. - */ - public void setEndDate(Date endDate) { - this.endDate = endDate; - } - /** - * @return Returns the id. - */ - public long getEmploymentId() { - return employmentId; - } - /** - * @param id The id to set. - */ - public void setEmploymentId(long id) { - this.employmentId = id; - } - /** - * @return Returns the startDate. - */ - public Date getStartDate() { - return startDate; - } - /** - * @param startDate The startDate to set. - */ - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - /** - * @return Returns the regionCode. - */ - public String getRegionCode() { - return regionCode; - } - /** - * @param regionCode The regionCode to set. - */ - public void setRegionCode(String regionCode) { - this.regionCode = regionCode; - } - - public MonetaryAmount getSalary() { - return salary; - } - - public void setSalary(MonetaryAmount salary) { - this.salary = salary; - } -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/General.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/General.hbm.xml 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/General.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,264 +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"> - - - -<hibernate-mapping package="org.hibernate.test.sql" default-access="field"> - - <class name="Organization" table="ORGANIZATION"> - <id name="id" unsaved-value="0" column="ORGID"> - <generator class="increment"/> - </id> - <property name="name" column="NAME" not-null="true"/> - <set lazy="true" name="employments" - inverse="true"> - <key column="EMPLOYER"/>  - <one-to-many class="Employment"/> - </set> - </class> - - <class name="Person" table="PERSON"> - <id name="id" unsaved-value="0" column="PERID"> - <generator class="increment"/> - </id> - <property name="name" column="NAME" not-null="true"/> - - </class> - - <class name="Employment" table="EMPLOYMENT"> - <id name="employmentId" unsaved-value="0" column="EMPID"> - <generator class="increment"/> - </id> - <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> - <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> - <property name="startDate" column="STARTDATE" not-null="false"/> - <property name="endDate" column="ENDDATE" insert="false"/> - <property name="regionCode" column="REGIONCODE" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - </class> - - <class name="Order" table="TBL_ORDER"> - <composite-id name="orderId" class="Order$OrderId"> - <key-property name="orgid"/> - <key-property name="ordernumber"/> - </composite-id> - - <many-to-one name="product"> - <column name="PROD_ORGID"/> - <column name="PROD_NO"/> - </many-to-one> - <many-to-one name="person"/> - </class> - - <class name="Product"> - <composite-id name="productId" class="Product$ProductId"> - <key-property name="orgid"/> - <key-property name="productnumber"/> - </composite-id> - - <property name="name"/> - - <set name="orders" inverse="true"> - <key> - <column name="PROD_ORGID"/> - <column name="PROD_NO"/> - </key> - <one-to-many class="Order"/> - </set> - </class> - - <class name="Dimension"> - <id name="id" type="long"> - <generator class="increment"/> - </id> - <property name="length" column="d_len"/> - <property name="width" column="d_width"/> - </class> - - <class name="SpaceShip"> - <id name="id" type="integer"> - <generator class="increment"/> - </id> - <property name="name" column="fld_name"/> - <property name="model" column="fld_model"/> - <property name="speed" column="fld_speed"/> - <component name="dimensions"> - <property name="length" column="fld_length"/> - <property name="width" column="fld_width"/> - </component> - </class> - - <class name="Speech"> - <id name="id" type="integer"> - <generator class="increment"/> - </id> - <property name="name" column="name"/> - <property name="length" column="flength"/> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - - <resultset name="org-description"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="spaceship-vol"> - <return alias="sps" class="SpaceShip"> - <return-property name="id" column="id"/> - <return-property name="name" column="name"/> - <return-property name="model" column="model"/> - <return-property name="speed" column="speed"/> - <return-property name="dimensions.length" column="length"/> - <return-property name="dimensions.width" column="width"/> - </return> - <return-scalar column="surface"/> - <return-scalar column="volume"/> - </resultset> - - <resultset name="speech"> - <return alias="sp" class="Speech"> - <return-property name="id" column="id"/> - <return-property name="name" column="name"/> - <return-property name="length" column="flength"/> - </return> - <return-scalar column="scalarName"/> - </resultset> - - <sql-query name="spaceship" resultset-ref="spaceship-vol"> - select id as id, - fld_name as name, - fld_model as model, - fld_speed as speed, - fld_length as length, - fld_width as width, - fld_length * fld_width as surface, - fld_length * fld_width *10 as volume - from SpaceShip - </sql-query> - - <sql-query name="orgNamesOnly"> - <return-scalar column="NAME" type="string"/> - SELECT org.NAME FROM ORGANIZATION org - </sql-query> - - <sql-query name="orgNamesAndOrgs"> - <return-scalar column="thename" type="string"/> - <return alias="org" class="Organization"/> - SELECT org.NAME AS thename, org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - ORDER BY thename - </sql-query> - - <sql-query name="orgsAndOrgNames"> - <return alias="org" class="Organization"/> - <return-scalar column="thename" type="string"/> - SELECT org.NAME AS thename, org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - ORDER BY thename - </sql-query> - - <sql-query name="orgIdsAndOrgNames"> - <return-scalar column="orgid" type="long"/> - <return-scalar column="thename" type="string"/> - SELECT NAME AS thename, ORGID AS orgid - FROM ORGANIZATION - ORDER BY thename - </sql-query> - - <sql-query name="AllEmploymentAsMapped"> - <return class="Employment"/> - SELECT * FROM EMPLOYMENT - </sql-query> - - <sql-query name="EmploymentAndPerson"> - <return class="Employment"/> - <return class="Person"/> - SELECT * FROM EMPLOYMENT, PERSON - </sql-query> - - <sql-query name="organizationEmploymentsExplicitAliases"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT empcol.EMPLOYER as {empcol.key}, empcol.EMPID as {empcol.element}, {empcol.element.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - <sql-query name="organizationreturnproperty"> - <return alias="org" class="Organization"> - <return-property name="id" column="ORGID"/> - <return-property name="name" column="NAME"/> - </return> - <return-join alias="emp" property="org.employments"> - <return-property name="key" column="EMPLOYER"/> - <return-property name="element" column="EMPID"/> - <return-property name="element.employee" column="EMPLOYEE"/> - <return-property name="element.employer" column="EMPLOYER"/> - <return-property name="element.startDate" column="XSTARTDATE"/> - <return-property name="element.endDate" column="ENDDATE"/> - <return-property name="element.regionCode" column="REGIONCODE"/> - <return-property name="element.employmentId" column="EMPID"/> - <return-property name="element.salary"> - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return-join> - SELECT org.ORGID as orgid, - org.NAME as name, - emp.EMPLOYER as employer, - emp.EMPID as empid, - emp.EMPLOYEE as employee, - emp.EMPLOYER as employer, - emp.STARTDATE as xstartDate, - emp.ENDDATE as endDate, - emp.REGIONCODE as regionCode, - emp.VALUE as VALUE, - emp.CURRENCY as CURRENCY - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - </sql-query> - - - <sql-query name="organizationautodetect" resultset-ref="org-description"> -  - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT org.ORGID as orgid, - org.NAME as name, - emp.EMPLOYER as employer, - emp.EMPID as empid, - emp.EMPLOYEE as employee, - emp.EMPLOYER as employer, - emp.STARTDATE as startDate, - emp.ENDDATE as endDate, - emp.REGIONCODE as regionCode, - emp.VALUE as VALUE, - emp.CURRENCY as CURRENCY - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - </sql-query> - -</hibernate-mapping> \ No newline at end of file Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/GeneralTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,608 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import junit.framework.Test; - -import org.hibernate.Hibernate; -import org.hibernate.HibernateException; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.junit.functional.FunctionalTestCase; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.transform.DistinctRootEntityResultTransformer; -import org.hibernate.transform.Transformers; -import org.hibernate.transform.AliasToEntityMapResultTransformer; - -/** - * @author Steve Ebersole - */ -public class GeneralTest extends FunctionalTestCase { - - public GeneralTest(String x) { - super( x ); - } - - public String[] getMappings() { - return new String[] { "sql/General.hbm.xml" }; - } - - public void configure(Configuration cfg) { - super.configure( cfg ); - cfg.setProperty( Environment.GENERATE_STATISTICS, "true" ); - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( GeneralTest.class ); - } - - protected String getOrganizationFetchJoinEmploymentSQL() { - return "SELECT org.ORGID as {org.id}, " + - " org.NAME as {org.name}, " + - " emp.EMPLOYER as {emp.key}, " + - " emp.EMPID as {emp.element}, " + - " {emp.element.*} " + - "FROM ORGANIZATION org " + - " LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER"; - } - - protected String getOrganizationJoinEmploymentSQL() { - return "SELECT org.ORGID as {org.id}, " + - " org.NAME as {org.name}, " + - " {emp.*} " + - "FROM ORGANIZATION org " + - " LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER"; - } - - protected String getEmploymentSQL() { - return "SELECT * FROM EMPLOYMENT"; - } - - protected String getEmploymentSQLMixedScalarEntity() { - return "SELECT e.*, e.employer as employerid FROM EMPLOYMENT e" ; - } - - protected String getOrgEmpRegionSQL() { - return "select {org.*}, {emp.*}, emp.REGIONCODE " + - "from ORGANIZATION org " + - " left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER"; - } - - protected String getOrgEmpPersonSQL() { - return "select {org.*}, {emp.*}, {pers.*} " + - "from ORGANIZATION org " + - " join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER " + - " join PERSON pers on pers.PERID = emp.EMPLOYEE "; - } - - public void testFailOnNoAddEntityOrScalar() { - // Note: this passes, but for the wrong reason. - // there is actually an exception thrown, but it is the database - // throwing a sql exception because the SQL gets passed - // "un-processed"... - Session s = openSession(); - try { - String sql = "select {org.*} " + - "from organization org"; - s.createSQLQuery( sql ).list(); - fail( "Should throw an exception since no addEntity nor addScalar has been performed." ); - } - catch( HibernateException he) { - // expected behavior - } - finally { - s.close(); - } - } - - public void testManualSynchronization() { - Session s = openSession(); - s.beginTransaction(); - - sfi().getStatistics().clear(); - - // create an Organization... - Organization jboss = new Organization( "JBoss" ); - s.persist( jboss ); - - // now query on Employment, this should not cause an auto-flush - s.createSQLQuery( getEmploymentSQL() ).list(); - assertEquals( 0, sfi().getStatistics().getEntityInsertCount() ); - - // now try to query on Employment but this time add Organization as a synchronized query space... - s.createSQLQuery( getEmploymentSQL() ).addSynchronizedEntityClass( Organization.class ).list(); - assertEquals( 1, sfi().getStatistics().getEntityInsertCount() ); - - // clean up - s.delete( jboss ); - s.getTransaction().commit(); - s.close(); - } - - public void testSQLQueryInterface() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization("IFA"); - Organization jboss = new Organization("JBoss"); - Person gavin = new Person("Gavin"); - Employment emp = new Employment(gavin, jboss, "AU"); - - s.persist(ifa); - s.persist(jboss); - s.persist(gavin); - s.persist(emp); - - List l = s.createSQLQuery( getOrgEmpRegionSQL() ) - .addEntity("org", Organization.class) - .addJoin("emp", "org.employments") - .addScalar("regionCode", Hibernate.STRING) - .list(); - assertEquals( 2, l.size() ); - - l = s.createSQLQuery( getOrgEmpPersonSQL() ) - .addEntity("org", Organization.class) - .addJoin("emp", "org.employments") - .addJoin("pers", "emp.employee") - .list(); - assertEquals( l.size(), 1 ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - l = s.createSQLQuery( "select {org.*}, {emp.*} " + - "from ORGANIZATION org " + - " left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2" ) - .addEntity("org", Organization.class) - .addJoin("emp", "org.employments") - .setResultTransformer(new DistinctRootEntityResultTransformer()) - .list(); - assertEquals( l.size(), 2 ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - s.delete(emp); - s.delete(gavin); - s.delete(ifa); - s.delete(jboss); - - t.commit(); - s.close(); - } - - public void testResultSetMappingDefinition() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization("IFA"); - Organization jboss = new Organization("JBoss"); - Person gavin = new Person("Gavin"); - Employment emp = new Employment(gavin, jboss, "AU"); - - s.persist(ifa); - s.persist(jboss); - s.persist(gavin); - s.persist(emp); - - List l = s.createSQLQuery( getOrgEmpRegionSQL() ) - .setResultSetMapping( "org-emp-regionCode" ) - .list(); - assertEquals( l.size(), 2 ); - - l = s.createSQLQuery( getOrgEmpPersonSQL() ) - .setResultSetMapping( "org-emp-person" ) - .list(); - assertEquals( l.size(), 1 ); - - s.delete(emp); - s.delete(gavin); - s.delete(ifa); - s.delete(jboss); - - t.commit(); - s.close(); - } - - public void testScalarValues() throws Exception { - Session s = openSession(); - Transaction t = s.beginTransaction(); - - Organization ifa = new Organization( "IFA" ); - Organization jboss = new Organization( "JBoss" ); - - Serializable idIfa = s.save( ifa ); - Serializable idJBoss = s.save( jboss ); - - s.flush(); - - List result = s.getNamedQuery( "orgNamesOnly" ).list(); - assertTrue( result.contains( "IFA" ) ); - assertTrue( result.contains( "JBoss" ) ); - - result = s.getNamedQuery( "orgNamesOnly" ).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP).list(); - Map m = (Map) result.get(0); - assertEquals( 2, result.size() ); - assertEquals( 1, m.size() ); - assertTrue( m.containsKey("NAME") ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - Iterator iter = s.getNamedQuery( "orgNamesAndOrgs" ).list().iterator(); - Object[] o = ( Object[] ) iter.next(); - assertEquals( o[0], "IFA" ); - assertEquals( ( ( Organization ) o[1] ).getName(), "IFA" ); - o = ( Object[] ) iter.next(); - assertEquals( o[0], "JBoss" ); - assertEquals( ( ( Organization ) o[1] ).getName(), "JBoss" ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - // test that the ordering of the results is truly based on the order in which they were defined - iter = s.getNamedQuery( "orgsAndOrgNames" ).list().iterator(); - Object[] row = ( Object[] ) iter.next(); - assertEquals( "expecting non-scalar result first", Organization.class, row[0].getClass() ); - assertEquals( "expecting scalar result second", String.class, row[1].getClass() ); - assertEquals( ( ( Organization ) row[0] ).getName(), "IFA" ); - assertEquals( row[1], "IFA" ); - row = ( Object[] ) iter.next(); - assertEquals( "expecting non-scalar result first", Organization.class, row[0].getClass() ); - assertEquals( "expecting scalar result second", String.class, row[1].getClass() ); - assertEquals( ( ( Organization ) row[0] ).getName(), "JBoss" ); - assertEquals( row[1], "JBoss" ); - assertFalse( iter.hasNext() ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - - iter = s.getNamedQuery( "orgIdsAndOrgNames" ).list().iterator(); - o = ( Object[] ) iter.next(); - assertEquals( o[1], "IFA" ); - assertEquals( o[0], idIfa ); - o = ( Object[] ) iter.next(); - assertEquals( o[1], "JBoss" ); - assertEquals( o[0], idJBoss ); - - s.delete( ifa ); - s.delete( jboss ); - t.commit(); - s.close(); - } - - public void testMappedAliasStrategy() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization("IFA"); - Organization jboss = new Organization("JBoss"); - Person gavin = new Person("Gavin"); - Employment emp = new Employment(gavin, jboss, "AU"); - Serializable orgId = s.save(jboss); - Serializable orgId2 = s.save(ifa); - s.save(gavin); - s.save(emp); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Query namedQuery = s.getNamedQuery("AllEmploymentAsMapped"); - List list = namedQuery.list(); - assertEquals(1,list.size()); - Employment emp2 = (Employment) list.get(0); - assertEquals(emp2.getEmploymentId(), emp.getEmploymentId() ); - assertEquals(emp2.getStartDate().getDate(), emp.getStartDate().getDate() ); - assertEquals(emp2.getEndDate(), emp.getEndDate() ); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Query sqlQuery = s.getNamedQuery("EmploymentAndPerson"); - sqlQuery.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); - list = sqlQuery.list(); - assertEquals(1,list.size() ); - Object res = list.get(0); - assertClassAssignability(res.getClass(),Map.class); - Map m = (Map) res; - assertEquals(2,m.size()); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - sqlQuery = s.getNamedQuery("organizationreturnproperty"); - sqlQuery.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); - list = sqlQuery.list(); - assertEquals(2,list.size() ); - m = (Map) list.get(0); - assertTrue(m.containsKey("org")); - assertClassAssignability(m.get("org").getClass(), Organization.class); - assertTrue(m.containsKey("emp")); - assertClassAssignability(m.get("emp").getClass(), Employment.class); - assertEquals(2, m.size()); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - namedQuery = s.getNamedQuery("EmploymentAndPerson"); - list = namedQuery.list(); - assertEquals(1,list.size() ); - Object[] objs = (Object[]) list.get(0); - assertEquals(2, objs.length); - emp2 = (Employment) objs[0]; - gavin = (Person) objs[1]; - s.delete(emp2); - s.delete(jboss); - s.delete(gavin); - s.delete(ifa); - t.commit(); - s.close(); - } - - /* test for native sql composite id joins which has never been implemented */ - public void testCompositeIdJoinsFailureExpected() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Person person = new Person(); - person.setName( "Noob" ); - - Product product = new Product(); - product.setProductId( new Product.ProductId() ); - product.getProductId().setOrgid( "x" ); - product.getProductId().setProductnumber( "1234" ); - product.setName( "Hibernate 3" ); - - Order order = new Order(); - order.setOrderId( new Order.OrderId() ); - order.getOrderId().setOrdernumber( "1" ); - order.getOrderId().setOrgid( "y" ); - - product.getOrders().add( order ); - order.setProduct( product ); - order.setPerson( person ); - - s.save( product ); - s.save( order); - s.save( person ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Product p = (Product) s.createQuery( "from Product p join fetch p.orders" ).list().get(0); - assertTrue(Hibernate.isInitialized( p.getOrders())); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Object[] o = (Object[]) s.createSQLQuery( "select\r\n" + - " product.orgid as {product.id.orgid}," + - " product.productnumber as {product.id.productnumber}," + - " {prod_orders}.orgid as orgid3_1_,\r\n" + - " {prod_orders}.ordernumber as ordernum2_3_1_,\r\n" + - " product.name as {product.name}," + - " {prod_orders.element.*}" + - /*" orders.PROD_NO as PROD4_3_1_,\r\n" + - " orders.person as person3_1_,\r\n" + - " orders.PROD_ORGID as PROD3_0__,\r\n" + - " orders.PROD_NO as PROD4_0__,\r\n" + - " orders.orgid as orgid0__,\r\n" + - " orders.ordernumber as ordernum2_0__ \r\n" +*/ - " from\r\n" + - " Product product \r\n" + - " inner join\r\n" + - " TBL_ORDER {prod_orders} \r\n" + - " on product.orgid={prod_orders}.PROD_ORGID \r\n" + - " and product.productnumber={prod_orders}.PROD_NO" ) - .addEntity( "product", Product.class ) - .addJoin( "prod_orders", "product.orders" ) - .list().get(0); - - p = (Product) o[0]; - assertTrue(Hibernate.isInitialized( p.getOrders() )); - assertNotNull(p.getOrders().iterator().next()); - t.commit(); - s.close(); - } - - public void testAutoDetectAliasing() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization("IFA"); - Organization jboss = new Organization("JBoss"); - Person gavin = new Person("Gavin"); - Employment emp = new Employment(gavin, jboss, "AU"); - Serializable orgId = s.save(jboss); - Serializable orgId2 = s.save(ifa); - s.save(gavin); - s.save(emp); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - List list = s.createSQLQuery( getEmploymentSQL() ) - .addEntity( Employment.class.getName() ) - .list(); - assertEquals( 1,list.size() ); - - Employment emp2 = (Employment) list.get(0); - assertEquals(emp2.getEmploymentId(), emp.getEmploymentId() ); - assertEquals(emp2.getStartDate().getDate(), emp.getStartDate().getDate() ); - assertEquals(emp2.getEndDate(), emp.getEndDate() ); - - s.clear(); - - list = s.createSQLQuery( getEmploymentSQL() ) - .addEntity( Employment.class.getName() ) - .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP) - .list(); - assertEquals( 1,list.size() ); - Map m = (Map) list.get(0); - assertTrue(m.containsKey("Employment")); - assertEquals(1,m.size()); - - list = s.createSQLQuery(getEmploymentSQL()).list(); - assertEquals(1, list.size()); - Object[] o = (Object[]) list.get(0); - assertEquals(8, o.length); - - list = s.createSQLQuery( getEmploymentSQL() ).setResultTransformer( new UpperCasedAliasToEntityMapResultTransformer() ).list(); - assertEquals(1, list.size()); - m = (Map) list.get(0); - assertTrue(m.containsKey("EMPID")); - assertTrue(m.containsKey("VALUE")); - assertTrue(m.containsKey("ENDDATE")); - assertEquals(8, m.size()); - - list = s.createSQLQuery( getEmploymentSQLMixedScalarEntity() ).addScalar( "employerid" ).addEntity( Employment.class ).list(); - assertEquals(1, list.size()); - o = (Object[]) list.get(0); - assertEquals(2, o.length); - assertClassAssignability( o[0].getClass(), Number.class); - assertClassAssignability( o[1].getClass(), Employment.class); - - - - Query queryWithCollection = s.getNamedQuery("organizationEmploymentsExplicitAliases"); - queryWithCollection.setLong("id", jboss.getId() ); - list = queryWithCollection.list(); - assertEquals(list.size(),1); - - s.clear(); - - list = s.createSQLQuery( getOrganizationJoinEmploymentSQL() ) - .addEntity( "org", Organization.class ) - .addJoin( "emp", "org.employments" ) - .list(); - assertEquals( 2,list.size() ); - - s.clear(); - - list = s.createSQLQuery( getOrganizationFetchJoinEmploymentSQL() ) - .addEntity( "org", Organization.class ) - .addJoin( "emp", "org.employments" ) - .list(); - assertEquals( 2,list.size() ); - - s.clear(); - - // TODO : why twice? - s.getNamedQuery( "organizationreturnproperty" ).list(); - list = s.getNamedQuery( "organizationreturnproperty" ).list(); - assertEquals( 2,list.size() ); - - s.clear(); - - list = s.getNamedQuery( "organizationautodetect" ).list(); - assertEquals( 2,list.size() ); - - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - s.delete(emp2); - - s.delete(jboss); - s.delete(gavin); - s.delete(ifa); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Dimension dim = new Dimension( 3, Integer.MAX_VALUE ); - s.save( dim ); - list = s.createSQLQuery( "select d_len * d_width as surface, d_len * d_width * 10 as volume from Dimension" ).list(); - s.delete( dim ); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - SpaceShip enterprise = new SpaceShip(); - enterprise.setModel( "USS" ); - enterprise.setName( "Entreprise" ); - enterprise.setSpeed( 50d ); - Dimension d = new Dimension(45, 10); - enterprise.setDimensions( d ); - s.save( enterprise ); - Object[] result = (Object[]) s.getNamedQuery( "spaceship" ).uniqueResult(); - enterprise = (SpaceShip) result[0]; - assertTrue(50d == enterprise.getSpeed() ); - assertTrue( 450d == extractDoubleValue( result[1] ) ); - assertTrue( 4500d == extractDoubleValue( result[2] ) ); - s.delete( enterprise ); - t.commit(); - s.close(); - - } - - public void testMixAndMatchEntityScalar() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Speech speech = new Speech(); - speech.setLength( new Double( 23d ) ); - speech.setName( "Mine" ); - s.persist( speech ); - s.flush(); - s.clear(); - - List l = s.createSQLQuery( "select name, id, flength, name as scalarName from Speech" ) - .setResultSetMapping( "speech" ) - .list(); - assertEquals( l.size(), 1 ); - - t.rollback(); - s.close(); - } - - private double extractDoubleValue(Object value) { - if ( value instanceof BigInteger ) { - return ( ( BigInteger ) value ).doubleValue(); - } - else if ( value instanceof BigDecimal ) { - return ( ( BigDecimal ) value ).doubleValue(); - } - else { - return Double.valueOf( value.toString() ).doubleValue(); - } - } - - private static class UpperCasedAliasToEntityMapResultTransformer extends AliasToEntityMapResultTransformer { - public Object transformTuple(Object[] tuple, String[] aliases) { - String[] ucAliases = new String[aliases.length]; - for ( int i = 0; i < aliases.length; i++ ) { - ucAliases[i] = aliases[i].toUpperCase(); - } - return super.transformTuple( tuple, ucAliases ); - } - } -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/HandSQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/HandSQLTest.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/HandSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,150 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; -import java.sql.SQLException; -import java.util.Date; -import java.util.Iterator; -import java.util.List; - -import org.hibernate.HibernateException; -import org.hibernate.LockMode; -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.Transaction; -import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; - -/** - * @author Steve Ebersole - */ -public abstract class HandSQLTest extends DatabaseSpecificFunctionalTestCase { - - public HandSQLTest(String name) { - super( name ); - } - - public String getCacheConcurrencyStrategy() { - return null; - } - - public void testHandSQL() { - Session s = openSession(); - Transaction t = s.beginTransaction(); - Organization ifa = new Organization( "IFA" ); - Organization jboss = new Organization( "JBoss" ); - Person gavin = new Person( "Gavin" ); - Employment emp = new Employment( gavin, jboss, "AU" ); - Serializable orgId = s.save( jboss ); - s.save( ifa ); - s.save( gavin ); - s.save( emp ); - t.commit(); - - t = s.beginTransaction(); - Person christian = new Person( "Christian" ); - s.save( christian ); - Employment emp2 = new Employment( christian, jboss, "EU" ); - s.save( emp2 ); - t.commit(); - s.close(); - - getSessions().evict( Organization.class ); - getSessions().evict( Person.class ); - getSessions().evict( Employment.class ); - - s = openSession(); - t = s.beginTransaction(); - jboss = ( Organization ) s.get( Organization.class, orgId ); - assertEquals( jboss.getEmployments().size(), 2 ); - emp = ( Employment ) jboss.getEmployments().iterator().next(); - gavin = emp.getEmployee(); - assertEquals( gavin.getName(), "GAVIN" ); - assertEquals( s.getCurrentLockMode( gavin ), LockMode.UPGRADE ); - emp.setEndDate( new Date() ); - Employment emp3 = new Employment( gavin, jboss, "US" ); - s.save( emp3 ); - t.commit(); - s.close(); - - s = openSession(); - t = s.beginTransaction(); - Iterator iter = s.getNamedQuery( "allOrganizationsWithEmployees" ).list().iterator(); - assertTrue( iter.hasNext() ); - Organization o = ( Organization ) iter.next(); - assertEquals( o.getEmployments().size(), 3 ); - Iterator iter2 = o.getEmployments().iterator(); - while ( iter2.hasNext() ) { - Employment e = ( Employment ) iter2.next(); - s.delete( e ); - } - iter2 = o.getEmployments().iterator(); - while ( iter2.hasNext() ) { - Employment e = ( Employment ) iter2.next(); - s.delete( e.getEmployee() ); - } - s.delete( o ); - assertFalse( iter.hasNext() ); - s.delete( ifa ); - t.commit(); - s.close(); - } - - - public void testScalarStoredProcedure() throws HibernateException, SQLException { - Session s = openSession(); - Query namedQuery = s.getNamedQuery( "simpleScalar" ); - namedQuery.setLong( "number", 43 ); - List list = namedQuery.list(); - Object o[] = ( Object[] ) list.get( 0 ); - assertEquals( o[0], "getAll" ); - assertEquals( o[1], new Long( 43 ) ); - s.close(); - } - - public void testParameterHandling() throws HibernateException, SQLException { - Session s = openSession(); - - Query namedQuery = s.getNamedQuery( "paramhandling" ); - namedQuery.setLong( 0, 10 ); - namedQuery.setLong( 1, 20 ); - List list = namedQuery.list(); - Object[] o = ( Object[] ) list.get( 0 ); - assertEquals( o[0], new Long( 10 ) ); - assertEquals( o[1], new Long( 20 ) ); - - namedQuery = s.getNamedQuery( "paramhandling_mixed" ); - namedQuery.setLong( 0, 10 ); - namedQuery.setLong( "second", 20 ); - list = namedQuery.list(); - o = ( Object[] ) list.get( 0 ); - assertEquals( o[0], new Long( 10 ) ); - assertEquals( o[1], new Long( 20 ) ); - s.close(); - } - - public void testEntityStoredProcedure() throws HibernateException, SQLException { - Session s = openSession(); - Transaction t = s.beginTransaction(); - - Organization ifa = new Organization( "IFA" ); - Organization jboss = new Organization( "JBoss" ); - Person gavin = new Person( "Gavin" ); - Employment emp = new Employment( gavin, jboss, "AU" ); - s.persist( ifa ); - s.persist( jboss ); - s.persist( gavin ); - s.persist( emp ); - - Query namedQuery = s.getNamedQuery( "selectAllEmployments" ); - List list = namedQuery.list(); - assertTrue( list.get( 0 ) instanceof Employment ); - s.delete( emp ); - s.delete( ifa ); - s.delete( jboss ); - s.delete( gavin ); - - t.commit(); - s.close(); - } - - -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MSSQLEmployment.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MSSQLEmployment.hbm.xml 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MSSQLEmployment.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,221 +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"> - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <class name="Organization" table="ORGANIZATION"> - <id name="id" unsaved-value="0" column="ORGID"> - <generator class="increment"/> - </id> - <property name="name" not-null="true" column="NAME"/> - <set name="employments" - inverse="true" - order-by="DUMMY"> - <key column="EMPLOYER"/>  - <one-to-many class="Employment"/> - <loader query-ref="organizationEmployments"/> - </set> -  - <loader query-ref="organization"/> - <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> - <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> - </class> - - <class name="Person" table="PERSON"> - <id name="id" unsaved-value="0" column="PERID"> - <generator class="increment"/> - </id> - <property name="name" not-null="true" column="NAME"/> - <loader query-ref="person"/> - <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> - <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> - </class> - - <class name="Employment" table="EMPLOYMENT"> - <id name="employmentId" unsaved-value="0" column="EMPID"> - <generator class="increment"/> - </id> - <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> - <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> - <property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/> - <property name="endDate" column="ENDDATE" insert="false"/> - <property name="regionCode" column="REGIONCODE" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - <loader query-ref="employment"/> - <sql-insert> - INSERT INTO EMPLOYMENT - (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) - VALUES (?, ?, getdate(), UPPER(?), ?, ?, ?) - </sql-insert> - <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> - <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - <sql-query name="person"> - <return alias="p" class="Person" lock-mode="upgrade"/> - SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ - </sql-query> - - <sql-query name="organization"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT {org.*}, {emp.*} - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - WHERE org.ORGID=? - </sql-query> - - -  - - <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> - <return alias="org" class="Organization"/> - SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID - </sql-query> - - - - - - <sql-query name="employment"> - <return alias="emp" class="Employment"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} - FROM EMPLOYMENT - WHERE EMPID = ? - </sql-query> - - <sql-query name="organizationEmployments"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT {empcol.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - - <sql-query name="organizationCurrentEmployments"> - <return alias="emp" class="Employment"> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> -  - <return-property name="endDate" column="myEndDate"/> - </return> - <synchronize table="EMPLOYMENT"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY - FROM EMPLOYMENT - WHERE EMPLOYER = :id AND ENDDATE IS NULL - ORDER BY STARTDATE ASC - </sql-query> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { call simpleScalar(:number) } - </sql-query> - - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { call paramHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call paramHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="id" column="EMPID"/> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { call selectAllEmployments() } - </sql-query> - - <database-object> - <create> - CREATE PROCEDURE selectAllEmployments AS - SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, - REGIONCODE, EMPID, VALUE, CURRENCY - FROM EMPLOYMENT - </create> - <drop> - DROP PROCEDURE selectAllEmployments - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE paramHandling @j int, @i int AS - SELECT @j as value, @i as value2 - </create> - <drop> - DROP PROCEDURE paramHandling - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE simpleScalar @number int AS - SELECT @number as value, 'getAll' as name - </create> - <drop> - DROP PROCEDURE simpleScalar - </drop> - </database-object> - -</hibernate-mapping> Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MSSQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MSSQLTest.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MSSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,31 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.SybaseDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Gavin King - */ -public class MSSQLTest extends HandSQLTest { - - public MSSQLTest(String str) { - super( str ); - } - - public String[] getMappings() { - return new String[] {"sql/MSSQLEmployment.hbm.xml"}; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( MSSQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof SybaseDialect ); - } -} - Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MonetaryAmount.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MonetaryAmount.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MonetaryAmount.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,78 +0,0 @@ -package org.hibernate.test.sql; - -import java.math.BigDecimal; -import java.util.Currency; -import java.io.Serializable; - -/** - * Represents a monetary amount as value and currency. - * - * @author Gavin King <gavin(a)hibernate.org> - * @author Christian Bauer <christian(a)hibernate.org> - */ -public class MonetaryAmount implements Serializable { - - private final BigDecimal value; - private final Currency currency; - - public MonetaryAmount(BigDecimal value, Currency currency) { - this.value = value; - this.currency = currency; - } - - public Currency getCurrency() { - return currency; - } - - public BigDecimal getValue() { - return value; - } - - // ********************** Common Methods ********************** // - - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof MonetaryAmount)) return false; - - final MonetaryAmount monetaryAmount = (MonetaryAmount) o; - - if (!currency.equals(monetaryAmount.currency)) return false; - if (!value.equals(monetaryAmount.value)) return false; - - return true; - } - - public int hashCode() { - int result; - result = value.hashCode(); - result = 29 * result + currency.hashCode(); - return result; - } - - public String toString() { - return "Value: '" + getValue() + "', " + - "Currency: '" + getCurrency() + "'"; - } - - public int compareTo(Object o) { - if (o instanceof MonetaryAmount) { - // TODO: This would actually require some currency conversion magic - return this.getValue().compareTo(((MonetaryAmount) o).getValue()); - } - return 0; - } - - // ********************** Business Methods ********************** // - - public static MonetaryAmount fromString(String amount, String currencyCode) { - return new MonetaryAmount(new BigDecimal(amount), - Currency.getInstance(currencyCode)); - } - - public static MonetaryAmount convert(MonetaryAmount amount, - Currency toConcurrency) { - // TODO: This requires some conversion magic and is therefore broken - return new MonetaryAmount(amount.getValue(), toConcurrency); - } - -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MonetaryAmountUserType.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MonetaryAmountUserType.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MonetaryAmountUserType.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,85 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; -import java.util.Currency; - -import org.hibernate.HibernateException; -import org.hibernate.usertype.UserType; - -/** - * This is a simple Hibernate custom mapping type for MonetaryAmount value types. - * - * - * @author Max & Christian - */ -public class MonetaryAmountUserType - implements UserType { - - private static final int[] SQL_TYPES = {Types.NUMERIC, Types.VARCHAR }; - - public int[] sqlTypes() { return SQL_TYPES; } - - public Class returnedClass() { return MonetaryAmount.class; } - - public boolean isMutable() { return false; } - - public Object deepCopy(Object value) { - return value; // MonetaryAmount is immutable - } - - public boolean equals(Object x, Object y) { - if (x == y) return true; - if (x == null || y == null) return false; - return x.equals(y); - } - - public Object nullSafeGet(ResultSet resultSet, - String[] names, - Object owner) - throws HibernateException, SQLException { - - BigDecimal value = resultSet.getBigDecimal(names[0]); - if (resultSet.wasNull()) return null; - String cur = resultSet.getString(names[1]); - Currency userCurrency = Currency.getInstance(cur); - - return new MonetaryAmount(value, userCurrency); - } - - public void nullSafeSet(PreparedStatement statement, - Object value, - int index) - throws HibernateException, SQLException { - - if (value == null) { - statement.setNull(index, Types.NUMERIC); - statement.setNull(index+1, Types.VARCHAR); - } else { - MonetaryAmount currency = (MonetaryAmount)value; - statement.setBigDecimal(index, currency.getValue()); - statement.setString(index+1, currency.getCurrency().getCurrencyCode()); - } - } - - public Serializable disassemble(Object value) throws HibernateException { - return (Serializable) value; - } - - public Object assemble(Serializable cached, Object owner) throws HibernateException { - return cached; - } - - public Object replace(Object original, Object target, Object owner) - throws HibernateException { - return original; - } - - public int hashCode(Object x) throws HibernateException { - return x.hashCode(); - } -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MySQLEmployment.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MySQLEmployment.hbm.xml 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MySQLEmployment.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,220 +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"> - - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <class name="Organization"> - <id name="id" unsaved-value="0" column="orgid"> - <generator class="increment"/> - </id> - <property name="name" not-null="true"/> - <set name="employments" - inverse="true" - order-by="DUMMY"> - <key column="employer"/>  - <one-to-many class="Employment"/> - <loader query-ref="organizationEmployments"/> - </set> -  - <loader query-ref="organization"/> - <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> - <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> - </class> - - <class name="Person"> - <id name="id" unsaved-value="0" column="perid"> - <generator class="increment"/> - </id> - <property name="name" not-null="true"/> - <loader query-ref="person"/> - <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> - <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> - </class> - - <class name="Employment"> - <id name="employmentId" unsaved-value="0" column="empid"> - <generator class="increment"/> - </id> - <many-to-one name="employee" not-null="true" update="false"/> - <many-to-one name="employer" not-null="true" update="false"/> - <property name="startDate" not-null="true" update="false" insert="false"/> - <property name="endDate" insert="false"/> - <property name="regionCode" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - <loader query-ref="employment"/> - <sql-insert> - INSERT INTO EMPLOYMENT - (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) - VALUES (?, ?, now(), UPPER(?), ?, ?, ?) - </sql-insert> - <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> - <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - <sql-query name="person"> - <return alias="p" class="Person" lock-mode="upgrade"/> - SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ - </sql-query> - - <sql-query name="organization"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT {org.*}, {emp.*} - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - WHERE org.ORGID=? - </sql-query> - - - -  - - <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> - <return alias="org" class="Organization"/> - SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID - </sql-query> - - <sql-query name="employment"> - <return alias="emp" class="Employment"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} - FROM EMPLOYMENT - WHERE EMPID = ? - </sql-query> - - - <sql-query name="organizationEmployments"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT {empcol.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - - <sql-query name="organizationCurrentEmployments"> - <return alias="emp" class="Employment"> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> -  - <return-property name="endDate" column="myEndDate"/> - </return> - <synchronize table="EMPLOYMENT"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY - FROM EMPLOYMENT - WHERE EMPLOYER = :id AND ENDDATE IS NULL - ORDER BY STARTDATE ASC - </sql-query> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { call simpleScalar(:number) } - </sql-query> - - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { call paramHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call paramHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="id" column="EMPID"/> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { call selectAllEmployments() } - </sql-query> - - <database-object> - <create> - CREATE PROCEDURE selectAllEmployments () - SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, - REGIONCODE, EMPID, VALUE, CURRENCY - FROM EMPLOYMENT - </create> - <drop> - DROP PROCEDURE selectAllEmployments - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE paramHandling (j int, i int) - SELECT j AS value, i AS value2 - </create> - <drop> - DROP PROCEDURE paramHandling - </drop> - </database-object> - - <database-object> - <create> - CREATE PROCEDURE simpleScalar (number int) - SELECT number AS value, 'getAll' AS name - </create> - <drop> - DROP PROCEDURE simpleScalar - </drop> - </database-object> - -</hibernate-mapping> Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MySQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MySQLTest.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/MySQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,31 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.MySQLDialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Gavin King - */ -public class MySQLTest extends HandSQLTest { - - public MySQLTest(String str) { - super(str); - } - - public String[] getMappings() { - return new String[] { "sql/MySQLEmployment.hbm.xml" }; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( MySQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof MySQLDialect ); - } -} - Modified: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/NativeSqlSupportSuite.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/NativeSqlSupportSuite.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/NativeSqlSupportSuite.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -2,23 +2,32 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.hibernate.test.sql.check.OracleCheckStyleTest; +import org.hibernate.test.sql.check.CheckSuite; +import org.hibernate.test.sql.hand.custom.datadirect.oracle.DataDirectOracleCustomSQLTest; +import org.hibernate.test.sql.hand.custom.db2.DB2CustomSQLTest; +import org.hibernate.test.sql.hand.custom.mysql.MySQLCustomSQLTest; +import org.hibernate.test.sql.hand.custom.oracle.OracleCustomSQLTest; +import org.hibernate.test.sql.hand.custom.sybase.SybaseCustomSQLTest; +import org.hibernate.test.sql.hand.query.NativeSQLQueriesTest; +import org.hibernate.test.sql.hand.identity.CustomInsertSQLWithIdentityColumnTest; + /** - * todo: describe NativeSqlSupportSuite + * Suite for testing aspects of native SQL support. * * @author Steve Ebersole */ public class NativeSqlSupportSuite { public static Test suite() { TestSuite suite = new TestSuite( "Native SQL support tests" ); - suite.addTest( Db2SQLTest.suite() ); - suite.addTest( DataDirectOracleSQLTest.suite() ); - suite.addTest( OracleSQLTest.suite() ); - suite.addTest( MSSQLTest.suite() ); - suite.addTest( MySQLTest.suite() ); - suite.addTest( GeneralTest.suite() ); - suite.addTest( OracleCheckStyleTest.suite() ); + suite.addTest( DB2CustomSQLTest.suite() ); + suite.addTest( DataDirectOracleCustomSQLTest.suite() ); + suite.addTest( OracleCustomSQLTest.suite() ); + suite.addTest( SybaseCustomSQLTest.suite() ); + suite.addTest( MySQLCustomSQLTest.suite() ); + suite.addTest( NativeSQLQueriesTest.suite() ); + suite.addTest( CheckSuite.suite() ); + suite.addTest( CustomInsertSQLWithIdentityColumnTest.suite() ); return suite; } } Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleDataDirectDriverStoredProcedures.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleDataDirectDriverStoredProcedures.hbm.xml 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleDataDirectDriverStoredProcedures.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,48 +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"> - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { call simpleScalar(:number) } - </sql-query> - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call testParamHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long" /> - <return-scalar column="value2" type="long" /> - { call testParamHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="emp" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="employmentId" column="EMPID"/> - <return-property name="salary"> - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { call allEmployments() } - </sql-query> - -</hibernate-mapping> Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleDriverStoredProcedures.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleDriverStoredProcedures.hbm.xml 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleDriverStoredProcedures.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,47 +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"> - - -<hibernate-mapping package="org.hibernate.test.sql" default-access="field"> - - <sql-query name="simpleScalar" callable="true"> - <return-scalar column="name" type="string"/> - <return-scalar column="value" type="long"/> - { ? = call simpleScalar(:number) } - </sql-query> - - <sql-query name="paramhandling" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { ? = call testParamHandling(?,?) } - </sql-query> - - <sql-query name="paramhandling_mixed" callable="true"> - <return-scalar column="value" type="long"/> - <return-scalar column="value2" type="long"/> - { ? = call testParamHandling(?,:second) } - </sql-query> - - <sql-query name="selectAllEmployments" callable="true"> - <return alias="emp" class="Employment"> - <return-property name="employee" column="EMPLOYEE"/> - <return-property name="employer" column="EMPLOYER"/> - <return-property name="startDate" column="STARTDATE"/> - <return-property name="endDate" column="ENDDATE"/> - <return-property name="regionCode" column="REGIONCODE"/> - <return-property name="employmentId" column="EMPID"/> - <return-property name="salary"> - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> - </return> - { ? = call allEmployments() } - </sql-query> - -</hibernate-mapping> Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleEmployment.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,214 +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"> - - -<hibernate-mapping - package="org.hibernate.test.sql" - default-access="field"> - - <class name="Organization"> - <id name="id" unsaved-value="0" column="orgid"> - <generator class="increment"/> - </id> - <property name="name" not-null="true"/> - <set name="employments" - inverse="true" - order-by="DUMMY"> - <key column="employer"/> -  - <one-to-many class="Employment"/> - <loader query-ref="organizationEmployments"/> - </set> -  - <loader query-ref="organization"/> - <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> - <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> - <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> - </class> - - <class name="Person"> - <id name="id" unsaved-value="0" column="perid"> - <generator class="increment"/> - </id> - <property name="name" not-null="true"/> - <loader query-ref="person"/> - <sql-insert callable="true" check="none">{call createPerson(?,?)}</sql-insert> - <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> - <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> - </class> - - <class name="Employment"> - <id name="employmentId" unsaved-value="0" column="empid"> - <generator class="increment"/> - </id> - <many-to-one name="employee" not-null="true" update="false"/> - <many-to-one name="employer" not-null="true" update="false"/> - <property name="startDate" not-null="true" update="false" insert="false"/> - <property name="endDate" insert="false"/> - <property name="regionCode" update="false"/> - <property name="salary" type="org.hibernate.test.sql.MonetaryAmountUserType"> - <column name="VALUE" sql-type="float"/> - <column name="CURRENCY"/> - </property> - <loader query-ref="employment"/> - <sql-insert> - INSERT INTO EMPLOYMENT - (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) - VALUES (?, ?, CURRENT_DATE, UPPER(?), ?, ?, ?) - </sql-insert> - <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> - <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> - </class> - - <resultset name="org-emp-regionCode"> - <return-scalar column="regionCode" type="string"/> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - </resultset> - - <resultset name="org-emp-person"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - <return-join alias="pers" property="emp.employee"/> - </resultset> - - <sql-query name="person"> - <return alias="p" class="Person" lock-mode="upgrade"/> - SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ - </sql-query> - - <sql-query name="organization"> - <return alias="org" class="Organization"/> - <return-join alias="emp" property="org.employments"/> - SELECT {org.*}, {emp.*} - FROM ORGANIZATION org - LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER - WHERE org.ORGID=? - </sql-query> - - - <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> - <return alias="org" class="Organization"/> - SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} - FROM ORGANIZATION org - INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID - </sql-query> - - - <sql-query name="employment"> - <return alias="emp" class="Employment"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} - FROM EMPLOYMENT - WHERE EMPID = ? - </sql-query> - - - <sql-query name="organizationEmployments"> - <load-collection alias="empcol" role="Organization.employments"/> - SELECT {empcol.*} - FROM EMPLOYMENT empcol - WHERE EMPLOYER = :id - ORDER BY STARTDATE ASC, EMPLOYEE ASC - </sql-query> - - - <sql-query name="organizationCurrentEmployments"> - <return alias="emp" class="Employment"> - <return-property name="salary"> -  - <return-column name="VALUE"/> - <return-column name="CURRENCY"/> - </return-property> -  - <return-property name="endDate" column="myEndDate"/> - </return> - <synchronize table="EMPLOYMENT"/> - SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, - STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, - REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY - FROM EMPLOYMENT - WHERE EMPLOYER = :id AND ENDDATE IS NULL - ORDER BY STARTDATE ASC - </sql-query> - - <database-object> - <create> - CREATE OR REPLACE FUNCTION testParamHandling (j number, i number) - RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; - BEGIN - OPEN st_cursor FOR - SELECT j as value, i as value2 from dual; - RETURN st_cursor; - END; - </create> - <drop> - DROP FUNCTION testParamHandling - </drop> - </database-object> - - <database-object> - <create> - CREATE OR REPLACE FUNCTION simpleScalar (j number) - RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; - BEGIN - OPEN st_cursor FOR - SELECT j as value, 'getAll' as name from dual; - RETURN st_cursor; - END; - </create> - <drop> - DROP FUNCTION simpleScalar - </drop> - </database-object> - - <database-object> - <create> - CREATE OR REPLACE FUNCTION allEmployments - RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; - BEGIN - OPEN st_cursor FOR - SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, - REGIONCODE, EMPID, VALUE, CURRENCY - FROM EMPLOYMENT; - RETURN st_cursor; - END; - </create> - <drop> - DROP FUNCTION allEmployments - </drop> - </database-object> - - <database-object> - <create> - CREATE OR REPLACE PROCEDURE createPerson(p_name PERSON.NAME%TYPE, p_id PERSON.PERID%TYPE) - AS - rowcount INTEGER; - BEGIN - INSERT INTO PERSON ( PERID, NAME ) VALUES ( p_id, UPPER( p_name ) ); - rowcount := SQL%ROWCOUNT; - IF rowcount = 1 THEN - NULL; - ELSE - RAISE_APPLICATION_ERROR( -20001, 'Unexpected rowcount [' || rowcount || ']' ); - END IF; - END; - </create> - <drop> - DROP PROCEDURE createPerson; - </drop> - </database-object> - -</hibernate-mapping> Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/OracleSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,33 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import junit.framework.Test; - -import org.hibernate.dialect.DataDirectOracle9Dialect; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.Oracle9Dialect; -import org.hibernate.junit.functional.FunctionalTestClassTestSuite; - -/** - * @author Gavin King - */ -public class OracleSQLTest extends HandSQLTest { - - public OracleSQLTest(String str) { - super(str); - } - - public String[] getMappings() { - return new String[] { "sql/OracleEmployment.hbm.xml", "sql/OracleDriverStoredProcedures.hbm.xml" }; - } - - public static Test suite() { - return new FunctionalTestClassTestSuite( OracleSQLTest.class ); - } - - public boolean appliesTo(Dialect dialect) { - return ( dialect instanceof Oracle9Dialect ) && !( dialect instanceof DataDirectOracle9Dialect ); - } - -} - Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Order.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Order.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Order.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,55 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; - -public class Order { - - static public class OrderId implements Serializable { - String orgid; - String ordernumber; - public String getOrdernumber() { - return ordernumber; - } - public void setOrdernumber(String ordernumber) { - this.ordernumber = ordernumber; - } - public String getOrgid() { - return orgid; - } - public void setOrgid(String orgid) { - this.orgid = orgid; - } - - - } - - OrderId orderId; - - Product product; - - Person person; - - public Person getPerson() { - return person; - } - - public void setPerson(Person person) { - this.person = person; - } - public OrderId getOrderId() { - return orderId; - } - - public void setOrderId(OrderId orderId) { - this.orderId = orderId; - } - - public Product getProduct() { - return product; - } - - public void setProduct(Product product) { - this.product = product; - } - -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Organization.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Organization.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Organization.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,59 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -import java.util.Collection; -import java.util.HashSet; - -/** - * @author Gavin King - */ -public class Organization { - private long id; - private String name; - private Collection employments; - - public Organization(String name) { - this.name = name; - employments = new HashSet(); - } - - public Organization() {} - - /** - * @return Returns the employments. - */ - public Collection getEmployments() { - return employments; - } - /** - * @param employments The employments to set. - */ - public void setEmployments(Collection employments) { - this.employments = employments; - } - /** - * @return Returns the id. - */ - public long getId() { - return id; - } - /** - * @param id The id to set. - */ - public void setId(long id) { - this.id = id; - } - /** - * @return Returns the name. - */ - public String getName() { - return name; - } - /** - * @param name The name to set. - */ - public void setName(String name) { - this.name = name; - } - -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Person.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Person.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Person.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,41 +0,0 @@ -//$Id$ -package org.hibernate.test.sql; - -/** - * @author Gavin King - */ -public class Person { - private long id; - private String name; - - public Person(String name) { - this.name = name; - } - - public Person() {} - -/** - * @return Returns the id. - */ - public long getId() { - return id; - } - /** - * @param id The id to set. - */ - public void setId(long id) { - this.id = id; - } - /** - * @return Returns the name. - */ - public String getName() { - return name; - } - /** - * @param name The name to set. - */ - public void setName(String name) { - this.name = name; - } -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Product.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Product.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Product.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,66 +0,0 @@ -package org.hibernate.test.sql; - -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - -public class Product { - - static public class ProductId implements Serializable { - String orgid; - String productnumber; - public String getProductnumber() { - return productnumber; - } - public void setProductnumber(String ordernumber) { - this.productnumber = ordernumber; - } - public String getOrgid() { - return orgid; - } - public void setOrgid(String orgid) { - this.orgid = orgid; - } - - - } - - ProductId productId; - - String name; - - Person person; - - Set orders = new HashSet(); - - public Set getOrders() { - return orders; - } - - public void setOrders(Set orders) { - this.orders = orders; - } - public Person getPerson() { - return person; - } - - public void setPerson(Person person) { - this.person = person; - } - public ProductId getProductId() { - return productId; - } - - public void setProductId(ProductId orderId) { - this.productId = orderId; - } - - public String getName() { - return name; - } - - public void setName(String product) { - this.name = product; - } - -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/SpaceShip.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/SpaceShip.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/SpaceShip.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,53 +0,0 @@ -//$Id: $ -package org.hibernate.test.sql; - -/** - * @author Emmanuel Bernard - */ -public class SpaceShip { - private Integer id; - private String name; - private String model; - private double speed; - private Dimension dimensions; - - public Dimension getDimensions() { - return dimensions; - } - - public void setDimensions(Dimension dimensions) { - this.dimensions = dimensions; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getModel() { - return model; - } - - public void setModel(String model) { - this.model = model; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public double getSpeed() { - return speed; - } - - public void setSpeed(double speed) { - this.speed = speed; - } -} Deleted: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Speech.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Speech.java 2007-05-08 21:36:50 UTC (rev 11484) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/Speech.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -1,35 +0,0 @@ -//$Id: $ -package org.hibernate.test.sql; - -/** - * @author Emmanuel Bernard - */ -public class Speech { - private Integer id; - private String name; - private Double length; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Double getLength() { - return length; - } - - public void setLength(Double length) { - this.length = length; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/check/CheckSuite.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/check/CheckSuite.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/check/CheckSuite.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,19 @@ +package org.hibernate.test.sql.check; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * Suite for testing custom SQL result checking strategies. + * + * Yes, currently there is only one actual test... + * + * @author Steve Ebersole + */ +public class CheckSuite { + public static Test suite() { + TestSuite suite = new TestSuite( "native sql result checking" ); + suite.addTest( OracleCheckStyleTest.suite() ); + return suite; + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Dimension.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Dimension.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Dimension.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,31 @@ +package org.hibernate.test.sql.hand; + +/** + * Used to mimic some tests from the JPA testsuite... + * + * @author Steve Ebersole + */ +public class Dimension { + private Long id; + private int length; + private int width; + + public Dimension() {} + + public Dimension(int length, int width) { + this.length = length; + this.width = width; + } + + public Long getId() { + return id; + } + + public int getLength() { + return length; + } + + public int getWidth() { + return width; + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Employment.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Employment.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Employment.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,107 @@ +//$Id: Employment.java 6356 2005-04-06 16:43:11Z maxcsaucdk $ +package org.hibernate.test.sql.hand; + +import java.util.Date; + +/** + * @author Gavin King + */ +public class Employment { + private long employmentId; + private Person employee; + private Organization employer; + private Date startDate; + private Date endDate; + private String regionCode; + private MonetaryAmount salary; + + public Employment() {} + + public Employment(Person employee, Organization employer, String regionCode) { + this.employee = employee; + this.employer = employer; + this.startDate = new Date(); + this.regionCode = regionCode; + employer.getEmployments().add(this); + } + /** + * @return Returns the employee. + */ + public Person getEmployee() { + return employee; + } + /** + * @param employee The employee to set. + */ + public void setEmployee(Person employee) { + this.employee = employee; + } + /** + * @return Returns the employer. + */ + public Organization getEmployer() { + return employer; + } + /** + * @param employer The employer to set. + */ + public void setEmployer(Organization employer) { + this.employer = employer; + } + /** + * @return Returns the endDate. + */ + public Date getEndDate() { + return endDate; + } + /** + * @param endDate The endDate to set. + */ + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + /** + * @return Returns the id. + */ + public long getEmploymentId() { + return employmentId; + } + /** + * @param id The id to set. + */ + public void setEmploymentId(long id) { + this.employmentId = id; + } + /** + * @return Returns the startDate. + */ + public Date getStartDate() { + return startDate; + } + /** + * @param startDate The startDate to set. + */ + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + /** + * @return Returns the regionCode. + */ + public String getRegionCode() { + return regionCode; + } + /** + * @param regionCode The regionCode to set. + */ + public void setRegionCode(String regionCode) { + this.regionCode = regionCode; + } + + public MonetaryAmount getSalary() { + return salary; + } + + public void setSalary(MonetaryAmount salary) { + this.salary = salary; + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmount.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmount.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmount.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,78 @@ +package org.hibernate.test.sql.hand; + +import java.math.BigDecimal; +import java.util.Currency; +import java.io.Serializable; + +/** + * Represents a monetary amount as value and currency. + * + * @author Gavin King <gavin(a)hibernate.org> + * @author Christian Bauer <christian(a)hibernate.org> + */ +public class MonetaryAmount implements Serializable { + + private final BigDecimal value; + private final Currency currency; + + public MonetaryAmount(BigDecimal value, Currency currency) { + this.value = value; + this.currency = currency; + } + + public Currency getCurrency() { + return currency; + } + + public BigDecimal getValue() { + return value; + } + + // ********************** Common Methods ********************** // + + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MonetaryAmount)) return false; + + final MonetaryAmount monetaryAmount = (MonetaryAmount) o; + + if (!currency.equals(monetaryAmount.currency)) return false; + if (!value.equals(monetaryAmount.value)) return false; + + return true; + } + + public int hashCode() { + int result; + result = value.hashCode(); + result = 29 * result + currency.hashCode(); + return result; + } + + public String toString() { + return "Value: '" + getValue() + "', " + + "Currency: '" + getCurrency() + "'"; + } + + public int compareTo(Object o) { + if (o instanceof MonetaryAmount) { + // TODO: This would actually require some currency conversion magic + return this.getValue().compareTo(((MonetaryAmount) o).getValue()); + } + return 0; + } + + // ********************** Business Methods ********************** // + + public static MonetaryAmount fromString(String amount, String currencyCode) { + return new MonetaryAmount(new BigDecimal(amount), + Currency.getInstance(currencyCode)); + } + + public static MonetaryAmount convert(MonetaryAmount amount, + Currency toConcurrency) { + // TODO: This requires some conversion magic and is therefore broken + return new MonetaryAmount(amount.getValue(), toConcurrency); + } + +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmountUserType.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmountUserType.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/MonetaryAmountUserType.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,85 @@ +package org.hibernate.test.sql.hand; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import java.util.Currency; + +import org.hibernate.HibernateException; +import org.hibernate.usertype.UserType; + +/** + * This is a simple Hibernate custom mapping type for MonetaryAmount value types. + * + * + * @author Max & Christian + */ +public class MonetaryAmountUserType + implements UserType { + + private static final int[] SQL_TYPES = {Types.NUMERIC, Types.VARCHAR }; + + public int[] sqlTypes() { return SQL_TYPES; } + + public Class returnedClass() { return MonetaryAmount.class; } + + public boolean isMutable() { return false; } + + public Object deepCopy(Object value) { + return value; // MonetaryAmount is immutable + } + + public boolean equals(Object x, Object y) { + if (x == y) return true; + if (x == null || y == null) return false; + return x.equals(y); + } + + public Object nullSafeGet(ResultSet resultSet, + String[] names, + Object owner) + throws HibernateException, SQLException { + + BigDecimal value = resultSet.getBigDecimal(names[0]); + if (resultSet.wasNull()) return null; + String cur = resultSet.getString(names[1]); + Currency userCurrency = Currency.getInstance(cur); + + return new MonetaryAmount(value, userCurrency); + } + + public void nullSafeSet(PreparedStatement statement, + Object value, + int index) + throws HibernateException, SQLException { + + if (value == null) { + statement.setNull(index, Types.NUMERIC); + statement.setNull(index+1, Types.VARCHAR); + } else { + MonetaryAmount currency = (MonetaryAmount)value; + statement.setBigDecimal(index, currency.getValue()); + statement.setString(index+1, currency.getCurrency().getCurrencyCode()); + } + } + + public Serializable disassemble(Object value) throws HibernateException { + return (Serializable) value; + } + + public Object assemble(Serializable cached, Object owner) throws HibernateException { + return cached; + } + + public Object replace(Object original, Object target, Object owner) + throws HibernateException { + return original; + } + + public int hashCode(Object x) throws HibernateException { + return x.hashCode(); + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Order.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Order.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Order.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,55 @@ +package org.hibernate.test.sql.hand; + +import java.io.Serializable; + +public class Order { + + static public class OrderId implements Serializable { + String orgid; + String ordernumber; + public String getOrdernumber() { + return ordernumber; + } + public void setOrdernumber(String ordernumber) { + this.ordernumber = ordernumber; + } + public String getOrgid() { + return orgid; + } + public void setOrgid(String orgid) { + this.orgid = orgid; + } + + + } + + OrderId orderId; + + Product product; + + Person person; + + public Person getPerson() { + return person; + } + + public void setPerson(Person person) { + this.person = person; + } + public OrderId getOrderId() { + return orderId; + } + + public void setOrderId(OrderId orderId) { + this.orderId = orderId; + } + + public Product getProduct() { + return product; + } + + public void setProduct(Product product) { + this.product = product; + } + +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Organization.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Organization.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Organization.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,59 @@ +//$Id: Organization.java 7547 2005-07-19 18:21:35Z oneovthafew $ +package org.hibernate.test.sql.hand; + +import java.util.Collection; +import java.util.HashSet; + +/** + * @author Gavin King + */ +public class Organization { + private long id; + private String name; + private Collection employments; + + public Organization(String name) { + this.name = name; + employments = new HashSet(); + } + + public Organization() {} + + /** + * @return Returns the employments. + */ + public Collection getEmployments() { + return employments; + } + /** + * @param employments The employments to set. + */ + public void setEmployments(Collection employments) { + this.employments = employments; + } + /** + * @return Returns the id. + */ + public long getId() { + return id; + } + /** + * @param id The id to set. + */ + public void setId(long id) { + this.id = id; + } + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } + +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Person.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Person.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Person.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,41 @@ +//$Id: Person.java 4316 2004-08-14 13:12:03Z oneovthafew $ +package org.hibernate.test.sql.hand; + +/** + * @author Gavin King + */ +public class Person { + private long id; + private String name; + + public Person(String name) { + this.name = name; + } + + public Person() {} + +/** + * @return Returns the id. + */ + public long getId() { + return id; + } + /** + * @param id The id to set. + */ + public void setId(long id) { + this.id = id; + } + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Product.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Product.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Product.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,66 @@ +package org.hibernate.test.sql.hand; + +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +public class Product { + + static public class ProductId implements Serializable { + String orgid; + String productnumber; + public String getProductnumber() { + return productnumber; + } + public void setProductnumber(String ordernumber) { + this.productnumber = ordernumber; + } + public String getOrgid() { + return orgid; + } + public void setOrgid(String orgid) { + this.orgid = orgid; + } + + + } + + ProductId productId; + + String name; + + Person person; + + Set orders = new HashSet(); + + public Set getOrders() { + return orders; + } + + public void setOrders(Set orders) { + this.orders = orders; + } + public Person getPerson() { + return person; + } + + public void setPerson(Person person) { + this.person = person; + } + public ProductId getProductId() { + return productId; + } + + public void setProductId(ProductId orderId) { + this.productId = orderId; + } + + public String getName() { + return name; + } + + public void setName(String product) { + this.name = product; + } + +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/SpaceShip.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/SpaceShip.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/SpaceShip.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,53 @@ +//$Id: $ +package org.hibernate.test.sql.hand; + +/** + * @author Emmanuel Bernard + */ +public class SpaceShip { + private Integer id; + private String name; + private String model; + private double speed; + private Dimension dimensions; + + public Dimension getDimensions() { + return dimensions; + } + + public void setDimensions(Dimension dimensions) { + this.dimensions = dimensions; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getSpeed() { + return speed; + } + + public void setSpeed(double speed) { + this.speed = speed; + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Speech.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Speech.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/Speech.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,35 @@ +//$Id: $ +package org.hibernate.test.sql.hand; + +/** + * @author Emmanuel Bernard + */ +public class Speech { + private Integer id; + private String name; + private Double length; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Double getLength() { + return length; + } + + public void setLength(Double length) { + this.length = length; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,94 @@ +package org.hibernate.test.sql.hand.custom; + +import java.io.Serializable; +import java.util.Date; +import java.util.Iterator; + +import org.hibernate.LockMode; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.test.sql.hand.Employment; +import org.hibernate.test.sql.hand.Organization; +import org.hibernate.test.sql.hand.Person; +import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; + +/** + * Abstract test case defining tests for the support for user-supplied (aka + * custom) insert, update, delete SQL. + * + * @author Steve Ebersole + */ +public abstract class CustomSQLTestSupport extends DatabaseSpecificFunctionalTestCase { + + public CustomSQLTestSupport(String name) { + super( name ); + } + + public String getCacheConcurrencyStrategy() { + return null; + } + + public void testHandSQL() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization( "IFA" ); + Organization jboss = new Organization( "JBoss" ); + Person gavin = new Person( "Gavin" ); + Employment emp = new Employment( gavin, jboss, "AU" ); + Serializable orgId = s.save( jboss ); + s.save( ifa ); + s.save( gavin ); + s.save( emp ); + t.commit(); + + t = s.beginTransaction(); + Person christian = new Person( "Christian" ); + s.save( christian ); + Employment emp2 = new Employment( christian, jboss, "EU" ); + s.save( emp2 ); + t.commit(); + s.close(); + + getSessions().evict( Organization.class ); + getSessions().evict( Person.class ); + getSessions().evict( Employment.class ); + + s = openSession(); + t = s.beginTransaction(); + jboss = ( Organization ) s.get( Organization.class, orgId ); + assertEquals( jboss.getEmployments().size(), 2 ); + assertEquals( jboss.getName(), "JBOSS" ); + emp = ( Employment ) jboss.getEmployments().iterator().next(); + gavin = emp.getEmployee(); + assertEquals( gavin.getName(), "GAVIN" ); + assertEquals( s.getCurrentLockMode( gavin ), LockMode.UPGRADE ); + emp.setEndDate( new Date() ); + Employment emp3 = new Employment( gavin, jboss, "US" ); + s.save( emp3 ); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Iterator iter = s.getNamedQuery( "allOrganizationsWithEmployees" ).list().iterator(); + assertTrue( iter.hasNext() ); + Organization o = ( Organization ) iter.next(); + assertEquals( o.getEmployments().size(), 3 ); + Iterator iter2 = o.getEmployments().iterator(); + while ( iter2.hasNext() ) { + Employment e = ( Employment ) iter2.next(); + s.delete( e ); + } + iter2 = o.getEmployments().iterator(); + while ( iter2.hasNext() ) { + Employment e = ( Employment ) iter2.next(); + s.delete( e.getEmployee() ); + } + s.delete( o ); + assertFalse( iter.hasNext() ); + s.delete( ifa ); + t.commit(); + s.close(); + } + +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,83 @@ +package org.hibernate.test.sql.hand.custom; + +import java.sql.SQLException; +import java.util.List; + +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.test.sql.hand.Employment; +import org.hibernate.test.sql.hand.Organization; +import org.hibernate.test.sql.hand.Person; + +/** + * Abstract test case defining tests of stored procedure support. + * + * @author Gail Badner + */ +public abstract class CustomStoredProcTestSupport extends CustomSQLTestSupport { + + public CustomStoredProcTestSupport(String name) { + super( name ); + } + + public void testScalarStoredProcedure() throws HibernateException, SQLException { + Session s = openSession(); + Query namedQuery = s.getNamedQuery( "simpleScalar" ); + namedQuery.setLong( "number", 43 ); + List list = namedQuery.list(); + Object o[] = ( Object[] ) list.get( 0 ); + assertEquals( o[0], "getAll" ); + assertEquals( o[1], new Long( 43 ) ); + s.close(); + } + + public void testParameterHandling() throws HibernateException, SQLException { + Session s = openSession(); + + Query namedQuery = s.getNamedQuery( "paramhandling" ); + namedQuery.setLong( 0, 10 ); + namedQuery.setLong( 1, 20 ); + List list = namedQuery.list(); + Object[] o = ( Object[] ) list.get( 0 ); + assertEquals( o[0], new Long( 10 ) ); + assertEquals( o[1], new Long( 20 ) ); + + namedQuery = s.getNamedQuery( "paramhandling_mixed" ); + namedQuery.setLong( 0, 10 ); + namedQuery.setLong( "second", 20 ); + list = namedQuery.list(); + o = ( Object[] ) list.get( 0 ); + assertEquals( o[0], new Long( 10 ) ); + assertEquals( o[1], new Long( 20 ) ); + s.close(); + } + + public void testEntityStoredProcedure() throws HibernateException, SQLException { + Session s = openSession(); + Transaction t = s.beginTransaction(); + + Organization ifa = new Organization( "IFA" ); + Organization jboss = new Organization( "JBoss" ); + Person gavin = new Person( "Gavin" ); + Employment emp = new Employment( gavin, jboss, "AU" ); + s.persist( ifa ); + s.persist( jboss ); + s.persist( gavin ); + s.persist( emp ); + + Query namedQuery = s.getNamedQuery( "selectAllEmployments" ); + List list = namedQuery.list(); + assertTrue( list.get( 0 ) instanceof Employment ); + s.delete( emp ); + s.delete( ifa ); + s.delete( jboss ); + s.delete( gavin ); + + t.commit(); + s.close(); + } + + +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/DataDirectOracleCustomSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,35 @@ +//$Id$ +package org.hibernate.test.sql.hand.custom.datadirect.oracle; + +import junit.framework.Test; + +import org.hibernate.dialect.DataDirectOracle9Dialect; +import org.hibernate.dialect.Dialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for Oracle via the DataDirect drivers. + * + * @author Max Rydahl Andersen + */ +public class DataDirectOracleCustomSQLTest extends CustomStoredProcTestSupport { + + public DataDirectOracleCustomSQLTest(String str) { + super(str); + } + + public String[] getMappings() { + return new String[] { "sql/hand/custom/oracle/Mappings.hbm.xml", "sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( DataDirectOracleCustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof DataDirectOracle9Dialect ); + } + +} + Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,44 @@ +<?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.sql.hand" default-access="field"> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { call simpleScalar(:number) } + </sql-query> + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call testParamHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call testParamHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="emp" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="employmentId" column="EMPID"/> + <return-property name="salary"> + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { call allEmployments() } + </sql-query> + +</hibernate-mapping> Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,35 @@ +//$Id$ +package org.hibernate.test.sql.hand.custom.db2; + +import junit.framework.Test; + +import org.hibernate.dialect.DB2Dialect; +import org.hibernate.dialect.Dialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for DB2 + * + * @author Max Rydahl Andersen + */ +public class DB2CustomSQLTest extends CustomStoredProcTestSupport { + + public DB2CustomSQLTest(String str) { + super(str); + } + + public String[] getMappings() { + return new String[] { "sql/hand/custom/db2/Mappings.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( DB2CustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof DB2Dialect); + } + +} + Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,236 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization" table="ORGANIZATION"> + <id name="id" unsaved-value="0" column="ORGID"> + <generator class="increment"/> + </id> + <property name="name" not-null="true" column="NAME"/> + <set name="employments" + inverse="true" + order-by="DUMMY"> + <key column="EMPLOYER"/>  + <one-to-many class="Employment"/> + <loader query-ref="organizationEmployments"/> + </set> +  + <loader query-ref="organization"/> + <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(? || ''), ? )</sql-insert> + <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(? || '') WHERE ORGID=?</sql-update> + <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> + </class> + + <class name="Person" table="PERSON"> + <id name="id" unsaved-value="0" column="PERID"> + <generator class="increment"/> + </id> + <property name="name" not-null="true" column="NAME"/> + <loader query-ref="person"/> + <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(? || ''), ? )</sql-insert> + <sql-update>UPDATE PERSON SET NAME=UPPER(? || '') WHERE PERID=?</sql-update> + <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> + </class> + + <class name="Employment" table="EMPLOYMENT"> + <id name="employmentId" unsaved-value="0" column="EMPID"> + <generator class="increment"/> + </id> + <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> + <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> + <property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/> + <property name="endDate" column="ENDDATE" insert="false"/> + <property name="regionCode" column="REGIONCODE" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + <loader query-ref="employment"/> + <sql-insert> + INSERT INTO EMPLOYMENT + (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) +  + VALUES (?, ?, TIMESTAMP ('2006-02-28 11:39:00'), UPPER(? || ''), ?, ?, ?) + </sql-insert> + <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> + <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + <sql-query name="person"> + <return alias="p" class="Person" lock-mode="upgrade"/> + SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ + </sql-query> + + <sql-query name="organization"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT {org.*}, {emp.*} + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + WHERE org.ORGID=? + </sql-query> + + +  + + <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> + <return alias="org" class="Organization"/> + SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID + </sql-query> + + + + + + <sql-query name="employment"> + <return alias="emp" class="Employment"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} + FROM EMPLOYMENT + WHERE EMPID = ? + </sql-query> + + <sql-query name="organizationEmployments"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT {empcol.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + + <sql-query name="organizationCurrentEmployments"> + <return alias="emp" class="Employment"> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> +  + <return-property name="endDate" column="myEndDate"/> + </return> + <synchronize table="EMPLOYMENT"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY + FROM EMPLOYMENT + WHERE EMPLOYER = :id AND ENDDATE IS NULL + ORDER BY STARTDATE ASC + </sql-query> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { call HIBDB2TST.simpleScalar(:number) } + </sql-query> + + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { call HIBDB2TST.paramHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call HIBDB2TST.paramHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="id" column="EMPID"/> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { call HIBDB2TST.selectAllEmployments() } + </sql-query> + +  + <database-object> + <create>CREATE SCHEMA HIBDB2TST</create> + <drop>DROP SCHEMA HIBDB2TST RESTRICT</drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE HIBDB2TST.selectAllEmployments () + P1: BEGIN + DECLARE C1 CURSOR WITH RETURN FOR + SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, + REGIONCODE, EMPID, VALUE, CURRENCY + FROM EMPLOYMENT; + OPEN C1; + END P1 + </create> + <drop> + DROP PROCEDURE HIBDB2TST.selectAllEmployments + </drop> + </database-object> + + + <database-object> + <create> + CREATE PROCEDURE HIBDB2TST.paramHandling (IN j SMALLINT, IN i SMALLINT) + P1: BEGIN + DECLARE C1 CURSOR WITH RETURN FOR + SELECT j as value, i as value2 from sysibm.sysdummy1; + OPEN C1; + END P1 + </create> + <drop> + DROP PROCEDURE HIBDB2TST.paramHandling + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE HIBDB2TST.simpleScalar (IN j SMALLINT) + P1: BEGIN + DECLARE C1 CURSOR WITH RETURN FOR + SELECT j as value, 'getAll' as name from sysibm.sysdummy1; + OPEN C1; + END P1 + </create> + <drop> + DROP PROCEDURE HIBDB2TST.simpleScalar + </drop> + </database-object> +</hibernate-mapping> Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,216 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization"> + <id name="id" unsaved-value="0" column="orgid"> + <generator class="increment"/> + </id> + <property name="name" not-null="true"/> + <set name="employments" + inverse="true" + order-by="DUMMY"> + <key column="employer"/>  + <one-to-many class="Employment"/> + <loader query-ref="organizationEmployments"/> + </set> +  + <loader query-ref="organization"/> + <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> + <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> + </class> + + <class name="Person"> + <id name="id" unsaved-value="0" column="perid"> + <generator class="increment"/> + </id> + <property name="name" not-null="true"/> + <loader query-ref="person"/> + <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> + <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> + </class> + + <class name="Employment"> + <id name="employmentId" unsaved-value="0" column="empid"> + <generator class="increment"/> + </id> + <many-to-one name="employee" not-null="true" update="false"/> + <many-to-one name="employer" not-null="true" update="false"/> + <property name="startDate" not-null="true" update="false" insert="false"/> + <property name="endDate" insert="false"/> + <property name="regionCode" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + <loader query-ref="employment"/> + <sql-insert> + INSERT INTO EMPLOYMENT + (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) + VALUES (?, ?, now(), UPPER(?), ?, ?, ?) + </sql-insert> + <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> + <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + <sql-query name="person"> + <return alias="p" class="Person" lock-mode="upgrade"/> + SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ + </sql-query> + + <sql-query name="organization"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT {org.*}, {emp.*} + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + WHERE org.ORGID=? + </sql-query> + + + +  + + <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> + <return alias="org" class="Organization"/> + SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID + </sql-query> + + <sql-query name="employment"> + <return alias="emp" class="Employment"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} + FROM EMPLOYMENT + WHERE EMPID = ? + </sql-query> + + + <sql-query name="organizationEmployments"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT {empcol.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + + <sql-query name="organizationCurrentEmployments"> + <return alias="emp" class="Employment"> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> +  + <return-property name="endDate" column="myEndDate"/> + </return> + <synchronize table="EMPLOYMENT"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY + FROM EMPLOYMENT + WHERE EMPLOYER = :id AND ENDDATE IS NULL + ORDER BY STARTDATE ASC + </sql-query> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { call simpleScalar(:number) } + </sql-query> + + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { call paramHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call paramHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="id" column="EMPID"/> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { call selectAllEmployments() } + </sql-query> + + <database-object> + <create> + CREATE PROCEDURE selectAllEmployments () + SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, + REGIONCODE, EMPID, VALUE, CURRENCY + FROM EMPLOYMENT + </create> + <drop> + DROP PROCEDURE selectAllEmployments + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE paramHandling (j int, i int) + SELECT j AS value, i AS value2 + </create> + <drop> + DROP PROCEDURE paramHandling + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE simpleScalar (number int) + SELECT number AS value, 'getAll' AS name + </create> + <drop> + DROP PROCEDURE simpleScalar + </drop> + </database-object> + +</hibernate-mapping> Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,34 @@ +//$Id: MySQLCustomSQLTest.java 10977 2006-12-12 17:28:04 -0600 (Tue, 12 Dec 2006) steve.ebersole(a)jboss.com $ +package org.hibernate.test.sql.hand.custom.mysql; + +import junit.framework.Test; + +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.MySQLDialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for MySQL + * + * @author Gavin King + */ +public class MySQLCustomSQLTest extends CustomStoredProcTestSupport { + + public MySQLCustomSQLTest(String str) { + super(str); + } + + public String[] getMappings() { + return new String[] { "sql/hand/custom/mysql/Mappings.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( MySQLCustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof MySQLDialect ); + } +} + Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,209 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization"> + <id name="id" unsaved-value="0" column="orgid"> + <generator class="increment"/> + </id> + <property name="name" not-null="true"/> + <set name="employments" + inverse="true" + order-by="DUMMY"> + <key column="employer"/> +  + <one-to-many class="Employment"/> + <loader query-ref="organizationEmployments"/> + </set> +  + <loader query-ref="organization"/> + <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> + <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> + </class> + + <class name="Person"> + <id name="id" unsaved-value="0" column="perid"> + <generator class="increment"/> + </id> + <property name="name" not-null="true"/> + <loader query-ref="person"/> + <sql-insert callable="true" check="none">{call createPerson(?,?)}</sql-insert> + <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> + <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> + </class> + + <class name="Employment"> + <id name="employmentId" unsaved-value="0" column="empid"> + <generator class="increment"/> + </id> + <many-to-one name="employee" not-null="true" update="false"/> + <many-to-one name="employer" not-null="true" update="false"/> + <property name="startDate" not-null="true" update="false" insert="false"/> + <property name="endDate" insert="false"/> + <property name="regionCode" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + <loader query-ref="employment"/> + <sql-insert> + INSERT INTO EMPLOYMENT + (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) + VALUES (?, ?, CURRENT_DATE, UPPER(?), ?, ?, ?) + </sql-insert> + <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> + <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + <sql-query name="person"> + <return alias="p" class="Person" lock-mode="upgrade"/> + SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ + </sql-query> + + <sql-query name="organization"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT {org.*}, {emp.*} + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + WHERE org.ORGID=? + </sql-query> + + + <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> + <return alias="org" class="Organization"/> + SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID + </sql-query> + + + <sql-query name="employment"> + <return alias="emp" class="Employment"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} + FROM EMPLOYMENT + WHERE EMPID = ? + </sql-query> + + + <sql-query name="organizationEmployments"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT {empcol.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + + <sql-query name="organizationCurrentEmployments"> + <return alias="emp" class="Employment"> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> +  + <return-property name="endDate" column="myEndDate"/> + </return> + <synchronize table="EMPLOYMENT"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY + FROM EMPLOYMENT + WHERE EMPLOYER = :id AND ENDDATE IS NULL + ORDER BY STARTDATE ASC + </sql-query> + + <database-object> + <create> + CREATE OR REPLACE FUNCTION testParamHandling (j number, i number) + RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; + BEGIN + OPEN st_cursor FOR + SELECT j as value, i as value2 from dual; + RETURN st_cursor; + END; + </create> + <drop> + DROP FUNCTION testParamHandling + </drop> + </database-object> + + <database-object> + <create> + CREATE OR REPLACE FUNCTION simpleScalar (j number) + RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; + BEGIN + OPEN st_cursor FOR + SELECT j as value, 'getAll' as name from dual; + RETURN st_cursor; + END; + </create> + <drop> + DROP FUNCTION simpleScalar + </drop> + </database-object> + + <database-object> + <create> + CREATE OR REPLACE FUNCTION allEmployments + RETURN SYS_REFCURSOR AS st_cursor SYS_REFCURSOR; + BEGIN + OPEN st_cursor FOR + SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, + REGIONCODE, EMPID, VALUE, CURRENCY + FROM EMPLOYMENT; + RETURN st_cursor; + END; + </create> + <drop> + DROP FUNCTION allEmployments + </drop> + </database-object> + + <database-object> + <create> + CREATE OR REPLACE PROCEDURE createPerson(p_name PERSON.NAME%TYPE, p_id PERSON.PERID%TYPE) + AS + rowcount INTEGER; + BEGIN + INSERT INTO PERSON ( PERID, NAME ) VALUES ( p_id, UPPER( p_name ) ); + rowcount := SQL%ROWCOUNT; + IF rowcount = 1 THEN + NULL; + ELSE + RAISE_APPLICATION_ERROR( -20001, 'Unexpected rowcount [' || rowcount || ']' ); + END IF; + END; + </create> + <drop> + DROP PROCEDURE createPerson; + </drop> + </database-object> + +</hibernate-mapping> Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,36 @@ +//$Id$ +package org.hibernate.test.sql.hand.custom.oracle; + +import junit.framework.Test; + +import org.hibernate.dialect.DataDirectOracle9Dialect; +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.Oracle9Dialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for Oracle + * + * @author Gavin King + */ +public class OracleCustomSQLTest extends CustomStoredProcTestSupport { + + public OracleCustomSQLTest(String str) { + super(str); + } + + public String[] getMappings() { + return new String[] { "sql/hand/custom/oracle/Mappings.hbm.xml", "sql/hand/custom/oracle/StoredProcedures.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( OracleCustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof Oracle9Dialect ) && !( dialect instanceof DataDirectOracle9Dialect ); + } + +} + Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,45 @@ +<?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.sql.hand" default-access="field"> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { ? = call simpleScalar(:number) } + </sql-query> + + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { ? = call testParamHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { ? = call testParamHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="emp" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="employmentId" column="EMPID"/> + <return-property name="salary"> + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { ? = call allEmployments() } + </sql-query> + +</hibernate-mapping> Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,217 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization" table="ORGANIZATION"> + <id name="id" unsaved-value="0" column="ORGID"> + <generator class="increment"/> + </id> + <property name="name" not-null="true" column="NAME"/> + <set name="employments" + inverse="true" + order-by="DUMMY"> + <key column="EMPLOYER"/>  + <one-to-many class="Employment"/> + <loader query-ref="organizationEmployments"/> + </set> +  + <loader query-ref="organization"/> + <sql-insert>INSERT INTO ORGANIZATION (NAME, ORGID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE ORGANIZATION SET NAME=UPPER(?) WHERE ORGID=?</sql-update> + <sql-delete>DELETE FROM ORGANIZATION WHERE ORGID=?</sql-delete> + </class> + + <class name="Person" table="PERSON"> + <id name="id" unsaved-value="0" column="PERID"> + <generator class="increment"/> + </id> + <property name="name" not-null="true" column="NAME"/> + <loader query-ref="person"/> + <sql-insert>INSERT INTO PERSON (NAME, PERID) VALUES ( UPPER(?), ? )</sql-insert> + <sql-update>UPDATE PERSON SET NAME=UPPER(?) WHERE PERID=?</sql-update> + <sql-delete>DELETE FROM PERSON WHERE PERID=?</sql-delete> + </class> + + <class name="Employment" table="EMPLOYMENT"> + <id name="employmentId" unsaved-value="0" column="EMPID"> + <generator class="increment"/> + </id> + <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> + <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> + <property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/> + <property name="endDate" column="ENDDATE" insert="false"/> + <property name="regionCode" column="REGIONCODE" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + <loader query-ref="employment"/> + <sql-insert> + INSERT INTO EMPLOYMENT + (EMPLOYEE, EMPLOYER, STARTDATE, REGIONCODE, VALUE, CURRENCY, EMPID) + VALUES (?, ?, getdate(), UPPER(?), ?, ?, ?) + </sql-insert> + <sql-update>UPDATE EMPLOYMENT SET ENDDATE=?, VALUE=?, CURRENCY=? WHERE EMPID=?</sql-update> + <sql-delete>DELETE FROM EMPLOYMENT WHERE EMPID=?</sql-delete> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + <sql-query name="person"> + <return alias="p" class="Person" lock-mode="upgrade"/> + SELECT NAME AS {p.name}, PERID AS {p.id} FROM PERSON WHERE PERID=? /*FOR UPDATE*/ + </sql-query> + + <sql-query name="organization"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT {org.*}, {emp.*} + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + WHERE org.ORGID=? + </sql-query> + + +  + + <sql-query name="allOrganizationsWithEmployees" flush-mode="never"> + <return alias="org" class="Organization"/> + SELECT DISTINCT org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + INNER JOIN EMPLOYMENT e ON e.EMPLOYER = org.ORGID + </sql-query> + + + + + + <sql-query name="employment"> + <return alias="emp" class="Employment"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id} + FROM EMPLOYMENT + WHERE EMPID = ? + </sql-query> + + <sql-query name="organizationEmployments"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT {empcol.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + + <sql-query name="organizationCurrentEmployments"> + <return alias="emp" class="Employment"> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> +  + <return-property name="endDate" column="myEndDate"/> + </return> + <synchronize table="EMPLOYMENT"/> + SELECT EMPLOYEE AS {emp.employee}, EMPLOYER AS {emp.employer}, + STARTDATE AS {emp.startDate}, ENDDATE AS {emp.endDate}, + REGIONCODE as {emp.regionCode}, EMPID AS {emp.id}, VALUE, CURRENCY + FROM EMPLOYMENT + WHERE EMPLOYER = :id AND ENDDATE IS NULL + ORDER BY STARTDATE ASC + </sql-query> + + <sql-query name="simpleScalar" callable="true"> + <return-scalar column="name" type="string"/> + <return-scalar column="value" type="long"/> + { call simpleScalar(:number) } + </sql-query> + + <sql-query name="paramhandling" callable="true"> + <return-scalar column="value" type="long"/> + <return-scalar column="value2" type="long"/> + { call paramHandling(?,?) } + </sql-query> + + <sql-query name="paramhandling_mixed" callable="true"> + <return-scalar column="value" type="long" /> + <return-scalar column="value2" type="long" /> + { call paramHandling(?,:second) } + </sql-query> + + <sql-query name="selectAllEmployments" callable="true"> + <return alias="" class="Employment"> + <return-property name="employee" column="EMPLOYEE"/> + <return-property name="employer" column="EMPLOYER"/> + <return-property name="startDate" column="STARTDATE"/> + <return-property name="endDate" column="ENDDATE"/> + <return-property name="regionCode" column="REGIONCODE"/> + <return-property name="id" column="EMPID"/> + <return-property name="salary"> +  + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return> + { call selectAllEmployments() } + </sql-query> + + <database-object> + <create> + CREATE PROCEDURE selectAllEmployments AS + SELECT EMPLOYEE, EMPLOYER, STARTDATE, ENDDATE, + REGIONCODE, EMPID, VALUE, CURRENCY + FROM EMPLOYMENT + </create> + <drop> + DROP PROCEDURE selectAllEmployments + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE paramHandling @j int, @i int AS + SELECT @j as value, @i as value2 + </create> + <drop> + DROP PROCEDURE paramHandling + </drop> + </database-object> + + <database-object> + <create> + CREATE PROCEDURE simpleScalar @number int AS + SELECT @number as value, 'getAll' as name + </create> + <drop> + DROP PROCEDURE simpleScalar + </drop> + </database-object> + +</hibernate-mapping> Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,34 @@ +//$Id$ +package org.hibernate.test.sql.hand.custom.sybase; + +import junit.framework.Test; + +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.SybaseDialect; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport; + +/** + * Custom SQL tests for Sybase/SQLServer (Transact-SQL) + * + * @author Gavin King + */ +public class SybaseCustomSQLTest extends CustomStoredProcTestSupport { + + public SybaseCustomSQLTest(String str) { + super( str ); + } + + public String[] getMappings() { + return new String[] { "sql/hand/custom/sybase/Mappings.hbm.xml" }; + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( SybaseCustomSQLTest.class ); + } + + public boolean appliesTo(Dialect dialect) { + return ( dialect instanceof SybaseDialect ); + } +} + Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,50 @@ +package org.hibernate.test.sql.hand.identity; + +import junit.framework.Test; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.junit.functional.DatabaseSpecificFunctionalTestCase; +import org.hibernate.dialect.Dialect; +import org.hibernate.Session; +import org.hibernate.JDBCException; +import org.hibernate.test.sql.hand.Organization; + +/** + * Custom SQL tests for combined usage of custom insert SQL and identity columns + * + * @author Gail Badner + */ +public class CustomInsertSQLWithIdentityColumnTest extends DatabaseSpecificFunctionalTestCase { + + public CustomInsertSQLWithIdentityColumnTest(String str) { + super( str ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( CustomInsertSQLWithIdentityColumnTest.class ); + } + + public String[] getMappings() { + return new String[] {"sql/hand/identity/Mappings.hbm.xml"}; + } + + public boolean appliesTo(Dialect dialect) { + return dialect.supportsIdentityColumns(); + } + + public void testBadInsertionFails() { + Session session = openSession(); + session.beginTransaction(); + Organization org = new Organization( "hola!" ); + try { + session.save( org ); + session.delete( org ); + fail( "expecting bad custom insert statement to fail" ); + } + catch( JDBCException e ) { + // expected failure + } + + session.getTransaction().rollback(); + session.close(); + } +} Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -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.sql.hand" default-access="field"> + + <class name="Organization" table="ORGANIZATION"> + <id name="id" column="ORG_ID"> + <generator class="identity"/> + </id> + <property name="name" not-null="true"/> +  + <sql-insert>INSERT INTO PERSON WHERE x=y</sql-insert> + </class> + +</hibernate-mapping> Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,262 @@ +<?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.sql.hand" default-access="field"> + + <class name="Organization" table="ORGANIZATION"> + <id name="id" unsaved-value="0" column="ORGID"> + <generator class="increment"/> + </id> + <property name="name" column="NAME" not-null="true"/> + <set lazy="true" name="employments" + inverse="true"> + <key column="EMPLOYER"/>  + <one-to-many class="Employment"/> + </set> + </class> + + <class name="Person" table="PERSON"> + <id name="id" unsaved-value="0" column="PERID"> + <generator class="increment"/> + </id> + <property name="name" column="NAME" not-null="true"/> + + </class> + + <class name="Employment" table="EMPLOYMENT"> + <id name="employmentId" unsaved-value="0" column="EMPID"> + <generator class="increment"/> + </id> + <many-to-one name="employee" column="EMPLOYEE" not-null="true" update="false"/> + <many-to-one name="employer" column="EMPLOYER" not-null="true" update="false"/> + <property name="startDate" column="STARTDATE" not-null="false"/> + <property name="endDate" column="ENDDATE" insert="false"/> + <property name="regionCode" column="REGIONCODE" update="false"/> + <property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType"> + <column name="VALUE" sql-type="float"/> + <column name="CURRENCY"/> + </property> + </class> + + <class name="Order" table="TBL_ORDER"> + <composite-id name="orderId" class="Order$OrderId"> + <key-property name="orgid"/> + <key-property name="ordernumber"/> + </composite-id> + + <many-to-one name="product"> + <column name="PROD_ORGID"/> + <column name="PROD_NO"/> + </many-to-one> + <many-to-one name="person"/> + </class> + + <class name="Product"> + <composite-id name="productId" class="Product$ProductId"> + <key-property name="orgid"/> + <key-property name="productnumber"/> + </composite-id> + + <property name="name"/> + + <set name="orders" inverse="true"> + <key> + <column name="PROD_ORGID"/> + <column name="PROD_NO"/> + </key> + <one-to-many class="Order"/> + </set> + </class> + + <class name="Dimension"> + <id name="id" type="long"> + <generator class="increment"/> + </id> + <property name="length" column="d_len"/> + <property name="width" column="d_width"/> + </class> + + <class name="SpaceShip"> + <id name="id" type="integer"> + <generator class="increment"/> + </id> + <property name="name" column="fld_name"/> + <property name="model" column="fld_model"/> + <property name="speed" column="fld_speed"/> + <component name="dimensions"> + <property name="length" column="fld_length"/> + <property name="width" column="fld_width"/> + </component> + </class> + + <class name="Speech"> + <id name="id" type="integer"> + <generator class="increment"/> + </id> + <property name="name" column="name"/> + <property name="length" column="flength"/> + </class> + + <resultset name="org-emp-regionCode"> + <return-scalar column="regionCode" type="string"/> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="org-emp-person"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + <return-join alias="pers" property="emp.employee"/> + </resultset> + + + <resultset name="org-description"> + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + </resultset> + + <resultset name="spaceship-vol"> + <return alias="sps" class="SpaceShip"> + <return-property name="id" column="id"/> + <return-property name="name" column="name"/> + <return-property name="model" column="model"/> + <return-property name="speed" column="speed"/> + <return-property name="dimensions.length" column="length"/> + <return-property name="dimensions.width" column="width"/> + </return> + <return-scalar column="surface"/> + <return-scalar column="volume"/> + </resultset> + + <resultset name="speech"> + <return alias="sp" class="Speech"> + <return-property name="id" column="id"/> + <return-property name="name" column="name"/> + <return-property name="length" column="flength"/> + </return> + <return-scalar column="scalarName"/> + </resultset> + + <sql-query name="spaceship" resultset-ref="spaceship-vol"> + select id as id, + fld_name as name, + fld_model as model, + fld_speed as speed, + fld_length as length, + fld_width as width, + fld_length * fld_width as surface, + fld_length * fld_width *10 as volume + from SpaceShip + </sql-query> + + <sql-query name="orgNamesOnly"> + <return-scalar column="NAME" type="string"/> + SELECT org.NAME FROM ORGANIZATION org + </sql-query> + + <sql-query name="orgNamesAndOrgs"> + <return-scalar column="thename" type="string"/> + <return alias="org" class="Organization"/> + SELECT org.NAME AS thename, org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + ORDER BY thename + </sql-query> + + <sql-query name="orgsAndOrgNames"> + <return alias="org" class="Organization"/> + <return-scalar column="thename" type="string"/> + SELECT org.NAME AS thename, org.NAME AS {org.name}, org.ORGID AS {org.id} + FROM ORGANIZATION org + ORDER BY thename + </sql-query> + + <sql-query name="orgIdsAndOrgNames"> + <return-scalar column="orgid" type="long"/> + <return-scalar column="thename" type="string"/> + SELECT NAME AS thename, ORGID AS orgid + FROM ORGANIZATION + ORDER BY thename + </sql-query> + + <sql-query name="AllEmploymentAsMapped"> + <return class="Employment"/> + SELECT * FROM EMPLOYMENT + </sql-query> + + <sql-query name="EmploymentAndPerson"> + <return class="Employment"/> + <return class="Person"/> + SELECT * FROM EMPLOYMENT, PERSON + </sql-query> + + <sql-query name="organizationEmploymentsExplicitAliases"> + <load-collection alias="empcol" role="Organization.employments"/> + SELECT empcol.EMPLOYER as {empcol.key}, empcol.EMPID as {empcol.element}, {empcol.element.*} + FROM EMPLOYMENT empcol + WHERE EMPLOYER = :id + ORDER BY STARTDATE ASC, EMPLOYEE ASC + </sql-query> + + <sql-query name="organizationreturnproperty"> + <return alias="org" class="Organization"> + <return-property name="id" column="ORGID"/> + <return-property name="name" column="NAME"/> + </return> + <return-join alias="emp" property="org.employments"> + <return-property name="key" column="EMPLOYER"/> + <return-property name="element" column="EMPID"/> + <return-property name="element.employee" column="EMPLOYEE"/> + <return-property name="element.employer" column="EMPLOYER"/> + <return-property name="element.startDate" column="XSTARTDATE"/> + <return-property name="element.endDate" column="ENDDATE"/> + <return-property name="element.regionCode" column="REGIONCODE"/> + <return-property name="element.employmentId" column="EMPID"/> + <return-property name="element.salary"> + <return-column name="VALUE"/> + <return-column name="CURRENCY"/> + </return-property> + </return-join> + SELECT org.ORGID as orgid, + org.NAME as name, + emp.EMPLOYER as employer, + emp.EMPID as empid, + emp.EMPLOYEE as employee, + emp.EMPLOYER as employer, + emp.STARTDATE as xstartDate, + emp.ENDDATE as endDate, + emp.REGIONCODE as regionCode, + emp.VALUE as VALUE, + emp.CURRENCY as CURRENCY + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + </sql-query> + + + <sql-query name="organizationautodetect" resultset-ref="org-description"> +  + <return alias="org" class="Organization"/> + <return-join alias="emp" property="org.employments"/> + SELECT org.ORGID as orgid, + org.NAME as name, + emp.EMPLOYER as employer, + emp.EMPID as empid, + emp.EMPLOYEE as employee, + emp.EMPLOYER as employer, + emp.STARTDATE as startDate, + emp.ENDDATE as endDate, + emp.REGIONCODE as regionCode, + emp.VALUE as VALUE, + emp.CURRENCY as CURRENCY + FROM ORGANIZATION org + LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER + </sql-query> + +</hibernate-mapping> \ No newline at end of file Added: branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java =================================================================== --- branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java (rev 0) +++ branches/Branch_3_2/Hibernate3/test/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java 2007-05-08 21:56:00 UTC (rev 11485) @@ -0,0 +1,618 @@ +package org.hibernate.test.sql.hand.query; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import junit.framework.Test; + +import org.hibernate.Hibernate; +import org.hibernate.HibernateException; +import org.hibernate.Query; +import org.hibernate.Session; +import org.hibernate.Transaction; +import org.hibernate.test.sql.hand.Organization; +import org.hibernate.test.sql.hand.Person; +import org.hibernate.test.sql.hand.Employment; +import org.hibernate.test.sql.hand.Product; +import org.hibernate.test.sql.hand.Order; +import org.hibernate.test.sql.hand.Dimension; +import org.hibernate.test.sql.hand.SpaceShip; +import org.hibernate.test.sql.hand.Speech; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.junit.functional.FunctionalTestCase; +import org.hibernate.junit.functional.FunctionalTestClassTestSuite; +import org.hibernate.transform.DistinctRootEntityResultTransformer; +import org.hibernate.transform.Transformers; +import org.hibernate.transform.AliasToEntityMapResultTransformer; + +/** + * Tests of various features of native SQL queries. + * + * @author Steve Ebersole + */ +public class NativeSQLQueriesTest extends FunctionalTestCase { + + public NativeSQLQueriesTest(String x) { + super( x ); + } + + public String[] getMappings() { + return new String[] { "sql/hand/query/NativeSQLQueries.hbm.xml" }; + } + + public void configure(Configuration cfg) { + super.configure( cfg ); + cfg.setProperty( Environment.GENERATE_STATISTICS, "true" ); + } + + public static Test suite() { + return new FunctionalTestClassTestSuite( NativeSQLQueriesTest.class ); + } + + protected String getOrganizationFetchJoinEmploymentSQL() { + return "SELECT org.ORGID as {org.id}, " + + " org.NAME as {org.name}, " + + " emp.EMPLOYER as {emp.key}, " + + " emp.EMPID as {emp.element}, " + + " {emp.element.*} " + + "FROM ORGANIZATION org " + + " LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER"; + } + + protected String getOrganizationJoinEmploymentSQL() { + return "SELECT org.ORGID as {org.id}, " + + " org.NAME as {org.name}, " + + " {emp.*} " + + "FROM ORGANIZATION org " + + " LEFT OUTER JOIN EMPLOYMENT emp ON org.ORGID = emp.EMPLOYER"; + } + + protected String getEmploymentSQL() { + return "SELECT * FROM EMPLOYMENT"; + } + + protected String getEmploymentSQLMixedScalarEntity() { + return "SELECT e.*, e.employer as employerid FROM EMPLOYMENT e" ; + } + + protected String getOrgEmpRegionSQL() { + return "select {org.*}, {emp.*}, emp.REGIONCODE " + + "from ORGANIZATION org " + + " left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER"; + } + + protected String getOrgEmpPersonSQL() { + return "select {org.*}, {emp.*}, {pers.*} " + + "from ORGANIZATION org " + + " join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER " + + " join PERSON pers on pers.PERID = emp.EMPLOYEE "; + } + + public void testFailOnNoAddEntityOrScalar() { + // Note: this passes, but for the wrong reason. + // there is actually an exception thrown, but it is the database + // throwing a sql exception because the SQL gets passed + // "un-processed"... + Session s = openSession(); + try { + String sql = "select {org.*} " + + "from organization org"; + s.createSQLQuery( sql ).list(); + fail( "Should throw an exception since no addEntity nor addScalar has been performed." ); + } + catch( HibernateException he) { + // expected behavior + } + finally { + s.close(); + } + } + + public void testManualSynchronization() { + Session s = openSession(); + s.beginTransaction(); + + sfi().getStatistics().clear(); + + // create an Organization... + Organization jboss = new Organization( "JBoss" ); + s.persist( jboss ); + + // now query on Employment, this should not cause an auto-flush + s.createSQLQuery( getEmploymentSQL() ).list(); + assertEquals( 0, sfi().getStatistics().getEntityInsertCount() ); + + // now try to query on Employment but this time add Organization as a synchronized query space... + s.createSQLQuery( getEmploymentSQL() ).addSynchronizedEntityClass( Organization.class ).list(); + assertEquals( 1, sfi().getStatistics().getEntityInsertCount() ); + + // clean up + s.delete( jboss ); + s.getTransaction().commit(); + s.close(); + } + + public void testSQLQueryInterface() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization("IFA"); + Organization jboss = new Organization("JBoss"); + Person gavin = new Person("Gavin"); + Employment emp = new Employment(gavin, jboss, "AU"); + + s.persist(ifa); + s.persist(jboss); + s.persist(gavin); + s.persist(emp); + + List l = s.createSQLQuery( getOrgEmpRegionSQL() ) + .addEntity("org", Organization.class) + .addJoin("emp", "org.employments") + .addScalar("regionCode", Hibernate.STRING) + .list(); + assertEquals( 2, l.size() ); + + l = s.createSQLQuery( getOrgEmpPersonSQL() ) + .addEntity("org", Organization.class) + .addJoin("emp", "org.employments") + .addJoin("pers", "emp.employee") + .list(); + assertEquals( l.size(), 1 ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + l = s.createSQLQuery( "select {org.*}, {emp.*} " + + "from ORGANIZATION org " + + " left outer join EMPLOYMENT emp on org.ORGID = emp.EMPLOYER, ORGANIZATION org2" ) + .addEntity("org", Organization.class) + .addJoin("emp", "org.employments") + .setResultTransformer(new DistinctRootEntityResultTransformer()) + .list(); + assertEquals( l.size(), 2 ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + s.delete(emp); + s.delete(gavin); + s.delete(ifa); + s.delete(jboss); + + t.commit(); + s.close(); + } + + public void testResultSetMappingDefinition() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization("IFA"); + Organization jboss = new Organization("JBoss"); + Person gavin = new Person("Gavin"); + Employment emp = new Employment(gavin, jboss, "AU"); + + s.persist(ifa); + s.persist(jboss); + s.persist(gavin); + s.persist(emp); + + List l = s.createSQLQuery( getOrgEmpRegionSQL() ) + .setResultSetMapping( "org-emp-regionCode" ) + .list(); + assertEquals( l.size(), 2 ); + + l = s.createSQLQuery( getOrgEmpPersonSQL() ) + .setResultSetMapping( "org-emp-person" ) + .list(); + assertEquals( l.size(), 1 ); + + s.delete(emp); + s.delete(gavin); + s.delete(ifa); + s.delete(jboss); + + t.commit(); + s.close(); + } + + public void testScalarValues() throws Exception { + Session s = openSession(); + Transaction t = s.beginTransaction(); + + Organization ifa = new Organization( "IFA" ); + Organization jboss = new Organization( "JBoss" ); + + Serializable idIfa = s.save( ifa ); + Serializable idJBoss = s.save( jboss ); + + s.flush(); + + List result = s.getNamedQuery( "orgNamesOnly" ).list(); + assertTrue( result.contains( "IFA" ) ); + assertTrue( result.contains( "JBoss" ) ); + + result = s.getNamedQuery( "orgNamesOnly" ).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP).list(); + Map m = (Map) result.get(0); + assertEquals( 2, result.size() ); + assertEquals( 1, m.size() ); + assertTrue( m.containsKey("NAME") ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + Iterator iter = s.getNamedQuery( "orgNamesAndOrgs" ).list().iterator(); + Object[] o = ( Object[] ) iter.next(); + assertEquals( o[0], "IFA" ); + assertEquals( ( ( Organization ) o[1] ).getName(), "IFA" ); + o = ( Object[] ) iter.next(); + assertEquals( o[0], "JBoss" ); + assertEquals( ( ( Organization ) o[1] ).getName(), "JBoss" ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + // test that the ordering of the results is truly based on the order in which they were defined + iter = s.getNamedQuery( "orgsAndOrgNames" ).list().iterator(); + Object[] row = ( Object[] ) iter.next(); + assertEquals( "expecting non-scalar result first", Organization.class, row[0].getClass() ); + assertEquals( "expecting scalar result second", String.class, row[1].getClass() ); + assertEquals( ( ( Organization ) row[0] ).getName(), "IFA" ); + assertEquals( row[1], "IFA" ); + row = ( Object[] ) iter.next(); + assertEquals( "expecting non-scalar result first", Organization.class, row[0].getClass() ); + assertEquals( "expecting scalar result second", String.class, row[1].getClass() ); + assertEquals( ( ( Organization ) row[0] ).getName(), "JBoss" ); + assertEquals( row[1], "JBoss" ); + assertFalse( iter.hasNext() ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + + iter = s.getNamedQuery( "orgIdsAndOrgNames" ).list().iterator(); + o = ( Object[] ) iter.next(); + assertEquals( o[1], "IFA" ); + assertEquals( o[0], idIfa ); + o = ( Object[] ) iter.next(); + assertEquals( o[1], "JBoss" ); + assertEquals( o[0], idJBoss ); + + s.delete( ifa ); + s.delete( jboss ); + t.commit(); + s.close(); + } + + public void testMappedAliasStrategy() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization("IFA"); + Organization jboss = new Organization("JBoss"); + Person gavin = new Person("Gavin"); + Employment emp = new Employment(gavin, jboss, "AU"); + Serializable orgId = s.save(jboss); + Serializable orgId2 = s.save(ifa); + s.save(gavin); + s.save(emp); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Query namedQuery = s.getNamedQuery("AllEmploymentAsMapped"); + List list = namedQuery.list(); + assertEquals(1,list.size()); + Employment emp2 = (Employment) list.get(0); + assertEquals(emp2.getEmploymentId(), emp.getEmploymentId() ); + assertEquals(emp2.getStartDate().getDate(), emp.getStartDate().getDate() ); + assertEquals(emp2.getEndDate(), emp.getEndDate() ); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Query sqlQuery = s.getNamedQuery("EmploymentAndPerson"); + sqlQuery.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + list = sqlQuery.list(); + assertEquals(1,list.size() ); + Object res = list.get(0); + assertClassAssignability(res.getClass(),Map.class); + Map m = (Map) res; + assertEquals(2,m.size()); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + sqlQuery = s.getNamedQuery("organizationreturnproperty"); + sqlQuery.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); + list = sqlQuery.list(); + assertEquals(2,list.size() ); + m = (Map) list.get(0); + assertTrue(m.containsKey("org")); + assertClassAssignability(m.get("org").getClass(), Organization.class); + assertTrue(m.containsKey("emp")); + assertClassAssignability(m.get("emp").getClass(), Employment.class); + assertEquals(2, m.size()); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + namedQuery = s.getNamedQuery("EmploymentAndPerson"); + list = namedQuery.list(); + assertEquals(1,list.size() ); + Object[] objs = (Object[]) list.get(0); + assertEquals(2, objs.length); + emp2 = (Employment) objs[0]; + gavin = (Person) objs[1]; + s.delete(emp2); + s.delete(jboss); + s.delete(gavin); + s.delete(ifa); + t.commit(); + s.close(); + } + + /* test for native sql composite id joins which has never been implemented */ + public void testCompositeIdJoinsFailureExpected() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Person person = new Person(); + person.setName( "Noob" ); + + Product product = new Product(); + product.setProductId( new Product.ProductId() ); + product.getProductId().setOrgid( "x" ); + product.getProductId().setProductnumber( "1234" ); + product.setName( "Hibernate 3" ); + + Order order = new Order(); + order.setOrderId( new Order.OrderId() ); + order.getOrderId().setOrdernumber( "1" ); + order.getOrderId().setOrgid( "y" ); + + product.getOrders().add( order ); + order.setProduct( product ); + order.setPerson( person ); + + s.save( product ); + s.save( order); + s.save( person ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Product p = (Product) s.createQuery( "from Product p join fetch p.orders" ).list().get(0); + assertTrue(Hibernate.isInitialized( p.getOrders())); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Object[] o = (Object[]) s.createSQLQuery( "select\r\n" + + " product.orgid as {product.id.orgid}," + + " product.productnumber as {product.id.productnumber}," + + " {prod_orders}.orgid as orgid3_1_,\r\n" + + " {prod_orders}.ordernumber as ordernum2_3_1_,\r\n" + + " product.name as {product.name}," + + " {prod_orders.element.*}" + + /*" orders.PROD_NO as PROD4_3_1_,\r\n" + + " orders.person as person3_1_,\r\n" + + " orders.PROD_ORGID as PROD3_0__,\r\n" + + " orders.PROD_NO as PROD4_0__,\r\n" + + " orders.orgid as orgid0__,\r\n" + + " orders.ordernumber as ordernum2_0__ \r\n" +*/ + " from\r\n" + + " Product product \r\n" + + " inner join\r\n" + + " TBL_ORDER {prod_orders} \r\n" + + " on product.orgid={prod_orders}.PROD_ORGID \r\n" + + " and product.productnumber={prod_orders}.PROD_NO" ) + .addEntity( "product", Product.class ) + .addJoin( "prod_orders", "product.orders" ) + .list().get(0); + + p = (Product) o[0]; + assertTrue(Hibernate.isInitialized( p.getOrders() )); + assertNotNull(p.getOrders().iterator().next()); + t.commit(); + s.close(); + } + + public void testAutoDetectAliasing() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Organization ifa = new Organization("IFA"); + Organization jboss = new Organization("JBoss"); + Person gavin = new Person("Gavin"); + Employment emp = new Employment(gavin, jboss, "AU"); + Serializable orgId = s.save(jboss); + Serializable orgId2 = s.save(ifa); + s.save(gavin); + s.save(emp); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + List list = s.createSQLQuery( getEmploymentSQL() ) + .addEntity( Employment.class.getName() ) + .list(); + assertEquals( 1,list.size() ); + + Employment emp2 = (Employment) list.get(0); + assertEquals(emp2.getEmploymentId(), emp.getEmploymentId() ); + assertEquals(emp2.getStartDate().getDate(), emp.getStartDate().getDate() ); + assertEquals(emp2.getEndDate(), emp.getEndDate() ); + + s.clear(); + + list = s.createSQLQuery( getEmploymentSQL() ) + .addEntity( Employment.class.getName() ) + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP) + .list(); + assertEquals( 1,list.size() ); + Map m = (Map) list.get(0); + assertTrue(m.containsKey("Employment")); + assertEquals(1,m.size()); + + list = s.createSQLQuery(getEmploymentSQL()).list(); + assertEquals(1, list.size()); + Object[] o = (Object[]) list.get(0); + assertEquals(8, o.length); + + list = s.createSQLQuery( getEmploymentSQL() ).setResultTransformer( new UpperCasedAliasToEntityMapResultTransformer() ).list(); + assertEquals(1, list.size()); + m = (Map) list.get(0); + assertTrue(m.containsKey("EMPID")); + assertTrue(m.containsKey("VALUE")); + assertTrue(m.containsKey("ENDDATE")); + assertEquals(8, m.size()); + + list = s.createSQLQuery( getEmploymentSQLMixedScalarEntity() ).addScalar( "employerid" ).addEntity( Employment.class ).list(); + assertEquals(1, list.size()); + o = (Object[]) list.get(0); + assertEquals(2, o.length); + assertClassAssignability( o[0].getClass(), Number.class); + assertClassAssignability( o[1].getClass(), Employment.class); + + + + Query queryWithCollection = s.getNamedQuery("organizationEmploymentsExplicitAliases"); + queryWithCollection.setLong("id", jboss.getId() ); + list = queryWithCollection.list(); + assertEquals(list.size(),1); + + s.clear(); + + list = s.createSQLQuery( getOrganizationJoinEmploymentSQL() ) + .addEntity( "org", Organization.class ) + .addJoin( "emp", "org.employments" ) + .list(); + assertEquals( 2,list.size() ); + + s.clear(); + + list = s.createSQLQuery( getOrganizationFetchJoinEmploymentSQL() ) + .addEntity( "org", Organization.class ) + .addJoin( "emp", "org.employments" ) + .list(); + assertEquals( 2,list.size() ); + + s.clear(); + + // TODO : why twice? + s.getNamedQuery( "organizationreturnproperty" ).list(); + list = s.getNamedQuery( "organizationreturnproperty" ).list(); + assertEquals( 2,list.size() ); + + s.clear(); + + list = s.getNamedQuery( "organizationautodetect" ).list(); + assertEquals( 2,list.size() ); + + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + s.delete(emp2); + + s.delete(jboss); + s.delete(gavin); + s.delete(ifa); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + Dimension dim = new Dimension( 3, Integer.MAX_VALUE ); + s.save( dim ); + list = s.createSQLQuery( "select d_len * d_width as surface, d_len * d_width * 10 as volume from Dimension" ).list(); + s.delete( dim ); + t.commit(); + s.close(); + + s = openSession(); + t = s.beginTransaction(); + SpaceShip enterprise = new SpaceShip(); + enterprise.setModel( "USS" ); + enterprise.setName( "Entreprise" ); + enterprise.setSpeed( 50d ); + Dimension d = new Dimension(45, 10); + enterprise.setDimensions( d ); + s.save( enterprise ); + Object[] result = (Object[]) s.getNamedQuery( "spaceship" ).uniqueResult(); + enterprise = ( SpaceShip ) result[0]; + assertTrue(50d == enterprise.getSpeed() ); + assertTrue( 450d == extractDoubleValue( result[1] ) ); + assertTrue( 4500d == extractDoubleValue( result[2] ) ); + s.delete( enterprise ); + t.commit(); + s.close(); + + } + + public void testMixAndMatchEntityScalar() { + Session s = openSession(); + Transaction t = s.beginTransaction(); + Speech speech = new Speech(); + speech.setLength( new Double( 23d ) ); + speech.setName( "Mine" ); + s.persist( speech ); + s.flush(); + s.clear(); + + List l = s.createSQLQuery( "select name, id, flength, name as scalarName from Speech" ) + .setResultSetMapping( "speech" ) + .list(); + assertEquals( l.size(), 1 ); + + t.rollback(); + s.close(); + } + + private double extractDoubleValue(Object value) { + if ( value instanceof BigInteger ) { + return ( ( BigInteger ) value ).doubleValue(); + } + else if ( value instanceof BigDecimal ) { + return ( ( BigDecimal ) value ).doubleValue(); + } + else { + return Double.valueOf( value.toString() ).doubleValue(); + } + } + + private static class UpperCasedAliasToEntityMapResultTransformer extends AliasToEntityMapResultTransformer { + public Object transformTuple(Object[] tuple, String[] aliases) { + String[] ucAliases = new String[aliases.length]; + for ( int i = 0; i < aliases.length; i++ ) { + ucAliases[i] = aliases[i].toUpperCase(); + } + return super.transformTuple( tuple, ucAliases ); + } + } +}

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11484 - branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-05-08 17:36:50 -0400 (Tue, 08 May 2007) New Revision: 11484 Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java Log: HHH-2602 : instrumented many-to-one and aggresive release Modified: branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java =================================================================== --- branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2007-05-08 21:36:07 UTC (rev 11483) +++ branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2007-05-08 21:36:50 UTC (rev 11484) @@ -764,8 +764,7 @@ final Object entity, final SessionImplementor session, final Serializable id, - final EntityEntry entry - ) { + final EntityEntry entry) { if ( !hasLazyProperties() ) { throw new AssertionFailure("no lazy properties"); @@ -780,12 +779,13 @@ ResultSet rs = null; try { final String lazySelect = getSQLLazySelectString(); - if (lazySelect!=null) { - // null sql means the lazy properties do not map to - // columns or formulas (eg. one-to-one associations) + if ( lazySelect != null ) { + // null sql means that the only lazy properties + // are shared PK one-to-one associations which are + // handled differently in the Type#nullSafeGet code... ps = session.getBatcher().prepareSelectStatement(lazySelect); getIdentifierType().nullSafeSet( ps, id, 1, session ); - rs = ps.executeQuery(); + rs = session.getBatcher().getResultSet( ps ); rs.next(); } final Object[] snapshot = entry.getLoadedState(); @@ -795,12 +795,12 @@ result = propValue; } } + } + finally { if ( rs != null ) { - rs.close(); + session.getBatcher().closeQueryStatement( ps, rs ); } - } - finally { - if ( ps != null ) { + else if ( ps != null ) { session.getBatcher().closeStatement( ps ); } }

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11483 - trunk/Hibernate3/src/org/hibernate/persister/entity.

by hibernate-commits＠lists.jboss.org

Author: steve.ebersole(a)jboss.com Date: 2007-05-08 17:36:07 -0400 (Tue, 08 May 2007) New Revision: 11483 Modified: trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java Log: HHH-2602 : instrumented many-to-one and aggresive release Modified: trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java =================================================================== --- trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2007-05-08 14:55:29 UTC (rev 11482) +++ trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2007-05-08 21:36:07 UTC (rev 11483) @@ -764,8 +764,7 @@ final Object entity, final SessionImplementor session, final Serializable id, - final EntityEntry entry - ) { + final EntityEntry entry) { if ( !hasLazyProperties() ) { throw new AssertionFailure("no lazy properties"); @@ -780,12 +779,13 @@ ResultSet rs = null; try { final String lazySelect = getSQLLazySelectString(); - if (lazySelect!=null) { - // null sql means the lazy properties do not map to - // columns or formulas (eg. one-to-one associations) + if ( lazySelect != null ) { + // null sql means that the only lazy properties + // are shared PK one-to-one associations which are + // handled differently in the Type#nullSafeGet code... ps = session.getBatcher().prepareSelectStatement(lazySelect); getIdentifierType().nullSafeSet( ps, id, 1, session ); - rs = ps.executeQuery(); + rs = session.getBatcher().getResultSet( ps ); rs.next(); } final Object[] snapshot = entry.getLoadedState(); @@ -795,12 +795,12 @@ result = propValue; } } + } + finally { if ( rs != null ) { - rs.close(); + session.getBatcher().closeQueryStatement( ps, rs ); } - } - finally { - if ( ps != null ) { + else if ( ps != null ) { session.getBatcher().closeStatement( ps ); } }

18 years, 4 months

1
0
0 / 0

Hibernate SVN: r11482 - in trunk/HibernateExt/shards/src: java/org/hibernate/shards/criteria and 25 other directories.

by hibernate-commits＠lists.jboss.org

Author: buurzgoth Date: 2007-05-08 10:55:29 -0400 (Tue, 08 May 2007) New Revision: 11482 Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/BaseHasShardIdList.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/HasShardIdList.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardId.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddCriterionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddOrderEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CreateAliasEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactory.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactoryImpl.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaId.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheModeEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheRegionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheableEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCommentEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchModeEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchSizeEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFirstResultEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFlushModeEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetLockModeEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetMaxResultsEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetProjectionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetResultTransformerEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetTimeoutEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteria.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/BaseShardLoadBalancer.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RandomShardLoadBalancer.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancer.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/ShardLoadBalancer.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/BaseStatefulInterceptorFactory.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/DisableFilterOpenSessionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/EnableFilterOpenSessionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/OpenSessionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/RequiresSession.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetCacheModeOpenSessionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetFlushModeOpenSessionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetReadOnlyOpenSessionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetSessionOnRequiresSessionEvent.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionException.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactory.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/StatefulInterceptorFactory.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/stat/ShardedSessionStatistics.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyFactory.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyImpl.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/LoadBalancedSequentialShardAccessStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/ParallelShardAccessStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ConcatenateListsExitStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ExitStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/AllShardsShardResolutionStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/BaseShardResolutionStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/ShardResolutionStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/BaseShardSelectionStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/RoundRobinShardSelectionStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyData.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyDataImpl.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardSelectionStrategy.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Iterables.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Lists.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Maps.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Sets.java trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/StringUtil.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/AllTests.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/BaseHasShardIdListTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/InstanceShardStrategyImplTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardImplTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddCriterionEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddOrderEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CreateAliasEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaEventDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryImplTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheModeEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheRegionEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheableEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCommentEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchModeEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchSizeEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFirstResultEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFlushModeEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetLockModeEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetMaxResultsEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetProjectionEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetResultTransformerEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetTimeoutEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SubcriteriaFactoryImplTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/InterceptorDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCasePermutedIntegrationTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/DbAccessPermutedIntegrationTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatform.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatformFactory.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/hsql/HSQLDatabasePlatform.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancerTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/ShardLoadBalancerDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Building.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Elevator.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Escalator.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Floor.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Office.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Person.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Tenant.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/DisableFilterOpenSessionEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/EnableFilterOpenSessionEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/OpenSessionEventDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetCacheModeOpenSessionEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetFlushModeOpenSessionEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetReadOnlyOpenSessionEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetSessionOnRequiresSessionEventTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyFactoryDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/access/ShardAccessStrategyDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/exit/ExitStrategyDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDataDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategyTest.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/ShardSelectionStrategyDefaultMock.java trunk/HibernateExt/shards/src/test/org/hibernate/shards/util/JdbcUtil.java Log: Some random refactoring. Fix bug in ShardedSessionStatistics. Fix @author tag format. Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/BaseHasShardIdList.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/BaseHasShardIdList.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/BaseHasShardIdList.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,14 +21,14 @@ import org.hibernate.shards.util.Preconditions; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import java.util.Collections; /** * Base implementation for HasShadIdList. * Takes care of null/empty checks. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public abstract class BaseHasShardIdList implements HasShardIdList { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/HasShardIdList.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/HasShardIdList.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/HasShardIdList.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -23,7 +23,7 @@ /** * Interface for objects that can provide a List of ShardIds. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface HasShardIdList { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/Shard.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -42,7 +42,7 @@ * Anybody else have a nagging suspicion this can get folded into the Session * itself? * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) * tomislav(a)google.com (Tomislav Nad) */ public interface Shard { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardId.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardId.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardId.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ /** * Uniquely identifies a virtual shard. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardId { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/ShardImpl.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -42,7 +42,7 @@ /** * Concrete implementation of the {@link Shard} interface. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardImpl implements Shard { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddCriterionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddCriterionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddCriterionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -25,7 +25,7 @@ * Event that allows a Criterion to be lazily added to a Criteria. * @see Criteria#add(Criterion) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class AddCriterionEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddOrderEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddOrderEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/AddOrderEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,14 @@ package org.hibernate.shards.criteria; +import org.hibernate.Criteria; import org.hibernate.criterion.Order; -import org.hibernate.Criteria; /** * Event that allows an Order to be lazily added to a Criteria. * @see Criteria#addOrder(Order) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class AddOrderEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CreateAliasEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CreateAliasEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CreateAliasEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,17 +18,16 @@ package org.hibernate.shards.criteria; +import org.hibernate.Criteria; import org.hibernate.shards.session.ShardedSessionException; -import org.hibernate.Criteria; - /** * Event that allows an alias to be lazily added to a Criteria. * @see Criteria#createAlias(String, String) * @see Criteria#createAlias(String, String, int) * @see Criteria#createAlias(String, String, int) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class CreateAliasEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -29,7 +29,7 @@ * which need to be applied to the actual {@link org.hibernate.Criteria} once * the actual {@link org.hibernate.Criteria} when it is allocated. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactory.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactory.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactory.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ /** * Factory that knows how to create a {@link Criteria} for a given {@link Session} * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface CriteriaFactory { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactoryImpl.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactoryImpl.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaFactoryImpl.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,10 +18,9 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.session.ShardedSessionException; - import org.hibernate.Criteria; import org.hibernate.Session; +import org.hibernate.shards.session.ShardedSessionException; /** * Implementation of the {@link CriteriaFactory} interface. @@ -30,7 +29,7 @@ * @see Session#createCriteria(String) * @see Session#createCriteria(String, String) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class CriteriaFactoryImpl implements CriteriaFactory { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaId.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaId.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/CriteriaId.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ /** * Uniquely identifies a {@link ShardedCriteria} * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class CriteriaId { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheModeEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheModeEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheModeEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -25,7 +25,7 @@ * Event that allows the {@link CacheMode} of a {@link Criteria} to be set lazily. * @see Criteria#setCacheMode(CacheMode) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetCacheModeEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheRegionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheRegionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheRegionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ * Event that allows the cache region of a {@link Criteria} to be set lazily. * @see Criteria#setCacheRegion(String) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetCacheRegionEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheableEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheableEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCacheableEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ * Event that allows the cacheability of a {@link Criteria} to be set lazily. * @see Criteria#setCacheable(boolean) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetCacheableEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCommentEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCommentEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetCommentEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ * Event that allows the comment of a {@link Criteria} to be set lazily. * @see Criteria#setComment(String) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetCommentEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchModeEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchModeEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchModeEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,14 @@ package org.hibernate.shards.criteria; +import org.hibernate.Criteria; import org.hibernate.FetchMode; -import org.hibernate.Criteria; /** * Event that allows the {@link FetchMode} of a {@link Criteria} to be set lazily. * @see Criteria#setFetchMode(String, FetchMode) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetFetchModeEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchSizeEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchSizeEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFetchSizeEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ * Event that allows the fetch size of a {@link Criteria} to be set lazily. * @see Criteria#setFetchSize(int) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetFetchSizeEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFirstResultEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFirstResultEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFirstResultEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ * Event that allows the firstResult of a {@link Criteria} to be set lazily. * @see Criteria#setFirstResult(int) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetFirstResultEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFlushModeEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFlushModeEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetFlushModeEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,14 @@ package org.hibernate.shards.criteria; +import org.hibernate.Criteria; import org.hibernate.FlushMode; -import org.hibernate.Criteria; /** * Event that allows the {@link FlushMode} of a {@link Criteria} to be set lazily. * @see Criteria#setFlushMode(FlushMode) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetFlushModeEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetLockModeEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetLockModeEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetLockModeEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,16 +18,15 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.session.ShardedSessionException; - import org.hibernate.Criteria; import org.hibernate.LockMode; +import org.hibernate.shards.session.ShardedSessionException; /** * Event that allows the {@link LockMode} of a {@link Criteria} to be set lazily. * @see Criteria#setLockMode(LockMode) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetLockModeEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetMaxResultsEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetMaxResultsEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetMaxResultsEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ * Event that allows the maxResults of a {@link Criteria} to be set lazily. * @see Criteria#setMaxResults(int) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetMaxResultsEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetProjectionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetProjectionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetProjectionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -25,7 +25,7 @@ * Event that allows the {@link Projection} of a {@link Criteria} to be set lazily. * @see Criteria#setProjection(Projection) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetProjectionEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetResultTransformerEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetResultTransformerEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetResultTransformerEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,14 @@ package org.hibernate.shards.criteria; +import org.hibernate.Criteria; import org.hibernate.transform.ResultTransformer; -import org.hibernate.Criteria; /** * Event that allows the {@link ResultTransformer} of a {@link Criteria} to be set lazily. * @see Criteria#setResultTransformer(ResultTransformer) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetResultTransformerEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetTimeoutEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetTimeoutEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/SetTimeoutEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ * Event that allows the timeout of a {@link Criteria} to be set lazily. * @see Criteria#setTimeout(int) * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetTimeoutEvent implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteria.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteria.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteria.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ * Interface for a shard-aware {@link Criteria} implementation. * @see Criteria * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface ShardedCriteria extends Criteria { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/criteria/ShardedCriteriaImpl.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,23 +18,15 @@ package org.hibernate.shards.criteria; +import org.hibernate.*; +import org.hibernate.criterion.Criterion; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Projection; import org.hibernate.shards.Shard; import org.hibernate.shards.ShardOperation; import org.hibernate.shards.strategy.access.ShardAccessStrategy; import org.hibernate.shards.strategy.exit.ConcatenateListsExitStrategy; import org.hibernate.shards.strategy.exit.FirstNonNullResultExitStrategy; - -import org.hibernate.CacheMode; -import org.hibernate.Criteria; -import org.hibernate.FetchMode; -import org.hibernate.FlushMode; -import org.hibernate.HibernateException; -import org.hibernate.LockMode; -import org.hibernate.ScrollMode; -import org.hibernate.ScrollableResults; -import org.hibernate.criterion.Criterion; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Projection; import org.hibernate.transform.ResultTransformer; import java.util.ArrayList; @@ -44,7 +36,7 @@ /** * Concrete implementation of the {@link ShardedCriteria} interface. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardedCriteriaImpl implements ShardedCriteria { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/BaseShardLoadBalancer.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/BaseShardLoadBalancer.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/BaseShardLoadBalancer.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -26,7 +26,7 @@ /** * Helpful base class for ShardLoadBalancer implementations. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public abstract class BaseShardLoadBalancer extends BaseHasShardIdList implements ShardLoadBalancer { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RandomShardLoadBalancer.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RandomShardLoadBalancer.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RandomShardLoadBalancer.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -26,7 +26,7 @@ /** * Random selection load balancing algorithm. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class RandomShardLoadBalancer extends BaseShardLoadBalancer { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancer.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancer.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancer.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -26,7 +26,7 @@ /** * Round robin load balancing algorithm. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class RoundRobinShardLoadBalancer extends BaseShardLoadBalancer { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/ShardLoadBalancer.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/ShardLoadBalancer.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/loadbalance/ShardLoadBalancer.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ * Describes a load balance for shards. * Implementations are expected to be threadsafe. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface ShardLoadBalancer { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/BaseStatefulInterceptorFactory.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/BaseStatefulInterceptorFactory.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/BaseStatefulInterceptorFactory.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import org.hibernate.EmptyInterceptor; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public abstract class BaseStatefulInterceptorFactory extends EmptyInterceptor implements StatefulInterceptorFactory { } Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/DisableFilterOpenSessionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/DisableFilterOpenSessionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/DisableFilterOpenSessionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -23,7 +23,7 @@ /** * OpenSessionEvent which disables specified filter. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class DisableFilterOpenSessionEvent implements OpenSessionEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/EnableFilterOpenSessionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/EnableFilterOpenSessionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/EnableFilterOpenSessionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -23,7 +23,7 @@ /** * OpenSessionEvent which enables specified filter. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class EnableFilterOpenSessionEvent implements OpenSessionEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/OpenSessionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/OpenSessionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/OpenSessionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -28,7 +28,7 @@ * need to be applied to the actual {@link org.hibernate.Session} * once the actual {@link org.hibernate.Session} is allocated. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface OpenSessionEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/RequiresSession.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/RequiresSession.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/RequiresSession.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -26,7 +26,7 @@ * * @see StatefulInterceptorFactory * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface RequiresSession { void setSession(Session session); Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetCacheModeOpenSessionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetCacheModeOpenSessionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetCacheModeOpenSessionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ /** * OpenSessionEvent which sets the CacheMode. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetCacheModeOpenSessionEvent implements OpenSessionEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetFlushModeOpenSessionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetFlushModeOpenSessionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetFlushModeOpenSessionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ /** * OpenSessionEvent which sets the FlushMode. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetFlushModeOpenSessionEvent implements OpenSessionEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetReadOnlyOpenSessionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetReadOnlyOpenSessionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetReadOnlyOpenSessionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -23,7 +23,7 @@ /** * OpenSessionEvent which sets specified entity's readOnly flag. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ class SetReadOnlyOpenSessionEvent implements OpenSessionEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetSessionOnRequiresSessionEvent.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetSessionOnRequiresSessionEvent.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/SetSessionOnRequiresSessionEvent.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -23,7 +23,7 @@ /** * OpenSessionEvent which sets the provided Session on a RequiresSession. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetSessionOnRequiresSessionEvent implements OpenSessionEvent { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionException.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionException.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionException.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ /** * Main exception used in Hibernate Shards. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardedSessionException extends RuntimeException { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactory.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactory.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactory.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,21 +18,19 @@ package org.hibernate.shards.session; -import org.hibernate.shards.strategy.ShardStrategyFactory; -import org.hibernate.shards.session.ShardedSession; +import org.hibernate.HibernateException; +import org.hibernate.Interceptor; +import org.hibernate.SessionFactory; import org.hibernate.shards.ShardId; +import org.hibernate.shards.strategy.ShardStrategyFactory; -import org.hibernate.SessionFactory; -import org.hibernate.Interceptor; -import org.hibernate.HibernateException; - import java.util.List; /** * Shard-aware extension to {@link SessionFactory}. Similar to {@link SessionFactory}, * ShardedSessionFactory is threadsafe. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface ShardedSessionFactory extends SessionFactory { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionFactoryImpl.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,25 +18,9 @@ package org.hibernate.shards.session; -import org.hibernate.shards.ShardId; -import org.hibernate.shards.util.Preconditions; -import org.hibernate.shards.engine.ShardedSessionFactoryImplementor; -import org.hibernate.shards.id.GeneratorRequiringControlSessionProvider; -import org.hibernate.shards.strategy.ShardStrategy; -import org.hibernate.shards.strategy.ShardStrategyFactory; -import org.hibernate.shards.util.Iterables; -import org.hibernate.shards.util.Lists; -import org.hibernate.shards.util.Sets; -import org.hibernate.shards.util.Maps; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.ConnectionReleaseMode; -import org.hibernate.HibernateException; -import org.hibernate.Interceptor; -import org.hibernate.MappingException; -import org.hibernate.SessionFactory; -import org.hibernate.StatelessSession; +import org.hibernate.*; import org.hibernate.cache.Cache; import org.hibernate.cache.QueryCache; import org.hibernate.cache.UpdateTimestampsCache; @@ -45,12 +29,7 @@ import org.hibernate.connection.ConnectionProvider; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.SQLFunctionRegistry; -import org.hibernate.engine.FilterDefinition; -import org.hibernate.engine.NamedQueryDefinition; -import org.hibernate.engine.NamedSQLQueryDefinition; -import org.hibernate.engine.ResultSetMappingDefinition; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.SessionImplementor; +import org.hibernate.engine.*; import org.hibernate.engine.query.QueryPlanCache; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.id.IdentifierGenerator; @@ -59,11 +38,20 @@ import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.proxy.EntityNotFoundDelegate; +import org.hibernate.shards.ShardId; +import org.hibernate.shards.engine.ShardedSessionFactoryImplementor; +import org.hibernate.shards.id.GeneratorRequiringControlSessionProvider; +import org.hibernate.shards.strategy.ShardStrategy; +import org.hibernate.shards.strategy.ShardStrategyFactory; +import org.hibernate.shards.util.*; import org.hibernate.stat.Statistics; import org.hibernate.stat.StatisticsImpl; import org.hibernate.stat.StatisticsImplementor; import org.hibernate.type.Type; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.transaction.TransactionManager; import java.io.Serializable; import java.sql.Connection; import java.util.Collections; @@ -71,14 +59,10 @@ import java.util.Map; import java.util.Set; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.transaction.TransactionManager; - /** * Shard-aware implementation of {@link SessionFactory}. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardedSessionFactoryImpl implements ShardedSessionFactoryImplementor, ControlSessionProvider { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -54,7 +54,7 @@ * ShardedSession itself, to the application, and ShardedSessionImplementor, to * other components of Hibernate Shards. This class is not threadsafe. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) * tomislav(a)google.com (Tomislav Nad) */ public class ShardedSessionImpl implements ShardedSession, ShardedSessionImplementor, @@ -976,59 +976,49 @@ invokeOnShardWithObject(op, object); } - public void refresh(Object object) throws HibernateException { - List<Shard> candidateShards; - Serializable id = null; - try { - id = getIdentifier(object); - List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new - ShardResolutionStrategyDataImpl(object.getClass(), id)); - candidateShards = shardIdListToShardList(shardIds); - } catch (TransientObjectException toe) { - // detached instance - candidateShards = shards; - } - if (candidateShards.size() == 1) { - candidateShards.get(0).refresh(object); + private interface RefreshOperation { + void refresh(Shard shard, Object object); + } + + private void applyRefreshOperation(RefreshOperation op, Object object) { + ShardId shardId = getShardIdForObject(object); + if (shardId != null) { + op.refresh(shardIdsToShards.get(shardId), object); } else { - for (Shard shard : candidateShards) { - try { - shard.refresh(object); - return; - } catch (UnresolvableObjectException uoe) { - // ignore + List<Shard> candidateShards = determineShardsObjectViaResolutionStrategy(object); + if (candidateShards.size() == 1) { + op.refresh(candidateShards.get(0), object); + } else { + for (Shard shard : candidateShards) { + try { + op.refresh(shard, object); + return; + } catch (UnresolvableObjectException uoe) { + // ignore + } } + op.refresh(shards.get(0), object); } - throw new UnresolvableObjectException(id, object.getClass().getName()); } } - public void refresh(Object object, LockMode lockMode) + public void refresh(final Object object) throws HibernateException { + RefreshOperation op = new RefreshOperation() { + public void refresh(Shard shard, Object object) { + shard.refresh(object); + } + }; + applyRefreshOperation(op, object); + } + + public void refresh(final Object object, final LockMode lockMode) throws HibernateException { - List<Shard> candidateShards; - Serializable id = null; - try { - id = getIdentifier(object); - List<ShardId> shardIds = selectShardIdsFromShardResolutionStrategyData(new - ShardResolutionStrategyDataImpl(object.getClass(), id)); - candidateShards = shardIdListToShardList(shardIds); - } catch (TransientObjectException toe) { - // detached instance - candidateShards = shards; - } - if (candidateShards.size() == 1) { - candidateShards.get(0).refresh(object, lockMode); - } else { - for (Shard shard : candidateShards) { - try { - shard.refresh(object, lockMode); - return; - } catch (UnresolvableObjectException uoe) { - // ignore - } + RefreshOperation op = new RefreshOperation() { + public void refresh(Shard shard, Object object) { + shard.refresh(object, lockMode); } - throw new UnresolvableObjectException(id, object.getClass().getName()); - } + }; + applyRefreshOperation(op, object); } public LockMode getCurrentLockMode(final Object object) throws HibernateException { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/StatefulInterceptorFactory.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/StatefulInterceptorFactory.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/session/StatefulInterceptorFactory.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -30,7 +30,7 @@ * Interceptor returned by newInstance() should implement the {@link RequiresSession} * interface. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface StatefulInterceptorFactory { Interceptor newInstance(); Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/stat/ShardedSessionStatistics.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/stat/ShardedSessionStatistics.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/stat/ShardedSessionStatistics.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,12 +18,13 @@ package org.hibernate.shards.stat; +import org.hibernate.Session; import org.hibernate.shards.Shard; import org.hibernate.shards.engine.ShardedSessionImplementor; +import org.hibernate.shards.session.OpenSessionEvent; import org.hibernate.shards.util.Sets; import org.hibernate.stat.SessionStatistics; -import java.util.Collections; import java.util.Set; /** @@ -39,7 +40,16 @@ public ShardedSessionStatistics(ShardedSessionImplementor session) { sessionStatistics = Sets.newHashSet(); for (Shard s : session.getShards()) { - sessionStatistics.add(s.getSession().getStatistics()); + if (s.getSession() != null) { + sessionStatistics.add(s.getSession().getStatistics()); + } else { + OpenSessionEvent ose = new OpenSessionEvent() { + public void onOpenSession(Session session) { + sessionStatistics.add(session.getStatistics()); + } + }; + s.addOpenSessionEvent(ose); + } } } @@ -64,7 +74,7 @@ for (SessionStatistics s : sessionStatistics) { entityKeys.addAll(s.getEntityKeys()); } - return Collections.unmodifiableSet(entityKeys); + return entityKeys; } public Set getCollectionKeys() { @@ -72,6 +82,6 @@ for (SessionStatistics s : sessionStatistics) { collectionKeys.addAll(s.getCollectionKeys()); } - return Collections.unmodifiableSet(collectionKeys); + return collectionKeys; } } Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -19,11 +19,11 @@ package org.hibernate.shards.strategy; import org.hibernate.shards.strategy.access.ShardAccessStrategy; +import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy; import org.hibernate.shards.strategy.selection.ShardSelectionStrategy; -import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface ShardStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyFactory.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyFactory.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyFactory.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -23,7 +23,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface ShardStrategyFactory { ShardStrategy newShardStrategy(List<ShardId> shardIds); Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyImpl.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyImpl.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/ShardStrategyImpl.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,13 +18,13 @@ package org.hibernate.shards.strategy; -import org.hibernate.shards.strategy.selection.ShardSelectionStrategy; import org.hibernate.shards.strategy.access.ShardAccessStrategy; import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy; +import org.hibernate.shards.strategy.selection.ShardSelectionStrategy; import org.hibernate.shards.util.Preconditions; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardStrategyImpl implements ShardStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/LoadBalancedSequentialShardAccessStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/LoadBalancedSequentialShardAccessStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/LoadBalancedSequentialShardAccessStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,8 +21,8 @@ import org.hibernate.shards.Shard; import org.hibernate.shards.util.Iterables; +import java.util.List; import java.util.Random; -import java.util.List; /** * A SequentialShardAccessStrategy starts with the first Shard in the list @@ -36,7 +36,7 @@ * the shards we're rotating in advance, but the shards passed to a * ShardAccessStrategy can vary between invocations. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class LoadBalancedSequentialShardAccessStrategy extends SequentialShardAccessStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/ParallelShardAccessStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/ParallelShardAccessStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/ParallelShardAccessStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,16 +18,15 @@ package org.hibernate.shards.strategy.access; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hibernate.shards.Shard; import org.hibernate.shards.ShardOperation; -import org.hibernate.shards.util.Lists; import org.hibernate.shards.strategy.exit.ExitOperationsCollector; import org.hibernate.shards.strategy.exit.ExitStrategy; +import org.hibernate.shards.util.Lists; import org.hibernate.shards.util.Preconditions; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadPoolExecutor; @@ -36,7 +35,7 @@ * Invokes the given operation on the given shards in parallel. * TODO(maxr) Add support for rejected tasks * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ParallelShardAccessStrategy implements ShardAccessStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/access/SequentialShardAccessStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -28,7 +28,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SequentialShardAccessStrategy implements ShardAccessStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ConcatenateListsExitStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ConcatenateListsExitStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ConcatenateListsExitStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -26,7 +26,7 @@ /** * Threadsafe ExistStrategy that concatenates all the lists that are added. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ConcatenateListsExitStrategy implements ExitStrategy<List<Object>> { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ExitStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ExitStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/ExitStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -26,7 +26,7 @@ * in conjunction with ParallelShardAccessStrategy that implementation must * be threadsafe. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface ExitStrategy<T> { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/exit/FirstNonNullResultExitStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -25,7 +25,7 @@ * Threadsafe ExitStrategy implementation that only accepts the first result * added. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class FirstNonNullResultExitStrategy<T> implements ExitStrategy<T> { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/AllShardsShardResolutionStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/AllShardsShardResolutionStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/AllShardsShardResolutionStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class AllShardsShardResolutionStrategy extends BaseShardResolutionStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/BaseShardResolutionStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/BaseShardResolutionStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/BaseShardResolutionStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public abstract class BaseShardResolutionStrategy extends BaseHasShardIdList implements ShardResolutionStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/ShardResolutionStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/ShardResolutionStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/resolution/ShardResolutionStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface ShardResolutionStrategy { /** Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/BaseShardSelectionStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/BaseShardSelectionStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/BaseShardSelectionStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public abstract class BaseShardSelectionStrategy extends BaseHasShardIdList implements ShardSelectionStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -22,7 +22,7 @@ import org.hibernate.shards.loadbalance.ShardLoadBalancer; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class LoadBalancedShardSelectionStrategy implements ShardSelectionStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/RoundRobinShardSelectionStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/RoundRobinShardSelectionStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/RoundRobinShardSelectionStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -22,7 +22,7 @@ import org.hibernate.shards.loadbalance.RoundRobinShardLoadBalancer; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class RoundRobinShardSelectionStrategy implements ShardSelectionStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyData.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyData.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyData.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import java.io.Serializable; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface ShardResolutionStrategyData { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyDataImpl.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyDataImpl.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardResolutionStrategyDataImpl.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import java.io.Serializable; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardResolutionStrategyDataImpl implements ShardResolutionStrategyData { private final String entityName; Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardSelectionStrategy.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardSelectionStrategy.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/strategy/selection/ShardSelectionStrategy.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import org.hibernate.shards.ShardId; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface ShardSelectionStrategy { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Iterables.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Iterables.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Iterables.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,14 @@ package org.hibernate.shards.util; +import java.util.Collections; +import java.util.Iterator; import java.util.List; -import java.util.Iterator; -import java.util.Collections; /** * Helper methods related to {@link Iterable}s. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Iterables { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Lists.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Lists.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Lists.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -26,7 +26,7 @@ /** * Helper methods related to {@link List}s. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Lists { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Maps.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Maps.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Maps.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -25,7 +25,7 @@ /** * Helper methods related to {@link Map}s. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Maps { Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Sets.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Sets.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/Sets.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -25,7 +25,7 @@ /** * Helper methods related to {@link Set}s. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Sets { private Sets() {} Modified: trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/StringUtil.java =================================================================== --- trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/StringUtil.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/java/org/hibernate/shards/util/StringUtil.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ /** * String utilities. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class StringUtil { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/AllTests.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/AllTests.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/AllTests.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,14 +21,13 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; - import org.hibernate.shards.integration.PermutedIntegrationTests; /** * This class is really just here for IDE users who want to run their tests * directly instead of through Ant. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class AllTests extends TestSuite { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/BaseHasShardIdListTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/BaseHasShardIdListTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/BaseHasShardIdListTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -19,13 +19,12 @@ package org.hibernate.shards; import junit.framework.TestCase; - import org.hibernate.shards.util.Lists; import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class BaseHasShardIdListTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/InstanceShardStrategyImplTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/InstanceShardStrategyImplTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/InstanceShardStrategyImplTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,18 +18,17 @@ package org.hibernate.shards; +import junit.framework.TestCase; import org.hibernate.shards.strategy.ShardStrategyImpl; -import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy; -import org.hibernate.shards.strategy.resolution.ShardResolutionStrategyDefaultMock; import org.hibernate.shards.strategy.access.ShardAccessStrategy; import org.hibernate.shards.strategy.access.ShardAccessStrategyDefaultMock; +import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy; +import org.hibernate.shards.strategy.resolution.ShardResolutionStrategyDefaultMock; import org.hibernate.shards.strategy.selection.ShardSelectionStrategy; import org.hibernate.shards.strategy.selection.ShardSelectionStrategyDefaultMock; -import junit.framework.TestCase; - /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class InstanceShardStrategyImplTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -36,7 +36,7 @@ import java.util.Set; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) * tomislav(a)google.com (Tomislav Nad) */ public class ShardDefaultMock implements Shard { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardImplTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardImplTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardImplTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,37 +18,17 @@ package org.hibernate.shards; +import junit.framework.TestCase; +import org.hibernate.*; +import org.hibernate.shards.criteria.*; +import org.hibernate.shards.defaultmock.*; +import org.hibernate.shards.query.*; import org.hibernate.shards.session.OpenSessionEvent; import org.hibernate.shards.session.OpenSessionEventDefaultMock; -import org.hibernate.shards.criteria.CriteriaId; -import org.hibernate.shards.criteria.CriteriaEventDefaultMock; -import org.hibernate.shards.criteria.CriteriaEvent; -import org.hibernate.shards.criteria.CriteriaFactory; -import org.hibernate.shards.criteria.ShardedCriteriaDefaultMock; -import org.hibernate.shards.criteria.CriteriaFactoryDefaultMock; -import org.hibernate.shards.query.QueryId; -import org.hibernate.shards.query.QueryEventDefaultMock; -import org.hibernate.shards.query.QueryEvent; -import org.hibernate.shards.query.QueryFactory; -import org.hibernate.shards.query.ShardedQueryDefaultMock; -import org.hibernate.shards.query.QueryFactoryDefaultMock; -import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock; -import org.hibernate.shards.defaultmock.InterceptorDefaultMock; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; -import org.hibernate.shards.defaultmock.QueryDefaultMock; -import org.hibernate.shards.defaultmock.SessionDefaultMock; import org.hibernate.shards.util.Sets; -import junit.framework.TestCase; - -import org.hibernate.Criteria; -import org.hibernate.HibernateException; -import org.hibernate.Interceptor; -import org.hibernate.Query; -import org.hibernate.Session; - /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardImplTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/ShardedSessionFactoryDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,55 +18,43 @@ package org.hibernate.shards; -import org.hibernate.shards.engine.ShardedSessionFactoryImplementor; -import org.hibernate.shards.strategy.ShardStrategyFactory; -import org.hibernate.shards.session.ShardedSession; -import org.hibernate.shards.session.ShardedSessionFactory; - -import org.hibernate.HibernateException; -import org.hibernate.Interceptor; -import org.hibernate.StatelessSession; -import org.hibernate.SessionFactory; -import org.hibernate.MappingException; -import org.hibernate.ConnectionReleaseMode; -import org.hibernate.proxy.EntityNotFoundDelegate; -import org.hibernate.cfg.Settings; -import org.hibernate.exception.SQLExceptionConverter; +import org.hibernate.*; +import org.hibernate.cache.Cache; import org.hibernate.cache.QueryCache; import org.hibernate.cache.UpdateTimestampsCache; -import org.hibernate.cache.Cache; +import org.hibernate.cfg.Settings; +import org.hibernate.classic.Session; import org.hibernate.connection.ConnectionProvider; -import org.hibernate.type.Type; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.SQLFunctionRegistry; -import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.persister.collection.CollectionPersister; -import org.hibernate.classic.Session; -import org.hibernate.engine.FilterDefinition; -import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.engine.SessionImplementor; -import org.hibernate.engine.NamedQueryDefinition; -import org.hibernate.engine.NamedSQLQueryDefinition; -import org.hibernate.engine.ResultSetMappingDefinition; +import org.hibernate.engine.*; import org.hibernate.engine.query.QueryPlanCache; +import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.id.IdentifierGenerator; import org.hibernate.metadata.ClassMetadata; import org.hibernate.metadata.CollectionMetadata; +import org.hibernate.persister.collection.CollectionPersister; +import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.proxy.EntityNotFoundDelegate; +import org.hibernate.shards.engine.ShardedSessionFactoryImplementor; +import org.hibernate.shards.session.ShardedSession; +import org.hibernate.shards.session.ShardedSessionFactory; +import org.hibernate.shards.strategy.ShardStrategyFactory; import org.hibernate.stat.Statistics; import org.hibernate.stat.StatisticsImplementor; +import org.hibernate.type.Type; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.transaction.TransactionManager; import java.io.Serializable; import java.sql.Connection; import java.util.List; import java.util.Map; import java.util.Set; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.transaction.TransactionManager; - /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardedSessionFactoryDefaultMock implements ShardedSessionFactoryImplementor { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddCriterionEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddCriterionEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddCriterionEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.criterion.Criterion; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class AddCriterionEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddOrderEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddOrderEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/AddOrderEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.criterion.Order; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class AddOrderEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CreateAliasEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CreateAliasEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CreateAliasEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.HibernateException; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class CreateAliasEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaEventDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaEventDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaEventDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import org.hibernate.Criteria; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class CriteriaEventDefaultMock implements CriteriaEvent { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -22,7 +22,7 @@ import org.hibernate.Session; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class CriteriaFactoryDefaultMock implements CriteriaFactory { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryImplTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryImplTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/CriteriaFactoryImplTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,16 +18,14 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.SessionDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.HibernateException; import org.hibernate.Session; +import org.hibernate.shards.defaultmock.SessionDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class CriteriaFactoryImplTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheModeEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheModeEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheModeEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - -import org.hibernate.Criteria; import org.hibernate.CacheMode; +import org.hibernate.Criteria; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetCacheModeEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheRegionEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheRegionEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheRegionEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetCacheRegionEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheableEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheableEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCacheableEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetCacheableEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCommentEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCommentEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetCommentEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetCommentEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchModeEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchModeEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchModeEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,16 +18,14 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.FetchMode; import org.hibernate.HibernateException; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetFetchModeEventTest extends TestCase { public void testOnOpenSession() { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchSizeEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchSizeEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFetchSizeEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetFetchSizeEventTest extends TestCase { public void testOnOpenSession() { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFirstResultEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFirstResultEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFirstResultEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetFirstResultEventTest extends TestCase { public void testOnOpenSession() { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFlushModeEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFlushModeEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetFlushModeEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.FlushMode; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetFlushModeEventTest extends TestCase { public void testOnOpenSession() { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetLockModeEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetLockModeEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetLockModeEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.LockMode; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetLockModeEventTest extends TestCase { public void testOnOpenSession() { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetMaxResultsEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetMaxResultsEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetMaxResultsEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetMaxResultsEventTest extends TestCase { public void testOnOpenSession() { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetProjectionEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetProjectionEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetProjectionEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.criterion.Projection; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetProjectionEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetResultTransformerEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetResultTransformerEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetResultTransformerEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; import org.hibernate.transform.ResultTransformer; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetResultTransformerEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetTimeoutEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetTimeoutEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SetTimeoutEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Criteria; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetTimeoutEventTest extends TestCase { public void testOnOpenSession() { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/ShardedCriteriaDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,23 +18,16 @@ package org.hibernate.shards.criteria; -import org.hibernate.Criteria; -import org.hibernate.FetchMode; -import org.hibernate.HibernateException; -import org.hibernate.LockMode; -import org.hibernate.FlushMode; -import org.hibernate.CacheMode; -import org.hibernate.ScrollableResults; -import org.hibernate.ScrollMode; -import org.hibernate.transform.ResultTransformer; -import org.hibernate.criterion.Projection; +import org.hibernate.*; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Projection; +import org.hibernate.transform.ResultTransformer; import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardedCriteriaDefaultMock implements ShardedCriteria { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SubcriteriaFactoryImplTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SubcriteriaFactoryImplTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/criteria/SubcriteriaFactoryImplTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,16 +18,14 @@ package org.hibernate.shards.criteria; -import org.hibernate.shards.defaultmock.CriteriaDefaultMock; -import org.hibernate.shards.util.Lists; - import junit.framework.TestCase; - import org.hibernate.Criteria; import org.hibernate.HibernateException; +import org.hibernate.shards.defaultmock.CriteriaDefaultMock; +import org.hibernate.shards.util.Lists; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SubcriteriaFactoryImplTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/CriteriaDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,23 +18,16 @@ package org.hibernate.shards.defaultmock; -import org.hibernate.Criteria; -import org.hibernate.FetchMode; -import org.hibernate.HibernateException; -import org.hibernate.LockMode; -import org.hibernate.FlushMode; -import org.hibernate.CacheMode; -import org.hibernate.ScrollableResults; -import org.hibernate.ScrollMode; -import org.hibernate.transform.ResultTransformer; -import org.hibernate.criterion.Projection; +import org.hibernate.*; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Order; +import org.hibernate.criterion.Projection; +import org.hibernate.transform.ResultTransformer; import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class CriteriaDefaultMock implements Criteria { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/InterceptorDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/InterceptorDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/InterceptorDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,9 +18,9 @@ package org.hibernate.shards.defaultmock; -import org.hibernate.Interceptor; import org.hibernate.CallbackException; import org.hibernate.EntityMode; +import org.hibernate.Interceptor; import org.hibernate.Transaction; import org.hibernate.type.Type; @@ -28,7 +28,7 @@ import java.util.Iterator; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class InterceptorDefaultMock implements Interceptor { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,30 +18,19 @@ package org.hibernate.shards.defaultmock; +import org.hibernate.*; import org.hibernate.classic.Session; -import org.hibernate.HibernateException; -import org.hibernate.Query; -import org.hibernate.EntityMode; -import org.hibernate.FlushMode; -import org.hibernate.CacheMode; -import org.hibernate.SessionFactory; -import org.hibernate.LockMode; -import org.hibernate.ReplicationMode; -import org.hibernate.Transaction; -import org.hibernate.Criteria; -import org.hibernate.SQLQuery; -import org.hibernate.Filter; import org.hibernate.stat.SessionStatistics; import org.hibernate.type.Type; import java.io.Serializable; -import java.util.List; -import java.util.Iterator; -import java.util.Collection; import java.sql.Connection; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SessionDefaultMock implements Session { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/defaultmock/SessionFactoryDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,12 +18,7 @@ package org.hibernate.shards.defaultmock; -import org.hibernate.ConnectionReleaseMode; -import org.hibernate.HibernateException; -import org.hibernate.Interceptor; -import org.hibernate.MappingException; -import org.hibernate.StatelessSession; -import org.hibernate.proxy.EntityNotFoundDelegate; +import org.hibernate.*; import org.hibernate.cache.Cache; import org.hibernate.cache.QueryCache; import org.hibernate.cache.UpdateTimestampsCache; @@ -32,11 +27,7 @@ import org.hibernate.connection.ConnectionProvider; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.function.SQLFunctionRegistry; -import org.hibernate.engine.FilterDefinition; -import org.hibernate.engine.NamedQueryDefinition; -import org.hibernate.engine.NamedSQLQueryDefinition; -import org.hibernate.engine.ResultSetMappingDefinition; -import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.engine.*; import org.hibernate.engine.query.QueryPlanCache; import org.hibernate.exception.SQLExceptionConverter; import org.hibernate.id.IdentifierGenerator; @@ -44,21 +35,21 @@ import org.hibernate.metadata.CollectionMetadata; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; +import org.hibernate.proxy.EntityNotFoundDelegate; import org.hibernate.stat.Statistics; import org.hibernate.stat.StatisticsImplementor; import org.hibernate.type.Type; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.transaction.TransactionManager; import java.io.Serializable; import java.sql.Connection; import java.util.Map; import java.util.Set; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.transaction.TransactionManager; - /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SessionFactoryDefaultMock implements SessionFactoryImplementor { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -19,7 +19,6 @@ package org.hibernate.shards.integration; import junit.framework.TestCase; - import org.hibernate.Session; import org.hibernate.cfg.Configuration; import org.hibernate.shards.ShardId; @@ -54,18 +53,14 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; -import java.util.concurrent.Executors; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; /** * Base class for all sharding integration tests. * Sets up and tears down in-memory hypersonic dbs. * The rest is up to you. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public abstract class BaseShardingIntegrationTestCase extends TestCase implements HasPermutation { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCasePermutedIntegrationTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCasePermutedIntegrationTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCasePermutedIntegrationTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -25,7 +25,7 @@ * the setup for the second test would fail because the tables would already * exist. * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class BaseShardingIntegrationTestCasePermutedIntegrationTest extends BaseShardingIntegrationTestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/DbAccessPermutedIntegrationTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/DbAccessPermutedIntegrationTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/DbAccessPermutedIntegrationTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,20 +18,19 @@ package org.hibernate.shards.integration; +import org.hibernate.Session; +import org.hibernate.SessionFactory; import org.hibernate.shards.engine.ShardedSessionFactoryImplementor; import org.hibernate.shards.util.JdbcStrategy; import org.hibernate.shards.util.JdbcUtil; -import org.hibernate.Session; -import org.hibernate.SessionFactory; - import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Set; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class DbAccessPermutedIntegrationTest extends BaseShardingIntegrationTestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/model/ModelPermutedIntegrationTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -47,7 +47,7 @@ import java.util.Set; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ModelPermutedIntegrationTest extends BaseShardingIntegrationTestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatform.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatform.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatform.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import org.hibernate.shards.integration.IdGenType; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface DatabasePlatform { String getName(); Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatformFactory.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatformFactory.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/DatabasePlatformFactory.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -22,7 +22,7 @@ import org.hibernate.shards.util.StringUtil; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public interface DatabasePlatformFactory { DatabasePlatform getDatabasePlatform(); Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/hsql/HSQLDatabasePlatform.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/hsql/HSQLDatabasePlatform.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/integration/platform/hsql/HSQLDatabasePlatform.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -27,7 +27,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class HSQLDatabasePlatform extends BaseDatabasePlatform { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancerTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancerTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/RoundRobinShardLoadBalancerTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,14 @@ package org.hibernate.shards.loadbalance; +import junit.framework.TestCase; import org.hibernate.shards.ShardId; import org.hibernate.shards.util.Lists; -import junit.framework.TestCase; - import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class RoundRobinShardLoadBalancerTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/ShardLoadBalancerDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/ShardLoadBalancerDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/loadbalance/ShardLoadBalancerDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -23,7 +23,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardLoadBalancerDefaultMock implements org.hibernate.shards.loadbalance.ShardLoadBalancer { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Building.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Building.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Building.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Building { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Elevator.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Elevator.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Elevator.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -20,11 +20,11 @@ import org.hibernate.shards.util.Lists; +import java.io.Serializable; import java.util.List; -import java.io.Serializable; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Elevator { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Escalator.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Escalator.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Escalator.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import java.io.Serializable; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Escalator { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Floor.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Floor.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Floor.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -20,11 +20,11 @@ import org.hibernate.shards.util.Lists; +import java.io.Serializable; import java.util.List; -import java.io.Serializable; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Floor { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Office.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Office.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Office.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,11 +18,11 @@ package org.hibernate.shards.model; +import java.io.Serializable; import java.util.List; -import java.io.Serializable; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Office { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Person.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Person.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Person.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import java.io.Serializable; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Person { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Tenant.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Tenant.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/model/Tenant.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,11 +18,11 @@ package org.hibernate.shards.model; +import java.io.Serializable; import java.util.List; -import java.io.Serializable; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class Tenant { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/DisableFilterOpenSessionEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/DisableFilterOpenSessionEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/DisableFilterOpenSessionEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.session; -import org.hibernate.shards.defaultmock.SessionDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Session; +import org.hibernate.shards.defaultmock.SessionDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class DisableFilterOpenSessionEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/EnableFilterOpenSessionEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/EnableFilterOpenSessionEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/EnableFilterOpenSessionEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.session; -import org.hibernate.shards.defaultmock.SessionDefaultMock; - import junit.framework.TestCase; - -import org.hibernate.Session; import org.hibernate.Filter; +import org.hibernate.Session; +import org.hibernate.shards.defaultmock.SessionDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class EnableFilterOpenSessionEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/OpenSessionEventDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/OpenSessionEventDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/OpenSessionEventDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import org.hibernate.Session; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class OpenSessionEventDefaultMock implements OpenSessionEvent { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetCacheModeOpenSessionEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetCacheModeOpenSessionEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetCacheModeOpenSessionEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.session; -import org.hibernate.shards.defaultmock.SessionDefaultMock; - import junit.framework.TestCase; - import org.hibernate.CacheMode; import org.hibernate.Session; +import org.hibernate.shards.defaultmock.SessionDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetCacheModeOpenSessionEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetFlushModeOpenSessionEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetFlushModeOpenSessionEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetFlushModeOpenSessionEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,15 +18,13 @@ package org.hibernate.shards.session; -import org.hibernate.shards.defaultmock.SessionDefaultMock; - import junit.framework.TestCase; - import org.hibernate.FlushMode; import org.hibernate.Session; +import org.hibernate.shards.defaultmock.SessionDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetFlushModeOpenSessionEventTest extends TestCase { public void testOnOpenSession() { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetReadOnlyOpenSessionEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetReadOnlyOpenSessionEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetReadOnlyOpenSessionEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.session; -import org.hibernate.shards.defaultmock.SessionDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Session; +import org.hibernate.shards.defaultmock.SessionDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetReadOnlyOpenSessionEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetSessionOnRequiresSessionEventTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetSessionOnRequiresSessionEventTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/SetSessionOnRequiresSessionEventTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,14 +18,12 @@ package org.hibernate.shards.session; -import org.hibernate.shards.defaultmock.SessionDefaultMock; - import junit.framework.TestCase; - import org.hibernate.Session; +import org.hibernate.shards.defaultmock.SessionDefaultMock; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class SetSessionOnRequiresSessionEventTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionFactoryImplTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,37 +18,28 @@ package org.hibernate.shards.session; +import junit.framework.TestCase; +import org.hibernate.HibernateException; +import org.hibernate.Interceptor; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.cfg.Settings; +import org.hibernate.engine.SessionFactoryImplementor; +import org.hibernate.shards.ShardId; import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock; import org.hibernate.shards.strategy.ShardStrategy; import org.hibernate.shards.strategy.ShardStrategyDefaultMock; import org.hibernate.shards.strategy.ShardStrategyFactory; import org.hibernate.shards.strategy.ShardStrategyFactoryDefaultMock; -import org.hibernate.shards.session.ShardedSessionFactoryImpl; -import org.hibernate.shards.ShardId; import org.hibernate.shards.util.Maps; import org.hibernate.shards.util.Sets; -import org.hibernate.shards.session.ShardedSessionFactory; -import junit.framework.TestCase; - -import org.hibernate.HibernateException; -import org.hibernate.Interceptor; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.cfg.Settings; -import org.hibernate.engine.SessionFactoryImplementor; - +import javax.naming.NamingException; import java.sql.Connection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; +import java.util.*; -import javax.naming.NamingException; - /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardedSessionFactoryImplTest extends TestCase { private SessionFactoryImplementor sf; Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/session/ShardedSessionImplTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -19,18 +19,13 @@ package org.hibernate.shards.session; import junit.framework.TestCase; - import org.hibernate.EntityMode; import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.Session; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.metadata.ClassMetadata; -import org.hibernate.shards.Shard; -import org.hibernate.shards.ShardDefaultMock; -import org.hibernate.shards.ShardId; -import org.hibernate.shards.ShardImpl; -import org.hibernate.shards.ShardedSessionFactoryDefaultMock; +import org.hibernate.shards.*; import org.hibernate.shards.defaultmock.ClassMetadataDefaultMock; import org.hibernate.shards.defaultmock.InterceptorDefaultMock; import org.hibernate.shards.defaultmock.SessionFactoryDefaultMock; @@ -54,7 +49,7 @@ import java.util.Set; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardedSessionImplTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,12 +18,12 @@ package org.hibernate.shards.strategy; -import org.hibernate.shards.strategy.selection.ShardSelectionStrategy; import org.hibernate.shards.strategy.access.ShardAccessStrategy; import org.hibernate.shards.strategy.resolution.ShardResolutionStrategy; +import org.hibernate.shards.strategy.selection.ShardSelectionStrategy; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardStrategyDefaultMock implements ShardStrategy { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyFactoryDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyFactoryDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/ShardStrategyFactoryDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -23,7 +23,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardStrategyFactoryDefaultMock implements ShardStrategyFactory { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/access/ShardAccessStrategyDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/access/ShardAccessStrategyDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/access/ShardAccessStrategyDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -26,7 +26,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardAccessStrategyDefaultMock implements ShardAccessStrategy { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/exit/ExitStrategyDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/exit/ExitStrategyDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/exit/ExitStrategyDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import org.hibernate.shards.Shard; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ExitStrategyDefaultMock<T> implements ExitStrategy<T> { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDataDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDataDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDataDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -23,7 +23,7 @@ import java.io.Serializable; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardResolutionStrategyDataDefaultMock implements ShardResolutionStrategyData { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/resolution/ShardResolutionStrategyDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -24,7 +24,7 @@ import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardResolutionStrategyDefaultMock implements ShardResolutionStrategy { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategyTest.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategyTest.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/LoadBalancedShardSelectionStrategyTest.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -18,16 +18,15 @@ package org.hibernate.shards.strategy.selection; +import junit.framework.TestCase; import org.hibernate.shards.ShardId; import org.hibernate.shards.loadbalance.ShardLoadBalancer; -import junit.framework.TestCase; - import java.util.Collections; import java.util.List; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class LoadBalancedShardSelectionStrategyTest extends TestCase { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/ShardSelectionStrategyDefaultMock.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/ShardSelectionStrategyDefaultMock.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/strategy/selection/ShardSelectionStrategyDefaultMock.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,7 +21,7 @@ import org.hibernate.shards.ShardId; /** - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class ShardSelectionStrategyDefaultMock implements ShardSelectionStrategy { Modified: trunk/HibernateExt/shards/src/test/org/hibernate/shards/util/JdbcUtil.java =================================================================== --- trunk/HibernateExt/shards/src/test/org/hibernate/shards/util/JdbcUtil.java 2007-05-08 10:50:39 UTC (rev 11481) +++ trunk/HibernateExt/shards/src/test/org/hibernate/shards/util/JdbcUtil.java 2007-05-08 14:55:29 UTC (rev 11482) @@ -21,16 +21,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; +import java.sql.*; /** * Helper methods for Jdbc * - * @author Max Ross <maxr(a)google.com> + * @author maxr(a)google.com (Max Ross) */ public class JdbcUtil {

18 years, 4 months

1
0
0 / 0

← Newer
1
...
9
10
11
12
13
14
15
16
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

hibernate-commits May 2007