summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/declarative.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-07-21 11:44:31 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-07-21 11:44:31 -0400
commitc1295ce57ba7d906821b3ddd5b97aa9659700d52 (patch)
tree029dc9f29647d2d2b7fcf138fcc0ab6face67786 /lib/sqlalchemy/ext/declarative.py
parent06e84d5bcc0c009b8d4a91e7d247a25299e6c879 (diff)
downloadsqlalchemy-c1295ce57ba7d906821b3ddd5b97aa9659700d52.tar.gz
- Added an informative error message when
ForeignKeyConstraint refers to a column name in the parent that is not found. Also in 0.6.9. - add tests for [ticket:2226], as if we hit each @declared_attr directly with obj.__get__(obj, name) instead of using getattr(cls, name). Basic inheritance mechanics are improperly used in this case, so 2226 is invalid.
Diffstat (limited to 'lib/sqlalchemy/ext/declarative.py')
-rwxr-xr-xlib/sqlalchemy/ext/declarative.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index 8c26edf5c..15e7ba34f 100755
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -944,7 +944,6 @@ def _as_declarative(cls, classname, dict_):
continue
elif base is not cls:
# we're a mixin.
-
if isinstance(obj, Column):
if obj.foreign_keys:
raise exc.InvalidRequestError(
@@ -1042,7 +1041,6 @@ def _as_declarative(cls, classname, dict_):
if key == c.key:
del our_stuff[key]
cols = sorted(cols, key=lambda c:c._creation_order)
-
table = None
if '__table__' not in dict_:
if tablename is not None: