diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 9 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 79a1909d1..4251c5810 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -632,11 +632,10 @@ class ResultProxy: def fetchall(self): """fetch all rows, just like DBAPI cursor.fetchall().""" l = [] - while True: - v = self.fetchone() - if v is None: - return l - l.append(v) + for row in self.cursor.fetchall(): + l.append(RowProxy(self, row)) + self.close() + return l def fetchone(self): """fetch one row, just like DBAPI cursor.fetchone().""" diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 57c29a630..096e1ca33 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -659,10 +659,7 @@ class Mapper(object): for m in mappers: otherresults.append(util.UniqueAppender([])) - while True: - row = cursor.fetchone() - if row is None: - break + for row in cursor.fetchall(): self._instance(context, row, result) i = 0 for m in mappers: |