Substitute unquoted string for tokens in queries

pyorient/ogm/commands.py

@@ -35,6 +35,7 @@ def retry(self, retries):
 from .expressions import ExpressionMixin
 from .property import PropertyEncoder
 from .operators import LogicalConnective
+from .what import QS
 class RetrievalCommand(Command, ExpressionMixin):
     def __init__(self, command_text=None):
         self._compiled = command_text
@@ -59,9 +60,11 @@ def __str__(self):
 
     def FORMAT_ENCODER(self, v):
         if isinstance(v, RetrievalCommand):
-            return '({})'.format(v.compile()) 
+            return '(' + v.compile() + ')'
         elif isinstance(v, LogicalConnective):
             return self.filter_string(v)
+        elif isinstance(v, QS):
+            return v
         else:
             return PropertyEncoder.encode_value(v, self)
 

pyorient/ogm/traverse.py

@@ -190,9 +190,10 @@ def build_pretty_compiler(self):
     def compiler():
         traverse_spaces = self._params.get('indent', 0)
         traverse_idt = ' ' * traverse_spaces
+        target = self._target
         return traverse_idt + Traverse.TEMPLATE.format(self.build_fields(tuple()),
-            u'(' + self._target.pretty() + ')' if isinstance(self._target, Query)
-                else ArgConverter.convert_to(ArgConverter.Vertex, self._target, self),
+            u'(' + target.pretty() + ')' if isinstance(target, Query)
+                else ArgConverter.convert_to(ArgConverter.Vertex, target, self),
             *self.build_optional())
     return compiler
 

pyorient/ogm/what.py

@@ -600,6 +600,10 @@ def traverse(self, *what, **kwargs):
         from .traverse import Traverse
         return Traverse(None, self, *what, **kwargs)
 
+class QS(str):
+    """Query string. Unquoted string substitutes to query tokens"""
+    pass
+
 class FunctionWhat(MethodWhat):
     """Derived from MethodWhat for the chain of which they might be the
     beginning