summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/schema.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-10-11 16:16:08 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-10-11 16:16:08 -0400
commit1f1ad557afa4919245c2cb9972099c1504a30a37 (patch)
tree74fac80835116d55f9e36b7de3e49d6369571308 /lib/sqlalchemy/sql/schema.py
parent9d38ed33400adf3ba8fdf3af49f26de1270bbe23 (diff)
downloadsqlalchemy-1f1ad557afa4919245c2cb9972099c1504a30a37.tar.gz
The ``default`` argument of :class:`.Column` now accepts a class
or object method as an argument, in addition to a standalone function; will properly detect if the "context" argument is accepted or not.
Diffstat (limited to 'lib/sqlalchemy/sql/schema.py')
-rw-r--r--lib/sqlalchemy/sql/schema.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index c493b9132..fe331ce2e 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -1776,7 +1776,7 @@ class ColumnDefault(DefaultGenerator):
on everyone.
"""
- if inspect.isfunction(fn):
+ if inspect.isfunction(fn) or inspect.ismethod(fn):
inspectable = fn
elif inspect.isclass(fn):
inspectable = fn.__init__