Cache type result - skip stream overhead on php when fetching all (ha…

…xetink/tink_streams#20)
haxetink · Dec 28, 2019 · 8b4dd6e · 8b4dd6e
1 parent 9f41b98
commit 8b4dd6e
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 30 deletions.
diff --git a/src/tink/sql/Dataset.hx b/src/tink/sql/Dataset.hx
@@ -199,7 +199,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.PDO.PDOConnection<DatabaseInfo>)
+      .syncResult(cast toQuery());
+    #else
     return stream().collect();
+    #end
 
   public function first():Promise<Result>
     return all()

diff --git a/src/tink/sql/drivers/node/MySql.hx b/src/tink/sql/drivers/node/MySql.hx
@@ -76,20 +76,20 @@ class MySqlConnection<Db:DatabaseInfo> implements Connection<Db> implements Sani
       case Select(_) | Union(_): 
         Stream.promise(fetch().next(function (res:Array<Any>) {
           var iterator = res.iterator();
+          var parse = parser.queryParser(query, formatter.isNested(query));
           return Stream.ofIterator({
             hasNext: function() return iterator.hasNext(),
-            next: function ()
-              return parser.parseResult(query, iterator.next(), formatter.isNested(query))
+            next: function () return parse(iterator.next())
           });
         }));
 
       case CallProcedure(_): 
         Stream.promise(fetch().next(function (res:Array<Array<Any>>) {
           var iterator = res[0].iterator();
+          var parse = parser.queryParser(query, formatter.isNested(query));
           return Stream.ofIterator({
             hasNext: function() return iterator.hasNext(),
-            next: function ()
-              return parser.parseResult(query, iterator.next(), formatter.isNested(query))
+            next: function () return parse(iterator.next())
           });
         }));
       case CreateTable(_, _) | DropTable(_) | AlterTable(_, _):

diff --git a/src/tink/sql/drivers/php/PDO.hx b/src/tink/sql/drivers/php/PDO.hx
@@ -73,14 +73,13 @@ class PDOConnection<Db:DatabaseInfo> implements Connection<Db> implements Saniti
       case Select(_) | Union(_) | CallProcedure(_): 
         Stream.promise(fetch().next(function (res:PDOStatement) {
           var row: Any;
+          var parse = parser.queryParser(query, formatter.isNested(query));
           return Stream.ofIterator({
             hasNext: function() {
               row = res.fetchObject();
               return row != false;
             },
-            next: function () {
-              return parser.parseResult(query, row, formatter.isNested(query));
-            }
+            next: function () return parse(row)
           });
         }));
       case CreateTable(_, _) | DropTable(_) | AlterTable(_, _):
@@ -105,4 +104,18 @@ class PDOConnection<Db:DatabaseInfo> implements Connection<Db> implements Saniti
       try cnx.query(query) 
       catch (e: PDOException) 
         new Error(e.getCode(), e.getMessage());
+
+  // haxetink/tink_streams#20
+  public function syncResult<R, T: {}>(query:Query<Db,R>): Outcome<Array<T>, Error> {
+    return switch query {
+      case Select(_) | Union(_) | CallProcedure(_): 
+        var parse = parser.queryParser(query, formatter.isNested(query));
+        try Success([
+          for (row in cnx.query(formatter.format(query)).fetchAll(PDO.FETCH_OBJ))
+            parse(row)
+        ]) catch (e: PDOException)
+          Failure(new Error(e.getCode(), e.getMessage()));
+      default: throw 'Cannot iterate this query';
+    }
+  }
 }
diff --git a/src/tink/sql/parse/ResultParser.hx b/src/tink/sql/parse/ResultParser.hx
@@ -83,32 +83,33 @@ class ResultParser<Db> {
     }
   }
 
-  public function parseResult<Row:{}>(
-    query:Query<Db, Dynamic>, 
-    row:DynamicAccess<Any>, 
+  public function queryParser<Row:{}>(
+    query:Query<Db, Dynamic>,
     nest:Bool
-  ):Row {
-    var res: DynamicAccess<Any> = {}
-    var target = res;
+  ): DynamicAccess<Any> -> Row {
     var types = typer.typeQuery(query);
-    for (field in row.keys()) {
-      var name = field;
-      var table = null;
-      if (nest) {
-        var parts = field.split(SqlFormatter.FIELD_DELIMITER);
-        table = parts[0];
-        name = parts[1];
-        target =
-          if (!res.exists(table)) res[table] = {};
-          else res[table];
-      }
-      target[name] = parseValue(row[field], 
-        switch types.get(field) {
-          case null: None;
-          case v: v;
+    return function (row: DynamicAccess<Any>) {
+      var res: DynamicAccess<Any> = {}
+      var target = res;
+      for (field in row.keys()) {
+        var name = field;
+        var table = null;
+        if (nest) {
+          var parts = field.split(SqlFormatter.FIELD_DELIMITER);
+          table = parts[0];
+          name = parts[1];
+          target =
+            if (!res.exists(table)) res[table] = {};
+            else res[table];
         }
-      );
+        target[name] = parseValue(row[field], 
+          switch types.get(field) {
+            case null: None;
+            case v: v;
+          }
+        );
+      }
+      return cast res;
     }
-    return cast res;
   }
 }