|
@@ -39,7 +39,8 @@ class NetWhere(sql.where.WhereNode):
|
|
|
|
|
|
if hasattr(lvalue, 'process'):
|
|
|
try:
|
|
|
- lvalue, params = lvalue.process(lookup_type, params_or_value, connection)
|
|
|
+ lvalue, params = lvalue.process(lookup_type, params_or_value,
|
|
|
+ connection)
|
|
|
except sql.where.EmptyShortCircuit:
|
|
|
raise query.EmptyResultSet
|
|
|
else:
|
|
@@ -57,9 +58,9 @@ class NetWhere(sql.where.WhereNode):
|
|
|
|
|
|
if NET_OPERATORS.get(lookup_type, '') in NET_TEXT_OPERATORS:
|
|
|
if db_type == 'inet':
|
|
|
- field_sql = 'HOST(%s)' % field_sql
|
|
|
+ field_sql = 'HOST(%s)' % field_sql
|
|
|
else:
|
|
|
- field_sql = 'TEXT(%s)' % field_sql
|
|
|
+ field_sql = 'TEXT(%s)' % field_sql
|
|
|
|
|
|
if isinstance(params, QueryWrapper):
|
|
|
extra, params = params.data
|
|
@@ -70,17 +71,20 @@ class NetWhere(sql.where.WhereNode):
|
|
|
params = (params,)
|
|
|
|
|
|
if lookup_type in NET_OPERATORS:
|
|
|
- return (' '.join([field_sql, NET_OPERATORS[lookup_type], extra]), params)
|
|
|
+ return (' '.join([field_sql, NET_OPERATORS[lookup_type], extra]),
|
|
|
+ params)
|
|
|
elif lookup_type == 'in':
|
|
|
if not value_annot:
|
|
|
raise sql.datastructures.EmptyResultSet
|
|
|
if extra:
|
|
|
return ('%s IN %s' % (field_sql, extra), params)
|
|
|
- return ('%s IN (%s)' % (field_sql, ', '.join(['%s'] * len(params))), params)
|
|
|
+ return ('%s IN (%s)' % (field_sql, ', '.join(['%s'] *
|
|
|
+ len(params))), params)
|
|
|
elif lookup_type == 'range':
|
|
|
return ('%s BETWEEN %%s and %%s' % field_sql, params)
|
|
|
elif lookup_type == 'isnull':
|
|
|
- return ('%s IS %sNULL' % (field_sql, (not value_annot and 'NOT ' or '')), params)
|
|
|
+ return ('%s IS %sNULL' % (field_sql, (not value_annot and 'NOT ' or
|
|
|
+ '')), params)
|
|
|
|
|
|
raise ValueError('Invalid lookup type "%s"' % lookup_type)
|
|
|
|