hibernate-commits — CVS commits

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/hql PathExpressionParser.java,1.4,1.5 QueryTranslator.java,1.4,1.5

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

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

Modified Files:
	PathExpressionParser.java QueryTranslator.java 
Log Message:
improved a common exception message

Index: PathExpressionParser.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/PathExpressionParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PathExpressionParser.java	5 Jan 2003 02:11:21 -0000	1.4
--- PathExpressionParser.java	12 Jan 2003 15:04:51 -0000	1.5
***************
*** 372,375 ****
--- 372,377 ----
  	public void addFromCollection(QueryTranslator q, String elementName) throws QueryException {
  		
+ 		if ( collectionElementType==null ) throw new QueryException("must specify 'elements' for collection valued property in from clause: " + elementName);
+ 		
  		if ( !collectionElementType.isEntityType() ) throw new QueryException(
  			"collection of values in from clause: " + elementName

Index: QueryTranslator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/QueryTranslator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** QueryTranslator.java	5 Jan 2003 02:11:21 -0000	1.4
--- QueryTranslator.java	12 Jan 2003 15:04:51 -0000	1.5
***************
*** 152,156 ****
  		log.trace("compiling query");
  		try {
! 			ParserHelper.parse( new PreprocessingParser(replacements), queryString, ParserHelper.HQL_SEPERATORS, this );
  			renderSQL();
  		}
--- 152,161 ----
  		log.trace("compiling query");
  		try {
! 			ParserHelper.parse( 
! 				new PreprocessingParser(replacements), 
! 				queryString, 
! 				ParserHelper.HQL_SEPERATORS, 
! 				this 
! 			);
  			renderSQL();
  		}

[Hibernate-commits] Hibernate2/src hibernate.properties,1.7,1.8

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

Update of /cvsroot/hibernate/Hibernate2/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21630/src

Modified Files:
	hibernate.properties 
Log Message:
tests

Index: hibernate.properties
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/hibernate.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** hibernate.properties	12 Jan 2003 09:02:57 -0000	1.7
--- hibernate.properties	12 Jan 2003 14:45:38 -0000	1.8
***************
*** 36,54 ****
  ## DB2
  
! #hibernate.dialect net.sf.hibernate.dialect.DB2Dialect
! #hibernate.connection.driver_class COM.ibm.db2.jdbc.app.DB2Driver
! #hibernate.connection.url jdbc:db2:test
! #hibernate.connection.username db2
! #hibernate.connection.password db2
  
  
  ## MySQL
  
! hibernate.dialect net.sf.hibernate.dialect.MySQLDialect
! hibernate.connection.driver_class org.gjt.mm.mysql.Driver
! hibernate.connection.driver_class com.mysql.jdbc.Driver
! hibernate.connection.url jdbc:mysql:///test
! hibernate.connection.username mysql
! hibernate.connection.password mysql
  
  
--- 36,54 ----
  ## DB2
  
! hibernate.dialect net.sf.hibernate.dialect.DB2Dialect
! hibernate.connection.driver_class COM.ibm.db2.jdbc.app.DB2Driver
! hibernate.connection.url jdbc:db2:test
! hibernate.connection.username db2
! hibernate.connection.password db2
  
  
  ## MySQL
  
! #hibernate.dialect net.sf.hibernate.dialect.MySQLDialect
! #hibernate.connection.driver_class org.gjt.mm.mysql.Driver
! #hibernate.connection.driver_class com.mysql.jdbc.Driver
! #hibernate.connection.url jdbc:mysql:///test
! #hibernate.connection.username mysql
! #hibernate.connection.password mysql
  
  

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test FooBarTest.java,1.7,1.8 ParentChildTest.java,1.3,1.4

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

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

Modified Files:
	FooBarTest.java ParentChildTest.java 
Log Message:
tests

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FooBarTest.java	12 Jan 2003 14:22:10 -0000	1.7
--- FooBarTest.java	12 Jan 2003 14:45:38 -0000	1.8
***************
*** 165,169 ****
  		while ( iter.hasNext() ) { Object[] arr = (Object[]) iter.next(); System.out.println( arr[0] + " " + arr[1] + " " + arr[2] + " " + arr[3] ); }
  		
! 		assertTrue( s.iterate("select max(baz.timeArray.elements) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next() instanceof Time );
  		assertTrue( s.iterate("select max(baz.stringSet.elements) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next().equals("foo") );
  		assertTrue( s.iterate("select size(baz.stringSet) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next().equals( new Integer(3) ) );
--- 165,169 ----
  		while ( iter.hasNext() ) { Object[] arr = (Object[]) iter.next(); System.out.println( arr[0] + " " + arr[1] + " " + arr[2] + " " + arr[3] ); }
  		
! 		assertTrue( s.iterate("select max( elements(baz.timeArray) ) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next() instanceof Time );
  		assertTrue( s.iterate("select max(baz.stringSet.elements) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next().equals("foo") );
  		assertTrue( s.iterate("select size(baz.stringSet) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next().equals( new Integer(3) ) );

Index: ParentChildTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ParentChildTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ParentChildTest.java	5 Jan 2003 02:11:23 -0000	1.3
--- ParentChildTest.java	12 Jan 2003 14:45:38 -0000	1.4
***************
*** 46,556 ****
  		assertTrue(
  			s.find("select c from c in class Container, s in class Simple where c.oneToMany[2] = s")
! 			.size() == 1 );
  			assertTrue(
! 				s.find("select c from c in class Container, s in class Simple where c.manyToMany[2] = s")
! 				.size() == 1 );
! 				assertTrue(
! 					s.find("select c from c in class Container, s in class Simple where s = c.oneToMany[2]")
! 					.size() == 1 );
! 					assertTrue(
[...1009 lines suppressed...]
! 				"Immutable.hbm.xml",
! 				"Fee.hbm.xml",
! 				"Vetoer.hbm.xml",
! 				"Holder.hbm.xml",
! 				"ParentChild.hbm.xml",
! 				"Simple.hbm.xml",
! 				"Container.hbm.xml",
! 				"Circular.hbm.xml",
! 				"Stuff.hbm.xml"
! 			} );
! 			return new TestSuite(ParentChildTest.class);
! 		}
! 		catch (Exception e) {
! 			e.printStackTrace();
! 			throw e;
! 		}
! 	}
! }
  											
  											

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/hql PreprocessingParser.java,1.5,1.6

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

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

Modified Files:
	PreprocessingParser.java 
Log Message:
got new collection functions working correctly

Index: PreprocessingParser.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/PreprocessingParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PreprocessingParser.java	12 Jan 2003 08:21:35 -0000	1.5
--- PreprocessingParser.java	12 Jan 2003 14:22:09 -0000	1.6
***************
*** 97,101 ****
  		else {
  			String prop = (String) collectionProps.get( token.toLowerCase() );
! 			if ( prop!=null ) currentCollectionProp = prop;
  		}
  		
--- 97,104 ----
  		else {
  			String prop = (String) collectionProps.get( token.toLowerCase() );
! 			if ( prop!=null ) {
! 				currentCollectionProp = prop;
! 				return;
! 			}
  		}
  		
***************
*** 107,112 ****
  		else {
  			String doubleToken = (token.length()>1) ?
! 			lastToken + ' ' + token :
! 			lastToken + token;
  			if ( operators.contains( doubleToken.toLowerCase() ) ) {
  				parser.token(doubleToken, q);
--- 110,115 ----
  		else {
  			String doubleToken = (token.length()>1) ?
! 				lastToken + ' ' + token :
! 				lastToken + token;
  			if ( operators.contains( doubleToken.toLowerCase() ) ) {
  				parser.token(doubleToken, q);
***************
*** 135,138 ****
--- 138,143 ----
  		if (lastToken!=null) parser.token(lastToken, q);
  		parser.end(q);
+ 		lastToken=null;
+ 		currentCollectionProp=null;
  	}
  	

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test FooBarTest.java,1.6,1.7

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

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

Modified Files:
	FooBarTest.java 
Log Message:
got new collection functions working correctly

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FooBarTest.java	9 Jan 2003 12:24:51 -0000	1.6
--- FooBarTest.java	12 Jan 2003 14:22:10 -0000	1.7
***************
*** 113,121 ****
  		s.find("from fum1 in class Fum where fum1.fo.fum is not null order by fum1.fo.fum");
  		if ( !(dialect instanceof MySQLDialect) && !(dialect instanceof HSQLDialect) && !(dialect instanceof MckoiDialect) && !(dialect instanceof PointbaseDialect) ) {
! 			s.find("from fum1 in class Fum where exists fum1.friends.elements");
! 			s.find("from fum1 in class Fum where fum1.friends.size = 0");
  		}
  		s.find("select fum1.friends.elements from fum1 in class Fum");
! 		s.find("from fum1 in class Fum, fr in fum1.friends.elements");
  		s.close();
  	}
--- 113,121 ----
  		s.find("from fum1 in class Fum where fum1.fo.fum is not null order by fum1.fo.fum");
  		if ( !(dialect instanceof MySQLDialect) && !(dialect instanceof HSQLDialect) && !(dialect instanceof MckoiDialect) && !(dialect instanceof PointbaseDialect) ) {
! 			s.find("from fum1 in class Fum where exists elements(fum1.friends)");
! 			s.find("from fum1 in class Fum where size(fum1.friends) = 0");
  		}
  		s.find("select fum1.friends.elements from fum1 in class Fum");
! 		s.find("from fum1 in class Fum, fr in elements( fum1.friends )");
  		s.close();
  	}
***************
*** 144,149 ****
  		
  		if ( dialect instanceof DB2Dialect || dialect instanceof PostgreSQLDialect ) {
! 			s.iterate("select one from one in class net.sf.hibernate.test.One, many in one.manies.elements group by one order by count(many)");
! 			s.iterate("select one from one in class net.sf.hibernate.test.One, many in one.manies.elements group by one having count(many) < 5");
  		}
  		
--- 144,149 ----
  		
  		if ( dialect instanceof DB2Dialect || dialect instanceof PostgreSQLDialect ) {
! 			s.iterate("select one from one in class net.sf.hibernate.test.One, many in elements(one.manies) group by one order by count(many)");
! 			s.iterate("select one from one in class net.sf.hibernate.test.One, many in elements(one.manies) group by one having count(many) < 5");
  		}
  		
***************
*** 157,161 ****
  		List list = s.find("select baz.fooArray.elements from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING);
  		assertTrue( list.size()==2 );
! 		iter = s.iterate("select baz.fooArray.indices from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING);
  		assertTrue( iter.next().equals( new Integer(0) ) && iter.next().equals( new Integer(1) ) && !iter.hasNext() );
  		
--- 157,161 ----
  		List list = s.find("select baz.fooArray.elements from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING);
  		assertTrue( list.size()==2 );
! 		iter = s.iterate("select indices(baz.fooArray) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING);
  		assertTrue( iter.next().equals( new Integer(0) ) && iter.next().equals( new Integer(1) ) && !iter.hasNext() );
  		
***************
*** 167,171 ****
  		assertTrue( s.iterate("select max(baz.timeArray.elements) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next() instanceof Time );
  		assertTrue( s.iterate("select max(baz.stringSet.elements) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next().equals("foo") );
! 		assertTrue( s.iterate("select baz.stringSet.size from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next().equals( new Integer(3) ) );
  		//s.find("from one in class net.sf.hibernate.test.One where sum one.manies.elements =0 or 1 = min one.manies.elements");
  		s.delete(baz);
--- 167,171 ----
  		assertTrue( s.iterate("select max(baz.timeArray.elements) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next() instanceof Time );
  		assertTrue( s.iterate("select max(baz.stringSet.elements) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next().equals("foo") );
! 		assertTrue( s.iterate("select size(baz.stringSet) from baz in class Baz where baz.id=?", baz.getCode(), Hibernate.STRING).next().equals( new Integer(3) ) );
  		//s.find("from one in class net.sf.hibernate.test.One where sum one.manies.elements =0 or 1 = min one.manies.elements");
  		s.delete(baz);

[Hibernate-commits] Hibernate2 demo.sh,NONE,1.1

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

Update of /cvsroot/hibernate/Hibernate2
In directory sc8-pr-cvs1:/tmp/cvs-serv9800

Added Files:
	demo.sh 
Log Message:
shell script for demo

--- NEW FILE: demo.sh ---
#!/bin/sh
JDBC_DRIVER=/opt/pgsql/lib/postgresql-jdbc3-7.3.jar
java -cp .:$JDBC_DRIVER:./lib/commons-logging.jar:./lib/commons-collections.jar:./lib/commons-lang.jar:./lib/cglib.jar:./lib/bcel.jar:./lib/odmg.jar:./lib/jdom.jar:./lib/xml-apis.jar:./lib/xerces.jar:./lib/xalan.jar:./hibernate.jar net.sf.hibernate.eg.NetworkDemo

[Hibernate-commits] Hibernate2/src hibernate.properties,1.6,1.7

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

Update of /cvsroot/hibernate/Hibernate2/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28503/src

Modified Files:
	hibernate.properties 
Log Message:
fixed proxy deserialization

Index: hibernate.properties
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/hibernate.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** hibernate.properties	12 Jan 2003 07:07:48 -0000	1.6
--- hibernate.properties	12 Jan 2003 09:02:57 -0000	1.7
***************
*** 45,54 ****
  ## MySQL
  
! #hibernate.dialect net.sf.hibernate.dialect.MySQLDialect
! #hibernate.connection.driver_class org.gjt.mm.mysql.Driver
! #hibernate.connection.driver_class com.mysql.jdbc.Driver
! #hibernate.connection.url jdbc:mysql:///test
! #hibernate.connection.username mysql
! #hibernate.connection.password mysql
  
  
--- 45,54 ----
  ## MySQL
  
! hibernate.dialect net.sf.hibernate.dialect.MySQLDialect
! hibernate.connection.driver_class org.gjt.mm.mysql.Driver
! hibernate.connection.driver_class com.mysql.jdbc.Driver
! hibernate.connection.url jdbc:mysql:///test
! hibernate.connection.username mysql
! hibernate.connection.password mysql
  
  
***************
*** 103,114 ****
  ## MS SQL Server
  
! hibernate.dialect net.sf.hibernate.dialect.SybaseDialect
! hibernate.connection.username foo
! hibernate.connection.password bar
  
  ## JSQL Driver
  
! hibernate.connection.driver_class com.jnetdirect.jsql.JSQLDriver
! hibernate.connection.url jdbc:JSQLConnect://WL99LCX27:1433
  
  ## JTURBO Driver
--- 103,114 ----
  ## MS SQL Server
  
! #hibernate.dialect net.sf.hibernate.dialect.SybaseDialect
! #hibernate.connection.username sa
! #hibernate.connection.password
  
  ## JSQL Driver
  
! #hibernate.connection.driver_class com.jnetdirect.jsql.JSQLDriver
! #hibernate.connection.url jdbc:JSQLConnect://CO3061835-A:1433
  
  ## JTURBO Driver

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/proxy SerializableProxy.java,1.4,1.5

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

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

Modified Files:
	SerializableProxy.java 
Log Message:
fixed proxy deserialization

Index: SerializableProxy.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/proxy/SerializableProxy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SerializableProxy.java	12 Jan 2003 07:07:49 -0000	1.4
--- SerializableProxy.java	12 Jan 2003 09:02:58 -0000	1.5
***************
*** 7,12 ****
  import org.apache.commons.logging.LogFactory;
  
- import net.sf.hibernate.util.ReflectHelper;
- 
  /**
   * Serializable placeholder for <tt>CGLIB</tt> proxies
--- 7,10 ----
***************
*** 14,17 ****
--- 12,22 ----
  public final class SerializableProxy implements Serializable {
  	
+ 	
+ 	private Class persistentClass;
+ 	private Class[] interfaces;
+ 	private Serializable id;
+ 	private Class getIdentifierMethodClass;
+ 	private String getIdentifierMethodName;
+ 	
  	public SerializableProxy() {}
  	
***************
*** 20,31 ****
  		this.interfaces = interfaces;
  		this.id = id;
! 		this.getIdentifierMethod = (getIdentifierMethod==null) ? null : getIdentifierMethod.getName();
  	}
! 	
! 	private Class persistentClass;
! 	private Class[] interfaces;
! 	private Serializable id;
! 	private String getIdentifierMethod;
! 	
  	Object readResolve() {
  		try {
--- 25,32 ----
  		this.interfaces = interfaces;
  		this.id = id;
! 		getIdentifierMethodClass = getIdentifierMethod.getDeclaringClass();
! 		getIdentifierMethodName = getIdentifierMethod.getName();
  	}
! 
  	Object readResolve() {
  		try {
***************
*** 33,37 ****
  				persistentClass,
  				interfaces,
! 				(getIdentifierMethod==null) ? null : ReflectHelper.getGetter(persistentClass, getIdentifierMethod).getMethod(),
  				id,
  				null
--- 34,38 ----
  				persistentClass,
  				interfaces,
! 				getIdentifierMethodClass.getDeclaredMethod(getIdentifierMethodName, null),
  				id,
  				null

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/id NativeGenerator.java,1.3,NONE

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

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

Removed Files:
	NativeGenerator.java 
Log Message:
remove obsolete file

--- NativeGenerator.java DELETED ---

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/hql PreprocessingParser.java,1.4,1.5

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

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

Modified Files:
	PreprocessingParser.java 
Log Message:
fixed conflict with SQL function names

Index: PreprocessingParser.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/PreprocessingParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PreprocessingParser.java	12 Jan 2003 07:07:48 -0000	1.4
--- PreprocessingParser.java	12 Jan 2003 08:21:35 -0000	1.5
***************
*** 37,45 ****
  		collectionProps.put("elements", "elements");
  		collectionProps.put("indices", "indices");
! 		collectionProps.put("count", "size");
  		collectionProps.put("maxindex", "maxIndex");
  		collectionProps.put("minindex", "minIndex");
! 		collectionProps.put("max", "maxElement");
! 		collectionProps.put("min", "minElement");
  	}
  	
--- 37,45 ----
  		collectionProps.put("elements", "elements");
  		collectionProps.put("indices", "indices");
! 		collectionProps.put("size", "size");
  		collectionProps.put("maxindex", "maxIndex");
  		collectionProps.put("minindex", "minIndex");
! 		collectionProps.put("maxelement", "maxElement");
! 		collectionProps.put("minelement", "minElement");
  	}
  	
***************
*** 95,102 ****
  			}
  		}
! 		
! 		String prop = (String) collectionProps.get( token.toLowerCase() );
! 		if ( prop!=null ) {
! 			currentCollectionProp = prop;
  		}
  		
--- 95,101 ----
  			}
  		}
! 		else {
! 			String prop = (String) collectionProps.get( token.toLowerCase() );
! 			if ( prop!=null ) currentCollectionProp = prop;
  		}
  		

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/hql PreprocessingParser.java,1.3,1.4

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

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

Modified Files:
	PreprocessingParser.java 
Log Message:
added isFirst(), isLast() to ScrollableResults
fixed problem finding properties inherited by interfaces and abstract classes
support for elements(), indices(), max(), min(), count() functions

Index: PreprocessingParser.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/PreprocessingParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PreprocessingParser.java	5 Jan 2003 02:11:21 -0000	1.3
--- PreprocessingParser.java	12 Jan 2003 07:07:48 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  package net.sf.hibernate.hql;
  
+ import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Map;
***************
*** 14,17 ****
--- 15,19 ----
  	
  	private static final Set operators;
+ 	private static final Map collectionProps;
  	static {
  		operators = new HashSet();
***************
*** 31,34 ****
--- 33,45 ----
  		operators.add("not between");
  		operators.add("not exists");
+ 		
+ 		collectionProps = new HashMap();
+ 		collectionProps.put("elements", "elements");
+ 		collectionProps.put("indices", "indices");
+ 		collectionProps.put("count", "size");
+ 		collectionProps.put("maxindex", "maxIndex");
+ 		collectionProps.put("minindex", "minIndex");
+ 		collectionProps.put("max", "maxElement");
+ 		collectionProps.put("min", "minElement");
  	}
  	
***************
*** 38,41 ****
--- 49,53 ----
  	private ClauseParser parser = new ClauseParser();
  	private String lastToken;
+ 	private String currentCollectionProp;
  	
  	public PreprocessingParser(Map replacements) {
***************
*** 69,72 ****
--- 81,104 ----
  		String substoken = (String) replacements.get(token);
  		token = (substoken==null) ? token : substoken;
+ 		
+ 		//handle HQL2 collection syntax
+ 		if ( currentCollectionProp!=null ) {
+ 			if ( "(".equals(token) ) {
+ 				return;
+ 			}
+ 			else if ( ")".equals(token) ) {
+ 				currentCollectionProp=null;
+ 				return;
+ 			}
+ 			else {
+ 				token+='.'+currentCollectionProp;
+ 			}
+ 		}
+ 		
+ 		String prop = (String) collectionProps.get( token.toLowerCase() );
+ 		if ( prop!=null ) {
+ 			currentCollectionProp = prop;
+ 		}
+ 		
  		
  		//handle <=, >=, !=, is not, not between, not in

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/util ReflectHelper.java,1.3,1.4

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

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

Modified Files:
	ReflectHelper.java 
Log Message:
added isFirst(), isLast() to ScrollableResults
fixed problem finding properties inherited by interfaces and abstract classes
support for elements(), indices(), max(), min(), count() functions

Index: ReflectHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/ReflectHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReflectHelper.java	5 Jan 2003 02:11:25 -0000	1.3
--- ReflectHelper.java	12 Jan 2003 07:07:49 -0000	1.4
***************
*** 115,166 ****
  		return !OBJECT_EQUALS.equals(equals);
  	}
- 	
- 	
- 	public static Method getMethod(Class theClass, String methodName) throws PropertyNotFoundException {
- 		
- 		if (theClass==Object.class || theClass==null) throw new PropertyNotFoundException( "Could not find a setter" ); // will be swallowed
- 		
- 		Method result;
- 		try {
- 			result = theClass.getDeclaredMethod(methodName, null);
- 		}
- 		catch (Exception e) {
- 			try {
- 				return getMethod( theClass.getSuperclass(), methodName );
- 			}
- 			catch (PropertyNotFoundException me) {
- 				throw new PropertyNotFoundException( "Could not find method " + methodName + " in class " + theClass.getName() );
- 			}
- 		}
  		
! 		if ( !ReflectHelper.isPublic(theClass, result) ) result.setAccessible(true);
  		return result;
- 		
  	}
  	
! 	public static Setter getSetter(Class theClass, String propertyName) throws PropertyNotFoundException {
  		
! 		if (theClass==Object.class || theClass==null) throw new PropertyNotFoundException( "Could not find a setter" ); // will be swallowed
  		
! 		Method result = setter(theClass, propertyName);
  		
! 		if(result==null) {
! 			try {
! 				return getSetter( theClass.getSuperclass(), propertyName );
! 			}
! 			catch (PropertyNotFoundException me) {
! 				throw new PropertyNotFoundException( "Could not find a setter for " + propertyName + " in class " + theClass.getName() );
! 			}
  		}
  		else {
! 			if ( !ReflectHelper.isPublic(theClass, result) ) result.setAccessible(true);
! 			return new Setter(theClass, result, propertyName);
  		}
  		
  	}
  	
! 	private static Method setter(Class theClass, String propertyName) throws PropertyNotFoundException {
  		
! 		Class returnType = getGetter(theClass, propertyName).getReturnType();
  		
  		Method[] methods = theClass.getDeclaredMethods();
--- 115,151 ----
  		return !OBJECT_EQUALS.equals(equals);
  	}
  		
! 	public static Setter getSetter(Class theClass, String propertyName) throws PropertyNotFoundException {
! 		Setter result = getSetterOrNull(theClass, propertyName);
! 		if (result==null) throw new PropertyNotFoundException( "Could not find a setter for property " + propertyName + " in class " + theClass.getName() );
  		return result;
  	}
  	
! 	private static Setter getSetterOrNull(Class theClass, String propertyName) {
  		
! 		if (theClass==Object.class || theClass==null) return null;
  		
! 		Method method = setterMethod(theClass, propertyName);
  		
! 		if(method!=null) {
! 			if ( !ReflectHelper.isPublic(theClass, method) ) method.setAccessible(true);
! 			return new Setter(theClass, method, propertyName);
  		}
  		else {
! 			Setter setter = getSetterOrNull( theClass.getSuperclass(), propertyName );
! 			if (setter==null) {
! 				Class[] interfaces = theClass.getInterfaces();
! 				for ( int i=0; setter==null && i<interfaces.length; i++ ) {
! 					setter=getSetterOrNull( interfaces[i], propertyName );
! 				}
! 			}
! 			return setter;
  		}
  		
  	}
  	
! 	private static Method setterMethod(Class theClass, String propertyName) {
  		
! 		Class returnType = getGetterOrNull(theClass, propertyName).getReturnType();
  		
  		Method[] methods = theClass.getDeclaredMethods();
***************
*** 178,182 ****
  				) {
  					potentialSetter = methods[i];
! 					if ( methods[i].getParameterTypes()[0].equals(returnType) ) return potentialSetter;
  				}
  			}
--- 163,167 ----
  				) {
  					potentialSetter = methods[i];
! 					if ( returnType==null || methods[i].getParameterTypes()[0].equals(returnType) ) return potentialSetter;
  				}
  			}
***************
*** 186,209 ****
  	
  	public static Getter getGetter(Class theClass, String propertyName) throws PropertyNotFoundException {
  		
! 		if (theClass==Object.class || theClass==null) throw new PropertyNotFoundException( "Could not find a getter" ); // will be swallowed
  		
! 		Method result = getter(theClass, propertyName);
  		
! 		if(result==null) {
! 			try {
! 				return getGetter( theClass.getSuperclass(), propertyName );
! 			}
! 			catch (PropertyNotFoundException me) {
! 				throw new PropertyNotFoundException( "Could not find a getter for " + propertyName + " in class " + theClass.getName() );
! 			}
  		}
  		else {
! 			if ( !ReflectHelper.isPublic(theClass, result) ) result.setAccessible(true);
! 			return new Getter(theClass, result, propertyName);
  		}
  	}
  	
! 	private static Method getter(Class theClass, String propertyName) {
  		
  		Method[] methods = theClass.getDeclaredMethods();
--- 171,203 ----
  	
  	public static Getter getGetter(Class theClass, String propertyName) throws PropertyNotFoundException {
+ 		Getter result = getGetterOrNull(theClass, propertyName);
+ 		if (result==null) throw new PropertyNotFoundException( "Could not find a getter for " + propertyName + " in class " + theClass.getName() );
+ 		return result;
  		
! 	}
! 	
! 	private static Getter getGetterOrNull(Class theClass, String propertyName) {
  		
! 		if (theClass==Object.class || theClass==null) return null;
  		
! 		Method method = getterMethod(theClass, propertyName);
! 		
! 		if(method!=null) {
! 			if ( !ReflectHelper.isPublic(theClass, method) ) method.setAccessible(true);
! 			return new Getter(theClass, method, propertyName);
  		}
  		else {
! 			Getter getter = getGetterOrNull( theClass.getSuperclass(), propertyName );
! 			if (getter==null) {
! 				Class[] interfaces = theClass.getInterfaces();
! 				for ( int i=0; getter==null && i<interfaces.length; i++ ) {
! 					getter=getGetterOrNull( interfaces[i], propertyName );
! 				}
! 			}
! 			return getter;
  		}
  	}
  	
! 	private static Method getterMethod(Class theClass, String propertyName) {
  		
  		Method[] methods = theClass.getDeclaredMethods();

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl ScrollableResultsImpl.java,1.3,1.4

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

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

Modified Files:
	ScrollableResultsImpl.java 
Log Message:
added isFirst(), isLast() to ScrollableResults
fixed problem finding properties inherited by interfaces and abstract classes
support for elements(), indices(), max(), min(), count() functions

Index: ScrollableResultsImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/ScrollableResultsImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScrollableResultsImpl.java	5 Jan 2003 02:11:21 -0000	1.3
--- ScrollableResultsImpl.java	12 Jan 2003 07:07:49 -0000	1.4
***************
*** 252,255 ****
--- 252,269 ----
  	}
  	
+ 	/**
+ 	 * @see net.sf.hibernate.ScrollableResults#isFirst()
+ 	 */
+ 	public boolean isFirst() throws SQLException, HibernateException {
+ 		return rs.isFirst();
+ 	}
+ 
+ 	/**
+ 	 * @see net.sf.hibernate.ScrollableResults#isLast()
+ 	 */
+ 	public boolean isLast() throws SQLException, HibernateException {
+ 		return rs.isLast();
+ 	}
+ 
  }
  

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/proxy SerializableProxy.java,1.3,1.4

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

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

Modified Files:
	SerializableProxy.java 
Log Message:
added isFirst(), isLast() to ScrollableResults
fixed problem finding properties inherited by interfaces and abstract classes
support for elements(), indices(), max(), min(), count() functions

Index: SerializableProxy.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/proxy/SerializableProxy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SerializableProxy.java	5 Jan 2003 02:11:22 -0000	1.3
--- SerializableProxy.java	12 Jan 2003 07:07:49 -0000	1.4
***************
*** 33,37 ****
  				persistentClass,
  				interfaces,
! 				(getIdentifierMethod==null) ? null : ReflectHelper.getMethod(persistentClass, getIdentifierMethod),
  				id,
  				null
--- 33,37 ----
  				persistentClass,
  				interfaces,
! 				(getIdentifierMethod==null) ? null : ReflectHelper.getGetter(persistentClass, getIdentifierMethod).getMethod(),
  				id,
  				null

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/connection ConnectionProviderFactory.java,1.3,1.4

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

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

Modified Files:
	ConnectionProviderFactory.java 
Log Message:
added isFirst(), isLast() to ScrollableResults
fixed problem finding properties inherited by interfaces and abstract classes
support for elements(), indices(), max(), min(), count() functions

Index: ConnectionProviderFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/connection/ConnectionProviderFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConnectionProviderFactory.java	5 Jan 2003 02:11:20 -0000	1.3
--- ConnectionProviderFactory.java	12 Jan 2003 07:07:48 -0000	1.4
***************
*** 105,109 ****
  			}
  		}
! 		result.setProperty( "user", properties.getProperty(Environment.USER) );
  		return result;
  	}
--- 105,110 ----
  			}
  		}
! 		String userName = properties.getProperty(Environment.USER);
! 		if (userName!=null) result.setProperty( "user", userName );
  		return result;
  	}

[Hibernate-commits] Hibernate2/src hibernate.properties,1.5,1.6

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

Update of /cvsroot/hibernate/Hibernate2/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5675/src

Modified Files:
	hibernate.properties 
Log Message:
added isFirst(), isLast() to ScrollableResults
fixed problem finding properties inherited by interfaces and abstract classes
support for elements(), indices(), max(), min(), count() functions

Index: hibernate.properties
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/hibernate.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** hibernate.properties	9 Jan 2003 15:15:34 -0000	1.5
--- hibernate.properties	12 Jan 2003 07:07:48 -0000	1.6
***************
*** 55,63 ****
  ## Oracle
  
! hibernate.dialect net.sf.hibernate.dialect.OracleDialect
! hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
! hibernate.connection.username ora
! hibernate.connection.password ora
! hibernate.connection.url jdbc:oracle:thin:@localhost:1521:test
  
  
--- 55,63 ----
  ## Oracle
  
! #hibernate.dialect net.sf.hibernate.dialect.OracleDialect
! #hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
! #hibernate.connection.username ora
! #hibernate.connection.password ora
! #hibernate.connection.url jdbc:oracle:thin:@localhost:1521:test
  
  
***************
*** 103,114 ****
  ## MS SQL Server
  
! #hibernate.dialect net.sf.hibernate.dialect.SybaseDialect
! #hibernate.connection.username sa
! #hibernate.connection.password
  
  ## JSQL Driver
  
! #hibernate.connection.driver_class com.jnetdirect.jsql.JSQLDriver
! #hibernate.connection.url jdbc:JSQLConnect://CO3061835-A:1433
  
  ## JTURBO Driver
--- 103,114 ----
  ## MS SQL Server
  
! hibernate.dialect net.sf.hibernate.dialect.SybaseDialect
! hibernate.connection.username foo
! hibernate.connection.password bar
  
  ## JSQL Driver
  
! hibernate.connection.driver_class com.jnetdirect.jsql.JSQLDriver
! hibernate.connection.url jdbc:JSQLConnect://WL99LCX27:1433
  
  ## JTURBO Driver

[Hibernate-commits] Hibernate2/src/net/sf/hibernate ScrollableResults.java,1.3,1.4

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

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

Modified Files:
	ScrollableResults.java 
Log Message:
added isFirst(), isLast() to ScrollableResults
fixed problem finding properties inherited by interfaces and abstract classes
support for elements(), indices(), max(), min(), count() functions

Index: ScrollableResults.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/ScrollableResults.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScrollableResults.java	5 Jan 2003 02:11:19 -0000	1.3
--- ScrollableResults.java	12 Jan 2003 07:07:48 -0000	1.4
***************
*** 64,67 ****
--- 64,83 ----
  	public void afterLast() throws SQLException, HibernateException;
  	/**
+ 	 * Is this the first result?
+ 	 * 
+ 	 * @return <tt>true</tt> if this is the first row of results
+ 	 * @throws SQLException
+ 	 * @throws HibernateException
+ 	 */
+ 	public boolean isFirst() throws SQLException, HibernateException;
+ 	/**
+ 	 * Is this the last result?
+ 	 * 
+ 	 * @return <tt>true</tt> if this is the last row of results
+ 	 * @throws SQLException
+ 	 * @throws HibernateException
+ 	 */
+ 	public boolean isLast() throws SQLException, HibernateException;
+ 	/**
  	 * Release resources immediately.
  	 */

[Hibernate-commits] Hibernate2/src hibernate.properties,1.4,1.5

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

Update of /cvsroot/hibernate/Hibernate2/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9298

Modified Files:
	hibernate.properties 
Log Message:
made <param> tag work again

Index: hibernate.properties
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/hibernate.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** hibernate.properties	9 Jan 2003 12:24:47 -0000	1.4
--- hibernate.properties	9 Jan 2003 15:15:34 -0000	1.5
***************
*** 36,44 ****
  ## DB2
  
! hibernate.dialect net.sf.hibernate.dialect.DB2Dialect
! hibernate.connection.driver_class COM.ibm.db2.jdbc.app.DB2Driver
! hibernate.connection.url jdbc:db2:test
! hibernate.connection.username db2
! hibernate.connection.password db2
  
  
--- 36,44 ----
  ## DB2
  
! #hibernate.dialect net.sf.hibernate.dialect.DB2Dialect
! #hibernate.connection.driver_class COM.ibm.db2.jdbc.app.DB2Driver
! #hibernate.connection.url jdbc:db2:test
! #hibernate.connection.username db2
! #hibernate.connection.password db2
  
  
***************
*** 55,63 ****
  ## Oracle
  
! #hibernate.dialect net.sf.hibernate.dialect.OracleDialect
! #hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
! #hibernate.connection.username ora
! #hibernate.connection.password ora
! #hibernate.connection.url jdbc:oracle:thin:@localhost:1521:test
  
  
--- 55,63 ----
  ## Oracle
  
! hibernate.dialect net.sf.hibernate.dialect.OracleDialect
! hibernate.connection.driver_class oracle.jdbc.driver.OracleDriver
! hibernate.connection.username ora
! hibernate.connection.password ora
! hibernate.connection.url jdbc:oracle:thin:@localhost:1521:test
  
  

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test MasterDetail.hbm.xml,1.1.1.1,1.2

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

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

Modified Files:
	MasterDetail.hbm.xml 
Log Message:
made <param> tag work again

Index: MasterDetail.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MasterDetail.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MasterDetail.hbm.xml	1 Jan 2003 13:57:09 -0000	1.1.1.1
--- MasterDetail.hbm.xml	9 Jan 2003 15:15:37 -0000	1.2
***************
*** 46,50 ****
  	<class name="net.sf.hibernate.test.SubDetail">
  		<id column="subdetail_key" type="long">
! 			<generator class="native"/>
  		</id>
  		<property name="name"/>
--- 46,52 ----
  	<class name="net.sf.hibernate.test.SubDetail">
  		<id column="subdetail_key" type="long">
! 			<generator class="native">
! 				<param name="sequence">fooseq</param>
! 			</generator>
  		</id>
  		<property name="name"/>

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/mapping Value.java,1.5,1.6

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

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

Modified Files:
	Value.java 
Log Message:
made <param> tag work again

Index: Value.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Value.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Value.java	9 Jan 2003 12:24:51 -0000	1.5
--- Value.java	9 Jan 2003 15:15:36 -0000	1.6
***************
*** 143,147 ****
  
  				Properties params = new Properties();
! 				NodeList nodes = node.getChildNodes();
  				for (int j=0; j<nodes.getLength(); j++) {
  					Node childNode = nodes.item(j);
--- 143,147 ----
  
  				Properties params = new Properties();
! 				NodeList nodes = subnode.getChildNodes();
  				for (int j=0; j<nodes.getLength(); j++) {
  					Node childNode = nodes.item(j);

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/eg Edge.hbm.xml,1.1.1.1,1.2 Vertex.hbm.xml,1.1.1.1,1.2

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

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

Modified Files:
	Edge.hbm.xml Vertex.hbm.xml 
Log Message:
redesigned id generator package
applied Mark Woon's patch for generated alias lengths
minor refactoring of Transaction package

Index: Edge.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/eg/Edge.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Edge.hbm.xml	1 Jan 2003 13:54:17 -0000	1.1.1.1
--- Edge.hbm.xml	9 Jan 2003 12:24:50 -0000	1.2
***************
*** 11,15 ****
      
      <id column="edge_id" name="key">
!       <generator class="hilo.long"/>
      </id>
      <property name="name" unique="true" not-null="true" length="50"/>
--- 11,15 ----
      
      <id column="edge_id" name="key">
!       <generator class="hilo"/>
      </id>
      <property name="name" unique="true" not-null="true" length="50"/>

Index: Vertex.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/eg/Vertex.hbm.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Vertex.hbm.xml	1 Jan 2003 13:54:19 -0000	1.1.1.1
--- Vertex.hbm.xml	9 Jan 2003 12:24:50 -0000	1.2
***************
*** 11,15 ****
    
      <id column="vertex_id" name="key">
!       <generator class="hilo.long"/>
      </id>
      
--- 11,15 ----
    
      <id column="vertex_id" name="key">
!       <generator class="hilo"/>
      </id>
      

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/dialect DB2Dialect.java,1.3,1.4 Dialect.java,1.3,1.4 HSQLDialect.java,1.3,1.4 InterbaseDialect.java,1.3,1.4 MckoiDialect.java,1.3,1.4 OracleDialect.java,1.3,1.4 PostgreSQLDialect.java,1.3,1.4 SAPDBDialect.java,1.3,1.4

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

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

Modified Files:
	DB2Dialect.java Dialect.java HSQLDialect.java 
	InterbaseDialect.java MckoiDialect.java OracleDialect.java 
	PostgreSQLDialect.java SAPDBDialect.java 
Log Message:
redesigned id generator package
applied Mark Woon's patch for generated alias lengths
minor refactoring of Transaction package

Index: DB2Dialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/DB2Dialect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DB2Dialect.java	5 Jan 2003 02:11:20 -0000	1.3
--- DB2Dialect.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 63,66 ****
--- 63,70 ----
  	}
  	
+ 	public boolean supportsSequences() {
+ 		return true;
+ 	}
+ 
  }
  

Index: Dialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/Dialect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Dialect.java	5 Jan 2003 02:11:20 -0000	1.3
--- Dialect.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 2,8 ****
  package net.sf.hibernate.dialect;
  
- import java.io.Serializable;
- import java.sql.ResultSet;
- import java.sql.SQLException;
  import java.util.Properties;
  
--- 2,5 ----
***************
*** 197,203 ****
  	}
  	
! 	public Serializable getIdentityFrom(ResultSet rs) throws SQLException {
! 		return new Long( rs.getLong(1) );
  	}
  	/**
  	 * The syntax that returns the identity value of the last insert, if native
--- 194,205 ----
  	}
  	
! 	/**
! 	 * Does this dialect support sequences?
! 	 * @return boolean
! 	 */
! 	public boolean supportsSequences() {
! 		return false;
  	}
+ 
  	/**
  	 * The syntax that returns the identity value of the last insert, if native

Index: HSQLDialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/HSQLDialect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HSQLDialect.java	5 Jan 2003 02:11:20 -0000	1.3
--- HSQLDialect.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 4,10 ****
  package net.sf.hibernate.dialect;
  
- import java.io.Serializable;
- import java.sql.ResultSet;
- import java.sql.SQLException;
  import java.sql.Types;
  
--- 4,7 ----
***************
*** 51,58 ****
  	public boolean dropConstraints() {
  		return false;
- 	}
- 	
- 	public Serializable getIdentityFrom(ResultSet rs) throws SQLException {
- 		return new Integer( rs.getInt(1) );
  	}
  	
--- 48,51 ----

Index: InterbaseDialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/InterbaseDialect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InterbaseDialect.java	5 Jan 2003 02:11:20 -0000	1.3
--- InterbaseDialect.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 49,52 ****
--- 49,56 ----
  	}
  	
+ 	public boolean supportsSequences() {
+ 		return true;
+ 	}
+ 
  }
  

Index: MckoiDialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/MckoiDialect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MckoiDialect.java	5 Jan 2003 02:11:20 -0000	1.3
--- MckoiDialect.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 47,50 ****
--- 47,54 ----
  		return false;
  	}
+ 	public boolean supportsSequences() {
+ 		return true;
+ 	}
+ 
  }
  

Index: OracleDialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/OracleDialect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OracleDialect.java	5 Jan 2003 02:11:20 -0000	1.3
--- OracleDialect.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 68,71 ****
--- 68,75 ----
  	}
  	
+ 	public boolean supportsSequences() {
+ 		return true;
+ 	}
+ 
  }
  

Index: PostgreSQLDialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/PostgreSQLDialect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PostgreSQLDialect.java	5 Jan 2003 02:11:20 -0000	1.3
--- PostgreSQLDialect.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 52,55 ****
--- 52,59 ----
  	}
  	
+ 	public boolean supportsSequences() {
+ 		return true;
+ 	}
+ 
  }
  

Index: SAPDBDialect.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/dialect/SAPDBDialect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SAPDBDialect.java	5 Jan 2003 02:11:20 -0000	1.3
--- SAPDBDialect.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 99,102 ****
--- 99,106 ----
  	}
  	
+ 	public boolean supportsSequences() {
+ 		return true;
+ 	}
+ 
  }
  

[Hibernate-commits] Hibernate2/src/net/sf/hibernate Session.java,1.3,1.4 Transaction.java,1.3,1.4 TransactionException.java,1.3,1.4 hibernate-mapping-1.1.dtd,1.1.1.1,1.2 hibernate-mapping-2.0.dtd,1.4,1.5 hibernate-mapping.dtd,1.1.1.1,1.2

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

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

Modified Files:
	Session.java Transaction.java TransactionException.java 
	hibernate-mapping-1.1.dtd hibernate-mapping-2.0.dtd 
	hibernate-mapping.dtd 
Log Message:
redesigned id generator package
applied Mark Woon's patch for generated alias lengths
minor refactoring of Transaction package

Index: Session.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/Session.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Session.java	5 Jan 2003 02:11:19 -0000	1.3
--- Session.java	9 Jan 2003 12:24:49 -0000	1.4
***************
*** 487,491 ****
  	/**
  	 * Begin a unit of work and return the associated <tt>Transaction</tt> object.
! 	 * If a new underlying transaction is required, begin the transaction.
  	 * The class of the returned <tt>Transaction</tt> object is determined by the
  	 * property <tt>hibernate.transaction_factory</tt>.
--- 487,492 ----
  	/**
  	 * Begin a unit of work and return the associated <tt>Transaction</tt> object.
! 	 * If a new underlying transaction is required, begin the transaction. Otherwise
! 	 * continue the new work in the context of the existing underlying transaction.
  	 * The class of the returned <tt>Transaction</tt> object is determined by the
  	 * property <tt>hibernate.transaction_factory</tt>.

Index: Transaction.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/Transaction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Transaction.java	5 Jan 2003 02:11:19 -0000	1.3
--- Transaction.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 28,33 ****
  	/**
  	 * Flush the associated <tt>Session</tt> and end the unit of work.
! 	 * (This method might commit the underlying transaction, if and only
! 	 * if the transaction was initiated by this client.)
  	 *
  	 * @throws HibernateException
--- 28,33 ----
  	/**
  	 * Flush the associated <tt>Session</tt> and end the unit of work.
! 	 * This method will commit the underlying transaction if and only
! 	 * if the transaction was initiated by this object.
  	 *
  	 * @throws HibernateException

Index: TransactionException.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/TransactionException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransactionException.java	5 Jan 2003 02:11:19 -0000	1.3
--- TransactionException.java	9 Jan 2003 12:24:50 -0000	1.4
***************
*** 14,17 ****
--- 14,21 ----
  	}
  	
+ 	public TransactionException(String message) {
+ 		super(message);
+ 	}
+ 	
  }
  

Index: hibernate-mapping-1.1.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-mapping-1.1.dtd,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hibernate-mapping-1.1.dtd	1 Jan 2003 13:53:43 -0000	1.1.1.1
--- hibernate-mapping-1.1.dtd	9 Jan 2003 12:24:50 -0000	1.2
***************
*** 361,364 ****
--- 361,365 ----
    <!ATTLIST generator class CDATA #REQUIRED>
  <!ELEMENT param (#PCDATA)>
+   <!ATTLIST param name CDATA #REQUIRED>
  
  <!-- The column element is an alternative to column attributes and required for 

Index: hibernate-mapping-2.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-mapping-2.0.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** hibernate-mapping-2.0.dtd	3 Jan 2003 13:36:00 -0000	1.4
--- hibernate-mapping-2.0.dtd	9 Jan 2003 12:24:50 -0000	1.5
***************
*** 327,330 ****
--- 327,331 ----
    <!ATTLIST generator class CDATA #REQUIRED>
  <!ELEMENT param (#PCDATA)>
+   <!ATTLIST param name CDATA #REQUIRED>
  
  <!-- The column element is an alternative to column attributes and required for 

Index: hibernate-mapping.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-mapping.dtd,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** hibernate-mapping.dtd	1 Jan 2003 13:53:46 -0000	1.1.1.1
--- hibernate-mapping.dtd	9 Jan 2003 12:24:50 -0000	1.2
***************
*** 321,324 ****
--- 321,325 ----
    <!ATTLIST generator class CDATA #REQUIRED>
  <!ELEMENT param (#PCDATA)>
+   <!ATTLIST param name CDATA #REQUIRED>
  
  <!-- The column element is an alternative to column attributes and required for 

[Hibernate-commits] Hibernate2/src hibernate.properties,1.3,1.4

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

Update of /cvsroot/hibernate/Hibernate2/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16192

Modified Files:
	hibernate.properties 
Log Message:
redesigned id generator package
applied Mark Woon's patch for generated alias lengths
minor refactoring of Transaction package

Index: hibernate.properties
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/hibernate.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hibernate.properties	4 Jan 2003 11:15:27 -0000	1.3
--- hibernate.properties	9 Jan 2003 12:24:47 -0000	1.4
***************
*** 247,258 ****
  ##############################
  
! ## specify a JDBC isolation level
  
! #hibernate.connection.isolation 4
  
  
! ## print all generated SQL to the console
  
! #hibernate.show_sql true
  
  
--- 247,258 ----
  ##############################
  
! ## print all generated SQL to the console
  
! #hibernate.show_sql true
  
  
! ## specify a JDBC isolation level
  
! #hibernate.connection.isolation 4
  
  

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/util PropertiesHelper.java,1.3,1.4 StringHelper.java,1.3,1.4

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

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

Modified Files:
	PropertiesHelper.java StringHelper.java 
Log Message:
redesigned id generator package
applied Mark Woon's patch for generated alias lengths
minor refactoring of Transaction package

Index: PropertiesHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/PropertiesHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PropertiesHelper.java	5 Jan 2003 02:11:25 -0000	1.3
--- PropertiesHelper.java	9 Jan 2003 12:24:52 -0000	1.4
***************
*** 19,23 ****
  	}
  	
! 	
  	
  	public static Integer getInteger(String property, Properties properties) {
--- 19,26 ----
  	}
  	
! 	public static String getString(String property, Properties properties, String defaultValue) {
! 		String propValue = properties.getProperty(property);
! 		return (propValue==null) ? defaultValue : propValue;
! 	}
  	
  	public static Integer getInteger(String property, Properties properties) {

Index: StringHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/util/StringHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StringHelper.java	5 Jan 2003 02:11:25 -0000	1.3
--- StringHelper.java	9 Jan 2003 12:24:52 -0000	1.4
***************
*** 95,107 ****
  	}
  	
! 	public static String suffix(String table, String suffix) {
! 		if (suffix==null) return table;
! 		char quote = table.charAt(0);
! 		if ( Dialect.QUOTE.indexOf(quote) > -1 ) {
! 			return table.substring( 0, table.length()-1 ) + suffix + quote;
  		}
  		else {
! 			return table + suffix;
  		}
  	}
  	
--- 95,130 ----
  	}
  	
! 	public static String suffix(String name, String suffix) {
! 
! 		if (suffix==null) {
! 			/*if (name.length() > 20) {
! 				return name.substring(name.length()-20);
! 			}
! 			else {*/
! 				return name;
! 			//}
! 		}
! 
! 		char quote = name.charAt(0);
! 		boolean nameEscaped = Dialect.QUOTE.indexOf(quote) > -1;
! 		StringBuffer nameBuffer = new StringBuffer(30);
! 
! 		if (nameEscaped) {
! 			nameBuffer.append( name.substring(1, name.length()-1) ).append(suffix);
  		}
  		else {
! 			nameBuffer.append(name).append(suffix);
  		}
+ 
+ 		if (nameBuffer.length() > 15) {
+ 			nameBuffer.delete(0, nameBuffer.length()-15);
+ 			if ( !Character.isLetter( nameBuffer.charAt(0) ) ) nameBuffer.setCharAt(0, 'x');
+ 		}
+ 
+ 		if (nameEscaped) {
+ 			nameBuffer.insert(0, quote);
+ 			nameBuffer.append(quote);
+ 		}
+ 		return nameBuffer.toString();
  	}