Skip to content

Commit 3ca3311

Browse files
author
Olha Danylova
authored
Merge pull request #240 from olgadanylova/master
5.6.0
2 parents 9e96826 + 192ded1 commit 3ca3311

31 files changed

+70
-12
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# RELEASE HISTORY
22

3+
## 5.6.0 November 15, 2019
4+
* added methods to the DataQueryBuilder:
5+
```
6+
-(NSNumber *)getRelationsPageSize;
7+
8+
-(instancetype)setRelationsPageSize:(int)relationsPageSize;
9+
```
10+
311
## 5.5.0 October 8, 2019
412
* fixed the device registration for iOS 13 and above
513

‎Pods/Backendless.podspec‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SDK/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ SPEC CHECKSUMS:
1717

1818
PODFILE CHECKSUM: 5cd4b8ef98be7dc5a7082de9b679e21d33e284c4
1919

20-
COCOAPODS: 1.8.1
20+
COCOAPODS: 1.8.4

‎SDK/backendlessAPI/Classes/Persistence/DataQueryBuilder.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,7 @@
5353
-(instancetype)addGroupByProperty:(NSString *)groupBy;
5454
-(instancetype)addGroupByProperies:(NSArray<NSString *> *)groupBy;
5555
-(instancetype)setHavingClause:(NSString *)havingClause;
56+
-(NSNumber *)getRelationsPageSize;
57+
-(instancetype)setRelationsPageSize:(int)relationsPageSize;
5658

5759
@end

‎SDK/backendlessAPI/Classes/Persistence/DataQueryBuilder.m‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,13 @@ -(instancetype)setHavingClause:(NSString *)havingClause {
207207
return self;
208208
}
209209

210+
-(NSNumber *)getRelationsPageSize {
211+
return [_queryOptionsBuilder getRelationsPageSize];
212+
}
213+
214+
-(instancetype)setRelationsPageSize:(int)relationsPageSize {
215+
[_queryOptionsBuilder setRelationsPageSize:relationsPageSize];
216+
return self;
217+
}
218+
210219
@end

‎SDK/backendlessAPI/Classes/Persistence/MapDrivenDataStore.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ -(id)findFirst:(DataQueryBuilder *)queryBuilder {
172172
if (!queryBuilder) {
173173
return [backendless throwFault:FAULT_FIELD_IS_NULL];
174174
}
175-
NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
175+
NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
176176
id result = [invoker invokeSync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_FIRST args:args responseAdapter:[MapAdapter new]];
177177
if ([result isKindOfClass:[Fault class]]) {
178178
return [backendless throwFault:result];
@@ -193,7 +193,7 @@ -(id)findLast:(DataQueryBuilder *)queryBuilder {
193193
if (!queryBuilder) {
194194
return [backendless throwFault:FAULT_FIELD_IS_NULL];
195195
}
196-
NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
196+
NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
197197
id result = [invoker invokeSync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_LAST args:args responseAdapter:[MapAdapter new]];
198198
if ([result isKindOfClass:[Fault class]]) {
199199
return [backendless throwFault:result];
@@ -380,7 +380,7 @@ -(void)findFirst:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
380380
}
381381

382382
-(void)findFirst:(DataQueryBuilder *)queryBuilder response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
383-
NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
383+
NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
384384
Responder *responder = [ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock];
385385
[invoker invokeAsync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_FIRST args:args responder:responder responseAdapter:[MapAdapter new]];
386386
}
@@ -392,7 +392,7 @@ -(void)findLast:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
392392
}
393393

394394
-(void)findLast:(DataQueryBuilder *)queryBuilder response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
395-
NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
395+
NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
396396
Responder *responder = [ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock];
397397
[invoker invokeAsync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_LAST args:args responder:responder responseAdapter:[MapAdapter new]];
398398
}

