Skip to content

Fix operators with dynamic where #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elpete merged 2 commits into from
Aug 7, 2025
Merged

Fix operators with dynamic where #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00e8450
Failing tests for dynamic column operator
DiscountDarcy Aug 7, 2025
87d9a38
fix(QueryBuilder): Fix for using operators with dynamic where constra…
elpete Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions models/Query/QueryBuilder.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4639,8 +4639,14 @@ component displayname="QueryBuilder" accessors="true" {
*/
if ( !arrayIsEmpty( reMatchNoCase( "^where(.+)", missingMethodName ) ) ) {
var args = { "column": mid( missingMethodName, 6, len( missingMethodName ) - 5 ) };
for ( var key in missingMethodArguments ) {
args[ "operator" ] = missingMethodArguments[ key ];
var missingArgsNames = structKeyArray( missingMethodArguments );
for ( var i = 1; i <= missingArgsNames.len(); i++ ) {
var key = missingArgsNames[ i ];
if ( isNumeric( key ) ) {
args[ i + 1 ] = missingMethodArguments[ key ];
} else {
args[ key ] = missingMethodArguments[ key ];
}
}
return where( argumentCollection = args );
}
Expand All @@ -4652,10 +4658,15 @@ component displayname="QueryBuilder" accessors="true" {
*/
if ( !arrayIsEmpty( reMatchNoCase( "^andWhere(.+)", missingMethodName ) ) ) {
var args = { "column": mid( missingMethodName, 9, len( missingMethodName ) - 8 ) };
for ( var key in missingMethodArguments ) {
args[ "operator" ] = missingMethodArguments[ key ];
var missingArgsNames = structKeyArray( missingMethodArguments );
for ( var i = 1; i <= missingArgsNames.len(); i++ ) {
var key = missingArgsNames[ i ];
if ( isNumeric( key ) ) {
args[ i + 1 ] = missingMethodArguments[ key ];
} else {
args[ key ] = missingMethodArguments[ key ];
}
}

return andWhere( argumentCollection = args );
}

Expand All @@ -4666,10 +4677,15 @@ component displayname="QueryBuilder" accessors="true" {
*/
if ( !arrayIsEmpty( reMatchNoCase( "^orWhere(.+)", missingMethodName ) ) ) {
var args = { "column": mid( missingMethodName, 8, len( missingMethodName ) - 7 ) };
for ( var key in missingMethodArguments ) {
args[ "operator" ] = missingMethodArguments[ key ];
var missingArgsNames = structKeyArray( missingMethodArguments );
for ( var i = 1; i <= missingArgsNames.len(); i++ ) {
var key = missingArgsNames[ i ];
if ( isNumeric( key ) ) {
args[ i + 1 ] = missingMethodArguments[ key ];
} else {
args[ key ] = missingMethodArguments[ key ];
}
}

return orWhere( argumentCollection = args );
}

Expand Down
38 changes: 38 additions & 0 deletions tests/resources/AbstractQueryBuilderSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,44 @@ component extends="testbox.system.BaseSpec" {
}, wrapColumnsAndAliases() );
} );

it( "handles dynamic whereColumns", function() {
testCase( function( builder ) {
builder
.select( "ID" )
.from( "users" )
.whereID( 1 );
}, dynamicWhere() );
} );

it( "parses operators in dynamic whereColumns", function() {
testCase( function( builder ) {
builder
.select( "ID" )
.from( "users" )
.whereID( ">", 1 );
}, parseOperatorsWithDynamicWhere() );
} );

it( "parses operators in dynamic andWhereColumns", function() {
testCase( function( builder ) {
builder
.select( "ID" )
.from( "users" )
.whereID( ">", 1 )
.andWhereID( "<", 10 );
}, parseOperatorsWithDynamicAndWhere() );
} );

it( "parses operators in dynamic orWhereColumns", function() {
testCase( function( builder ) {
builder
.select( "ID" )
.from( "users" )
.whereID( ">", 1 )
.orWhereID( "<", 0 );
}, parseOperatorsWithDynamicOrWhere() );
} );

it( "selects raw values correctly", function() {
testCase( function( builder ) {
builder.select( builder.raw( "substr( foo, 6 )" ) ).from( "users" );
Expand Down
16 changes: 16 additions & 0 deletions tests/specs/Query/DerbyQueryBuilderSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { "sql": "SELECT ""users"".""foo"" FROM ""users"" WHERE ""users"".""foo"" = ?", "bindings": [ "bar" ] };
}

function dynamicWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" = ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" > ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicAndWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" > ? AND ""ID"" < ?", "bindings": [ 1, 10 ] };
}

function parseOperatorsWithDynamicOrWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" > ? OR ""ID"" < ?", "bindings": [ 1, 0 ] };
}

function parseColumnAliasInWhereSubselect() {
return {
"sql": "SELECT ""u"".*, ""user_roles"".""roleid"", ""roles"".""rolecode"" FROM ""users"" AS ""u"" INNER JOIN ""user_roles"" ON ""user_roles"".""userid"" = ""u"".""userid"" LEFT JOIN ""roles"" ON ""user_roles"".""roleid"" = ""roles"".""roleid"" WHERE ""user_roles"".""roleid"" = (SELECT ""roleid"" FROM ""roles"" WHERE ""rolecode"" = ?)",
Expand Down
16 changes: 16 additions & 0 deletions tests/specs/Query/MySQLQueryBuilderSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { "sql": "SELECT `users`.`foo` FROM `users` WHERE `users`.`foo` = ?", "bindings": [ "bar" ] };
}

function dynamicWhere() {
return { "sql": "SELECT `ID` FROM `users` WHERE `ID` = ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicWhere() {
return { "sql": "SELECT `ID` FROM `users` WHERE `ID` > ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicAndWhere() {
return { "sql": "SELECT `ID` FROM `users` WHERE `ID` > ? AND `ID` < ?", "bindings": [ 1, 10 ] };
}

function parseOperatorsWithDynamicOrWhere() {
return { "sql": "SELECT `ID` FROM `users` WHERE `ID` > ? OR `ID` < ?", "bindings": [ 1, 0 ] };
}

function parseColumnAliasInWhereSubselect() {
return {
"sql": "SELECT `u`.*, `user_roles`.`roleid`, `roles`.`rolecode` FROM `users` AS `u` INNER JOIN `user_roles` ON `user_roles`.`userid` = `u`.`userid` LEFT JOIN `roles` ON `user_roles`.`roleid` = `roles`.`roleid` WHERE `user_roles`.`roleid` = (SELECT `roleid` FROM `roles` WHERE `rolecode` = ?)",
Expand Down
16 changes: 16 additions & 0 deletions tests/specs/Query/OracleQueryBuilderSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { "sql": "SELECT ""USERS"".""FOO"" FROM ""USERS"" WHERE ""USERS"".""FOO"" = ?", "bindings": [ "bar" ] };
}

function dynamicWhere() {
return { "sql": "SELECT ""ID"" FROM ""USERS"" WHERE ""ID"" = ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicWhere() {
return { "sql": "SELECT ""ID"" FROM ""USERS"" WHERE ""ID"" > ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicAndWhere() {
return { "sql": "SELECT ""ID"" FROM ""USERS"" WHERE ""ID"" > ? AND ""ID"" < ?", "bindings": [ 1, 10 ] };
}

function parseOperatorsWithDynamicOrWhere() {
return { "sql": "SELECT ""ID"" FROM ""USERS"" WHERE ""ID"" > ? OR ""ID"" < ?", "bindings": [ 1, 0 ] };
}

function parseColumnAliasInWhereSubselect() {
return {
"sql": "SELECT ""U"".*, ""USER_ROLES"".""ROLEID"", ""ROLES"".""ROLECODE"" FROM ""USERS"" ""U"" INNER JOIN ""USER_ROLES"" ON ""USER_ROLES"".""USERID"" = ""U"".""USERID"" LEFT JOIN ""ROLES"" ON ""USER_ROLES"".""ROLEID"" = ""ROLES"".""ROLEID"" WHERE ""USER_ROLES"".""ROLEID"" = (SELECT ""ROLEID"" FROM ""ROLES"" WHERE ""ROLECODE"" = ?)",
Expand Down
16 changes: 16 additions & 0 deletions tests/specs/Query/PostgresQueryBuilderSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { "sql": "SELECT ""users"".""foo"" FROM ""users"" WHERE ""users"".""foo"" = ?", "bindings": [ "bar" ] };
}

function dynamicWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" = ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" > ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicAndWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" > ? AND ""ID"" < ?", "bindings": [ 1, 10 ] };
}

function parseOperatorsWithDynamicOrWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" > ? OR ""ID"" < ?", "bindings": [ 1, 0 ] };
}

function parseColumnAliasInWhereSubselect() {
return {
"sql": "SELECT ""u"".*, ""user_roles"".""roleid"", ""roles"".""rolecode"" FROM ""users"" AS ""u"" INNER JOIN ""user_roles"" ON ""user_roles"".""userid"" = ""u"".""userid"" LEFT JOIN ""roles"" ON ""user_roles"".""roleid"" = ""roles"".""roleid"" WHERE ""user_roles"".""roleid"" = (SELECT ""roleid"" FROM ""roles"" WHERE ""rolecode"" = ?)",
Expand Down
16 changes: 16 additions & 0 deletions tests/specs/Query/SQLiteQueryBuilderSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,22 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { "sql": "SELECT ""users"".""foo"" FROM ""users"" WHERE ""users"".""foo"" = ?", "bindings": [ "bar" ] };
}

function dynamicWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" = ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" > ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicAndWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" > ? AND ""ID"" < ?", "bindings": [ 1, 10 ] };
}

function parseOperatorsWithDynamicOrWhere() {
return { "sql": "SELECT ""ID"" FROM ""users"" WHERE ""ID"" > ? OR ""ID"" < ?", "bindings": [ 1, 0 ] };
}

function parseColumnAliasInWhereSubselect() {
return {
"sql": "SELECT ""u"".*, ""user_roles"".""roleid"", ""roles"".""rolecode"" FROM ""users"" AS ""u"" INNER JOIN ""user_roles"" ON ""user_roles"".""userid"" = ""u"".""userid"" LEFT JOIN ""roles"" ON ""user_roles"".""roleid"" = ""roles"".""roleid"" WHERE ""user_roles"".""roleid"" = (SELECT ""roleid"" FROM ""roles"" WHERE ""rolecode"" = ?)",
Expand Down
16 changes: 16 additions & 0 deletions tests/specs/Query/SqlServerQueryBuilderSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { "sql": "SELECT [users].[foo] FROM [users] WHERE [users].[foo] = ?", "bindings": [ "bar" ] };
}

function dynamicWhere() {
return { "sql": "SELECT [ID] FROM [users] WHERE [ID] = ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicWhere() {
return { "sql": "SELECT [ID] FROM [users] WHERE [ID] > ?", "bindings": [ 1 ] };
}

function parseOperatorsWithDynamicAndWhere() {
return { "sql": "SELECT [ID] FROM [users] WHERE [ID] > ? AND [ID] < ?", "bindings": [ 1, 10 ] };
}

function parseOperatorsWithDynamicOrWhere() {
return { "sql": "SELECT [ID] FROM [users] WHERE [ID] > ? OR [ID] < ?", "bindings": [ 1, 0 ] };
}

function parseColumnAliasInWhereSubselect() {
return {
"sql": "SELECT [u].*, [user_roles].[roleid], [roles].[rolecode] FROM [users] AS [u] INNER JOIN [user_roles] ON [user_roles].[userid] = [u].[userid] LEFT JOIN [roles] ON [user_roles].[roleid] = [roles].[roleid] WHERE [user_roles].[roleid] = (SELECT [roleid] FROM [roles] WHERE [rolecode] = ?)",
Expand Down
Loading