summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/mapping/query.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/mapping/query.py')
-rw-r--r--lib/sqlalchemy/mapping/query.py17
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/sqlalchemy/mapping/query.py b/lib/sqlalchemy/mapping/query.py
index 2ef23c560..283e8c189 100644
--- a/lib/sqlalchemy/mapping/query.py
+++ b/lib/sqlalchemy/mapping/query.py
@@ -177,7 +177,7 @@ class Query(object):
for key, value in params.iteritems():
if value is False:
continue
- c = self._get_criterion(key, value)
+ c = self.mapper._get_criterion(key, value)
if c is None:
raise InvalidRequestError("Cant find criterion for property '"+ key + "'")
if clause is None:
@@ -261,18 +261,3 @@ class Query(object):
value.setup(key, statement, **kwargs)
return statement
- def _get_criterion(self, key, value):
- """used by select_by to match a key/value pair against
- local properties, column names, or a matching property in this mapper's
- list of relations."""
- if self.props.has_key(key):
- return self.props[key].columns[0] == value
- elif self.table.c.has_key(key):
- return self.table.c[key] == value
- else:
- for prop in self.props.values():
- c = prop.get_criterion(key, value)
- if c is not None:
- return c
- else:
- return None