Merge pull request #84 from sethdenner/fix-model-creation

Fix Model Meta Class __new__
Knotis · Aug 5, 2016 · 3c67d3a · 3c67d3a
2 parents 9fceeea + c08500b
commit 3c67d3a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/djangocassandra/db/meta.py b/djangocassandra/db/meta.py
@@ -121,7 +121,7 @@ def __new__(
 
             if partition_keys:
                 for column_name in partition_keys:
-                    field = model._meta.get_field(column_name)
+                    field = registered_model._meta.get_field(column_name)
                     field_name = (
                         field.db_column if
                         field.db_column else
@@ -141,7 +141,7 @@ def __new__(
                     ] = column
 
             else:
-                primary_key_field = model._meta.pk
+                primary_key_field = registered_model._meta.pk
                 primary_field_name = (
                     primary_key_field.db_column
                     if primary_key_field.db_column
@@ -169,7 +169,7 @@ def __new__(
                 clustering_keys = cassandra_options.clustering_keys
 
                 for column_name in clustering_keys:
-                    field = model._meta.get_field(column_name)
+                    field = registered_model._meta.get_field(column_name)
                     field_name = (
                         field.db_column if
                         field.db_column else
@@ -194,7 +194,7 @@ def __new__(
                         field.column
                     ] = column
 
-            for field in model._meta.fields:
+            for field in registered_model._meta.fields:
                 if 'Token' == field.get_internal_type():
                     continue
 

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='djangocassandra',
-    version='0.5.3',
+    version='0.5.4',
     description='Cassandra support for the Django web framework',
     long_description=(
         'The Cassandra database backend for Django has been '