[Hibernate-commits] Hibernate/cirrus/hibernate/query PathExpressionParser.java,1.63,1.64

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

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/query
In directory sc8-pr-cvs1:/tmp/cvs-serv30262/hibernate/query

Modified Files:
	PathExpressionParser.java 
Log Message:
removed static final Log from exception classes
provided composite key support for expressions with []

Index: PathExpressionParser.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/query/PathExpressionParser.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** PathExpressionParser.java	21 Nov 2002 07:44:57 -0000	1.63
--- PathExpressionParser.java	22 Nov 2002 01:07:12 -0000	1.64
***************
*** 64,74 ****
  		q.addType( currentName, clazz.getName() );
  		
! 		join.append(" and ")
! 			.append( joinColumns[0] )
! 			.append('=')
! 			.append(currentName)
! 			.append('.')
! 			.append( q.getPersister(clazz).getIdentifierColumnNames()[0] ); 
! 		//TODO: composite keys!
  		return currentName;
  	}
--- 64,75 ----
  		q.addType( currentName, clazz.getName() );
  		
! 		for ( int i=0; i<joinColumns.length; i++ ) {
! 			join.append(" and ")
! 				.append( joinColumns[i] )
! 				.append('=')
! 				.append(currentName)
! 				.append('.')
! 				.append( q.getPersister(clazz).getIdentifierColumnNames()[i] );
! 		}
  		return currentName;
  	}
***************
*** 84,94 ****
  		collectionTable = p.getQualifiedTableName();
  
! 		join.append(" and ")
! 			.append( joinColumns[0] )
! 			.append('=')
! 			.append(collectionName)
! 			.append('.')
! 			.append( p.getKeyColumnNames()[0] );
! 		//TODO: composite keys!
  		return collectionName;
  	}
--- 85,96 ----
  		collectionTable = p.getQualifiedTableName();
  
! 		for ( int i=0; i<joinColumns.length; i++ ) {
! 			join.append(" and ")
! 				.append( joinColumns[i] )
! 				.append('=')
! 				.append(collectionName)
! 				.append('.')
! 				.append( p.getKeyColumnNames()[i] );
! 		}
  		return collectionName;
  	}