Ticket #16979: df1.diff

tree.py

@@ -45 +45 @@
         return obj
     _new_instance = classmethod(_new_instance)
 
+    @staticmethod
+    def _push (t, pfx):
+        """adds pfx to the first member of any tuple in the tree."""
+        import copy
+        if isinstance(t, tuple):
+            return ((pfx+t[0],)+t[1:])
+
+        elif isinstance(t, list):
+            return map(lambda x: Node._push(x, pfx), t)
+
+        elif isinstance (t, Node):
+            t2 = copy.copy(t)
+            t2.children = Node._push(t2.children, pfx)
+            t2.subtree_parents = Node._push(t2.subtree_parents, pfx)
+            return t2
+
+        else:
+            return copy.copy(t)
+
     def __str__(self):
         if self.negated:
             return '(NOT (%s: %s))' % (self.connector, ', '.join([str(c) for c

query.py

@@ -1167 +1167 @@
                     self.where.start_subtree(connector)
                 if isinstance(child, Node):
                     self.add_q(child, used_aliases, force_having=force_having)
+                elif isinstance(child, tuple) and isinstance(child[1], Node):
+                    self.add_q(_push(child[1], child_[0]+'__'),
+                            used_aliases, force_having=force_having)
                 else:
                     self.add_filter(child, connector, q_object.negated,
                             can_reuse=used_aliases, force_having=force_having)