From ed3d1cc8492956f741673370d3f5610dbdf15a8e Mon Sep 17 00:00:00 2001
From: twalder-docnet <tom@doc-net.com>
Date: Thu, 18 Jun 2015 23:31:19 +0100
Subject: [PATCH] Updates to JSON API Gateway

---
 src/GDS/Gateway/GoogleAPIClient.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/GDS/Gateway/GoogleAPIClient.php b/src/GDS/Gateway/GoogleAPIClient.php
index 4a22912..1e7eff2 100644
--- a/src/GDS/Gateway/GoogleAPIClient.php
+++ b/src/GDS/Gateway/GoogleAPIClient.php
@@ -254,9 +254,6 @@ public function deleteMulti(array $arr_entities)
     /**
      * Fetch some Entities, based on the supplied GQL and, optionally, parameters
      *
-     * @todo FIXME, mapper
-     * @todo consume Schema
-     *
      * @param $str_gql
      * @param array $arr_params
      * @return Entity[]
@@ -269,7 +266,9 @@ public function gql($str_gql, $arr_params = NULL)
         if(NULL !== $arr_params) {
             $this->addParamsToQuery($obj_query, $arr_params);
         }
-        return $this->executeQuery($obj_query);
+        $arr_mapped_results = $this->createMapper()->mapFromResults($this->executeQuery($obj_query));
+        $this->obj_schema = NULL; // Consume Schema
+        return $arr_mapped_results;
     }
 
     /**