Changeset 1903 for trunk/src/groovy/dbnp/query/Search.groovy

Timestamp:

May 31, 2011, 11:01:23 AM (11 years ago)

Author:

robert@…

Message:

Bugfix for searches in 'complex' fields with no results (#446)

File:

• trunk/src/groovy/dbnp/query/Search.groovy (modified) (2 diffs)

trunk/src/groovy/dbnp/query/Search.groovy

@@ -339 +339 @@
                         
                         // If there are entities matching these criteria, put a where clause in the full HQL query 
-                        if( entities && entities.findAll { it } ) {
+                        if( entities ) {
                                 // Find criteria that match one or more 'complex' fields
                                 // These criteria must be checked extra, since they are not correctly handled
@@ -346 +346 @@
                                 entities = filterForComplexCriteria( entities, entityCriteria );
                                 
-                                def paramName = from.replaceAll( /\W/, '' );
-                                fullHQL.where << sprintf( entityClause( entityName ), from, alias, paramName );
-                                fullHQL.parameters[ paramName ] = entities
-                                return true;
-                        } else {
-                                results = [];
-                                return false
-                        }
+                                if( entities ) {
+                                        def paramName = from.replaceAll( /\W/, '' );
+                                        fullHQL.where << sprintf( entityClause( entityName ), from, alias, paramName );
+                                        fullHQL.parameters[ paramName ] = entities
+                                        return true;
+                                } 
+                        }
+                        
+                        // No results are found.
+                        results = [];
+                        return false
                 }