Merge pull request #118 from saimn/patch-1

Reflect views.
This commit is contained in:
Friedrich Lindenberg 2015-02-18 18:56:42 +02:00
commit 3157b45820
2 changed files with 21 additions and 14 deletions

View File

@ -1,25 +1,32 @@
import os
# shut up useless SA warning:
import warnings
warnings.filterwarnings(
'ignore', 'Unicode type received non-unicode bind param value.')
from dataset.persistence.util import sqlite_datetime_fix
from dataset.persistence.database import Database
from dataset.persistence.table import Table
from dataset.freeze.app import freeze
# shut up useless SA warning:
warnings.filterwarnings(
'ignore', 'Unicode type received non-unicode bind param value.')
__all__ = ['Database', 'Table', 'freeze', 'connect']
def connect(url=None, schema=None, reflectMetadata=True, engine_kwargs=None):
def connect(url=None, schema=None, reflectMetadata=True, engine_kwargs=None,
reflect_views=True):
"""
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.
Returns an instance of :py:class:`Database <dataset.Database>`. Set *reflectMetadata* to False if you
don't want the entire database schema to be pre-loaded. This significantly speeds up
connecting to large databases with lots of tables. Additionally, *engine_kwargs* will be directly passed to
SQLAlchemy, e.g. set *engine_kwargs={'pool_recycle': 3600}* will avoid `DB connection timeout`_.
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. Returns an
instance of :py:class:`Database <dataset.Database>`. Set *reflectMetadata*
to False if you don't want the entire database schema to be pre-loaded.
This significantly speeds up connecting to large databases with lots of
tables. *reflect_views* can be set to False if you don't want views to be
loaded. Additionally, *engine_kwargs* will be directly passed to
SQLAlchemy, e.g. set *engine_kwargs={'pool_recycle': 3600}* will avoid `DB
connection timeout`_.
::
db = dataset.connect('sqlite:///factbook.db')
@ -34,4 +41,4 @@ def connect(url=None, schema=None, reflectMetadata=True, engine_kwargs=None):
sqlite_datetime_fix()
return Database(url, schema=schema, reflectMetadata=reflectMetadata,
engine_kwargs=engine_kwargs)
engine_kwargs=engine_kwargs, reflect_views=reflect_views)

View File

@ -25,7 +25,7 @@ log = logging.getLogger(__name__)
class Database(object):
def __init__(self, url, schema=None, reflectMetadata=True,
engine_kwargs=None):
engine_kwargs=None, reflect_views=True):
if engine_kwargs is None:
engine_kwargs = {}
@ -50,7 +50,7 @@ class Database(object):
self.metadata = MetaData(schema=schema)
self.metadata.bind = self.engine
if reflectMetadata:
self.metadata.reflect(self.engine)
self.metadata.reflect(self.engine, views=reflect_views)
self._tables = {}
@property