[hibernate-commits] Hibernate SVN: r10285 - in trunk/Hibernate3/src/org/hibernate/persister: collection entity

Author: epbernard Date: 2006-08-18 17:45:44 -0400 (Fri, 18 Aug 2006) New Revision: 10285 Modified: trunk/Hibernate3/src/org/hibernate/persister/collection/AbstractCollectionPersister.java trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java Log: HHH-2015 add parenthesis around <class where=/> or <collection where=/> clauses, allowing safe multi term clauses Modified: trunk/Hibernate3/src/org/hibernate/persister/collection/AbstractCollectionPersister.java =================================================================== --- trunk/Hibernate3/src/org/hibernate/persister/collection/AbstractCollectionPersister.java 2006-08-18 19:54:07 UTC (rev 10284) +++ trunk/Hibernate3/src/org/hibernate/persister/collection/AbstractCollectionPersister.java 2006-08-18 21:45:44 UTC (rev 10285) @@ -249,7 +249,7 @@ sqlOrderByStringTemplate = hasOrder ? Template.renderOrderByStringTemplate(sqlOrderByString, dialect, factory.getSqlFunctionRegistry()) : null; - sqlWhereString = collection.getWhere(); + sqlWhereString = StringHelper.isNotEmpty( collection.getWhere() ) ? "( " + collection.getWhere() + ") " : null; hasWhere = sqlWhereString != null; sqlWhereStringTemplate = hasWhere ? Template.renderWhereStringTemplate(sqlWhereString, dialect, factory.getSqlFunctionRegistry()) : Modified: trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java =================================================================== --- trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2006-08-18 19:54:07 UTC (rev 10284) +++ trunk/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java 2006-08-18 21:45:44 UTC (rev 10285) @@ -473,7 +473,7 @@ //WHERE STRING - sqlWhereString = persistentClass.getWhere(); + sqlWhereString = StringHelper.isNotEmpty( persistentClass.getWhere() ) ? "( " + persistentClass.getWhere() + ") " : null; sqlWhereStringTemplate = sqlWhereString == null ? null : Template.renderWhereStringTemplate( sqlWhereString, factory.getDialect(), factory.getSqlFunctionRegistry() );