From dabb8d412b27aa91b772d625e41c6711eed1b4a1 Mon Sep 17 00:00:00 2001 From: Alan Boudreault Date: Thu, 3 Mar 2016 15:17:04 -0500 Subject: [PATCH] Add tests for distcint with count --- tests/integration/cqlengine/query/test_queryset.py | 7 +++++++ .../cqlengine/statements/test_select_statement.py | 3 +++ 2 files changed, 10 insertions(+) diff --git a/tests/integration/cqlengine/query/test_queryset.py b/tests/integration/cqlengine/query/test_queryset.py index a1609f3c..7fffe813 100644 --- a/tests/integration/cqlengine/query/test_queryset.py +++ b/tests/integration/cqlengine/query/test_queryset.py @@ -485,6 +485,13 @@ class TestQuerySetDistinct(BaseQuerySetUsage): q = TestModel.objects.distinct(['test_id']).filter(test_id__in=[52]) self.assertEqual(len(q), 0) + def test_distinct_with_explicit_count(self): + q = TestModel.objects.distinct(['test_id']) + self.assertEqual(q.count(), 3) + + q = TestModel.objects.distinct(['test_id']).filter(test_id__in=[1, 2]) + self.assertEqual(q.count(), 2) + class TestQuerySetOrdering(BaseQuerySetUsage): diff --git a/tests/integration/cqlengine/statements/test_select_statement.py b/tests/integration/cqlengine/statements/test_select_statement.py index 33b1ef07..3f1c371c 100644 --- a/tests/integration/cqlengine/statements/test_select_statement.py +++ b/tests/integration/cqlengine/statements/test_select_statement.py @@ -64,6 +64,9 @@ class SelectStatementTests(unittest.TestCase): ss = SelectStatement('table', distinct_fields=['field1', 'field2']) self.assertEqual(six.text_type(ss), 'SELECT DISTINCT "field1", "field2" FROM table') + ss = SelectStatement('table', distinct_fields=['field1'], count=True) + self.assertEqual(six.text_type(ss), 'SELECT DISTINCT COUNT("field1") FROM table') + def test_context(self): ss = SelectStatement('table') ss.add_where_clause(WhereClause('a', EqualsOperator(), 'b'))