diff --git a/cassandra/cqlengine/query.py b/cassandra/cqlengine/query.py index ada4e4a7..a5ac3e3d 100644 --- a/cassandra/cqlengine/query.py +++ b/cassandra/cqlengine/query.py @@ -719,7 +719,7 @@ class AbstractQuerySet(object): else: query_val = column.to_database(val) if not col_op: # only equal values should be deferred - clone._defer_fields.add(col_name) + clone._defer_fields.add(column.db_field_name) clone._deferred_values[column.db_field_name] = val # map by db field name for substitution in results clone._where.append(WhereClause(column.db_field_name, operator, query_val, quote_field=quote_field)) diff --git a/tests/integration/cqlengine/query/test_queryset.py b/tests/integration/cqlengine/query/test_queryset.py index fbb23e18..004f21a0 100644 --- a/tests/integration/cqlengine/query/test_queryset.py +++ b/tests/integration/cqlengine/query/test_queryset.py @@ -1281,6 +1281,15 @@ class TestModelQueryWithDBField(BaseCassEngTestCase): for value in values: self.assertTrue(value not in str(b2.queries[0])) + def test_db_field_value_list(self): + DBFieldModel.create(k0=0, k1=0, c0=0, v0=4, v1=5) + + self.assertEqual(DBFieldModel.objects.filter(c0=0, k0=0, k1=0).values_list('c0', 'v0')._defer_fields, + {'a', 'c', 'b'}) + self.assertEqual(DBFieldModel.objects.filter(c0=0, k0=0, k1=0).values_list('c0', 'v0')._only_fields, + ['c', 'd']) + + list(DBFieldModel.objects.filter(c0=0, k0=0, k1=0).values_list('c0', 'v0')) class TestModelSmall(Model):