diff --git a/changelog b/changelog index 0420badf..849a5f3c 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,9 @@ CHANGELOG +0.18.1 + + + 0.18.0 [260] support for static columns @@ -8,7 +12,7 @@ CHANGELOG [256] write docs about developing cqlengine itself [254] use CASSANDRA_VERSION in tests [252] memtable_flush_period_in_ms not in C 1.2 - guard against test failure -[251] test fails occasionally despite lists looking the same +[251] test fails occasionally despite lists looking the same [246] document Batches default behaviour [239] add sphinx contrib module to docs [237] update to cassandra-driver 2.1 diff --git a/cqlengine/columns.py b/cqlengine/columns.py index af895023..9297d3d8 100644 --- a/cqlengine/columns.py +++ b/cqlengine/columns.py @@ -221,7 +221,7 @@ class Blob(Column): def to_database(self, value): - if not isinstance(value, six.binary_type): + if not isinstance(value, (six.binary_type, bytearray)): raise Exception("expecting a binary, got a %s" % type(value)) val = super(Bytes, self).to_database(value) diff --git a/cqlengine/tests/columns/test_value_io.py b/cqlengine/tests/columns/test_value_io.py index 45bc5945..b7587afa 100644 --- a/cqlengine/tests/columns/test_value_io.py +++ b/cqlengine/tests/columns/test_value_io.py @@ -85,6 +85,12 @@ class TestBlobIO(BaseColumnIOTest): pkey_val = six.b('blake'), uuid4().bytes data_val = six.b('eggleston'), uuid4().bytes +class TestBlobIO2(BaseColumnIOTest): + + column = columns.Blob + pkey_val = bytearray(six.b('blake')), uuid4().bytes + data_val = bytearray(six.b('eggleston')), uuid4().bytes + class TestTextIO(BaseColumnIOTest): column = columns.Text