Minor fixes re offenesparlament.de

Browse Source
This commit is contained in:
Friedrich Lindenberg 2012-08-12 11:54:32 +02:00
parent f74ef1d33c
commit 15e89f3f89
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sqlaload/__init__.py
View File

@ -4,6 +4,6 @@ from sqlaload.schema import create_table, load_table, get_table, drop_table
from sqlaload.schema import create_column from sqlaload.schema import create_column
from sqlaload.write import add_row, update_row from sqlaload.write import add_row, update_row
from sqlaload.write import upsert, update, delete from sqlaload.write import upsert, update, delete
from sqlaload.query import distinct, resultiter, all, find_one, find from sqlaload.query import distinct, resultiter, all, find_one, find, query
from sqlaload.util import dump_csv from sqlaload.util import dump_csv

4
sqlaload/query.py
View File

@ -54,6 +54,10 @@ def find(engine, table, _limit=None, _step=5000, _offset=0,
for row in rows: for row in rows:
yield row yield row
def query(engine, query):
for res in resultiter(engine.execute(query)):
yield res
def distinct(engine, table, *columns): def distinct(engine, table, *columns):
columns = [table.c[c] for c in columns] columns = [table.c[c] for c in columns]
q = expression.select(columns, distinct=True, q = expression.select(columns, distinct=True,

6
sqlaload/schema.py
View File

@ -18,8 +18,10 @@ INDEXES = dict()
def connect(url): def connect(url):
""" Create an engine for the given database URL. """ """ Create an engine for the given database URL. """
kw = {} kw = {}
#if url.startswith('postgres'): if url.startswith('postgres'):
# kw['pool_size'] = 10 #kw['pool_size'] = 5
from sqlalchemy.pool import NullPool
kw['poolclass'] = NullPool
engine = create_engine(url, **kw) engine = create_engine(url, **kw)
engine = construct_engine(engine) engine = construct_engine(engine)
meta = MetaData() meta = MetaData()