From 52c736b57d2722d1d578086d68fec8ed2bae2cad Mon Sep 17 00:00:00 2001 From: Jon Haddad Date: Wed, 18 Jun 2014 15:07:58 -0700 Subject: [PATCH] fixed update clause --- cqlengine/tests/statements/test_base_clause.py | 2 +- cqlengine/tests/statements/test_delete_statement.py | 4 ++-- cqlengine/tests/statements/test_update_statement.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cqlengine/tests/statements/test_base_clause.py b/cqlengine/tests/statements/test_base_clause.py index 746cafae..c5bbeb40 100644 --- a/cqlengine/tests/statements/test_base_clause.py +++ b/cqlengine/tests/statements/test_base_clause.py @@ -8,7 +8,7 @@ class BaseClauseTests(TestCase): ss = BaseClause('a', 'b') assert ss.get_context_size() == 1 - ctx = [] + ctx = {} ss.set_context_id(10) ss.update_context(ctx) assert ctx == {'10': 'b'} diff --git a/cqlengine/tests/statements/test_delete_statement.py b/cqlengine/tests/statements/test_delete_statement.py index ada5b720..f3b0df9f 100644 --- a/cqlengine/tests/statements/test_delete_statement.py +++ b/cqlengine/tests/statements/test_delete_statement.py @@ -31,7 +31,7 @@ class DeleteStatementTests(TestCase): def test_where_clause_rendering(self): ds = DeleteStatement('table', None) ds.add_where_clause(WhereClause('a', EqualsOperator(), 'b')) - self.assertEqual(unicode(ds), 'DELETE FROM table WHERE "a" = ?', unicode(ds)) + self.assertEqual(unicode(ds), 'DELETE FROM table WHERE "a" = %(0)s', unicode(ds)) def test_context_update(self): ds = DeleteStatement('table', None) @@ -39,7 +39,7 @@ class DeleteStatementTests(TestCase): ds.add_where_clause(WhereClause('a', EqualsOperator(), 'b')) ds.update_context_id(7) - self.assertEqual(unicode(ds), 'DELETE "d"[?] FROM table WHERE "a" = ?') + self.assertEqual(unicode(ds), 'DELETE "d"[%(8)s] FROM table WHERE "a" = %(7)s') self.assertEqual(ds.get_context(), {'7': 'b', '8': 3}) def test_context(self): diff --git a/cqlengine/tests/statements/test_update_statement.py b/cqlengine/tests/statements/test_update_statement.py index b98cfae9..fae69bbd 100644 --- a/cqlengine/tests/statements/test_update_statement.py +++ b/cqlengine/tests/statements/test_update_statement.py @@ -31,7 +31,7 @@ class UpdateStatementTests(TestCase): us.add_assignment_clause(AssignmentClause('c', 'd')) us.add_where_clause(WhereClause('a', EqualsOperator(), 'x')) us.update_context_id(3) - self.assertEqual(unicode(us), 'UPDATE table SET "a" = ?, "c" = ? WHERE "a" = ?') + self.assertEqual(unicode(us), 'UPDATE table SET "a" = %(4)s, "c" = %(5)s WHERE "a" = %(3)s') self.assertEqual(us.get_context(), {'4': 'b', '5': 'd', '3': 'x'}) def test_additional_rendering(self):