Use same procedure as django for expansion of child in make_atom

netfields/managers.py

@@ -34,16 +34,19 @@ class NetQuery(sql.Query):
 
 class NetWhere(sql.where.WhereNode):
     def make_atom(self, child, qn, conn):
-        if isinstance(child[0], sql.where.Constraint):
+        lvalue, lookup_type, value_annot, params_or_value = child
-            c = child[0]
+
-            table_alias = c.alias
+        if hasattr(lvalue, 'process'):
-            name = c.col
+            try:
-            field = c.field
+                lvalue, params = lvalue.process(lookup_type, params_or_value, connection)
-            lookup_type, value_annot, params = child[1:]
+            except EmptyShortCircuit:
+                raise EmptyResultSet
         else:
-            table_alias, name, db_type, lookup_type, value_annot, params = child
+            return super(NetWhere, self).make_atom(child, qn, conn)
+
+        table_alias, name, db_type = lvalue
 
-        if field.db_type() not in ['inet', 'cidr']:
+        if db_type not in ['inet', 'cidr']:
             return super(NetWhere, self).make_atom(child, qn, conn)
 
         if table_alias:
@@ -52,7 +55,7 @@ class NetWhere(sql.where.WhereNode):
             field_sql = qn(name)
 
         if NET_OPERATORS.get(lookup_type, '') in NET_TEXT_OPERATORS:
-            if field.db_type() == 'inet':
+            if db_type == 'inet':
                 field_sql  = 'HOST(%s)' % field_sql
             else:
                 field_sql  = 'TEXT(%s)' % field_sql