[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test Baz.hbm.xml,1.16,1.17 Baz.java,1.8,1.9 Fee.hbm.xml,1.6,1.7 FooBarTest.java,1.47,1.48 SQLFunctionsTest.java,1.6,1.7

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

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

Modified Files:
	Baz.hbm.xml Baz.java Fee.hbm.xml FooBarTest.java 
	SQLFunctionsTest.java 
Log Message:
added many-to-any, index-many-to-any
added update and insert attributes to component

Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Baz.hbm.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Baz.hbm.xml	4 Apr 2003 13:51:59 -0000	1.16
--- Baz.hbm.xml	5 Apr 2003 07:13:38 -0000	1.17
***************
*** 87,188 ****
  		</map>
  		
! 	<set name="stringSet" lazy="true" sort="natural">
! 		<!--<jcs-cache usage="read-write"/>-->
! 		<key column="id_" />
! 		<element column="element" type="string" not-null="true" length="32"/>
! 	</set>
! 
! 	<map name="stringDateMap" lazy="true" sort="net.sf.hibernate.test.ReverseComparator">
! 		<key column="id_" />
! 		<index column="map_key" type="string" length="32"/>
! 		<element column="map_value" type="date"/>
! 	</map>
! 
! 	<array name="fooArray" element-class="net.sf.hibernate.test.FooProxy" where="i&lt;8">
! 		<jcs-cache usage="read-write"/>
! 		<key column="id_" />
! 		<index column="i"/>
! 		<many-to-many class="net.sf.hibernate.test.Foo">
! 			<column name="foo" length="36"/>
! 		</many-to-many>
! 	</array>
! 
! 	<bag name="fooBag" lazy="true" table="baz_foo" cascade="all">
! 		<key column="baz" />
! 		<many-to-many class="net.sf.hibernate.test.Foo" column="foo" outer-join="true"/>
! 	</bag>
! 
! 	<array name="stringArray">
! 		<key column="id_" />
! 		<index column="i"/>
! 		<element column="name" type="string"/>
! 	</array>
  	
! 	<list name="fees" lazy="true" cascade="all">
! 		<key column="bazid"/>
! 		<index column="bazind"/>
! 		<one-to-many class="net.sf.hibernate.test.Fee"/>
! 	</list>
  	
! 	<list name="customs">
! 		<key column="id_"/>
! 		<index column="indx"/>
! 		<element type="net.sf.hibernate.test.DoubleStringType">
! 			<column name="first_"/>
! 			<column name="second_"/>
! 		</element>
! 	</list>
! 
! 	<list name="topComponents" table="topcomponents">
! 		<jcs-cache usage="read-write"/>
! 		<key column="id_"/>
! 		<index column="i"/>
! 		<composite-element class="net.sf.hibernate.test.FooComponent">
! 			<property name="name"/>
! 			<property name="count" column="count_"/>
! 		</composite-element>
! 	</list>
  	
! 	<set name="topFoos">
! 		<key column="idtopbar" />
! 		<one-to-many class = "net.sf.hibernate.test.Bar"/>
! 	</set>
! 
! 	<set name="cascadingBars" cascade="all">
! 		<key column="idtopbar" />
! 		<one-to-many class = "net.sf.hibernate.test.Bar"/>
! 	</set>
! 
! 	<map name="topGlarchez">
! 		<key column="idtopglarch" />
! 		<index column="mapkey" type="character"/>
! 		<one-to-many class = "net.sf.hibernate.test.Glarch"/>
! 	</map>
  	
! 	<set name="cached" sort="natural" table="cached_set">
! 		<jcs-cache usage="read-write"/>
! 		<key column="baz"/>
! 		<composite-element class="net.sf.hibernate.test.CompositeElement">
! 			<property name="foo"/>
! 			<property name="bar"/>
! 		</composite-element>
! 	</set>
! 
! 	<map name="cachedMap" sort="natural" table="cached_map">
! 		<jcs-cache usage="read-write"/>
! 		<key column="baz"/>
! 		<index-many-to-many column="another_baz" class="net.sf.hibernate.test.Baz"/>
! 		<composite-element class="net.sf.hibernate.test.CompositeElement">
! 			<property name="foo"/>
! 			<property name="bar"/>
! 		</composite-element>
! 	</map>
  	
! 	<map name="stringGlarchMap" where="baz_map_index > 'a' and tha_key is not null" cascade="all">
! 		<key column="baz_map_id"/>
! 		<index column="baz_map_index" type="string"/>
! 		<one-to-many class="net.sf.hibernate.test.Glarch"/>
! 	</map>
! 
  	</class>
  	
--- 87,200 ----
  		</map>
  		
! 		<set name="stringSet" lazy="true" sort="natural">
! 			<!--<jcs-cache usage="read-write"/>-->
! 			<key column="id_" />
! 			<element column="element" type="string" not-null="true" length="32"/>
! 		</set>
  	
! 		<map name="stringDateMap" lazy="true" sort="net.sf.hibernate.test.ReverseComparator">
! 			<key column="id_" />
! 			<index column="map_key" type="string" length="32"/>
! 			<element column="map_value" type="date"/>
! 		</map>
  	
! 		<array name="fooArray" element-class="net.sf.hibernate.test.FooProxy" where="i&lt;8">
! 			<jcs-cache usage="read-write"/>
! 			<key column="id_" />
! 			<index column="i"/>
! 			<many-to-many class="net.sf.hibernate.test.Foo">
! 				<column name="foo" length="36"/>
! 			</many-to-many>
! 		</array>
  	
! 		<bag name="fooBag" lazy="true" table="baz_foo" cascade="all">
! 			<key column="baz" />
! 			<many-to-many class="net.sf.hibernate.test.Foo" column="foo" outer-join="true"/>
! 		</bag>
  	
! 		<array name="stringArray">
! 			<key column="id_" />
! 			<index column="i"/>
! 			<element column="name" type="string"/>
! 		</array>
! 		
! 		<list name="fees" lazy="true" cascade="all">
! 			<key column="bazid"/>
! 			<index column="bazind"/>
! 			<one-to-many class="net.sf.hibernate.test.Fee"/>
! 		</list>
! 		
! 		<list name="customs">
! 			<key column="id_"/>
! 			<index column="indx"/>
! 			<element type="net.sf.hibernate.test.DoubleStringType">
! 				<column name="first_"/>
! 				<column name="second_"/>
! 			</element>
! 		</list>
  	
! 		<list name="topComponents" table="topcomponents">
! 			<jcs-cache usage="read-write"/>
! 			<key column="id_"/>
! 			<index column="i"/>
! 			<composite-element class="net.sf.hibernate.test.FooComponent">
! 				<property name="name"/>
! 				<property name="count" column="count_"/>
! 			</composite-element>
! 		</list>
! 		
! 		<set name="topFoos">
! 			<key column="idtopbar" />
! 			<one-to-many class = "net.sf.hibernate.test.Bar"/>
! 		</set>
! 	
! 		<set name="cascadingBars" cascade="all">
! 			<key column="idtopbar" />
! 			<one-to-many class = "net.sf.hibernate.test.Bar"/>
! 		</set>
! 	
! 		<map name="topGlarchez">
! 			<key column="idtopglarch" />
! 			<index column="mapkey" type="character"/>
! 			<one-to-many class = "net.sf.hibernate.test.Glarch"/>
! 		</map>
! 		
! 		<set name="cached" sort="natural" table="cached_set">
! 			<jcs-cache usage="read-write"/>
! 			<key column="baz"/>
! 			<composite-element class="net.sf.hibernate.test.CompositeElement">
! 				<property name="foo"/>
! 				<property name="bar"/>
! 			</composite-element>
! 		</set>
! 	
! 		<map name="cachedMap" sort="natural" table="cached_map">
! 			<jcs-cache usage="read-write"/>
! 			<key column="baz"/>
! 			<index-many-to-many column="another_baz" class="net.sf.hibernate.test.Baz"/>
! 			<composite-element class="net.sf.hibernate.test.CompositeElement">
! 				<property name="foo"/>
! 				<property name="bar"/>
! 			</composite-element>
! 		</map>
! 		
! 		<map name="stringGlarchMap" where="baz_map_index > 'a' and tha_key is not null" cascade="all">
! 			<key column="baz_map_id"/>
! 			<index column="baz_map_index" type="string"/>
! 			<one-to-many class="net.sf.hibernate.test.Glarch"/>
! 		</map>
! 		
! 		<map name="anyToAny" lazy="true">
! 			<key column="baz"/>
! 			<index-many-to-any id-type="long">
! 				<column name="ind_clazz_"/>
! 				<column name="ind_id_"/>
! 			</index-many-to-any>
! 			<many-to-any id-type="long">
! 				<column name="el_clazz_"/>
! 				<column name="el_id_"/>
! 			</many-to-any>
! 		</map>
! 		
  	</class>
  	

Index: Baz.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Baz.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Baz.java	21 Mar 2003 12:03:38 -0000	1.8
--- Baz.java	5 Apr 2003 07:13:38 -0000	1.9
***************
*** 41,44 ****
--- 41,45 ----
  	private Map cachedMap;
  	private Map stringGlarchMap;
+ 	private Map anyToAny;
  	
  	Baz() {}
***************
*** 322,325 ****
--- 323,342 ----
  	public void setStringGlarchMap(Map stringGlarchMap) {
  		this.stringGlarchMap = stringGlarchMap;
+ 	}
+ 
+ 	/**
+ 	 * Returns the anyToAny.
+ 	 * @return Map
+ 	 */
+ 	public Map getAnyToAny() {
+ 		return anyToAny;
+ 	}
+ 
+ 	/**
+ 	 * Sets the anyToAny.
+ 	 * @param anyToAny The anyToAny to set
+ 	 */
+ 	public void setAnyToAny(Map anyToAny) {
+ 		this.anyToAny = anyToAny;
  	}
  

Index: Fee.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fee.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Fee.hbm.xml	29 Mar 2003 07:36:22 -0000	1.6
--- Fee.hbm.xml	5 Apr 2003 07:13:38 -0000	1.7
***************
*** 16,20 ****
          	<element column="str_" type="string"/>
          </set>
!         <component name="compon">
          	<property name="name"/>
          	<property name="null" column="null_prop"/>
--- 16,20 ----
          	<element column="str_" type="string"/>
          </set>
!         <component name="compon" update="false">
          	<property name="name"/>
          	<property name="null" column="null_prop"/>

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** FooBarTest.java	4 Apr 2003 13:51:59 -0000	1.47
--- FooBarTest.java	5 Apr 2003 07:13:38 -0000	1.48
***************
*** 456,467 ****
  		
  		s.find("select max( elements(bar.baz.fooArray) ) from Bar as bar");
! 		s.find("select count(*) from Baz as baz where 1 in indices(baz.fooArray)");
! 		s.find("select count(*) from Bar as bar where 'abc' in elements(bar.baz.fooArray)");
! 		s.find("select count(*) from Bar as bar where 1 in indices(bar.baz.fooArray)");
! 		s.find("select count(*) from Bar as bar, bar.component.glarch.proxyArray as g where g.id in indices(bar.baz.fooArray)");
! 		s.find("select max( elements(bar.baz.fooArray) ) from Bar as bar, bar.component.glarch.proxyArray as g where g.id in indices(bar.baz.fooArray)");
  		
- 		s.find("select count(*) from Bar as bar where 1 in (from g in bar.component.glarch.proxyArray where g.name='foo')");
- 		s.find("select count(*) from Bar as bar left outer join bar.component.glarch.proxyArray as pg where 1 in (from g in bar.component.glarch.proxyArray)");
  		
  		s.find("select baz.name from Bar bar inner join bar.baz baz inner join baz.fooSet foo where baz.name = bar.string");
--- 456,470 ----
  		
  		s.find("select max( elements(bar.baz.fooArray) ) from Bar as bar");
! 		//The following test is disabled for databases with no subselects...also for Interbase (not sure why).
! 		if ( !(dialect instanceof MySQLDialect) && !(dialect instanceof HSQLDialect) && !(dialect instanceof MckoiDialect) && !(dialect instanceof SAPDBDialect) && !(dialect instanceof PointbaseDialect) )  {
! 			s.find("select count(*) from Baz as baz where 1 in indices(baz.fooArray)");
! 			s.find("select count(*) from Bar as bar where 'abc' in elements(bar.baz.fooArray)");
! 			s.find("select count(*) from Bar as bar where 1 in indices(bar.baz.fooArray)");
! 			s.find("select count(*) from Bar as bar, bar.component.glarch.proxyArray as g where g.id in indices(bar.baz.fooArray)");
! 			s.find("select max( elements(bar.baz.fooArray) ) from Bar as bar, bar.component.glarch.proxyArray as g where g.id in indices(bar.baz.fooArray)");
! 			s.find("select count(*) from Bar as bar where 1 in (from g in bar.component.glarch.proxyArray where g.name='foo')");
! 			s.find("select count(*) from Bar as bar left outer join bar.component.glarch.proxyArray as pg where 1 in (from g in bar.component.glarch.proxyArray)");
! 		}
  		
  		
  		s.find("select baz.name from Bar bar inner join bar.baz baz inner join baz.fooSet foo where baz.name = bar.string");
***************
*** 1919,1922 ****
--- 1922,1927 ----
  		Transaction tx = s.beginTransaction();
  		s.save(fee);
+ 		s.flush();
+ 		fee.setCount(123);
  		tx.commit();
  		s.close();
***************
*** 1929,1933 ****
  		tx = s.beginTransaction();
  		assertTrue( s.find("from fee in class Fee").size()==0 );
- 		//    	s.delete(fee);
  		tx.commit();
  		s.close();
--- 1934,1937 ----

Index: SQLFunctionsTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/SQLFunctionsTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SQLFunctionsTest.java	28 Feb 2003 07:01:29 -0000	1.6
--- SQLFunctionsTest.java	5 Apr 2003 07:13:38 -0000	1.7
***************
*** 162,165 ****
--- 162,168 ----
  	
  	public void testBlobClob() throws Exception {
+ 		
+ 		if (dialect instanceof MySQLDialect) return;
+ 		
  		Session s = sessions.openSession();
  		Blobber b = new Blobber();