From b723b7da7cb607e9315c437129f665d98cd5b0b5 Mon Sep 17 00:00:00 2001 From: Friedrich Lindenberg Date: Mon, 1 Apr 2013 19:28:22 +0200 Subject: [PATCH] Refactor to simplify --- dataset/persistence/database.py | 3 +-- dataset/persistence/table.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dataset/persistence/database.py b/dataset/persistence/database.py index 9a1588f..685a55c 100644 --- a/dataset/persistence/database.py +++ b/dataset/persistence/database.py @@ -59,8 +59,7 @@ class Database(object): return self.get_table(table_name) def query(self, query): - for res in resultiter(self.engine.execute(query)): - yield res + return resultiter(self.engine.execute(query)): def __repr__(self): return '' % self.url diff --git a/dataset/persistence/table.py b/dataset/persistence/table.py index fb4c473..8f930f2 100644 --- a/dataset/persistence/table.py +++ b/dataset/persistence/table.py @@ -4,7 +4,7 @@ from itertools import count from sqlalchemy.sql import and_, expression from sqlalchemy.schema import Column, Index -from dataset.persistence.util import guess_type, resultiter +from dataset.persistence.util import guess_type log = logging.getLogger(__name__) @@ -116,7 +116,7 @@ class Table(object): break q = self.table.select(whereclause=args, limit=qlimit, offset=qoffset, order_by=order_by) - rows = list(resultiter(self.database.engine.execute(q))) + rows = list(self.database.query(q)) if not len(rows): return for row in rows: @@ -134,7 +134,7 @@ class Table(object): q = expression.select(columns, distinct=True, whereclause=and_(*qargs), order_by=[c.asc() for c in columns]) - return resultiter(self.database.engine.execute(q)) + return self.database.query(q) def all(self): return self.find()