Skip to content
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

multiple filtergroup fix #123

Merged
merged 2 commits into from
May 13, 2024
Merged

multiple filtergroup fix #123

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
e1f51cf
multiple filtergroup fix
pgajek2 May 13, 2024
77a27f0
unit test update
pgajek2 May 13, 2024
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
2 changes: 1 addition & 1 deletion force-app/main/default/classes/SOQL.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,7 @@ public virtual inherited sharing class SOQL implements Queryable {
String orderWithSpecialCharacters = getConditionsLogic();

for (Integer i = 0; i < queryConditions.size(); i++) {
orderWithSpecialCharacters = orderWithSpecialCharacters.replace(String.valueOf(i + 1), '{' + i + '}');
orderWithSpecialCharacters = orderWithSpecialCharacters.replaceFirst(String.valueOf(i + 1), '{' + i + '}');
}

return orderWithSpecialCharacters; // e.g ({0} AND ({1} AND {2}))
Expand Down
37 changes: 37 additions & 0 deletions force-app/main/default/classes/SOQL_Test.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,6 +1522,43 @@ private class SOQL_Test {
Assert.areEqual('Krakow', binding.get('v3'));
}

@IsTest
static void multipleFiltersGroups() {
// Test
SOQL builder = SOQL.of(Account.SObjectType)
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('1')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('2')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('3')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('4')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('5')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('6')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('7')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('8')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('9')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('10')))
.whereAre(SOQL.FilterGroup.add(SOQL.Filter.with(Account.Name).contains('11')));

// Verify
String soql = builder.toString();
Assert.areEqual(
'SELECT Id FROM Account WHERE (Name LIKE :v1) AND (Name LIKE :v2) AND (Name LIKE :v3) AND (Name LIKE :v4) AND (Name LIKE :v5) AND (Name LIKE :v6) AND (Name LIKE :v7) AND (Name LIKE :v8) AND (Name LIKE :v9) AND (Name LIKE :v10) AND (Name LIKE :v11)',
soql
);

Map<String, Object> binding = builder.binding();
Assert.areEqual('%1%', binding.get('v1'));
Assert.areEqual('%2%', binding.get('v2'));
Assert.areEqual('%3%', binding.get('v3'));
Assert.areEqual('%4%', binding.get('v4'));
Assert.areEqual('%5%', binding.get('v5'));
Assert.areEqual('%6%', binding.get('v6'));
Assert.areEqual('%7%', binding.get('v7'));
Assert.areEqual('%8%', binding.get('v8'));
Assert.areEqual('%9%', binding.get('v9'));
Assert.areEqual('%10%', binding.get('v10'));
Assert.areEqual('%11%', binding.get('v11'));
}

@IsTest
static void anyConditionMatchingForInnerGroup() {
// Test
Expand Down
Loading