[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl DatastoreImpl.java,1.5,1.6 QueryImpl.java,1.6,1.7 SessionFactoryImpl.java,1.5,1.6

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

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

Modified Files:
	DatastoreImpl.java QueryImpl.java SessionFactoryImpl.java 
Log Message:
major refactoring to create SQL Generation layer
more efficient queries against normalized mappings

Index: DatastoreImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/DatastoreImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DatastoreImpl.java	14 Jan 2003 13:42:11 -0000	1.5
--- DatastoreImpl.java	20 Jan 2003 12:48:11 -0000	1.6
***************
*** 19,22 ****
--- 19,23 ----
  
  import net.sf.hibernate.util.ArrayHelper;
+ import net.sf.hibernate.util.StringHelper;
  import net.sf.hibernate.util.XMLHelper;
  import net.sf.hibernate.Environment;
***************
*** 143,147 ****
  	
  	public Datastore storeClass(Class persistentClass) throws MappingException {
! 		String fileName = persistentClass.getName().replace('.','/') + ".hbm.xml";
  		log.info("Mapping resource: " + fileName);
  		InputStream rsrc = persistentClass.getClassLoader().getResourceAsStream(fileName);
--- 144,148 ----
  	
  	public Datastore storeClass(Class persistentClass) throws MappingException {
! 		String fileName = persistentClass.getName().replace(StringHelper.DOT,'/') + ".hbm.xml";
  		log.info("Mapping resource: " + fileName);
  		InputStream rsrc = persistentClass.getClassLoader().getResourceAsStream(fileName);

Index: QueryImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/QueryImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** QueryImpl.java	17 Jan 2003 10:27:41 -0000	1.6
--- QueryImpl.java	20 Jan 2003 12:48:11 -0000	1.7
***************
*** 290,297 ****
  		int i=0;
  		while ( iter.hasNext() ) {
! 			String alias = name + i++ + '_';
  			setParameter(alias, iter.next(), type);
  			list.append( ':' + alias );
! 			if ( iter.hasNext() ) list.append(", ");
  		}
  		queryString = StringHelper.replaceOnce( queryString, ':' + name, list.toString() );
--- 290,297 ----
  		int i=0;
  		while ( iter.hasNext() ) {
! 			String alias = name + i++ + StringHelper.UNDERSCORE;
  			setParameter(alias, iter.next(), type);
  			list.append( ':' + alias );
! 			if ( iter.hasNext() ) list.append(StringHelper.COMMA_SPACE);
  		}
  		queryString = StringHelper.replaceOnce( queryString, ':' + name, list.toString() );

Index: SessionFactoryImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionFactoryImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SessionFactoryImpl.java	14 Jan 2003 13:42:13 -0000	1.5
--- SessionFactoryImpl.java	20 Jan 2003 12:48:11 -0000	1.6
***************
*** 58,62 ****
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.persister.EntityPersister;
! import net.sf.hibernate.persister.MultiTableEntityPersister;
  import net.sf.hibernate.persister.Queryable;
  import net.sf.hibernate.ps.PreparedStatementCache;
--- 58,62 ----
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.persister.EntityPersister;
! import net.sf.hibernate.persister.NormalizedEntityPersister;
  import net.sf.hibernate.persister.Queryable;
  import net.sf.hibernate.ps.PreparedStatementCache;
***************
*** 197,202 ****
  				cp = new EntityPersister(model, this);
  			}
! 			else if (persisterClass==MultiTableEntityPersister.class) {
! 				cp = new MultiTableEntityPersister(model, this);
  			}
  			else {
--- 197,202 ----
  				cp = new EntityPersister(model, this);
  			}
! 			else if (persisterClass==NormalizedEntityPersister.class) {
! 				cp = new NormalizedEntityPersister(model, this);
  			}
  			else {
***************
*** 483,487 ****
  		
  		if ( log.isDebugEnabled() ) log.debug(
! 			(scrollable ? "scrollable ":"" ) + "prepared statement get: " + sql
  		);
  		if (showSql) System.out.println("Hibernate: " + sql);
--- 483,487 ----
  		
  		if ( log.isDebugEnabled() ) log.debug(
! 			(scrollable ? "scrollable ":StringHelper.EMPTY_STRING ) + "prepared statement get: " + sql
  		);
  		if (showSql) System.out.println("Hibernate: " + sql);