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

Sub query support for IN and NOT IN #42

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Sub query support for IN and NOT IN #42

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
14 changes: 14 additions & 0 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 @@ -39,6 +39,8 @@ public class QCondition implements QICondition {
} else if (val instanceof Date) {
String dateString = String.valueOf(val);
return dateString.substring(0, dateString.indexOf(' '));
} else if (val instanceof Q) {
return ((Q)val).build();
} else {
return val;
}
Expand Down Expand Up @@ -92,12 +94,24 @@ public class QCondition implements QICondition {
return this;
}

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

public QCondition isNotIn(List<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(List<Object> values) {
this.operatorValue = ComparisonOperator.INCLUDES;
this.fieldValue = values;
Expand Down
14 changes: 14 additions & 0 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 @@ -94,4 +94,18 @@ private class QConditionTest {
System.assertEquals('Name != null', segment, 'It should output a IS NOT NULL condition.');
}

@isTest
static void testIsInSubQuery() {
String segment = new QCondition('Name').isIn(new Q(Account.SObjectType).selectFields(new Set<String> {'Name'})).build();
String expected = 'Name IN (SELECT Name FROM Account)';
System.assertEquals(expected, segment, 'It should output a IN sub query.');
}

@isTest
static void testIsNotInSubQuery() {
String segment = new QCondition('Name').isNotIn(new Q(Account.SObjectType).selectFields(new Set<String> {'Name'})).build();
String expected = 'Name NOT IN (SELECT Name FROM Account)';
System.assertEquals(expected, segment, 'It should output a NOT IN sub query.');
}

}
112 changes: 66 additions & 46 deletions force-app/main/default/classes/QTest.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,59 +115,79 @@ private class QTest {
}

@isTest
static void testOrGroup() {
String query =
new Q(Account.SObjectType)
.add(Q.orGroup()
.add(Q.condition('Name').equalsTo('test'))
.add(Q.condition('Name').equalsTo('test'))
)
.build();
static void testOrGroup() {
String query =
new Q(Account.SObjectType)
.add(Q.orGroup()
.add(Q.condition('Name').equalsTo('test'))
.add(Q.condition('Name').equalsTo('test'))
)
.build();

String expected = 'SELECT Id FROM Account WHERE (Name = \'test\' OR Name = \'test\')';
System.assertEquals(expected, query, 'It should output a query with a condition group.');
Database.query(query);

List<QCondition> conditions = new List<QCondition>();
conditions.add(Q.condition('Name').equalsTo('test'));
conditions.add(Q.condition('Name').equalsTo('test'));
QOrGroup sbOrGroup = new QOrGroup(conditions);
query =
new Q(Account.SObjectType)
.add(sbOrGroup)
.build();
System.assertEquals(expected, query, 'It should output a query with a condition group.');
Database.query(query);

List<QCondition> conditions = new List<QCondition>();
conditions.add(Q.condition('Name').equalsTo('test'));
conditions.add(Q.condition('Name').equalsTo('test'));
QOrGroup sbOrGroup = new QOrGroup(conditions);
query =
new Q(Account.SObjectType)
.add(sbOrGroup)
.build();

String expected2 = 'SELECT Id FROM Account WHERE (Name = \'test\' OR Name = \'test\')';
System.assertEquals(expected2, query, 'It should output a query with a condition group.');
Database.query(query);
}

@isTest
static void testAndGroup() {
String query =
new Q(Account.SObjectType)
.add(Q.andGroup()
.add(Q.condition('Name').equalsTo('test'))
.add(Q.condition('Name').equalsTo('test'))
)
.build();
System.assertEquals(expected2, query, 'It should output a query with a condition group.');
Database.query(query);
}

@isTest
static void testAndGroup() {
String query =
new Q(Account.SObjectType)
.add(Q.andGroup()
.add(Q.condition('Name').equalsTo('test'))
.add(Q.condition('Name').equalsTo('test'))
)
.build();

String expected = 'SELECT Id FROM Account WHERE (Name = \'test\' AND Name = \'test\')';
System.assertEquals(expected, query, 'It should output a query with a condition group.');
Database.query(query);

List<QCondition> conditions = new List<QCondition>();
conditions.add(Q.condition('Name').equalsTo('test'));
conditions.add(Q.condition('Name').equalsTo('test'));
QAndGroup sbAndGroup = new QAndGroup(conditions);
query =
new Q(Account.SObjectType)
.add(sbAndGroup)
.build();
System.assertEquals(expected, query, 'It should output a query with a condition group.');
Database.query(query);

List<QCondition> conditions = new List<QCondition>();
conditions.add(Q.condition('Name').equalsTo('test'));
conditions.add(Q.condition('Name').equalsTo('test'));
QAndGroup sbAndGroup = new QAndGroup(conditions);
query =
new Q(Account.SObjectType)
.add(sbAndGroup)
.build();

String expected2 = 'SELECT Id FROM Account WHERE (Name = \'test\' AND Name = \'test\')';
System.assertEquals(expected2, query, 'It should output a query with a condition group.');
Database.query(query);
}
System.assertEquals(expected2, query, 'It should output a query with a condition group.');
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();
String expected = 'SELECT Id FROM Account WHERE Name IN (SELECT Name FROM Account)';
System.assertEquals(expected, query, 'It should output a query with an IN sub 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();
String expected = 'SELECT Id FROM Account WHERE Name NOT IN (SELECT Name FROM Account)';
System.assertEquals(expected, query, 'It should output a query with a NOT IN sub query.');
}

}