summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-11-14 16:43:21 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-11-14 16:43:21 +0000
commita03aa84c31bee4c13a32612109c79e86a2afcd53 (patch)
tree822fff40d3ea6559221dc4e307dc560d08c39a72 /lib/sqlalchemy/engine/base.py
parent7f0b5edc9258364b9bb954bd4e3b18d88d63edf4 (diff)
downloadsqlalchemy-a03aa84c31bee4c13a32612109c79e86a2afcd53.tar.gz
- DeferredColumnLoader checks row for column, if present sends it to
ColumnLoader to create the row processor - eager loaders ensure deferred foreign key cols are present in the primary list of columns (and secondary...). because eager loading with LIMIT/OFFSET doesn't re-join to the parent table anymore this is now necessary. [ticket:864]
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
-rw-r--r--lib/sqlalchemy/engine/base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 859fb796e..c3f99bb24 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -1406,6 +1406,8 @@ class ResultProxy(object):
def _has_key(self, row, key):
try:
+ # _key_cache uses __missing__ in 2.5, so not much alternative
+ # to catching KeyError
self._key_cache[key]
return True
except KeyError: