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.

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

API 60 Update #105

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .forceignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**/jsconfig.json

**/.eslintrc.json
14 changes: 6 additions & 8 deletions force-app/main/default/classes/SOQL.cls
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public virtual inherited sharing class SOQL implements Queryable {
Queryable with(String relationshipName, SObjectField field1, SObjectField field2, SObjectField field3);
Queryable with(String relationshipName, SObjectField field1, SObjectField field2, SObjectField field3, SObjectField field4);
Queryable with(String relationshipName, SObjectField field1, SObjectField field2, SObjectField field3, SObjectField field4, SObjectField field5);
Queryable with(String relationshipName, List<SObjectField> fields);
Queryable with(String relationshipName, Iterable<SObjectField> fields);
Queryable with(SubQuery subQuery);
// SELECT - AGGREGATE FUNCTIONS
Queryable count();
Expand Down Expand Up @@ -170,7 +170,7 @@ public virtual inherited sharing class SOQL implements Queryable {
SubQuery with(SObjectField field1, SObjectField field2, SObjectField field3, SObjectField field4);
SubQuery with(SObjectField field1, SObjectField field2, SObjectField field3, SObjectField field4, SObjectField field5);
SubQuery with(List<SObjectField> fields);
SubQuery with(String relationshipName, List<SObjectField> fields);
SubQuery with(String relationshipName, Iterable<SObjectField> fields);
SubQuery with(SubQuery subQuery);
// WHERE
SubQuery whereAre(FilterGroup filterGroup);
Expand Down Expand Up @@ -232,10 +232,8 @@ public virtual inherited sharing class SOQL implements Queryable {
Filter contains(String prefix, String value, String suffix);
Filter notContains(String prefix, String value, String suffix);
Filter isIn(Iterable<Object> iterable);
Filter isIn(List<Object> inList);
Filter isIn(InnerJoin joinQuery);
Filter notIn(Iterable<Object> iterable);
Filter notIn(List<Object> inList);
Filter notIn(InnerJoin joinQuery);
Filter includesAll(Iterable<String> values);
Filter includesSome(Iterable<String> values);
Expand Down Expand Up @@ -357,7 +355,7 @@ public virtual inherited sharing class SOQL implements Queryable {
return with(relationshipName, new List<SObjectField>{ field1, field2, field3, field4, field5 });
}

public SOQL with(String relationshipName, List<SObjectField> fields) {
public SOQL with(String relationshipName, Iterable<SObjectField> fields) {
builder.fields.with(relationshipName, fields);
return this;
}
Expand Down Expand Up @@ -995,7 +993,7 @@ public virtual inherited sharing class SOQL implements Queryable {
fields.add('FORMAT(' + field + ') ' + alias);
}

public void with(String relationshipPath, List<SObjectField> fields) {
public void with(String relationshipPath, Iterable<SObjectField> fields) {
for (SObjectField field : fields) {
with(relationshipPath, field);
}
Expand Down Expand Up @@ -1079,7 +1077,7 @@ public virtual inherited sharing class SOQL implements Queryable {
return this;
}

public SubQuery with(String relationshipName, List<SObjectField> fields) {
public SubQuery with(String relationshipName, Iterable<SObjectField> fields) {
builder.fields.with(relationshipName, fields);
return this;
}
Expand Down Expand Up @@ -1456,7 +1454,7 @@ public virtual inherited sharing class SOQL implements Queryable {
}

private String formattedString(String value) {
return value == null ? value : value.trim();
return value ?? value.trim();
}

public Filter isIn(Iterable<Object> iterable) {
Expand Down
2 changes: 1 addition & 1 deletion force-app/main/default/classes/SOQL.cls-meta.xml
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>58.0</apiVersion>
<apiVersion>60.0</apiVersion>
<status>Active</status>
</ApexClass>
2 changes: 1 addition & 1 deletion force-app/main/default/classes/SOQL_Test.cls-meta.xml
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>58.0</apiVersion>
<apiVersion>60.0</apiVersion>
<status>Active</status>
</ApexClass>
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>56.0</apiVersion>
<apiVersion>60.0</apiVersion>
<status>Active</status>
</ApexClass>
</ApexClass>
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>60.0</apiVersion>
<status>Active</status>
</ApexClass>
</ApexClass>
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>60.0</apiVersion>
<status>Active</status>
</ApexClass>
</ApexClass>
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>60.0</apiVersion>
<status>Active</status>
</ApexClass>
</ApexClass>
4 changes: 2 additions & 2 deletions website/docs/api/soql-sub.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The following are methods for `SubQuery`.
- [`with(SObjectField field1, SObjectField field2, SObjectField field3, SObjectField field4)`](#with-field1---field5)
- [`with(SObjectField field1, SObjectField field2, SObjectField field3, SObjectField field4, SObjectField field5)`](#with-field1---field5)
- [`with(List<SObjectField> fields)`](#with-fields)
- [`with(String relationshipName, List<SObjectField> fields)`](#with-related-fields)
- [`with(String relationshipName, Iterable<SObjectField> fields)`](#with-related-fields)

[**SUBQUERY**](#sub-query)

Expand Down Expand Up @@ -154,7 +154,7 @@ SOQL.of(Account.SObjectType)
**Signature**

```apex
SubQuery with(String relationshipName, List<SObjectField> fields)
SubQuery with(String relationshipName, Iterable<SObjectField> fields)
```


Expand Down
4 changes: 2 additions & 2 deletions website/docs/api/soql.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The following are methods for `SOQL`.
- [`with(String relationshipName, SObjectField field1, SObjectField field2, SObjectField field3)`](#with-related-field1---field5)
- [`with(String relationshipName, SObjectField field1, SObjectField field2, SObjectField field3, SObjectField field4)`](#with-related-field1---field5)
- [`with(String relationshipName, SObjectField field1, SObjectField field2, SObjectField field3, SObjectField field4, SObjectField field5)`](#with-related-field1---field5)
- [`with(String relationshipName, List<SObjectField> fields)`](#with-related-fields)
- [`with(String relationshipName, Iterable<SObjectField> fields)`](#with-related-fields)

[**AGGREGATION FUNCTIONS**](#aggregate-functions)

Expand Down Expand Up @@ -343,7 +343,7 @@ Use for more than 5 parent fields.
**Signature**

```apex
Queryable with(String relationshipName, List<SObjectField> fields)
Queryable with(String relationshipName, Iterable<SObjectField> fields)
```

**Example**
Expand Down
Loading