From: Jason Kirtland Date: Fri, 6 Jul 2007 17:28:45 +0000 (+0000) Subject: Tweak docs, very minor DMD compatability tweak X-Git-Tag: rel_0_3_9~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c87304874c53b1c8b3e184bb6198a252d1d430ff;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Tweak docs, very minor DMD compatability tweak --- diff --git a/doc/build/content/metadata.txt b/doc/build/content/metadata.txt index 3f13a3c698..1090b0851c 100644 --- a/doc/build/content/metadata.txt +++ b/doc/build/content/metadata.txt @@ -132,12 +132,16 @@ To bind `MetaData` to a single `Engine`, supply an Engine when creating the Meta # create the Engine and MetaData in one step meta = MetaData('postgres://db/', **kwargs) - # or bind later + # or bind the MetaData to an Engine later meta = MetaData() - # ... + invoices = Table('invoices', meta, + Column('invoice_id', Integer, primary_key=True), + Column('ref_num', Integer, primary_key=True), + Column('description', String(60), nullable=False) + ) meta.connect(engine) -Another form of `MetaData` exits which can connect to an engine within the current thread (or "on a per-thread basis"), allowing other threads to be connected to different engines simultaneously: +Another form of `MetaData` exists which can connect to an engine within the current thread (or "on a per-thread basis"), allowing other threads to be connected to different engines simultaneously: {python} meta = ThreadLocalMetaData() diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index 868dcb7b0c..d01677b697 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -1268,7 +1268,7 @@ def DynamicMetaData(name=None, threadlocal=True, **kw): """Deprecated. Use ``MetaData`` or ``ThreadLocalMetaData``.""" if threadlocal: - return ThreadLocalMetaData(**kw) + return ThreadLocalMetaData(name=name, **kw) else: return MetaData(name=name, **kw)