diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-07-26 19:04:07 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-07-26 19:04:07 -0400 |
| commit | e65cb04974cc35e6f8301b9b7bc2a02d11edf139 (patch) | |
| tree | 3e94242aeb6d6650720407f95a63f4c0e195ea39 /lib/sqlalchemy/testing/schema.py | |
| parent | e602a731974bface5c25ff4e83e7e2bd153daa61 (diff) | |
| parent | c85fa9fa50ca32523c160eaab58ab6d2b97aacc6 (diff) | |
| download | sqlalchemy-e65cb04974cc35e6f8301b9b7bc2a02d11edf139.tar.gz | |
Merge branch 'master' into xdist_poc
Conflicts:
lib/sqlalchemy/engine/url.py
Diffstat (limited to 'lib/sqlalchemy/testing/schema.py')
| -rw-r--r-- | lib/sqlalchemy/testing/schema.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/schema.py b/lib/sqlalchemy/testing/schema.py index 1cb356dd7..9561b1f1e 100644 --- a/lib/sqlalchemy/testing/schema.py +++ b/lib/sqlalchemy/testing/schema.py @@ -67,7 +67,7 @@ def Column(*args, **kw): test_opts = dict([(k, kw.pop(k)) for k in list(kw) if k.startswith('test_')]) - if config.requirements.foreign_key_ddl.predicate(config): + if not config.requirements.foreign_key_ddl.enabled_for_config(config): args = [arg for arg in args if not isinstance(arg, schema.ForeignKey)] col = schema.Column(*args, **kw) |