# django 1.0
table, column, type, x, y, values = item
equal_bits = [ "(%s=%s)" % (column, value) for value in values ]
- if len(equal_bits) > 1:
- clause = '(|%s)' % ''.join(equal_bits)
- else:
+ if len(equal_bits) == 1:
clause = equal_bits[0]
+ else:
+ clause = '(|%s)' % ''.join(equal_bits)
if self.negated:
bits.append('(!%s)' % clause)
else:
keys = []
for k in ordering:
attr = self.model._meta.get_field(k).db_column
- keys.append(x[1].get(attr, None))
+ keys.append(x[1].get(attr, '').lower())
return keys
vals = sorted(vals, key=lambda x: getkey(x))