diff --git a/djangocassandra/db/backends/cassandra/compiler.py b/djangocassandra/db/backends/cassandra/compiler.py index 11dd2c1b..fda7892f 100644 --- a/djangocassandra/db/backends/cassandra/compiler.py +++ b/djangocassandra/db/backends/cassandra/compiler.py @@ -303,7 +303,7 @@ def fetch(self, low_mark, high_mark): if ( high_mark is not None and low_mark is not None and - high_mark <= low_mark + high_mark < low_mark ): raise Exception('Can\'t slice query high_mark > low_mark') diff --git a/djangocassandra/db/fields.py b/djangocassandra/db/fields.py index 4d104b0d..5338a43e 100644 --- a/djangocassandra/db/fields.py +++ b/djangocassandra/db/fields.py @@ -91,6 +91,8 @@ def __init__( if 'default' not in kwargs: kwargs['default'] = uuid.uuid4 + kwargs['max_length'] = 36 + super(FieldUUID, self).__init__( *args, **kwargs diff --git a/djangocassandra/db/models.py b/djangocassandra/db/models.py index b7e66e3b..e2eab1db 100644 --- a/djangocassandra/db/models.py +++ b/djangocassandra/db/models.py @@ -3,6 +3,9 @@ Model as DjangoModel, Manager ) +from django.db.models.fields import ( + FieldDoesNotExist +) from .fields import TokenPartitionKeyField from .query import QuerySet @@ -18,7 +21,12 @@ def denormalize( ): field_names = origin._meta.get_all_field_names() for name in field_names: - field = origin._meta.get_field(name) + try: + field = origin._meta.get_field(name) + + except FieldDoesNotExist: + pass + setattr( destination, field.name, diff --git a/setup.py b/setup.py index 68999932..69a8fb28 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='djangocassandra', - version='0.4.3', + version='0.4.4', description='Cassandra support for the Django web framework', long_description=( 'The Cassandra database backend for Django has been '