‎SDK/backendlessAPI/Classes/Persistence/PersistenceService.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ -(id)first:(Class)entity queryBuilder:(DataQueryBuilder *)queryBuilder {
319319
}
320320
[self prepareClass:entity];
321321
NSString *entityName = [self getEntityName:[self typeClassName:entity]];
322-
NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
322+
NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
323323
id result = [invoker invokeSync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_FIRST args:args responseAdapter:[[AdapterFactory new] adapterForClassName:entityName]];
324324
if ([result isKindOfClass:[Fault class]]) {
325325
return [backendless throwFault:result];
@@ -350,7 +350,7 @@ -(id)last:(Class)entity queryBuilder:(DataQueryBuilder *)queryBuilder {
350350
}
351351
[self prepareClass:entity];
352352
NSString *entityName = [self getEntityName:[self typeClassName:entity]];
353-
NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
353+
NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
354354
id result = [invoker invokeSync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_LAST args:args responseAdapter:[[AdapterFactory new] adapterForClassName:entityName]];
355355
if ([result isKindOfClass:[Fault class]]) {
356356
return [backendless throwFault:result];
@@ -818,7 +818,7 @@ -(void)first:(Class)entity queryBuilder:(DataQueryBuilder *)queryBuilder respons
818818
}
819819
[self prepareClass:entity];
820820
NSString *entityName = [self getEntityName:[self typeClassName:entity]];
821-
NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
821+
NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
822822
[invoker invokeAsync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_FIRST args:args responder:chainedResponder responseAdapter:[[AdapterFactory new] adapterForClassName:entityName]];
823823
}
824824

@@ -840,7 +840,7 @@ -(void)last:(Class)entity queryBuilder:(DataQueryBuilder *)queryBuilder response
840840
}
841841
[self prepareClass:entity];
842842
NSString *entityName = [self getEntityName:[self typeClassName:entity]];
843-
NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
843+
NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
844844
[invoker invokeAsync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_LAST args:args responder:chainedResponder responseAdapter:[[AdapterFactory new] adapterForClassName:entityName]];
845845
}
846846

‎SDK/backendlessAPI/Classes/Persistence/QueryOptions.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
@property (strong, nonatomic) NSMutableArray<NSString*> *sortBy;
2727
@property (strong, nonatomic) NSMutableArray<NSString*> *related;
2828
@property (strong, nonatomic) NSNumber *relationsDepth;
29+
@property (strong, nonatomic) NSNumber *relationsPageSize;
2930

3031
+(instancetype)query;
3132
-(BOOL)addSortByOption:(NSString *)sortBy;

‎SDK/backendlessAPI/Classes/Persistence/QueryOptionsBuilder.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
-(id)addListRelated:(NSArray<NSString *> *)related;
3535
-(NSNumber *)getRelationsDepth;
3636
-(id)setRelationsDepth:(int)relationsDepth;
37+
-(NSNumber *)getRelationsPageSize;
38+
-(id)setRelationsPageSize:(int)relationsPageSize;
3739

3840
@end
3941

‎SDK/backendlessAPI/Classes/Persistence/QueryOptionsBuilder.m‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ @interface QueryOptionsBuilder () {
2727
NSMutableArray<NSString *> *_sortBy;
2828
NSMutableArray<NSString *> *_related;
2929
NSNumber *_relationsDepth;
30+
NSNumber *_relationsPageSize;
3031
id _builder;
3132
}
3233
@end
@@ -39,6 +40,7 @@ -(instancetype)init {
3940
_related = [NSMutableArray new];
4041
_builder = nil;
4142
_relationsDepth = nil;
43+
_relationsPageSize = nil;
4244
}
4345
return self;
4446
}
@@ -66,6 +68,7 @@ -(QueryOptions *)build {
6668
queryOptions.sortBy = [[NSMutableArray alloc] initWithArray:_sortBy];
6769
queryOptions.related = [[NSMutableArray alloc] initWithArray:_related];
6870
queryOptions.relationsDepth = _relationsDepth;
71+
queryOptions.relationsPageSize = _relationsPageSize;
6972
return queryOptions;
7073
}
7174

@@ -128,4 +131,13 @@ -(id)setRelationsDepth:(int)relationsDepth {
128131
return _builder;
129132
}
130133

134+
-(NSNumber *)getRelationsPageSize {
135+
return _relationsPageSize;
136+
}
137+
138+
-(id)setRelationsPageSize:(int)relationsPageSize {
139+
_relationsPageSize = @(relationsPageSize);
140+
return _builder;
141+
}
142+
131143
@end

0 commit comments

Comments
 (0)