Merge pull request #240 from olgadanylova/master

5.6.0
Backendless · Nov 15, 2019 · 3ca3311 · 3ca3311
2 parents 9e96826 + 192ded1
commit 3ca3311
Show file tree

Hide file tree

Showing 31 changed files with 70 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # RELEASE HISTORY
 
+## 5.6.0 November 15, 2019
+* added methods to the DataQueryBuilder:
+```
+-(NSNumber *)getRelationsPageSize;
+
+-(instancetype)setRelationsPageSize:(int)relationsPageSize;
+```
+
 ## 5.5.0 October 8, 2019
 * fixed the device registration for iOS 13 and above
 

diff --git a/Pods/Backendless.podspec b/Pods/Backendless.podspec
diff --git a/SDK/Podfile.lock b/SDK/Podfile.lock
@@ -17,4 +17,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 5cd4b8ef98be7dc5a7082de9b679e21d33e284c4
 
-COCOAPODS: 1.8.1
+COCOAPODS: 1.8.4
diff --git a/SDK/backendlessAPI/Classes/Persistence/DataQueryBuilder.h b/SDK/backendlessAPI/Classes/Persistence/DataQueryBuilder.h
@@ -53,5 +53,7 @@
 -(instancetype)addGroupByProperty:(NSString *)groupBy;
 -(instancetype)addGroupByProperies:(NSArray<NSString *> *)groupBy;
 -(instancetype)setHavingClause:(NSString *)havingClause;
+-(NSNumber *)getRelationsPageSize;
+-(instancetype)setRelationsPageSize:(int)relationsPageSize;
 
 @end
diff --git a/SDK/backendlessAPI/Classes/Persistence/DataQueryBuilder.m b/SDK/backendlessAPI/Classes/Persistence/DataQueryBuilder.m
@@ -207,4 +207,13 @@ -(instancetype)setHavingClause:(NSString *)havingClause {
     return self;
 }
 
+-(NSNumber *)getRelationsPageSize {
+    return [_queryOptionsBuilder getRelationsPageSize];
+}
+
+-(instancetype)setRelationsPageSize:(int)relationsPageSize {
+    [_queryOptionsBuilder setRelationsPageSize:relationsPageSize];
+    return self;
+}
+
 @end
diff --git a/SDK/backendlessAPI/Classes/Persistence/MapDrivenDataStore.m b/SDK/backendlessAPI/Classes/Persistence/MapDrivenDataStore.m
@@ -172,7 +172,7 @@ -(id)findFirst:(DataQueryBuilder *)queryBuilder {
     if (!queryBuilder) {
         return [backendless throwFault:FAULT_FIELD_IS_NULL];
     }
-    NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
+    NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
     id result = [invoker invokeSync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_FIRST args:args responseAdapter:[MapAdapter new]];
     if ([result isKindOfClass:[Fault class]]) {
         return [backendless throwFault:result];
@@ -193,7 +193,7 @@ -(id)findLast:(DataQueryBuilder *)queryBuilder {
     if (!queryBuilder) {
         return [backendless throwFault:FAULT_FIELD_IS_NULL];
     }
-    NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
+    NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
     id result = [invoker invokeSync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_LAST args:args responseAdapter:[MapAdapter new]];
     if ([result isKindOfClass:[Fault class]]) {
         return [backendless throwFault:result];
@@ -380,7 +380,7 @@ -(void)findFirst:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
 }
 
 -(void)findFirst:(DataQueryBuilder *)queryBuilder response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
-    NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
+    NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
     Responder *responder = [ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock];
     [invoker invokeAsync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_FIRST args:args responder:responder responseAdapter:[MapAdapter new]];
 }
@@ -392,7 +392,7 @@ -(void)findLast:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
 }
 
 -(void)findLast:(DataQueryBuilder *)queryBuilder response:(void(^)(id))responseBlock error:(void(^)(Fault *))errorBlock {
-    NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
+    NSArray *args = @[_tableName, [queryBuilder getRelated]?[queryBuilder getRelated]:@[], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
     Responder *responder = [ResponderBlocksContext responderBlocksContext:responseBlock error:errorBlock];
     [invoker invokeAsync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_LAST args:args responder:responder responseAdapter:[MapAdapter new]];
 }

diff --git a/SDK/backendlessAPI/Classes/Persistence/PersistenceService.m b/SDK/backendlessAPI/Classes/Persistence/PersistenceService.m
@@ -319,7 +319,7 @@ -(id)first:(Class)entity queryBuilder:(DataQueryBuilder *)queryBuilder {
     }
     [self prepareClass:entity];
     NSString *entityName = [self getEntityName:[self typeClassName:entity]];
-    NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
+    NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
     id result = [invoker invokeSync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_FIRST args:args responseAdapter:[[AdapterFactory new] adapterForClassName:entityName]];
     if ([result isKindOfClass:[Fault class]]) {
         return [backendless throwFault:result];
@@ -350,7 +350,7 @@ -(id)last:(Class)entity queryBuilder:(DataQueryBuilder *)queryBuilder {
     }
     [self prepareClass:entity];
     NSString *entityName = [self getEntityName:[self typeClassName:entity]];
-    NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
+    NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
     id result = [invoker invokeSync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_LAST args:args responseAdapter:[[AdapterFactory new] adapterForClassName:entityName]];
     if ([result isKindOfClass:[Fault class]]) {
         return [backendless throwFault:result];
@@ -818,7 +818,7 @@ -(void)first:(Class)entity queryBuilder:(DataQueryBuilder *)queryBuilder respons
     }
     [self prepareClass:entity];
     NSString *entityName = [self getEntityName:[self typeClassName:entity]];
-    NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
+    NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
     [invoker invokeAsync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_FIRST args:args responder:chainedResponder responseAdapter:[[AdapterFactory new] adapterForClassName:entityName]];
 }
 
@@ -840,7 +840,7 @@ -(void)last:(Class)entity queryBuilder:(DataQueryBuilder *)queryBuilder response
     }
     [self prepareClass:entity];
     NSString *entityName = [self getEntityName:[self typeClassName:entity]];
-    NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties]];
+    NSArray *args = @[entityName, [queryBuilder getRelated], [queryBuilder getRelationsDepth]?[queryBuilder getRelationsDepth]:[NSNull null], [queryBuilder getProperties], [queryBuilder getRelationsPageSize]?[queryBuilder getRelationsPageSize]:[NSNull null]];
     [invoker invokeAsync:SERVER_PERSISTENCE_SERVICE_PATH method:METHOD_LAST args:args responder:chainedResponder responseAdapter:[[AdapterFactory new] adapterForClassName:entityName]];
 }
 

