From 413dcdf0f4cc860ad2f4613c8cf02f38bb59c426 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 2 Mar 2006 00:38:16 +0000 Subject: engine argument on tables optional test suite uses BaseProxyEngine as a base for the tester engine documented global proxy engine --- lib/sqlalchemy/__init__.py | 4 ++++ lib/sqlalchemy/schema.py | 3 +++ 2 files changed, 7 insertions(+) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/__init__.py b/lib/sqlalchemy/__init__.py index 5efbf6652..9f7b99fea 100644 --- a/lib/sqlalchemy/__init__.py +++ b/lib/sqlalchemy/__init__.py @@ -15,3 +15,7 @@ from mapping import * import sqlalchemy.schema import sqlalchemy.ext.proxy sqlalchemy.schema.default_engine = sqlalchemy.ext.proxy.ProxyEngine() + +def global_connect(*args, **kwargs): + sqlalchemy.schema.default_engine.connect(*args, **kwargs) + \ No newline at end of file diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py index 6d43d8e9d..a11a1539e 100644 --- a/lib/sqlalchemy/schema.py +++ b/lib/sqlalchemy/schema.py @@ -47,6 +47,9 @@ class TableSingleton(type): """a metaclass used by the Table object to provide singleton behavior.""" def __call__(self, name, engine=None, *args, **kwargs): try: + if not isinstance(engine, SchemaEngine): + args = [engine] + list(args) + engine = None if engine is None: engine = default_engine name = str(name) # in case of incoming unicode -- cgit v1.2.1