[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test FooBarTest.java,1.28,1.29 SQLFunctionsTest.java,1.5,1.6

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

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

Modified Files:
	FooBarTest.java SQLFunctionsTest.java 
Log Message:
reworked HQL, adding support for AS syntax in FROM clause
non-collection associations may now be aliased

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** FooBarTest.java	24 Feb 2003 11:53:44 -0000	1.28
--- FooBarTest.java	28 Feb 2003 07:01:28 -0000	1.29
***************
*** 262,265 ****
--- 262,268 ----
  		s.save(bar);
  		
+ 		s.find("select bar.string, foo.string from bar in class Bar, bar.baz as baz, elements(baz.fooSet) as foo where baz.name = 'name'");
+ 		s.find("select foo from bar in class Bar, bar.baz as baz, baz.fooSet as foo");
+ 		
  		assertTrue( s.find("from bar in class Bar, foo in bar.baz.fooSet.elements").size()==0 );
  		assertTrue( s.find("from bar in class Bar, foo in elements( bar.baz.fooArray )").size()==1 );
***************
*** 868,871 ****
--- 871,876 ----
  		s.find("select foo.string from foo in class Foo where foo.foo.foo = 'bar' and foo.foo.foo.foo = 'baz'");
  		s.find("select foo.string from foo in class Foo where foo.foo.foo.foo.string = 'a' and foo.foo.string = 'b'");
+ 		
+ 		s.find("from bar in class Bar, foo in elements(bar.baz.fooArray)");
  	
  		if ( dialect instanceof DB2Dialect) {

Index: SQLFunctionsTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/SQLFunctionsTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SQLFunctionsTest.java	23 Feb 2003 01:32:21 -0000	1.5
--- SQLFunctionsTest.java	28 Feb 2003 07:01:29 -0000	1.6
***************
*** 173,177 ****
  		//b.getBlob().setBytes( 2, "abc".getBytes() );
  		b.getClob().getSubString(2, 3);
! 		b.getClob().setString(2, "abc");
  		s.flush();
  		s.connection().commit();
--- 173,177 ----
  		//b.getBlob().setBytes( 2, "abc".getBytes() );
  		b.getClob().getSubString(2, 3);
! 		//b.getClob().setString(2, "abc");
  		s.flush();
  		s.connection().commit();
***************
*** 186,190 ****
  		//assertTrue( b.getClob().getSubString(1, 3).equals("fab") );
  		b.getClob().getSubString(1, 6);
! 		b.getClob().setString(1, "qwerty");
  		s.flush();
  		s.connection().commit();
--- 186,190 ----
  		//assertTrue( b.getClob().getSubString(1, 3).equals("fab") );
  		b.getClob().getSubString(1, 6);
! 		//b.getClob().setString(1, "qwerty");
  		s.flush();
  		s.connection().commit();
***************
*** 201,205 ****
  		b = (Blobber) s.load( Blobber.class, new Integer( b.getId() ) );
  		assertTrue( b.getClob().getSubString(1, 7).equals("xcvfxvc") );
! 		b.getClob().setString(5, "1234567890");
  		s.flush();
  		s.connection().commit();
--- 201,205 ----
  		b = (Blobber) s.load( Blobber.class, new Integer( b.getId() ) );
  		assertTrue( b.getClob().getSubString(1, 7).equals("xcvfxvc") );
! 		//b.getClob().setString(5, "1234567890");
  		s.flush();
  		s.connection().commit();