Skip to content

Commit 0ca571b

Browse files
nlutsenkonlutsenko
committed
Merge pull request parse-community#834 from nathanhillyer/pfquerykey_constants
Move PFQueryKey constants to their own file to allow reuse throughout the Parse SDK.
2 parents edf9ed4 + 801c7db commit 0ca571b

File tree

9 files changed

+116
-55
lines changed

9 files changed

+116
-55
lines changed

‎Parse.xcodeproj/project.pbxproj‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
4030936B1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; };
11+
4030936C1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; };
12+
4030936D1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; };
13+
4030936E1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; };
14+
4030936F1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; };
15+
403093701C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; };
16+
403093711C81F0B200CF09F8 /* PFQueryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 403093691C81F0B200CF09F8 /* PFQueryConstants.h */; };
17+
403093721C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; };
18+
403093731C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; };
19+
403093741C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; };
20+
403093751C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; };
21+
403093761C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; };
22+
403093771C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; };
23+
403093781C81F0B200CF09F8 /* PFQueryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */; };
1024
7CBC8DA116D594F800AEC66D /* PFTaskQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CF213BB16D41D980065CF1A /* PFTaskQueue.m */; };
1125
8101550A1BB3832700D7C7BD /* PFWeakValue.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C1EE481AE1EF960031C438 /* PFWeakValue.m */; };
1226
8101550B1BB3832700D7C7BD /* PFUserState.m in Sources */ = {isa = PBXBuildFile; fileRef = 814BCDF01B4DF63600007B7F /* PFUserState.m */; };
@@ -2946,6 +2960,8 @@
29462960
09EEA12E1434FB1F00E3A3FA /* Parse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Parse.m; sourceTree = "<group>"; };
29472961
09EEA1351435143500E3A3FA /* ParseInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParseInternal.h; sourceTree = "<group>"; };
29482962
2FE3E9E9147B383200445083 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
2963+
403093691C81F0B200CF09F8 /* PFQueryConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFQueryConstants.h; sourceTree = "<group>"; };
2964+
4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFQueryConstants.m; sourceTree = "<group>"; };
29492965
44B78E11157D21B000A5E97F /* PFInstallation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFInstallation.h; sourceTree = "<group>"; };
29502966
44B78E12157D21B000A5E97F /* PFInstallation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFInstallation.m; sourceTree = "<group>"; };
29512967
498C29FE1551DC450034BB80 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
@@ -4625,6 +4641,8 @@
46254641
81A207C31AEB0AA0008A5F1A /* Query */ = {
46264642
isa = PBXGroup;
46274643
children = (
4644+
403093691C81F0B200CF09F8 /* PFQueryConstants.h */,
4645+
4030936A1C81F0B200CF09F8 /* PFQueryConstants.m */,
46284646
8166FC961B50381B003841A2 /* PFQueryPrivate.h */,
46294647
812B7AB51AF2FA3F00D15FF5 /* Controller */,
46304648
81C7F4A61AF42BD9007B5418 /* State */,
@@ -5333,6 +5351,7 @@
53335351
810156271BB3832700D7C7BD /* PFSQLiteDatabase.h in Headers */,
53345352
8101562A1BB3832700D7C7BD /* PFKeyValueCache.h in Headers */,
53355353
8101562C1BB3832700D7C7BD /* PFSessionController.h in Headers */,
5354+
403093701C81F0B200CF09F8 /* PFQueryConstants.h in Headers */,
53365355
8101562D1BB3832700D7C7BD /* PFRole.h in Headers */,
53375356
810156301BB3832700D7C7BD /* PFSession.h in Headers */,
53385357
810156311BB3832700D7C7BD /* PFEventuallyPin.h in Headers */,
@@ -5418,6 +5437,7 @@
54185437
815F23621BD04D150054659F /* PFCategoryLoader.h in Headers */,
54195438
815F23631BD04D150054659F /* PFThreadsafety.h in Headers */,
54205439
815F23641BD04D150054659F /* PFRelationState_Private.h in Headers */,
5440+
4030936E1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */,
54215441
815F23651BD04D150054659F /* ParseInternal.h in Headers */,
54225442
815F23671BD04D150054659F /* PFCoreDataProvider.h in Headers */,
54235443
815F23681BD04D150054659F /* ParseModule.h in Headers */,
@@ -5784,6 +5804,7 @@
57845804
8166FC9D1B503847003841A2 /* PFUserPrivate.h in Headers */,
57855805
81C7F4991AF42187007B5418 /* PFFileState.h in Headers */,
57865806
818AAA7219D36B1C00FC1B3C /* PFAnonymousUtils.h in Headers */,
5807+
4030936B1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */,
57875808
818D6F141B3C8D1900F94C82 /* PFObjectLocalIdStore.h in Headers */,
57885809
814881551B795CAC008763BF /* PFPropertyInfo_Runtime.h in Headers */,
57895810
8166FC891B503794003841A2 /* PFInstallationPrivate.h in Headers */,
@@ -6006,6 +6027,7 @@
60066027
81C584361C3B0A98000063C6 /* PFUserPrivate.h in Headers */,
60076028
81C584371C3B0A98000063C6 /* PFFileState.h in Headers */,
60086029
81C584381C3B0A98000063C6 /* PFAnonymousUtils.h in Headers */,
6030+
4030936C1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */,
60096031
81C584391C3B0A98000063C6 /* PFObjectLocalIdStore.h in Headers */,
60106032
81C5843A1C3B0A98000063C6 /* PFPropertyInfo_Runtime.h in Headers */,
60116033
81C5843B1C3B0A98000063C6 /* PFInstallationPrivate.h in Headers */,
@@ -6068,6 +6090,7 @@
60686090
81C585081C3B0AA1000063C6 /* PFCategoryLoader.h in Headers */,
60696091
81C585091C3B0AA1000063C6 /* PFThreadsafety.h in Headers */,
60706092
81C5850A1C3B0AA1000063C6 /* PFRelationState_Private.h in Headers */,
6093+
4030936F1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */,
60716094
81C5850B1C3B0AA1000063C6 /* ParseInternal.h in Headers */,
60726095
81C5850C1C3B0AA1000063C6 /* PFCoreDataProvider.h in Headers */,
60736096
81C5850D1C3B0AA1000063C6 /* ParseModule.h in Headers */,
@@ -6384,6 +6407,7 @@
63846407
81C586D11C3B0AA9000063C6 /* PFSQLiteDatabase.h in Headers */,
63856408
81C586D21C3B0AA9000063C6 /* PFKeyValueCache.h in Headers */,
63866409
81C586D31C3B0AA9000063C6 /* PFSessionController.h in Headers */,
6410+
403093711C81F0B200CF09F8 /* PFQueryConstants.h in Headers */,
63876411
81C586D41C3B0AA9000063C6 /* PFRole.h in Headers */,
63886412
81C586D51C3B0AA9000063C6 /* PFSession.h in Headers */,
63896413
81C586D61C3B0AA9000063C6 /* PFEventuallyPin.h in Headers */,
@@ -6599,6 +6623,7 @@
65996623
815EE91E19F987910076FE5D /* PFRESTCloudCommand.h in Headers */,
66006624
81146C7F1A785203001F8473 /* PFRESTObjectCommand.h in Headers */,
66016625
8124C8741B26B9E700758E00 /* PFPinningObjectStore.h in Headers */,
6626+
4030936D1C81F0B200CF09F8 /* PFQueryConstants.h in Headers */,
66026627
81EB6635198A7FA600851598 /* PFConfig.h in Headers */,
66036628
81F0E89C19E6F83E00812A88 /* PFObject+Subclass.h in Headers */,
66046629
815EE8F619F976D50076FE5D /* PFRESTCommand.h in Headers */,
@@ -7258,6 +7283,7 @@
72587283
810155511BB3832700D7C7BD /* PFACLState.m in Sources */,
72597284
810155521BB3832700D7C7BD /* PFRESTConfigCommand.m in Sources */,
72607285
810155531BB3832700D7C7BD /* PFQueryUtilities.m in Sources */,
7286+
403093771C81F0B200CF09F8 /* PFQueryConstants.m in Sources */,
72617287
810155561BB3832700D7C7BD /* PFOfflineObjectController.m in Sources */,
72627288
810155571BB3832700D7C7BD /* PFKeychainStore.m in Sources */,
72637289
810155591BB3832700D7C7BD /* PFQueryState.m in Sources */,
@@ -7344,6 +7370,7 @@
73447370
815F22BF1BD04D150054659F /* PFCommandRunningConstants.m in Sources */,
73457371
815F22C01BD04D150054659F /* PFDevice.m in Sources */,
73467372
815F22C11BD04D150054659F /* PFSQLiteStatement.m in Sources */,
7373+
403093751C81F0B200CF09F8 /* PFQueryConstants.m in Sources */,
73477374
815F22C21BD04D150054659F /* ParseModule.m in Sources */,
73487375
815F22C31BD04D150054659F /* PFACL.m in Sources */,
73497376
815F22C41BD04D150054659F /* PFUserController.m in Sources */,
@@ -7808,6 +7835,7 @@
78087835
81E7A2271B6042BD006CB680 /* PFObjectFileCodingLogic.m in Sources */,
78097836
8124C88C1B276B8800758E00 /* PFObjectFilePersistenceController.m in Sources */,
78107837
818D586C1B5D9F4B00813989 /* PFURLSessionCommandRunner.m in Sources */,
7838+
403093721C81F0B200CF09F8 /* PFQueryConstants.m in Sources */,
78117839
815619021A1F79AC0076504A /* PFDateFormatter.m in Sources */,
78127840
8124C8751B26B9E700758E00 /* PFPinningObjectStore.m in Sources */,
78137841
81C7F49B1AF42187007B5418 /* PFFileState.m in Sources */,
@@ -7967,6 +7995,7 @@
79677995
81C583421C3B0A98000063C6 /* PFObjectFileCodingLogic.m in Sources */,
79687996
81C583431C3B0A98000063C6 /* PFObjectFilePersistenceController.m in Sources */,
79697997
81C583441C3B0A98000063C6 /* PFURLSessionCommandRunner.m in Sources */,
7998+
403093731C81F0B200CF09F8 /* PFQueryConstants.m in Sources */,
79707999
81C583451C3B0A98000063C6 /* PFDateFormatter.m in Sources */,
79718000
81C583461C3B0A98000063C6 /* PFPinningObjectStore.m in Sources */,
79728001
81C583471C3B0A98000063C6 /* PFFileState.m in Sources */,
@@ -8047,6 +8076,7 @@
80478076
81C584711C3B0AA1000063C6 /* PFCommandRunningConstants.m in Sources */,
80488077
81C584721C3B0AA1000063C6 /* PFDevice.m in Sources */,
80498078
81C584731C3B0AA1000063C6 /* PFSQLiteStatement.m in Sources */,
8079+
403093761C81F0B200CF09F8 /* PFQueryConstants.m in Sources */,
80508080
81C584741C3B0AA1000063C6 /* ParseModule.m in Sources */,
80518081
81C584751C3B0AA1000063C6 /* PFACL.m in Sources */,
80528082
81C584761C3B0AA1000063C6 /* PFUserController.m in Sources */,
@@ -8248,6 +8278,7 @@
82488278
81C586091C3B0AA9000063C6 /* PFACLState.m in Sources */,
82498279
81C5860A1C3B0AA9000063C6 /* PFRESTConfigCommand.m in Sources */,
82508280
81C5860B1C3B0AA9000063C6 /* PFQueryUtilities.m in Sources */,
8281+
403093781C81F0B200CF09F8 /* PFQueryConstants.m in Sources */,
82518282
81C5860C1C3B0AA9000063C6 /* PFOfflineObjectController.m in Sources */,
82528283
81C5860D1C3B0AA9000063C6 /* PFKeychainStore.m in Sources */,
82538284
81C5860E1C3B0AA9000063C6 /* PFQueryState.m in Sources */,
@@ -8421,6 +8452,7 @@
84218452
812B7ABB1AF2FA4800D15FF5 /* PFQueryController.m in Sources */,
84228453
812145801AA4A808000B23F5 /* PFRESTSessionCommand.m in Sources */,
84238454
81EEE1B31B446D600087AC4D /* PFCurrentUserController.m in Sources */,
8455+
403093741C81F0B200CF09F8 /* PFQueryConstants.m in Sources */,
84248456
814BCDF41B4DF63600007B7F /* PFUserState.m in Sources */,
84258457
818D6F231B3DCB5A00F94C82 /* PFObjectEstimatedData.m in Sources */,
84268458
81C7F49C1AF42187007B5418 /* PFFileState.m in Sources */,

‎Parse/Internal/Commands/PFRESTQueryCommand.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#import "PFHTTPRequest.h"
1515
#import "PFQueryPrivate.h"
1616
#import "PFQueryState.h"
17+
#import "PFQueryConstants.h"
1718

1819
@implementation PFRESTQueryCommand
1920

@@ -133,7 +134,7 @@ + (NSDictionary *)findCommandParametersWithOrder:(NSString *)order
133134
if (conditions.count > 0) {
134135
NSMutableDictionary *whereData = [[NSMutableDictionary alloc] init];
135136
[conditions enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
136-
if ([key isEqualToString:@"$or"]) {
137+
if ([key isEqualToString:PFQueryKeyOr]) {
137138
NSArray *array = (NSArray *)obj;
138139
NSMutableArray *newArray = [NSMutableArray array];
139140
for (PFQuery *subquery in array) {

‎Parse/Internal/LocalDataStore/OfflineQueryLogic/PFOfflineQueryLogic.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#import "PFQueryPrivate.h"
2525
#import "PFRelation.h"
2626
#import "PFRelationPrivate.h"
27+
#import "PFQueryConstants.h"
2728

2829
typedef BOOL (^PFComparatorDeciderBlock)(id value, id constraint);
2930
typedef BOOL (^PFSubQueryMatcherBlock)(id object, NSArray *results);

‎Parse/Internal/Query/Controller/PFOfflineQueryController.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#import "PFQueryState.h"
2020
#import "PFRESTCommand.h"
2121
#import "PFRelationPrivate.h"
22+
#import "PFQueryConstants.h"
2223

2324
@interface PFOfflineQueryController () {
2425
PFOfflineStore *_offlineStore; // TODO: (nlutsenko) Lazy-load this via self.dataSource.
@@ -63,7 +64,7 @@ - (BFTask *)findObjectsAsyncForQueryState:(PFQueryState *)queryState
6364
user:user];
6465
}
6566

66-
NSDictionary *relationCondition = queryState.conditions[@"$relatedTo"];
67+
NSDictionary *relationCondition = queryState.conditions[PFQueryKeyRelatedTo];
6768
if (relationCondition) {
6869
PFObject *object = relationCondition[@"object"];
6970
NSString *key = relationCondition[@"key"];

‎Parse/Internal/Query/PFQueryConstants.h‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/**
2+
* Copyright (c) 2015-present, Parse, LLC.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the BSD-style license found in the
6+
* LICENSE file in the root directory of this source tree. An additional grant
7+
* of patent rights can be found in the PATENTS file in the same directory.
8+
*/
9+
10+
#import <Foundation/Foundation.h>
11+
12+
NS_ASSUME_NONNULL_BEGIN
13+
14+
extern NSString *const PFQueryKeyNotEqualTo;
15+
extern NSString *const PFQueryKeyLessThan;
16+
extern NSString *const PFQueryKeyLessThanEqualTo;
17+
extern NSString *const PFQueryKeyGreaterThan;
18+
extern NSString *const PFQueryKeyGreaterThanOrEqualTo;
19+
extern NSString *const PFQueryKeyContainedIn;
20+
extern NSString *const PFQueryKeyNotContainedIn;
21+
extern NSString *const PFQueryKeyContainsAll;
22+
extern NSString *const PFQueryKeyNearSphere;
23+
extern NSString *const PFQueryKeyWithin;
24+
extern NSString *const PFQueryKeyRegex;
25+
extern NSString *const PFQueryKeyExists;
26+
extern NSString *const PFQueryKeyInQuery;
27+
extern NSString *const PFQueryKeyNotInQuery;
28+
extern NSString *const PFQueryKeySelect;
29+
extern NSString *const PFQueryKeyDontSelect;
30+
extern NSString *const PFQueryKeyRelatedTo;
31+
extern NSString *const PFQueryKeyOr;
32+
extern NSString *const PFQueryKeyQuery;
33+
extern NSString *const PFQueryKeyKey;
34+
extern NSString *const PFQueryKeyObject;
35+
36+
extern NSString *const PFQueryOptionKeyMaxDistance;
37+
extern NSString *const PFQueryOptionKeyBox;
38+
extern NSString *const PFQueryOptionKeyRegexOptions;
39+
40+
NS_ASSUME_NONNULL_END

‎Parse/Internal/Query/PFQueryConstants.m‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
/**
2+
* Copyright (c) 2015-present, Parse, LLC.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the BSD-style license found in the
6+
* LICENSE file in the root directory of this source tree. An additional grant
7+
* of patent rights can be found in the PATENTS file in the same directory.
8+
*/
9+
10+
#import "PFQueryConstants.h"
11+
12+
NSString *const PFQueryKeyNotEqualTo = @"$ne";
13+
NSString *const PFQueryKeyLessThan = @"$lt";
14+
NSString *const PFQueryKeyLessThanEqualTo = @"$lte";
15+
NSString *const PFQueryKeyGreaterThan = @"$gt";
16+
NSString *const PFQueryKeyGreaterThanOrEqualTo = @"$gte";
17+
NSString *const PFQueryKeyContainedIn = @"$in";
18+
NSString *const PFQueryKeyNotContainedIn = @"$nin";
19+
NSString *const PFQueryKeyContainsAll = @"$all";
20+
NSString *const PFQueryKeyNearSphere = @"$nearSphere";
21+
NSString *const PFQueryKeyWithin = @"$within";
22+
NSString *const PFQueryKeyRegex = @"$regex";
23+
NSString *const PFQueryKeyExists = @"$exists";
24+
NSString *const PFQueryKeyInQuery = @"$inQuery";
25+
NSString *const PFQueryKeyNotInQuery = @"$notInQuery";
26+
NSString *const PFQueryKeySelect = @"$select";
27+
NSString *const PFQueryKeyDontSelect = @"$dontSelect";
28+
NSString *const PFQueryKeyRelatedTo = @"$relatedTo";
29+
NSString *const PFQueryKeyOr = @"$or";
30+
NSString *const PFQueryKeyQuery = @"query";
31+
NSString *const PFQueryKeyKey = @"key";
32+
NSString *const PFQueryKeyObject = @"object";
33+
34+
NSString *const PFQueryOptionKeyMaxDistance = @"$maxDistance";
35+
NSString *const PFQueryOptionKeyBox = @"$box";
36+
NSString *const PFQueryOptionKeyRegexOptions = @"$options";

‎Parse/Internal/Query/PFQueryPrivate.h‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,6 @@
1313

1414
#import "PFQueryState.h"
1515

16-
extern NSString *const PFQueryKeyNotEqualTo;
17-
extern NSString *const PFQueryKeyLessThan;
18-
extern NSString *const PFQueryKeyLessThanEqualTo;
19-
extern NSString *const PFQueryKeyGreaterThan;
20-
extern NSString *const PFQueryKeyGreaterThanOrEqualTo;
21-
extern NSString *const PFQueryKeyContainedIn;
22-
extern NSString *const PFQueryKeyNotContainedIn;
23-
extern NSString *const PFQueryKeyContainsAll;
24-
extern NSString *const PFQueryKeyNearSphere;
25-
extern NSString *const PFQueryKeyWithin;
26-
extern NSString *const PFQueryKeyRegex;
27-
extern NSString *const PFQueryKeyExists;
28-
extern NSString *const PFQueryKeyInQuery;
29-
extern NSString *const PFQueryKeyNotInQuery;
30-
extern NSString *const PFQueryKeySelect;
31-
extern NSString *const PFQueryKeyDontSelect;
32-
extern NSString *const PFQueryKeyRelatedTo;
33-
extern NSString *const PFQueryKeyOr;
34-
extern NSString *const PFQueryKeyQuery;
35-
extern NSString *const PFQueryKeyKey;
36-
extern NSString *const PFQueryKeyObject;
37-
38-
extern NSString *const PFQueryOptionKeyMaxDistance;
39-
extern NSString *const PFQueryOptionKeyBox;
40-
extern NSString *const PFQueryOptionKeyRegexOptions;
41-
4216
@class BFTask<__covariant BFGenericType>;
4317
@class PFObject;
4418

‎Parse/Internal/Query/State/PFMutableQueryState.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99

1010
#import "PFMutableQueryState.h"
11+
#import "PFQueryConstants.h"
1112

1213
#import "PFQueryState_Private.h"
1314

@@ -103,7 +104,7 @@ - (void)setRelationConditionWithObject:(id)object forKey:(NSString *)key {
103104
NSMutableDictionary *condition = [NSMutableDictionary dictionaryWithCapacity:2];
104105
condition[@"object"] = object;
105106
condition[@"key"] = key;
106-
[self setEqualityConditionWithObject:condition forKey:@"$relatedTo"];
107+
[self setEqualityConditionWithObject:condition forKey:PFQueryKeyRelatedTo];
107108
}
108109

109110
- (void)removeAllConditions {

‎Parse/PFQuery.m‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,7 @@
3434
#import "PFUserPrivate.h"
3535
#import "ParseInternal.h"
3636
#import "Parse_Private.h"
37-
38-
NSString *const PFQueryKeyNotEqualTo = @"$ne";
39-
NSString *const PFQueryKeyLessThan = @"$lt";
40-
NSString *const PFQueryKeyLessThanEqualTo = @"$lte";
41-
NSString *const PFQueryKeyGreaterThan = @"$gt";
42-
NSString *const PFQueryKeyGreaterThanOrEqualTo = @"$gte";
43-
NSString *const PFQueryKeyContainedIn = @"$in";
44-
NSString *const PFQueryKeyNotContainedIn = @"$nin";
45-
NSString *const PFQueryKeyContainsAll = @"$all";
46-
NSString *const PFQueryKeyNearSphere = @"$nearSphere";
47-
NSString *const PFQueryKeyWithin = @"$within";
48-
NSString *const PFQueryKeyRegex = @"$regex";
49-
NSString *const PFQueryKeyExists = @"$exists";
50-
NSString *const PFQueryKeyInQuery = @"$inQuery";
51-
NSString *const PFQueryKeyNotInQuery = @"$notInQuery";
52-
NSString *const PFQueryKeySelect = @"$select";
53-
NSString *const PFQueryKeyDontSelect = @"$dontSelect";
54-
NSString *const PFQueryKeyRelatedTo = @"$relatedTo";
55-
NSString *const PFQueryKeyOr = @"$or";
56-
NSString *const PFQueryKeyQuery = @"query";
57-
NSString *const PFQueryKeyKey = @"key";
58-
NSString *const PFQueryKeyObject = @"object";
59-
60-
NSString *const PFQueryOptionKeyMaxDistance = @"$maxDistance";
61-
NSString *const PFQueryOptionKeyBox = @"$box";
62-
NSString *const PFQueryOptionKeyRegexOptions = @"$options";
37+
#import "PFQueryConstants.h"
6338

6439
/**
6540
Checks if an object can be used as value for query equality clauses.

0 commit comments

Comments
 (0)