Skip to content

Fixes Set handling in filterWhere #44

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
jongpie merged 5 commits into from
Sep 18, 2023
Merged

Fixes Set handling in filterWhere #44

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3839ffc
Fixes #43 by upgrading SOQl.cls to API version 58, where Set<T> alway…
jamessimone Sep 12, 2023
2bdb13f
Bumped all metadata to API v58.0 (Summer '23 release)
jongpie Sep 14, 2023
9a59c1a
Updated all references to classes & enums in the Schema & System name…
jongpie Sep 14, 2023
043f934
Eliminated a now-deprecated private method, SOQL.convertSetToQueryStr…
jongpie Sep 14, 2023
cadb563
Created new package versions
jongpie Sep 14, 2023
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
12 changes: 6 additions & 6 deletions nebula-query-and-search/main/classes/SOQL.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,10 +619,8 @@ global abstract class SOQL implements Comparable {
private String formatObjectForQueryString(Object valueToFormat) {
if (valueToFormat == null) {
return null;
} else if (valueToFormat instanceof List<Object>) {
return this.convertListToQueryString((List<Object>) valueToFormat);
} else if (valueToFormat instanceof Set<Object>) {
return this.convertSetToQueryString(valueToFormat);
} else if (valueToFormat instanceof Iterable<Object>) {
return this.convertListToQueryString((Iterable<Object>) valueToFormat);
} else if (valueToFormat instanceof Map<Object, Object>) {
return this.convertMapToQueryString(valueToFormat);
} else if (valueToFormat instanceof Date) {
Expand Down Expand Up @@ -653,9 +651,11 @@ global abstract class SOQL implements Comparable {
return input;
}

private String convertListToQueryString(List<Object> valueList) {
private String convertListToQueryString(Iterable<Object> valueIterable) {
List<String> parsedValueList = new List<String>();
for (Object value : valueList) {
Iterator<Object> valueIterator = valueIterable.iterator();
while (valueIterator.hasNext()) {
Object value = valueIterator.next();
parsedValueList.add(this.formatObjectForQueryString(value));
}
return '(' + String.join(parsedValueList, ', ') + ')';
Expand Down
2 changes: 1 addition & 1 deletion nebula-query-and-search/main/classes/SOQL.cls-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>57.0</apiVersion>
<apiVersion>58.0</apiVersion>
Comment thread
jongpie marked this conversation as resolved.
<status>Active</status>
</ApexClass>
12 changes: 12 additions & 0 deletions nebula-query-and-search/tests/classes/Query_Tests.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ private class Query_Tests {
List<Account> accounts = simpleAccountQuery.getResults();
}

@IsTest
static void it_should_correctly_represent_sets_in_query_filters() {
String expectedName = 'someName';
String expectedQueryString = 'SELECT Id, Name FROM Account WHERE Name IN (\'' + expectedName + '\')';

String actualQuery = new Query(Schema.Account.SObjectType)
.filterWhere(Schema.Account.Name, SOQL.Operator.IS_IN, new Set<String>{ expectedName })
.getQuery();

System.Assert.areEqual(expectedQueryString, actualQuery);
}

@IsTest
static void it_should_return_results_for_an_advanced_query() {
Datetime now = System.now();
Expand Down