Merge branch 'master' into ticket_3100

1 files changed, 18 insertions, 0 deletions

diff --git a/test/sql/test_generative.py b/test/sql/test_generative.py
index 013ba8082..6b86614e6 100644
--- a/test/sql/test_generative.py
+++ b/test/sql/test_generative.py
@@ -132,6 +132,19 @@ class TraversalTest(fixtures.TestBase, AssertsExecutionResults):
         assert struct == s2
         assert struct.is_other(s2)
 
+    def test_clone_anon_label(self):
+        from sqlalchemy.sql.elements import Grouping
+        c1 = Grouping(literal_column('q'))
+        s1 = select([c1])
+
+        class Vis(CloningVisitor):
+            def visit_grouping(self, elem):
+                pass
+
+        vis = Vis()
+        s2 = vis.traverse(s1)
+        eq_(list(s2.inner_columns)[0].anon_label, c1.anon_label)
+
     def test_change_in_place(self):
         struct = B(A("expr1"), A("expr2"), B(A("expr1b"),
                                              A("expr2b")), A("expr3"))
@@ -539,6 +552,11 @@ class ClauseTest(fixtures.TestBase, AssertsCompiledSQL):
         expr2 = CloningVisitor().traverse(expr)
         assert str(expr) == str(expr2)
 
+    def test_funcfilter(self):
+        expr = func.count(1).filter(t1.c.col1 > 1)
+        expr2 = CloningVisitor().traverse(expr)
+        assert str(expr) == str(expr2)
+
     def test_adapt_union(self):
         u = union(
             t1.select().where(t1.c.col1 == 4),