Switch to last-return exception checking

Author: jeffreylovitz

redisgraph/query_result.py

@@ -1,6 +1,7 @@
 from .node import Node
 from .edge import Edge
 from prettytable import PrettyTable
+from redis import ResponseError
 
 class ResultSetColumnTypes(object):
     COLUMN_UNKNOWN = 0
@@ -15,7 +16,6 @@ class ResultSetScalarTypes(object):
     PROPERTY_INTEGER = 3
     PROPERTY_BOOLEAN = 4
     PROPERTY_DOUBLE = 5
-    PROPERTY_ERROR = 6
 
 class QueryResult(object):
     LABELS_ADDED = 'Labels added'
@@ -31,6 +31,10 @@ def __init__(self, graph, response):
         self.header = []
         self.result_set = []
 
+        # If we encountered a run-time error, the last response element will be an exception.
+        if isinstance(response[-1], ResponseError):
+            raise response[-1]
+
         if len(response) is 1:
             self.parse_statistics(response[0])
         else:
@@ -140,9 +144,6 @@ def parse_scalar(self, cell):
         elif scalar_type == ResultSetScalarTypes.PROPERTY_DOUBLE:
             scalar = float(value)
 
-        elif scalar_type == ResultSetScalarTypes.PROPERTY_ERROR:
-            raise value
-
         elif scalar_type == ResultSetScalarTypes.PROPERTY_UNKNOWN:
             print("Unknown scalar type\n")