- mapping to a select() construct now requires that you

make an alias() out of it distinctly.   This to eliminate
confusion over such issues as [ticket:1542]

2 files changed, 8 insertions, 7 deletions

diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py
index 79286fe2a..321ac25c1 100644
--- a/test/orm/test_mapper.py
+++ b/test/orm/test_mapper.py
@@ -115,12 +115,9 @@ class MapperTest(_fixtures.FixtureTest):
         s = sa.select([users.c.name]).alias('foo')
         assert_raises(sa.exc.ArgumentError, mapper, User, s)
 
-    @testing.emits_warning(
-        'mapper Mapper|User|Select object creating an alias for '
-        'the given selectable - use Class attributes for queries')
     @testing.resolve_artifact_names
     def test_no_pks_2(self):
-        s = sa.select([users.c.name])
+        s = sa.select([users.c.name]).alias()
         assert_raises(sa.exc.ArgumentError, mapper, User, s)
 
     @testing.resolve_artifact_names
diff --git a/test/orm/test_selectable.py b/test/orm/test_selectable.py
index bfa400895..e46d8bbc8 100644
--- a/test/orm/test_selectable.py
+++ b/test/orm/test_selectable.py
@@ -27,15 +27,19 @@ class SelectableNoFromsTest(_base.MappedTest):
     @testing.resolve_artifact_names
     def test_no_tables(self):
 
-        selectable = select(["x", "y", "z"])
+        selectable = select(["x", "y", "z"]).alias()
         assert_raises_message(sa.exc.InvalidRequestError,
                                  "Could not find any Table objects",
                                  mapper, Subset, selectable)
 
-    @testing.emits_warning('.*creating an Alias.*')
     @testing.resolve_artifact_names
-    def test_basic(self):
+    def test_no_selects(self):
         subset_select = select([common.c.id, common.c.data])
+        assert_raises(sa.exc.InvalidRequestError, mapper, Subset, subset_select)
+        
+    @testing.resolve_artifact_names
+    def test_basic(self):
+        subset_select = select([common.c.id, common.c.data]).alias()
         subset_mapper = mapper(Subset, subset_select)
 
         sess = create_session(bind=testing.db)