fixing statement tests

cqlengine/statements.py

@@ -72,7 +72,7 @@ class BaseClause(object):
     def update_context(self, ctx):
         """ updates the query context with this clauses values """
         assert isinstance(ctx, dict)
-        ctx[str(self.context_id)] = ValueQuoter(self.value)
+        ctx[str(self.context_id)] = self.value
 
 
 class WhereClause(BaseClause):
@@ -538,6 +538,8 @@ class DeleteStatement(BaseCQLStatement):
             where=where,
         )
         self.fields = []
+        if isinstance(fields, basestring):
+            fields = [fields]
         for field in fields or []:
             self.add_field(field)
 
@@ -551,7 +553,9 @@ class DeleteStatement(BaseCQLStatement):
     def __unicode__(self):
         qs = ['DELETE']
         if self.fields:
-            qs += [', '.join(['"{}"'.format(f) for f in self.fields])]
+            qs += [', '.join(['{}'.format(f) for f in self.fields])]
+        else:
+            qs += ['*']
         qs += ['FROM', self.table]
 
         if self.where_clauses:

cqlengine/tests/statements/test_base_clause.py

@@ -11,6 +11,6 @@ class BaseClauseTests(TestCase):
         ctx = {}
         ss.set_context_id(10)
         ss.update_context(ctx)
-        assert ctx == {10: 'b'}
+        assert ctx == {'10': 'b'}
 
 

cqlengine/tests/statements/test_delete_statement.py

@@ -8,7 +8,8 @@ class DeleteStatementTests(TestCase):
     def test_single_field_is_listified(self):
         """ tests that passing a string field into the constructor puts it into a list """
         ds = DeleteStatement('table', 'field')
-        self.assertEqual(ds.fields, ['field'])
+        self.assertEqual(len(ds.fields), 1)
+        self.assertEqual(ds.fields[0].field, 'field')
 
     def test_field_rendering(self):
         """ tests that fields are properly added to the select statement """
@@ -35,4 +36,4 @@ class DeleteStatementTests(TestCase):
     def test_context(self):
         ds = DeleteStatement('table', None)
         ds.add_where_clause(WhereClause('a', EqualsOperator(), 'b'))
-        self.assertEqual(ds.get_context(), {0: 'b'})
+        self.assertEqual(ds.get_context(), {'0': 'b'})

cqlengine/tests/statements/test_select_statement.py

@@ -42,7 +42,7 @@ class SelectStatementTests(TestCase):
     def test_context(self):
         ss = SelectStatement('table')
         ss.add_where_clause(WhereClause('a', EqualsOperator(), 'b'))
-        self.assertEqual(ss.get_context(), {0: 'b'})
+        self.assertEqual(ss.get_context(), {'0': 'b'})
 
     def test_additional_rendering(self):
         ss = SelectStatement(

cqlengine/tests/statements/test_update_statement.py

@@ -23,7 +23,7 @@ class UpdateStatementTests(TestCase):
         us.add_assignment_clause(AssignmentClause('a', 'b'))
         us.add_assignment_clause(AssignmentClause('c', 'd'))
         us.add_where_clause(WhereClause('a', EqualsOperator(), 'x'))
-        self.assertEqual(us.get_context(), {0: 'b', 1: 'd', 2: 'x'})
+        self.assertEqual(us.get_context(), {'0': 'b', '1': 'd', '2': 'x'})
 
     def test_additional_rendering(self):
         us = UpdateStatement('table', ttl=60)