diff --git a/models/QuickBuilder.cfc b/models/QuickBuilder.cfc index 730d58b3..0b033a59 100644 --- a/models/QuickBuilder.cfc +++ b/models/QuickBuilder.cfc @@ -1634,8 +1634,8 @@ component accessors="true" transientCache="false" { } var mementos = []; - for ( var entity in arguments.entity ) { - mementos.append( entity.getMemento( argumentCollection = variables._asMementoSettings ) ); + for ( var resultEntity in arguments.entity ) { + mementos.append( resultEntity.getMemento( argumentCollection = variables._asMementoSettings ) ); } return mementos; } diff --git a/models/QuickQB.cfc b/models/QuickQB.cfc index 228a08cb..9f1e932b 100644 --- a/models/QuickQB.cfc +++ b/models/QuickQB.cfc @@ -721,7 +721,7 @@ component } var q = arguments.relationQuery; - if ( structKeyExists( arguments, "directConstraint" ) ) { + if ( structKeyExists( arguments, "directConstraint" ) && !isNull( arguments.directConstraint ) ) { invoke( q, arguments.directConstraint.method, @@ -839,7 +839,7 @@ component if ( listLen( arguments.relationshipName, "." ) == 1 ) { var q = relation.addCompareConstraints( nested = arguments.relationQuery ).clearOrders(); - if ( structKeyExists( arguments, "directConstraint" ) ) { + if ( structKeyExists( arguments, "directConstraint" ) && !isNull( arguments.directConstraint ) ) { invoke( q, arguments.directConstraint.method,