Support postgres schemata, bump version

Browse Source
This commit is contained in:
Friedrich Lindenberg 2013-07-25 10:18:20 +02:00
parent 1dbf8ddc70
commit 39edde3a2c
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dataset/__init__.py
View File

@ -11,7 +11,7 @@ from dataset.freeze.app import freeze
__all__ = ['Database', 'Table', 'freeze', 'connect'] __all__ = ['Database', 'Table', 'freeze', 'connect']
def connect(url=None, reflectMetadata=True): def connect(url=None, schema=None, reflectMetadata=True):
""" """
Opens a new connection to a database. *url* can be any valid `SQLAlchemy engine URL`_. Opens a new connection to a database. *url* can be any valid `SQLAlchemy engine URL`_.
If *url* is not defined it will try to use *DATABASE_URL* from environment variable. If *url* is not defined it will try to use *DATABASE_URL* from environment variable.
@ -26,4 +26,4 @@ def connect(url=None, reflectMetadata=True):
""" """
if url is None: if url is None:
url = os.environ.get('DATABASE_URL', url) url = os.environ.get('DATABASE_URL', url)
return Database(url, reflectMetadata) return Database(url, schema=schema, reflectMetadata=reflectMetadata)

19
dataset/persistence/database.py
View File

@ -1,5 +1,6 @@
import logging import logging
import threading import threading
from urlparse import parse_qs
from sqlalchemy import create_engine from sqlalchemy import create_engine
from migrate.versioning.util import construct_engine from migrate.versioning.util import construct_engine
@ -17,16 +18,25 @@ log = logging.getLogger(__name__)
class Database(object): class Database(object):
def __init__(self, url, reflectMetadata=True): def __init__(self, url, schema=None, reflectMetadata=True):
kw = {} kw = {}
if url.startswith('postgres'): if url.startswith('postgres'):
kw['poolclass'] = NullPool kw['poolclass'] = NullPool
engine = create_engine(url, **kw)
self.lock = threading.RLock() self.lock = threading.RLock()
self.local = threading.local() self.local = threading.local()
if '?' in url:
url, query = url.split('?', 1)
query = parse_qs(query)
if schema is None:
# le pop
schema_qs = query.pop('schema', query.pop('searchpath', []))
if len(schema_qs):
schema = schema_qs.pop()
self.schema = schema
engine = create_engine(url, **kw)
self.url = url self.url = url
self.engine = construct_engine(engine) self.engine = construct_engine(engine)
self.metadata = MetaData() self.metadata = MetaData(schema=schema)
self.metadata.bind = self.engine self.metadata.bind = self.engine
if reflectMetadata: if reflectMetadata:
self.metadata.reflect(self.engine) self.metadata.reflect(self.engine)
@ -146,7 +156,7 @@ class Database(object):
return Table(self, self._tables[table_name]) return Table(self, self._tables[table_name])
self._acquire() self._acquire()
try: try:
if self.engine.has_table(table_name): if self.engine.has_table(table_name, schema=self.schema):
return self.load_table(table_name) return self.load_table(table_name)
else: else:
return self.create_table(table_name) return self.create_table(table_name)
@ -172,4 +182,3 @@ class Database(object):
def __repr__(self): def __repr__(self):
return '<Database(%s)>' % self.url return '<Database(%s)>' % self.url

2
setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup( setup(
name='dataset', name='dataset',
version='0.3.7', version='0.3.8',
description="Toolkit for Python-based data processing.", description="Toolkit for Python-based data processing.",
long_description="", long_description="",
classifiers=[ classifiers=[