[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test DoubleStringType.java,1.3,1.4 FooBarTest.java,1.48,1.49 MultiTableTest.java,1.11,1.12 Qux.hbm.xml,1.6,1.7

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv13138/test

Modified Files:
	DoubleStringType.java FooBarTest.java MultiTableTest.java 
	Qux.hbm.xml 
Log Message:
added CompositeUserType
refactored handling of component path expressions
PersistentIdentifierGenerators now aware of schema

Index: DoubleStringType.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/DoubleStringType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DoubleStringType.java	5 Jan 2003 02:11:23 -0000	1.3
--- DoubleStringType.java	6 Apr 2003 02:28:58 -0000	1.4
***************
*** 7,15 ****
  import java.sql.Types;
  
  import net.sf.hibernate.Hibernate;
  import net.sf.hibernate.HibernateException;
! import net.sf.hibernate.UserType;
  
! public class DoubleStringType implements UserType {
  	
  	private static final int[] TYPES = { Types.VARCHAR, Types.VARCHAR };
--- 7,16 ----
  import java.sql.Types;
  
+ import net.sf.hibernate.CompositeUserType;
  import net.sf.hibernate.Hibernate;
  import net.sf.hibernate.HibernateException;
! import net.sf.hibernate.type.Type;
  
! public class DoubleStringType implements CompositeUserType {
  	
  	private static final int[] TYPES = { Types.VARCHAR, Types.VARCHAR };
***************
*** 58,61 ****
--- 59,82 ----
  	}
  	
+ 	public String[] getPropertyNames() {
+ 		return new String[] { "1", "2" };
+ 	}
+ 
+ 	public Type[] getPropertyTypes() {
+ 		return new Type[] { Hibernate.STRING, Hibernate.STRING };
+ 	}
+ 
+ 	public Object getPropertyValue(Object component, int property) {
+ 		return ( (String[]) component )[property];
+ 	}
+ 
+ 	public void setPropertyValue(
+ 		Object component,
+ 		int property,
+ 		Object value) {
+ 		
+ 		( (String[]) component )[property] = (String) value;
+ 	}
+ 
  }
  

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** FooBarTest.java	5 Apr 2003 07:13:38 -0000	1.48
--- FooBarTest.java	6 Apr 2003 02:28:58 -0000	1.49
***************
*** 2152,2155 ****
--- 2152,2166 ----
  		s.connection().commit();
  		s.close();
+ 
+ 		s = sessions.openSession();
+ 		foo = new Foo();
+ 		s.save(foo);
+ 		foo.setCustom( new String[] { "one", "two" } );
+ 		assertTrue( s.find("from Foo foo where foo.custom.1 = 'one'").get(0)==foo );
+ 		s.delete(foo);
+ 		s.flush();
+ 		s.connection().commit();
+ 		s.close();
+ 		
  	}
  	

Index: MultiTableTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MultiTableTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MultiTableTest.java	16 Mar 2003 03:37:01 -0000	1.11
--- MultiTableTest.java	6 Apr 2003 02:28:58 -0000	1.12
***************
*** 188,194 ****
  			s.find("from m in class Multi").size()==2
  		);
! 		/*assertTrue(
! 			s.find("from m in class Multi where m.class = Multi").size()==1
! 		);*/
  		assertTrue(
  			s.find("from s in class Simple").size()==3
--- 188,197 ----
  			s.find("from m in class Multi").size()==2
  		);
! 		assertTrue(
! 			s.find("from m in class Multi where m.class = SubMulti").size()==1
! 		);
! 		assertTrue(
! 			s.find("from m in class Simple where m.class = Multi").size()==2
! 		);
  		assertTrue(
  			s.find("from s in class Simple").size()==3

Index: Qux.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Qux.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Qux.hbm.xml	29 Mar 2003 07:36:22 -0000	1.6
--- Qux.hbm.xml	6 Apr 2003 02:28:58 -0000	1.7
***************
*** 1,5 ****
  <?xml version="1.0"?>
  <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
! <hibernate-mapping>
  	
  	<class name="net.sf.hibernate.test.Qux" table="quux" proxy="net.sf.hibernate.test.Qux"> <!---->
--- 1,5 ----
  <?xml version="1.0"?>
  <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
! <hibernate-mapping schema="dbo">
  	
  	<class name="net.sf.hibernate.test.Qux" table="quux" proxy="net.sf.hibernate.test.Qux"> <!---->