diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-10-29 14:38:34 -0400 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-10-29 14:38:34 -0400 |
commit | 382950b70150434f124b6dc27df2b360e7d0331e (patch) | |
tree | 4dcbbc1e5f4aa24ffc3a1c522c3bd77cbeeaf0cd /lib/sqlalchemy/sql/schema.py | |
parent | 98c1dcc6bcade313a254fe11e8efa3c5b5ad959e (diff) | |
parent | e31211c578854d63128a30c036e40eee5c43edc7 (diff) | |
download | sqlalchemy-382950b70150434f124b6dc27df2b360e7d0331e.tar.gz |
Merge branch 'pr204'
Diffstat (limited to 'lib/sqlalchemy/sql/schema.py')
-rw-r--r-- | lib/sqlalchemy/sql/schema.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index e20545962..25eb68f6f 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -1987,13 +1987,14 @@ class ColumnDefault(DefaultGenerator): try: argspec = util.get_callable_argspec(fn, no_self=True) except TypeError: - return lambda ctx: fn() + return util.wrap_callable(lambda ctx: fn(), fn) defaulted = argspec[3] is not None and len(argspec[3]) or 0 positionals = len(argspec[0]) - defaulted if positionals == 0: - return lambda ctx: fn() + return util.wrap_callable(lambda ctx: fn(), fn) + elif positionals == 1: return fn else: |