|
@@ -64,8 +64,8 @@ class Lookup:
|
|
|
self.lhs, self.rhs = new_exprs
|
|
|
|
|
|
def get_prep_lookup(self):
|
|
|
- if hasattr(self.rhs, '_prepare'):
|
|
|
- return self.rhs._prepare(self.lhs.output_field)
|
|
|
+ if hasattr(self.rhs, 'resolve_expression'):
|
|
|
+ return self.rhs
|
|
|
if self.prepare_rhs and hasattr(self.lhs.output_field, 'get_prep_value'):
|
|
|
return self.lhs.output_field.get_prep_value(self.rhs)
|
|
|
return self.rhs
|
|
@@ -195,11 +195,9 @@ class FieldGetDbPrepValueIterableMixin(FieldGetDbPrepValueMixin):
|
|
|
get_db_prep_lookup_value_is_iterable = True
|
|
|
|
|
|
def get_prep_lookup(self):
|
|
|
+ if hasattr(self.rhs, 'resolve_expression'):
|
|
|
+ return self.rhs
|
|
|
prepared_values = []
|
|
|
- if hasattr(self.rhs, '_prepare'):
|
|
|
- # A subquery is like an iterable but its items shouldn't be
|
|
|
- # prepared independently.
|
|
|
- return self.rhs._prepare(self.lhs.output_field)
|
|
|
for rhs_value in self.rhs:
|
|
|
if hasattr(rhs_value, 'resolve_expression'):
|
|
|
# An expression will be handled by the database but can coexist
|