Skip to content

subquery support for 'IN' operator #9

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
fehays merged 1 commit into from
Apr 28, 2020
Merged

subquery support for 'IN' operator #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 15 additions & 13 deletions force-app/main/default/classes/QCondition.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ public virtual class QCondition implements QICondition {
return dateString.substring(0, dateString.indexOf(' '));
} else if (val instanceof QDateLiteral) {
return ((QDateLiteral)val).buildLiteral();
}else {
} else if (val instanceof Q) {
return ((Q)val).build();
} else {
return val;
}
}
Expand Down Expand Up @@ -99,12 +101,24 @@ public virtual class QCondition implements QICondition {
return this;
}

public QCondition isIn(Q subQuery) {
this.operatorValue = ComparisonOperator.IS_IN;
this.fieldValue = subQuery;
return this;
}

public QCondition isNotIn(Object values) {
this.operatorValue = ComparisonOperator.NOT_IN;
this.fieldValue = values;
return this;
}

public QCondition isNotIn(Q subQuery) {
this.operatorValue = ComparisonOperator.NOT_IN;
this.fieldValue = subQuery;
return this;
}

public QCondition includes(Object values) {
this.operatorValue = ComparisonOperator.INCLUDES;
this.fieldValue = values;
Expand Down Expand Up @@ -145,24 +159,12 @@ public virtual class QCondition implements QICondition {
} else if (operatorValue.equals(ComparisonOperator.IS_LIKE)) {
return field + ' LIKE ' + fieldValue;
} else if (operatorValue.equals(ComparisonOperator.IS_IN)) {
if (fieldValue instanceOf QBindVariable) {
return field + ' IN ' + fieldValue;
}
return field + ' IN (' + fieldValue + ')';
} else if (operatorValue.equals(ComparisonOperator.NOT_IN)) {
if (fieldValue instanceOf QBindVariable) {
return field + ' NOT IN ' + fieldValue;
}
return field + ' NOT IN (' + fieldValue + ')';
} else if (operatorValue.equals(ComparisonOperator.INCLUDES)) {
if (fieldValue instanceOf QBindVariable) {
return field + ' INCLUDES ' + fieldValue;
}
return field + ' INCLUDES (' + fieldValue + ')';
} else if (operatorValue.equals(ComparisonOperator.EXCLUDES)) {
if (fieldValue instanceOf QBindVariable) {
return field + ' EXCLUDES ' + fieldValue;
}
return field + ' EXCLUDES (' + fieldValue + ')';
} else {
return '';
Expand Down
20 changes: 16 additions & 4 deletions force-app/main/default/classes/QConditionTest.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,13 @@ private class QConditionTest {
static void testIsInBindVar() {
List<String> names = new List<String>{'John', 'Jane'};
String segment = new QCondition('Name').isIn(Q.bindVar(':names')).build();
System.assertEquals('Name IN :names', segment);
System.assertEquals('Name IN (:names)', segment);
}

@IsTest
static void testIsInSubQuery() {
String segment = new QCondition('Name').isIn(new Q(Account.SObjectType).selectFields(new Set<String> {'Name'})).build();
System.assertEquals('Name IN (SELECT Name FROM Account)', segment);
}

@IsTest
Expand All @@ -86,7 +92,13 @@ private class QConditionTest {
static void testIsNotInBindVar() {
List<String> names = new List<String>{'John', 'Jane'};
String segment = new QCondition('Name').isNotIn(Q.bindVar(':names')).build();
System.assertEquals('Name NOT IN :names', segment);
System.assertEquals('Name NOT IN (:names)', segment);
}

@IsTest
static void testIsNotInSubQuery() {
String segment = new QCondition('Name').isNotIn(new Q(Account.SObjectType).selectFields(new Set<String> {'Name'})).build();
System.assertEquals('Name NOT IN (SELECT Name FROM Account)', segment);
}

@IsTest
Expand All @@ -100,7 +112,7 @@ private class QConditionTest {
static void testIncludesBindVar() {
List<String> markets = new List<String>{'APAC', 'EMEA'};
String segment = new QCondition('Market').includes(q.bindVar(':markets')).build();
System.assertEquals('Market INCLUDES :markets', segment);
System.assertEquals('Market INCLUDES (:markets)', segment);
}

@IsTest
Expand All @@ -114,7 +126,7 @@ private class QConditionTest {
static void testExcludesBindVar() {
List<String> markets = new List<String>{'APAC', 'EMEA'};
String segment = new QCondition('Market').excludes(q.bindVar(':markets')).build();
System.assertEquals('Market EXCLUDES :markets', segment);
System.assertEquals('Market EXCLUDES (:markets)', segment);
}

@IsTest
Expand Down
22 changes: 21 additions & 1 deletion force-app/main/default/classes/QTest.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private class QTest {
.add(Q.condition('Name').isIn(Q.bindVar(':listOfNames')))
.build();

System.assertEquals('SELECT Id FROM Account WHERE Name IN :listOfNames', query);
System.assertEquals('SELECT Id FROM Account WHERE Name IN (:listOfNames)', query);
}

@IsTest
Expand Down Expand Up @@ -236,4 +236,24 @@ private class QTest {
System.assertEquals('SELECT Id FROM Account WHERE DISTANCE(BillingAddress, GEOLOCATION(37.775, -122.418), \'mi\') < 20', query);
Database.query(query);
}

@IsTest
static void testIsInSubQuery() {
String query =
new Q(Account.SObjectType)
.add(Q.condition('Name').isIn(new Q(Account.SObjectType).selectFields(new Set<String> {'Name'})))
.build();

System.assertEquals('SELECT Id FROM Account WHERE Name IN (SELECT Name FROM Account)', query);
}

@IsTest
static void testIsNotInSubQuery() {
String query =
new Q(Account.SObjectType)
.add(Q.condition('Name').isNotIn(new Q(Account.SObjectType).selectFields(new Set<String> {'Name'})))
.build();

System.assertEquals('SELECT Id FROM Account WHERE Name NOT IN (SELECT Name FROM Account)', query);
}
}