diff --git a/dataset/persistence/util.py b/dataset/persistence/util.py new file mode 100644 index 0000000..dacdc60 --- /dev/null +++ b/dataset/persistence/util.py @@ -0,0 +1,13 @@ + +def resultiter(rp): + """ SQLAlchemy ResultProxies are not iterable to get a + list of dictionaries. This is to wrap them. """ + keys = rp.keys() + while True: + row = rp.fetchone() + if row is None: + break + yield dict(zip(keys, row)) + + + diff --git a/dataset/query.py b/dataset/query.py index ab94820..c782675 100644 --- a/dataset/query.py +++ b/dataset/query.py @@ -2,19 +2,11 @@ import logging from itertools import count from sqlalchemy.sql import expression, and_ -from sqlaload.schema import _ensure_columns, get_table +from dataset.schema import _ensure_columns, get_table +from dataset.persistence.util import resultiter log = logging.getLogger(__name__) -def resultiter(rp): - """ SQLAlchemy ResultProxies are not iterable to get a - list of dictionaries. This is to wrap them. """ - keys = rp.keys() - while True: - row = rp.fetchone() - if row is None: - break - yield dict(zip(keys, row)) def find_one(engine, table, **kw): table = get_table(engine, table) diff --git a/test.py b/test.py index 907c1c4..24af6a4 100644 --- a/test.py +++ b/test.py @@ -1,7 +1,7 @@ import unittest from datetime import datetime -from sqlaload import * +from dataset import * TEST_DATA = [ {