openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Merge pull request #293 from lchi/ah_lc_empty_set

Browse Source 
Fixes issues with empty set and list types
This commit is contained in:
Jon Haddad
2014-11-14 11:42:01 -08:00
parent f8c595cb8e c2590b46b8
commit 079f885519
3 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cqlengine/statements.py
View File

@@ -173,15 +173,18 @@ class SetUpdateClause(ContainerUpdateClause):
def __unicode__(self):
qs = []
ctx_id = self.context_id
if self.previous is None and not (self._assignments or self._additions or self._removals):
if (self.previous is None and
self._assignments is None and
self._additions is None and
self._removals is None):
qs += ['"{}" = %({})s'.format(self.field, ctx_id)]
if self._assignments:
if self._assignments is not None:
qs += ['"{}" = %({})s'.format(self.field, ctx_id)]
ctx_id += 1
if self._additions:
if self._additions is not None:
qs += ['"{0}" = "{0}" + %({1})s'.format(self.field, ctx_id)]
ctx_id += 1
if self._removals:
if self._removals is not None:
qs += ['"{0}" = "{0}" - %({1})s'.format(self.field, ctx_id)]
return ', '.join(qs)
@@ -204,22 +207,28 @@ class SetUpdateClause(ContainerUpdateClause):
def get_context_size(self):
if not self._analyzed: self._analyze()
if self.previous is None and not (self._assignments or self._additions or self._removals):
if (self.previous is None and
self._assignments is None and
self._additions is None and
self._removals is None):
return 1
return int(bool(self._assignments)) + int(bool(self._additions)) + int(bool(self._removals))
def update_context(self, ctx):
if not self._analyzed: self._analyze()
ctx_id = self.context_id
if self.previous is None and not (self._assignments or self._additions or self._removals):
if (self.previous is None and
self._assignments is None and
self._additions is None and
self._removals is None):
ctx[str(ctx_id)] = self._to_database({})
if self._assignments:
if self._assignments is not None:
ctx[str(ctx_id)] = self._to_database(self._assignments)
ctx_id += 1
if self._additions:
if self._additions is not None:
ctx[str(ctx_id)] = self._to_database(self._additions)
ctx_id += 1
if self._removals:
if self._removals is not None:
ctx[str(ctx_id)] = self._to_database(self._removals)
@@ -239,11 +248,11 @@ class ListUpdateClause(ContainerUpdateClause):
qs += ['"{}" = %({})s'.format(self.field, ctx_id)]
ctx_id += 1
if self._prepend:
if self._prepend is not None:
qs += ['"{0}" = %({1})s + "{0}"'.format(self.field, ctx_id)]
ctx_id += 1
if self._append:
if self._append is not None:
qs += ['"{0}" = "{0}" + %({1})s'.format(self.field, ctx_id)]
return ', '.join(qs)
@@ -258,13 +267,13 @@ class ListUpdateClause(ContainerUpdateClause):
if self._assignments is not None:
ctx[str(ctx_id)] = self._to_database(self._assignments)
ctx_id += 1
if self._prepend:
if self._prepend is not None:
# CQL seems to prepend element at a time, starting
# with the element at idx 0, we can either reverse
# it here, or have it inserted in reverse
ctx[str(ctx_id)] = self._to_database(list(reversed(self._prepend)))
ctx_id += 1
if self._append:
if self._append is not None:
ctx[str(ctx_id)] = self._to_database(self._append)
def _analyze(self):

2
cqlengine/tests/columns/test_validation.py
View File

@@ -30,8 +30,6 @@ from cqlengine.columns import Inet
from cqlengine.management import sync_table, drop_table
from cqlengine.models import Model
import sys
class TestDatetime(BaseCassEngTestCase):
class DatetimeTest(Model):

30
cqlengine/tests/statements/test_update_statement.py
View File

@@ -1,8 +1,12 @@
from unittest import TestCase
from cqlengine.statements import UpdateStatement, WhereClause, AssignmentClause
from cqlengine.columns import Set, List
from cqlengine.operators import *
from cqlengine.statements import (UpdateStatement, WhereClause,
AssignmentClause, SetUpdateClause,
ListUpdateClause)
import six
class UpdateStatementTests(TestCase):
def test_table_rendering(self):
@@ -40,3 +44,27 @@ class UpdateStatementTests(TestCase):
us.add_where_clause(WhereClause('a', EqualsOperator(), 'x'))
self.assertIn('USING TTL 60', six.text_type(us))
def test_update_set_add(self):
us = UpdateStatement('table')
us.add_assignment_clause(SetUpdateClause('a', Set.Quoter({1}), operation='add'))
self.assertEqual(six.text_type(us), 'UPDATE table SET "a" = "a" + %(0)s')
def test_update_empty_set_add_does_not_assign(self):
us = UpdateStatement('table')
us.add_assignment_clause(SetUpdateClause('a', Set.Quoter(set()), operation='add'))
self.assertEqual(six.text_type(us), 'UPDATE table SET "a" = "a" + %(0)s')
def test_update_empty_set_removal_does_not_assign(self):
us = UpdateStatement('table')
us.add_assignment_clause(SetUpdateClause('a', Set.Quoter(set()), operation='remove'))
self.assertEqual(six.text_type(us), 'UPDATE table SET "a" = "a" - %(0)s')
def test_update_list_prepend_with_empty_list(self):
us = UpdateStatement('table')
us.add_assignment_clause(ListUpdateClause('a', List.Quoter([]), operation='prepend'))
self.assertEqual(six.text_type(us), 'UPDATE table SET "a" = %(0)s + "a"')
def test_update_list_append_with_empty_list(self):
us = UpdateStatement('table')
us.add_assignment_clause(ListUpdateClause('a', List.Quoter([]), operation='append'))
self.assertEqual(six.text_type(us), 'UPDATE table SET "a" = "a" + %(0)s')