- remove remote_foreign annotation

- support annotations on Column where name isn't immediately present

2 files changed, 10 insertions, 3 deletions

diff --git a/test/orm/test_rel_fn.py b/test/orm/test_rel_fn.py
index ac56f876b..bad3a0dd7 100644
--- a/test/orm/test_rel_fn.py
+++ b/test/orm/test_rel_fn.py
@@ -1,7 +1,7 @@
 from sqlalchemy.testing import assert_raises, assert_raises_message, eq_, \
     AssertsCompiledSQL, is_
 from sqlalchemy.testing import fixtures
-from sqlalchemy.orm import relationships, foreign, remote, remote_foreign
+from sqlalchemy.orm import relationships, foreign, remote
 from sqlalchemy import MetaData, Table, Column, ForeignKey, Integer, \
     select, ForeignKeyConstraint, exc, func, and_
 from sqlalchemy.orm.interfaces import ONETOMANY, MANYTOONE, MANYTOMANY
@@ -245,9 +245,9 @@ class _JoinFixtures(object):
             self.left,
             self.right,
             primaryjoin=(self.left.c.x + self.left.c.y) == \
-                            relationships.remote_foreign(
+                            relationships.remote(relationships.foreign(
                                 self.right.c.x * self.right.c.y
-                            ),
+                            )),
             **kw
         )
 
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py
index bbf7eeab1..35d5a0b05 100644
--- a/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@ -1277,6 +1277,13 @@ class AnnotationsTest(fixtures.TestBase):
         assert x_p.compare(x_p_a)
         assert not x_p_a.compare(x_a)
 
+    def test_late_name_add(self):
+        from sqlalchemy.schema import Column
+        c1 = Column(Integer)
+        c1_a = c1._annotate({"foo": "bar"})
+        c1.name = 'somename'
+        eq_(c1_a.name, 'somename')
+
     def test_custom_constructions(self):
         from sqlalchemy.schema import Column
         class MyColumn(Column):