hibernate-commits

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory usw-pr-cvs1:/tmp/cvs-serv10810/hibernate/test

Modified Files:
	Category.hbm.xml Nameable.hbm.xml SQLFunctionsTest.java 
Log Message:
integrated some small patches by Max Andersen

Index: Category.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Category.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Category.hbm.xml	28 Oct 2002 08:00:48 -0000	1.1
--- Category.hbm.xml	5 Nov 2002 07:09:14 -0000	1.2
***************
*** 5,9 ****
  <class name="cirrus.hibernate.test.Category" table="category">
  <id name="id">
! <generator class="sequence"/>
  </id>
  
--- 5,9 ----
  <class name="cirrus.hibernate.test.Category" table="category">
  <id name="id">
! <generator class="native"/>
  </id>
  

Index: Nameable.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Nameable.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Nameable.hbm.xml	30 Oct 2002 13:34:25 -0000	1.1
--- Nameable.hbm.xml	5 Nov 2002 07:09:14 -0000	1.2
***************
*** 4,8 ****
  
      <class name="cirrus.hibernate.test.Nameable">
!         <id name="key">
          	<generator class="native"/>
           </id>
--- 4,8 ----
  
      <class name="cirrus.hibernate.test.Nameable">
!         <id name="key_">
          	<generator class="native"/>
           </id>

Index: SQLFunctionsTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/SQLFunctionsTest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** SQLFunctionsTest.java	28 Oct 2002 13:44:49 -0000	1.29
--- SQLFunctionsTest.java	5 Nov 2002 07:09:14 -0000	1.30
***************
*** 8,11 ****
--- 8,12 ----
  import cirrus.hibernate.sql.MySQLDialect;
  import cirrus.hibernate.sql.SAPDBDialect;
+ import cirrus.hibernate.sql.SybaseDialect;
  
  import junit.framework.Test;
***************
*** 27,36 ****
  			s.find("from s in class Simple where upper( s.name ) ='SIMPLE 1'").size()==1
  		);
! 		if ( ! (dialect instanceof MySQLDialect) ) { //My SQL has a funny concatenation operator
  			assertTrue(
  				s.find("from s in class Simple where lower( s.name || ' foo' ) ='simple 1 foo'").size()==1
  			);
  		}
! 		Simple other = new Simple();
  		other.setName("Simple 2");
  		other.setCount(12);
--- 28,44 ----
  			s.find("from s in class Simple where upper( s.name ) ='SIMPLE 1'").size()==1
  		);
! 		if ( !(dialect instanceof MySQLDialect) && !(dialect instanceof SybaseDialect)) { //My SQL has a funny concatenation operator
  			assertTrue(
  				s.find("from s in class Simple where lower( s.name || ' foo' ) ='simple 1 foo'").size()==1
  			);
  		}
! 		if ( (dialect instanceof SybaseDialect)) { 
!             assertTrue(
!                 s.find("from s in class Simple where lower( s.name + ' foo' ) ='simple 1 foo'").size()==1
!             );
!         }
!         
!         
!         Simple other = new Simple();
  		other.setName("Simple 2");
  		other.setCount(12);
***************
*** 131,135 ****
  		);
  		return new TestSuite(SQLFunctionsTest.class);
! 	}
  }
  
--- 139,143 ----
  		);
  		return new TestSuite(SQLFunctionsTest.class);
! 	}
  }