[hibernate-commits] Hibernate SVN: r10286 - in branches/Branch_3_2/Hibernate3/src/org/hibernate/persister: collection entity

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2006-08-18 17:46:07 -0400 (Fri, 18 Aug 2006)
New Revision: 10286

Modified:
   branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/collection/AbstractCollectionPersister.java
   branches/Branch_3_2/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: branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/collection/AbstractCollectionPersister.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/collection/AbstractCollectionPersister.java	2006-08-18 21:45:44 UTC (rev 10285)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/collection/AbstractCollectionPersister.java	2006-08-18 21:46:07 UTC (rev 10286)
@@ -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: branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java
===================================================================
--- branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java	2006-08-18 21:45:44 UTC (rev 10285)
+++ branches/Branch_3_2/Hibernate3/src/org/hibernate/persister/entity/AbstractEntityPersister.java	2006-08-18 21:46:07 UTC (rev 10286)
@@ -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() );