Merge lp:~splee/turbogearshub/spleedev into lp:turbogearshub

[Lee McFadden]

[Lee McFadden (splee)]

DeclarativeBase now uses DBSession.mapper instead of the default mapper function.

This allows for ModelClass.query instead of DBSession.query(ModelClass)

[Gustavo Narea (gnarea)]

Looks good. Thanks!

review: Approve

=== modified file 'app/tghub/model/__init__.py'
--- app/tghub/model/__init__.py	2009-02-21 01:08:31 +0000
+++ app/tghub/model/__init__.py	2009-03-04 18:05:09 +0000
@@ -32,7 +32,7 @@
 DBSession = scoped_session(_maker)
 
 # Creating the base class for the models:
-DeclarativeBase = declarative_base()
+DeclarativeBase = declarative_base(mapper=DBSession.mapper)
 
 # The global metadata:
 metadata = DeclarativeBase.metadata

=== modified file 'app/tghub/model/auth.py'
--- app/tghub/model/auth.py	2009-02-21 01:16:54 +0000
+++ app/tghub/model/auth.py	2009-03-04 18:05:09 +0000
@@ -124,12 +124,12 @@
     @classmethod
     def by_email_address(cls, email):
         """Search users based on their email addresses."""
-        return DBSession.query(cls).filter(cls.email_address==email).first()
+        return cls.query.filter(cls.email_address==email).first()
 
     @classmethod
     def by_user_name(cls, username):
         """Search users based on their user name."""
-        return DBSession.query(cls).filter(cls.user_name==username).first()
+        return cls.query.filter(cls.user_name==username).first()
 
 
     def _set_password(self, password):