summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/declarative.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-02-23 00:39:35 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2010-02-23 00:39:35 +0000
commitc2060e8943e628404d9620ad60787c6af0a12b07 (patch)
tree83607353cd4aa2ada91be9096bdfe1e7c779c87b /lib/sqlalchemy/ext/declarative.py
parent733d8e593a611b4601ec2ee197ca112250111b64 (diff)
downloadsqlalchemy-c2060e8943e628404d9620ad60787c6af0a12b07.tar.gz
- the __mapper_args__ dict is copied when propagating to a subclass.
Still need to decide how the argument propagation should work in the bigger picture. [ticket:1393]
Diffstat (limited to 'lib/sqlalchemy/ext/declarative.py')
-rw-r--r--lib/sqlalchemy/ext/declarative.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index d5bd2906b..cc972fc6f 100644
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -500,7 +500,7 @@ def _as_declarative(cls, classname, dict_):
raise exceptions.ArgumentError(
"Can't add additional column %r when specifying __table__" % key)
- mapper_args = getattr(cls, '__mapper_args__', {})
+ mapper_args = dict(getattr(cls, '__mapper_args__', {}))
if 'inherits' not in mapper_args:
for c in cls.__bases__:
if _is_mapped_class(c):