diff --git a/SDK/backendlessAPI/Classes/Persistence/QueryOptions.h b/SDK/backendlessAPI/Classes/Persistence/QueryOptions.h
@@ -26,6 +26,7 @@
 @property (strong, nonatomic) NSMutableArray<NSString*> *sortBy;
 @property (strong, nonatomic) NSMutableArray<NSString*> *related;
 @property (strong, nonatomic) NSNumber *relationsDepth;
+@property (strong, nonatomic) NSNumber *relationsPageSize;
 
 +(instancetype)query;
 -(BOOL)addSortByOption:(NSString *)sortBy;

diff --git a/SDK/backendlessAPI/Classes/Persistence/QueryOptionsBuilder.h b/SDK/backendlessAPI/Classes/Persistence/QueryOptionsBuilder.h
@@ -34,6 +34,8 @@
 -(id)addListRelated:(NSArray<NSString *> *)related;
 -(NSNumber *)getRelationsDepth;
 -(id)setRelationsDepth:(int)relationsDepth;
+-(NSNumber *)getRelationsPageSize;
+-(id)setRelationsPageSize:(int)relationsPageSize;
 
 @end
 

diff --git a/SDK/backendlessAPI/Classes/Persistence/QueryOptionsBuilder.m b/SDK/backendlessAPI/Classes/Persistence/QueryOptionsBuilder.m
@@ -27,6 +27,7 @@ @interface QueryOptionsBuilder () {
     NSMutableArray<NSString *> *_sortBy;
     NSMutableArray<NSString *> *_related;
     NSNumber *_relationsDepth;
+    NSNumber *_relationsPageSize;
     id _builder;
 }
 @end
@@ -39,6 +40,7 @@ -(instancetype)init {
         _related = [NSMutableArray new];
         _builder = nil;
         _relationsDepth = nil;
+        _relationsPageSize = nil;
     }
     return self;
 }
@@ -66,6 +68,7 @@ -(QueryOptions *)build {
     queryOptions.sortBy = [[NSMutableArray alloc] initWithArray:_sortBy];
     queryOptions.related = [[NSMutableArray alloc] initWithArray:_related];
     queryOptions.relationsDepth = _relationsDepth;
+    queryOptions.relationsPageSize = _relationsPageSize;
     return queryOptions;
 }
 
@@ -128,4 +131,13 @@ -(id)setRelationsDepth:(int)relationsDepth {
     return _builder;
 }
 
+-(NSNumber *)getRelationsPageSize {
+    return _relationsPageSize;
+}
+
+-(id)setRelationsPageSize:(int)relationsPageSize {
+    _relationsPageSize = @(relationsPageSize);
+    return _builder;
+}
+
 @end
diff --git a/SDK/backendlessAPI/Classes/RT/RTClient.m b/SDK/backendlessAPI/Classes/RT/RTClient.m
@@ -89,7 +89,6 @@ -(void)connectSocket:(void(^)(void))connected {
             if (!socketCreated) {
                 NSString *path = [@"/" stringByAppendingString:[backendless getAppId]];
                 NSURL *url = [NSURL URLWithString:[RTHelper lookup]];
-
                 NSString *clientId = @"";
 
 #if !TARGET_OS_WATCH

diff --git a/SDK/ios/backendless/backendless.a b/SDK/ios/backendless/backendless.a
diff --git a/SDK/ios/backendless/include/DataQueryBuilder.h b/SDK/ios/backendless/include/DataQueryBuilder.h
@@ -53,5 +53,7 @@
 -(instancetype)addGroupByProperty:(NSString *)groupBy;
 -(instancetype)addGroupByProperies:(NSArray<NSString *> *)groupBy;
 -(instancetype)setHavingClause:(NSString *)havingClause;
+-(NSNumber *)getRelationsPageSize;
+-(instancetype)setRelationsPageSize:(int)relationsPageSize;
 
 @end
diff --git a/SDK/ios/backendless/include/QueryOptions.h b/SDK/ios/backendless/include/QueryOptions.h
@@ -26,6 +26,7 @@
 @property (strong, nonatomic) NSMutableArray<NSString*> *sortBy;
 @property (strong, nonatomic) NSMutableArray<NSString*> *related;
 @property (strong, nonatomic) NSNumber *relationsDepth;
+@property (strong, nonatomic) NSNumber *relationsPageSize;
 
 +(instancetype)query;
 -(BOOL)addSortByOption:(NSString *)sortBy;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,4 @@ SPEC CHECKSUMS:

		PODFILE CHECKSUM: 5cd4b8ef98be7dc5a7082de9b679e21d33e284c4

		COCOAPODS: 1.8.1
		COCOAPODS: 1.8.4