From: <one...@us...> - 2003-01-12 15:04:55
|
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(); } |