Skip to content

Where between two raw #306

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
Jan 14, 2026
Merged

Where between two raw #306

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
bc1da74
fix(QueryBuilder): Handle raw statements in `whereBetween` statements
elpete Jan 14, 2026
c1cf80c
fix(DerbyGrammar): Fix test for BoxLang type strictness
elpete Jan 14, 2026
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
8 changes: 6 additions & 2 deletions models/Grammars/BaseGrammar.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,12 @@ component displayname="Grammar" accessors="true" singleton {
* @return string
*/
private string function whereBetween( required QueryBuilder query, required struct where ) {
var start = isSimpleValue( where.start ) ? "?" : "(#compileSelect( where.start )#)";
var end = isSimpleValue( where.end ) ? "?" : "(#compileSelect( where.end )#)";
var start = variables.utils.isExpression( where.start ) ? where.start.getSql() : (
isSimpleValue( where.start ) ? "?" : "(#compileSelect( where.start )#)"
);
var end = variables.utils.isExpression( where.end ) ? where.end.getSql() : (
isSimpleValue( where.end ) ? "?" : "(#compileSelect( where.end )#)"
);
return "#wrapColumn( where.column )# BETWEEN #start# AND #end#";
}

Expand Down
24 changes: 19 additions & 5 deletions models/Query/QueryBuilder.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ component displayname="QueryBuilder" accessors="true" {

private void function renameAliasesInHavings( required string oldAlias, required string newAlias ) {
for ( var having in variables.havings ) {
if ( having.keyExists( "column" ) ) {
if ( structKeyExists( having, "column" ) ) {
if ( having.column.type == "simple" ) {
having.column.value = swapAlias( having.column.value, arguments.oldAlias, arguments.newAlias );
}
Expand Down Expand Up @@ -2255,19 +2255,33 @@ component displayname="QueryBuilder" accessors="true" {
callback( arguments.end );
}

addBindings( utils.extractBinding( arguments.start, variables.grammar ), "where" );
addBindings( utils.extractBinding( arguments.end, variables.grammar ), "where" );
addBindings(
utils.isExpression( arguments.start ) ? arguments.start.getBindings() : utils.extractBinding(
arguments.start,
variables.grammar
),
"where"
);
addBindings(
utils.isExpression( arguments.end ) ? arguments.end.getBindings() : utils.extractBinding(
arguments.end,
variables.grammar
),
"where"
);

if (
isStruct( arguments.start ) && !structKeyExists( arguments.start, "isBuilder" ) && arguments.start.keyExists(
isStruct( arguments.start ) && !structKeyExists( arguments.start, "isBuilder" ) && structKeyExists(
arguments.start,
"value"
)
) {
arguments.start = arguments.start.value;
}

if (
isStruct( arguments.end ) && !structKeyExists( arguments.end, "isBuilder" ) && arguments.end.keyExists(
isStruct( arguments.end ) && !structKeyExists( arguments.end, "isBuilder" ) && structKeyExists(
arguments.end,
"value"
)
) {
Expand Down
13 changes: 13 additions & 0 deletions tests/resources/AbstractQueryBuilderSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,19 @@ component extends="testbox.system.BaseSpec" {
}, whereBetween() );
} );

it( "can add where between statements with raw expressions", function() {
testCase( function( builder ) {
builder
.select( "*" )
.from( "users" )
.whereBetween(
"createdDate",
builder.raw( "GETDATE() - 7" ),
builder.raw( "GETDATE()" )
);
}, whereBetweenRaw() );
} );

it( "can add where between statements with query param structs", function() {
testCase( function( builder ) {
builder
Expand Down
11 changes: 9 additions & 2 deletions tests/specs/Query/DerbyQueryBuilderSpec.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
bindings: [
{
"cfsqltype": "OTHER",
"value": true,
"value": 1,
"list": false,
"null": false
}
Expand Down Expand Up @@ -310,6 +310,13 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { sql: "SELECT * FROM ""users"" WHERE ""id"" BETWEEN ? AND ?", bindings: [ 1, 2 ] };
}

function whereBetweenRaw() {
return {
sql: "SELECT * FROM ""users"" WHERE ""createdDate"" BETWEEN GETDATE() - 7 AND GETDATE()",
bindings: []
};
}

function whereBetweenWithQueryParamStructs() {
return {
sql: "SELECT * FROM ""users"" WHERE ""createdDate"" BETWEEN ? AND ?",
Expand Down Expand Up @@ -752,7 +759,7 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
sql: "INSERT INTO ""users"" (""active"") VALUES (?)",
bindings: [
{
"value": true,
"value": 1,
"cfsqltype": "OTHER",
"null": false,
"list": false
Expand Down
4 changes: 4 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 @@ -307,6 +307,10 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { sql: "SELECT * FROM `users` WHERE `id` BETWEEN ? AND ?", bindings: [ 1, 2 ] };
}

function whereBetweenRaw() {
return { sql: "SELECT * FROM `users` WHERE `createdDate` BETWEEN GETDATE() - 7 AND GETDATE()", bindings: [] };
}

function whereBetweenWithQueryParamStructs() {
return {
sql: "SELECT * FROM `users` WHERE `createdDate` BETWEEN ? AND ?",
Expand Down
7 changes: 7 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 @@ -316,6 +316,13 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { sql: "SELECT * FROM ""USERS"" WHERE ""ID"" BETWEEN ? AND ?", bindings: [ 1, 2 ] };
}

function whereBetweenRaw() {
return {
sql: "SELECT * FROM ""USERS"" WHERE ""CREATEDDATE"" BETWEEN GETDATE() - 7 AND GETDATE()",
bindings: []
};
}

function whereBetweenWithQueryParamStructs() {
return {
sql: "SELECT * FROM ""USERS"" WHERE ""CREATEDDATE"" BETWEEN ? AND ?",
Expand Down
7 changes: 7 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 @@ -310,6 +310,13 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { sql: "SELECT * FROM ""users"" WHERE ""id"" BETWEEN ? AND ?", bindings: [ 1, 2 ] };
}

function whereBetweenRaw() {
return {
sql: "SELECT * FROM ""users"" WHERE ""createdDate"" BETWEEN GETDATE() - 7 AND GETDATE()",
bindings: []
};
}

function whereBetweenWithQueryParamStructs() {
return {
sql: "SELECT * FROM ""users"" WHERE ""createdDate"" BETWEEN ? AND ?",
Expand Down
7 changes: 7 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 @@ -339,6 +339,13 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { sql: "SELECT * FROM ""users"" WHERE ""id"" BETWEEN ? AND ?", bindings: [ 1, 2 ] };
}

function whereBetweenRaw() {
return {
sql: "SELECT * FROM ""users"" WHERE ""createdDate"" BETWEEN GETDATE() - 7 AND GETDATE()",
bindings: []
};
}

function whereBetweenWithQueryParamStructs() {
return {
sql: "SELECT * FROM ""users"" WHERE ""createdDate"" BETWEEN ? AND ?",
Expand Down
4 changes: 4 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 @@ -307,6 +307,10 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
return { sql: "SELECT * FROM [users] WHERE [id] BETWEEN ? AND ?", bindings: [ 1, 2 ] };
}

function whereBetweenRaw() {
return { sql: "SELECT * FROM [users] WHERE [createdDate] BETWEEN GETDATE() - 7 AND GETDATE()", bindings: [] };
}

function whereBetweenWithQueryParamStructs() {
return {
sql: "SELECT * FROM [users] WHERE [createdDate] BETWEEN ? AND ?",
Expand Down