feat(ios): have Ti.Database.DB.executeAllAsync return a Promise

tidev · Jan 26, 2021 · 6c4253f · 6c4253f
1 parent 7b70f11
commit 6c4253f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/iphone/Classes/TiDatabaseProxy.h b/iphone/Classes/TiDatabaseProxy.h
@@ -27,7 +27,7 @@ READONLY_PROPERTY(NSUInteger, rowsAffected, RowsAffected);
 - (JSValue *)executeAsync:(NSString *)sql;
 - (NSArray<TiDatabaseResultSetProxy *> *)executeAll:(NSArray<NSString *> *)queries;
 JSExportAs(executeAllAsync,
-           -(void)executeAllAsync
+           -(JSValue *)executeAllAsync
            : (NSArray<NSString *> *)queries withCallback
            : (JSValue *)callback);
 - (void)remove;

diff --git a/iphone/Classes/TiDatabaseProxy.m b/iphone/Classes/TiDatabaseProxy.m
@@ -379,21 +379,25 @@ - (JSValue *)executeAsync:(NSString *)sql
   return results;
 }
 
-- (void)executeAllAsync:(NSArray<NSString *> *)queries withCallback:(JSValue *)callback
+- (JSValue *)executeAllAsync:(NSArray<NSString *> *)queries withCallback:(JSValue *)callback
 {
+  JSContext *context = [self currentContext];
+  KrollPromise *promise = [[[KrollPromise alloc] initInContext:context] autorelease];
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-    JSContext *context = [callback context];
     NSError *error = nil;
     NSMutableArray *results = [NSMutableArray arrayWithCapacity:[queries count]];
     NSUInteger index = 0;
     for (NSString *sql in queries) {
       TiDatabaseResultSetProxy *result = [self executeSQL:sql withParams:nil withError:&error];
       if (error != nil) {
         JSValue *jsError = [self createError:@"failed to execute SQL statements" subreason:[error description] location:CODELOCATION inContext:context];
-        jsError[@"results"] = result;
+        jsError[@"results"] = results;
         jsError[@"index"] = [NSNumber numberWithUnsignedInteger:index];
         dispatch_async(dispatch_get_main_queue(), ^{
-          [callback callWithArguments:@[ jsError, results ]];
+          if (![callback isUndefined]) {
+            [callback callWithArguments:@[ jsError, results ]];
+          }
+          [promise reject:@[ jsError ]];
         });
         return;
       }
@@ -406,9 +410,13 @@ - (void)executeAllAsync:(NSArray<NSString *> *)queries withCallback:(JSValue *)c
     }
 
     dispatch_async(dispatch_get_main_queue(), ^{
-      [callback callWithArguments:@[ [JSValue valueWithUndefinedInContext:context], results ]];
+      if (![callback isUndefined]) {
+        [callback callWithArguments:@[ [JSValue valueWithUndefinedInContext:context], results ]];
+      }
+      [promise resolve:@[ results ]];
     });
   });
+  return promise.JSValue;
 }
 
 - (void)close