Skip to content

Commit 17c6674

Browse files
committed
boxlang prime fixes
1 parent eec0bac commit 17c6674

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

models/criterion/BaseBuilder.cfc

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ component accessors="true" {
404404

405405
// iterate and add dynamically if the incoming argument exists, man, so much easier if we had closures.
406406
for ( var pType in arguments ) {
407-
if ( structKeyExists( arguments, pType ) AND NOT listFindNoCase( excludes, pType ) ) {
407+
if ( !isNull( arguments[ pType ] ) AND NOT listFindNoCase( excludes, pType ) ) {
408408
addProjection(
409409
arguments[ pType ],
410410
lCase( pType ),
@@ -414,23 +414,23 @@ component accessors="true" {
414414
}
415415

416416
// id
417-
if ( structKeyExists( arguments, "id" ) ) {
417+
if ( !isNull( arguments.id ) ) {
418418
projectionList.add( this.PROJECTIONS.id() );
419419
}
420420

421421
// rowCount
422-
if ( structKeyExists( arguments, "rowCount" ) ) {
422+
if ( !isNull( arguments.rowCount ) ) {
423423
projectionList.add( this.PROJECTIONS.rowCount() );
424424
}
425425

426426
// distinct
427-
if ( structKeyExists( arguments, "distinct" ) ) {
427+
if ( !isNull( arguments.distinct ) ) {
428428
addProjection( arguments.distinct, "property", projectionList );
429429
projectionList = this.PROJECTIONS.distinct( projectionList );
430430
}
431431

432432
// detachedSQLProjection
433-
if ( structKeyExists( arguments, "detachedSQLProjection" ) ) {
433+
if ( !isNull( arguments.detachedSQLProjection ) ) {
434434
// allow single or arrary of detachedSQLProjection
435435
var projectionCollection = !isArray( arguments.detachedSQLProjection ) ? [
436436
arguments.detachedSQLProjection
@@ -442,7 +442,7 @@ component accessors="true" {
442442
}
443443

444444
// sqlProjection
445-
if ( structKeyExists( arguments, "sqlProjection" ) ) {
445+
if ( !isNull( arguments.sqlProjection ) ) {
446446
// allow for either an array of sqlProjections, or a stand-alone config for one
447447
var sqlargs = !isArray( arguments.sqlProjection ) ? [ arguments.sqlProjection ] : arguments.sqlProjection;
448448
// loop over sqlProjections
@@ -460,7 +460,7 @@ component accessors="true" {
460460
}
461461

462462
// sqlGroupProjection
463-
if ( structKeyExists( arguments, "sqlGroupProjection" ) ) {
463+
if ( !isNull( arguments.sqlGroupProjection ) ) {
464464
// allow for either an array of sqlGroupProjections, or a stand-alone config for one
465465
var sqlargs = !isArray( arguments.sqlGroupProjection ) ? [ arguments.sqlGroupProjection ] : arguments.sqlGroupProjection;
466466
// loop over sqlGroupProjections
@@ -701,6 +701,9 @@ component accessors="true" {
701701
}
702702

703703
// iterate array and add projections
704+
writeDump( var=arguments, top = 5, showUDFs = false, expand = false );
705+
writeDump( var=callStackGet(), expand=false );
706+
704707
for ( var thisP in arguments.propertyName ) {
705708
// add projection into the projection list
706709
arguments.projectionList.add(

0 commit comments

Comments
 (0)