DRV-216: Support for versioned @query type

faunadb/client.py

@@ -12,7 +12,7 @@
 from faunadb.request_result import RequestResult
 from faunadb._json import parse_json_or_none, to_json
 
-API_VERSION = "2.7"
+API_VERSION = "3"
 
 class _LastTxnTime(object):
   """Wraps tracking the last transaction time supplied from the database."""

tests/test_deserialization.py

@@ -47,8 +47,14 @@ def test_bytes(self):
     self.assertJson('{"@bytes":"AQID"}', bytearray(b'\x01\x02\x03'))
 
   def test_query(self):
+    self.assertJson('{"@query": {"api_version": "3", "lambda": "x", "expr": {"var": "x"}}}',
+                    Query({"api_version":"3", "lambda": "x", "expr": {"var": "x"}}))
     self.assertJson('{"@query": {"lambda": "x", "expr": {"var": "x"}}}',
                     Query({"lambda": "x", "expr": {"var": "x"}}))
+    self.assertJson('{"@query":  {"lambda": "x", "expr": {"var": "x"}}}',
+                    Query({"lambda": "x", "expr": {"var": "x"}}))
+    self.assertJson('{"@query": {"api_version": "2.12", "lambda": "x", "expr": {"var": "x"}}}',
+                    Query({"api_version": "2.12", "lambda": "x", "expr": {"var": "x"}}))
 
   def test_string(self):
     self.assertJson('"a string"', "a string")

tests/test_query.py

@@ -3,7 +3,7 @@
 from time import sleep
 
 from faunadb.errors import BadRequest, NotFound
-from faunadb.objects import FaunaTime, Ref, SetRef, _Expr, Native
+from faunadb.objects import FaunaTime, Ref, SetRef, _Expr, Native, Query
 from faunadb import query
 from tests.helpers import FaunaTestCase
 
@@ -60,6 +60,18 @@ def _assert_bad_query(self, q):
   def test_abort(self):
     self._assert_bad_query(query.abort("aborting"))
 
+  def test_query(self):
+    versioned212 = Query({"api_version": "2.12", "lambda": ["a", "b"], "expr": {
+        "concat": [{"var": "a"}, {"var": "b"}], "separator": "/"}})
+    body212 = self._q(versioned212)
+
+    body3 = self._q(query.query(lambda a, b: query.concat([a, b], "/")))
+    versioned3 = Query({"api_version": "3", "lambda": ["a", "b"], "expr": {
+                       "concat": [{"var": "a"}, {"var": "b"}], "separator": "/"}})
+
+    self.assertEqual(body212, versioned212)
+    self.assertEqual(body3, versioned3)
+
   def test_at(self):
     document = self._create(n=1)
     ref = document["ref"]

tests/test_serialization.py

@@ -44,8 +44,11 @@ def test_bytes(self):
       self.assertJson(b'\x01\x02\x03', '{"@bytes":"AQID"}')
 
   def test_query(self):
-    self.assertJson(Query({"lambda": "x", "expr": {"var": "x"}}),
-                    '{"@query":{"expr":{"var":"x"},"lambda":"x"}}')
+    expected1 = '{"@query":{"expr":{"var":"x"},"lambda":"x"}}'
+    expected2 = '{"@query":{"api_version":"3","expr":{"var":"x"},"lambda":"x"}}'
+    self.assertJson(Query({"lambda": "x", "expr": {"var": "x"}}), expected1)
+    self.assertJson(Query({"api_version": "3", "lambda": "x", "expr": {"var": "x"}}),
+                    expected2)
 
   #region Basic forms