Changeset 148

Timestamp:

07/24/07 15:41:37 (6 years ago)

Author:

ged

Message:

do not rely on the query() classmethod to provide the .q property

Location:

elixir/trunk/elixir

Files:

• __init__.py (modified) (1 diff)
• entity.py (modified) (2 diffs)

elixir/trunk/elixir/__init__.py

@@ -64 +64 @@
         def __getattr__(self, name):
             return getattr(self.context.current, name)
+
         session = property(lambda s:s.context.current)
 

elixir/trunk/elixir/entity.py

@@ -4 +4 @@
 
 from sqlalchemy                     import Table, Integer, desc
-from sqlalchemy.orm                 import deferred
+from sqlalchemy.orm                 import deferred, Query
 from sqlalchemy.ext.assignmapper    import assign_mapper
 from sqlalchemy.util                import OrderedDict
@@ -345 +345 @@
 
     def q(cls):
-        return cls.query()
+        return Query(cls, session=elixir.objectstore.session)
     q = property(q)