diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2005-09-22 04:15:46 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2005-09-22 04:15:46 +0000 |
| commit | fb74b7a8bc524496d7de0923df843a093a235c6f (patch) | |
| tree | 946f926906f93bad7ce6158bad0f12f0c448e962 /lib/sqlalchemy/mapper.py | |
| parent | cc39e49c408db7bb6f6310f3a9eb1885edc798be (diff) | |
| download | sqlalchemy-fb74b7a8bc524496d7de0923df843a093a235c6f.tar.gz | |
Diffstat (limited to 'lib/sqlalchemy/mapper.py')
| -rw-r--r-- | lib/sqlalchemy/mapper.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/mapper.py b/lib/sqlalchemy/mapper.py index dd943325b..ab30319c5 100644 --- a/lib/sqlalchemy/mapper.py +++ b/lib/sqlalchemy/mapper.py @@ -163,9 +163,9 @@ class Mapper(object): # TODO: get some notion of "primary mapper" going so multiple mappers dont collide self.class_._mapper = self.hashkey - def instances(self, cursor, db = None): + def instances(self, cursor, db): result = util.HistoryArraySet() - cursor = engine.ResultProxy(cursor, echo = db and db.echo, engine = db) + cursor = engine.ResultProxy(cursor, db, echo = db.echo) imap = {} while True: row = cursor.fetchone() |