summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/declarative
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-01-22 20:16:47 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-01-22 20:16:47 -0500
commit743ceb045e8be8b606198f4d5c02a72abebb2fbb (patch)
treeca3b2c4a1a36cf88eb74d32b999c37d4bc1bee1b /lib/sqlalchemy/ext/declarative
parent1732414076677e8fb84134325635729691f3d26d (diff)
downloadsqlalchemy-743ceb045e8be8b606198f4d5c02a72abebb2fbb.tar.gz
- Support is improved for supplying a :func:`.join` construct as the
target of :paramref:`.relationship.secondary` for the purposes of creating very complex :func:`.relationship` join conditions. The change includes adjustments to query joining, joined eager loading to not render a SELECT subquery, changes to lazy loading such that the "secondary" target is properly included in the SELECT, and changes to declarative to better support specification of a join() object with classes as targets.
Diffstat (limited to 'lib/sqlalchemy/ext/declarative')
-rw-r--r--lib/sqlalchemy/ext/declarative/clsregistry.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/sqlalchemy/ext/declarative/clsregistry.py b/lib/sqlalchemy/ext/declarative/clsregistry.py
index fda1cffb5..8b846746f 100644
--- a/lib/sqlalchemy/ext/declarative/clsregistry.py
+++ b/lib/sqlalchemy/ext/declarative/clsregistry.py
@@ -14,6 +14,7 @@ from ...orm.properties import ColumnProperty, RelationshipProperty, \
from ...schema import _get_table_key
from ...orm import class_mapper, interfaces
from ... import util
+from ... import inspection
from ... import exc
import weakref
@@ -207,6 +208,9 @@ class _GetColumns(object):
" directly to a Column)." % key)
return getattr(self.cls, key)
+inspection._inspects(_GetColumns)(
+ lambda target: inspection.inspect(target.cls))
+
class _GetTable(object):
def __init__(self, key, metadata):