See haxetink/tink_streams#20

benmerckx · Oct 2, 2019 · 630ba69 · 630ba69
1 parent 2c6e9ed
commit 630ba69
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/tink/sql/Dataset.hx b/src/tink/sql/Dataset.hx
@@ -3,6 +3,7 @@ package tink.sql;
 import tink.sql.Expr;
 import tink.streams.RealStream;
 import tink.sql.Query;
+import tink.sql.Info;
 
 using tink.CoreApi;
 
@@ -185,7 +186,12 @@ class Dataset<Fields, Result:{}, Db> {
     return cnx.execute(toQuery());
 
   public function all():Promise<Array<Result>>
+    #if php
+    return (cast cnx: tink.sql.drivers.php.MySQLi.MySQLiConnection<DatabaseInfo>)
+      .syncResult(cast toQuery());
+    #else
     return stream().collect();
+    #end
 
   public function first():Promise<Result>
     return all()

diff --git a/src/tink/sql/drivers/php/MySQLi.hx b/src/tink/sql/drivers/php/MySQLi.hx
@@ -58,12 +58,27 @@ class MySQLiConnection<Db:DatabaseInfo> implements Connection<Db> implements San
   public function getFormatter()
     return formatter;
 
+	public function syncResult<R, T>(query:Query<Db,R>): Outcome<Array<T>, Error> {
+    return switch query {
+      case Select(_) | Union(_): 
+        switch cnx.query(formatter.format(query)) {
+          case false: Failure(new Error(cnx.errno, cnx.error));
+          case (cast _: ResultSet) => res:
+            Success([
+              for (row in res.nestedIterator(formatter.isNested(query)))
+                row
+            ]);
+        }
+      default: throw 'Cannot iterate this query';
+    }
+  }
+
   public function execute<Result>(query:Query<Db,Result>):Result {
     inline function fetch<T>(): Promise<T> return run(formatter.format(query));
     return switch query {
       case Select(_) | Union(_): 
         Stream.promise(fetch().next(function (res:ResultSet)
-          return Stream.ofIterator(res.nestedIterator(formatter.isNested(query)))
+          return Stream.ofIterator(cast res.nestedIterator(formatter.isNested(query)))
         ));
       case CreateTable(_, _) | DropTable(_) | AlterTable(_, _):
         fetch().next(function(_) return Noise);
@@ -87,7 +102,6 @@ class MySQLiConnection<Db:DatabaseInfo> implements Connection<Db> implements San
       case false: new Error(cnx.errno, cnx.error);
       case v: (cast v: T);
     }
-
 }
 
 private abstract ResultSet(NativeResultSet) from NativeResultSet {