diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-06-02 22:34:54 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-06-02 22:34:54 +0000 |
| commit | cfcf47338d56cffd1731d93202aa10ce0fec76c4 (patch) | |
| tree | 34e77a835d94d64178eef64be8ad41c1dc7b94f4 /lib/sqlalchemy/schema.py | |
| parent | 58078e8e09da61106f9b72a60e89e8b96cdeaf36 (diff) | |
| download | sqlalchemy-cfcf47338d56cffd1731d93202aa10ce0fec76c4.tar.gz | |
restored global_connect() function, default table metadata
Diffstat (limited to 'lib/sqlalchemy/schema.py')
| -rw-r--r-- | lib/sqlalchemy/schema.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index 8b0c9f0b3..31b325990 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -57,6 +57,15 @@ class TableSingleton(type): if not hasattr(engine, '_legacy_metadata'): engine._legacy_metadata = BoundMetaData(engine) metadata = engine._legacy_metadata + elif metadata is not None and not isinstance(metadata, MetaData): + # they left MetaData out, so assume its another SchemaItem, add it to *args + args = list(args) + args.insert(0, metadata) + metadata = None + + if metadata is None: + metadata = default_metadata + name = str(name) # in case of incoming unicode schema = kwargs.get('schema', None) autoload = kwargs.pop('autoload', False) |
