[Checkins] SVN: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/ more 0.4.0 compatibility

[Andreas Jung]

Log message for revision 78820:
  more 0.4.0 compatibility
  

Changed:
  U   z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py
  U   z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/tests/testSQLAlchemy.py

-=-
Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py	2007-08-14 19:10:09 UTC (rev 78819)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/mapper.py	2007-08-14 19:20:39 UTC (rev 78820)
@@ -58,10 +58,14 @@
             the only way to get hold of a mapper by name. See also
             http://groups.google.com/group/sqlalchemy/browse_thread/thread/18fb2e2818bdc032/5c2dfd71679925cb#5c2dfd71679925cb
         """
-        return class_mapper(self.__class__).props[name].mapper.class_
+        try:
+            return class_mapper(self.__class__)._Mapper__props[name].mapper.class_
+        except AttributeError:
+            return class_mapper(self.__class__).props[name].mapper.class_
 
 
 
+
 class MapperFactory(object):
     """ a factory for table and mapper objects """
 

Modified: z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/tests/testSQLAlchemy.py
===================================================================
--- z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/tests/testSQLAlchemy.py	2007-08-14 19:10:09 UTC (rev 78819)
+++ z3c.sqlalchemy/trunk/src/z3c/sqlalchemy/tests/testSQLAlchemy.py	2007-08-14 19:20:39 UTC (rev 78820)
@@ -76,14 +76,14 @@
         User = db.getMapper('user')
         session = db.session
 
-        rows = session.query(User).select()
+        rows = session.query(User).all()
         self.assertEqual(len(rows), 0)
 
         session.save(User(id=1, firstname='udo', lastname='juergens'))
         session.save(User(id=2, firstname='heino', lastname='n/a'))
         session.flush()
         
-        rows = session.query(User).select()
+        rows = session.query(User).all()
         self.assertEqual(len(rows), 2)
 
 
@@ -172,7 +172,7 @@
         session = db.session
         session.save(User(id=1,firstname='foo', lastname='bar'))
         session.flush()
-        user = session.query(User).select_by(firstname='foo')[0]
+        user = session.query(User).filter_by(firstname='foo')[0]
         Skill = user.getMapper('skills')
         user.skills.append(Skill(id=1, name='Zope'))
         session.flush()