Merge branch 'master' into and-query

parse-community · Jul 14, 2023 · 3fe2e30 · 3fe2e30
2 parents fb89260 + 04f81e8
commit 3fe2e30
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/Parse/Parse/Internal/Query/State/PFMutableQueryState.h b/Parse/Parse/Internal/Query/State/PFMutableQueryState.h
@@ -69,6 +69,7 @@
 
 - (void)includeKey:(NSString *)key;
 - (void)includeKeys:(NSArray<NSString *> *)keys;
+- (void)includeAll;
 
 ///--------------------------------------
 #pragma mark - Excludes

diff --git a/Parse/Parse/Internal/Query/State/PFMutableQueryState.m b/Parse/Parse/Internal/Query/State/PFMutableQueryState.m
@@ -166,6 +166,10 @@ - (void)includeKeys:(NSArray<NSString *> *)keys {
     }
 }
 
+- (void)includeAll {
+    [self includeKey:@"*"];
+}
+
 ///--------------------------------------
 #pragma mark - Excludes
 ///--------------------------------------

diff --git a/Parse/Parse/Source/PFQuery.h b/Parse/Parse/Source/PFQuery.h
@@ -107,6 +107,13 @@ typedef void (^PFQueryArrayResultBlock)(NSArray<PFGenericObject> *_Nullable obje
  */
 - (instancetype)includeKeys:(NSArray<NSString *> *)keys;
 
+/**
+ Make the query include  all `PFObject`s that have a reference.
+
+ @return The same instance of `PFQuery` as the receiver. This allows method chaining.
+ */
+- (instancetype)includeAll;
+
 /**
  Make the query restrict the fields of the returned `PFObject`s to exclude the provided key.
 

diff --git a/Parse/Parse/Source/PFQuery.m b/Parse/Parse/Source/PFQuery.m
@@ -426,6 +426,12 @@ - (instancetype)includeKeys:(NSArray<NSString *> *)keys {
     return self;
 }
 
+- (instancetype)includeAll {
+    [self checkIfCommandIsRunning];
+    [self.state includeAll];
+    return self;
+}
+
 ///--------------------------------------
 #pragma mark - Exclude
 ///--------------------------------------

diff --git a/Parse/Tests/Unit/QueryStateUnitTests.m b/Parse/Tests/Unit/QueryStateUnitTests.m
@@ -215,6 +215,14 @@ - (void)testIncludeMultipleKeys {
     XCTAssertEqualObjects(state.includedKeys, includedKeys);
 }
 
+- (void)testIncludeAll {
+    PFMutableQueryState *state = [[PFMutableQueryState alloc] initWithParseClassName:@"Yarr"];
+    [state includeAll];
+
+    NSSet *includedKeys = PF_SET(@"*");
+    XCTAssertEqualObjects(state.includedKeys, includedKeys);
+}
+
 - (void)testExcludeKeys {
     PFMutableQueryState *state = [[PFMutableQueryState alloc] initWithParseClassName:@"Yarr"];
     [state excludeKey:@"a"];