Add Select from Set of Strings

jpmonette · Jun 5, 2017 · af9978b · af9978b
1 parent d590a1d
commit af9978b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/classes/Q.cls b/src/classes/Q.cls
@@ -14,7 +14,6 @@ public class Q {
 	private List<QCondition> conditions = new List<QCondition>();
 	private List<Q> subQueries = new List<Q>();
 
-	public Q() 						{}
 	public Q(SObjectType fromType)	{ this.fromText = String.valueOf(fromType); }
 	public Q(String fromText) 		{ this.fromText = fromText; }
 
@@ -59,7 +58,7 @@ public class Q {
 	}
 
 	/**
-	 * Add fields to the SELECT statement
+	 * Add fields to the SELECT statement from FieldSet
 	 */
 	public Q selectFields(Schema.FieldSet fs) {
 		for(Schema.FieldSetMember field : fs.getFields()) {
@@ -68,6 +67,16 @@ public class Q {
 		return this;
 	}
 
+	/**
+	 * Add fields to the SELECT statement from Set of Strings
+	 */
+	public Q selectFields(Set<String> fields) {
+		for(String field : fields) {
+			this.fieldList.add(field);
+		}
+		return this;
+	}
+
 	/**
 	 * Add a LIMIT statement
 	 */

diff --git a/src/classes/QTest.cls b/src/classes/QTest.cls
@@ -28,7 +28,7 @@ private class QTest {
 	}
 
 	@isTest
-	static void testSelectFields() {
+	static void testSelectFieldsUsingFieldSet() {
 		String query =
 			new Q(Account.SObjectType)
 				.selectFields(SObjectType.Account.fieldSets.Example)
@@ -38,6 +38,17 @@ private class QTest {
 		Database.query(query);
 	}
 
+	@isTest
+	static void testSelectFieldsUsingSetString() {
+		String query =
+			new Q(Account.SObjectType)
+				.selectFields(new Set<String>{'CreatedById', 'Description', 'Owner.Email'})
+				.build();
+
+		System.assertEquals('SELECT CreatedById, Description, Owner.Email FROM Account', query);
+		Database.query(query);
+	}
+
 	@isTest
 	static void testAddOrders() {
 		String query =