Merge branch 'bugfix_columns_by_db_field'

pacefalm · pacefalm · commit 90890b62f1d6 · 2015-06-22T23:00:22.000Z
diff --git a/cassandra/cqlengine/models.py b/cassandra/cqlengine/models.py
@@ -878,6 +878,7 @@ def _get_polymorphic_base(bases):
 
         # some validation
         col_names = set()
+        column_dict_by_db_field = OrderedDict()
         for v in column_dict.values():
             # check for duplicate column names
             if v.db_field_name in col_names:
@@ -887,6 +888,7 @@ def _get_polymorphic_base(bases):
             if v.clustering_order and v.clustering_order.lower() not in ('asc', 'desc'):
                 raise ModelException("invalid clustering order {0} for column {1}".format(repr(v.clustering_order), v.db_field_name))
             col_names.add(v.db_field_name)
+            column_dict_by_db_field[v.db_field_name] = v
 
         # create db_name -> model name map for loading
         db_map = {}
@@ -897,6 +899,7 @@ def _get_polymorphic_base(bases):
         attrs['_columns'] = column_dict
         attrs['_primary_keys'] = primary_keys
         attrs['_defined_columns'] = defined_columns
+        attrs['_column_dict_by_db_field'] = column_dict_by_db_field
 
         # maps the database field to the models key
         attrs['_db_map'] = db_map
diff --git a/cassandra/cqlengine/query.py b/cassandra/cqlengine/query.py
@@ -780,7 +780,13 @@ class ModelQuerySet(AbstractQuerySet):
     def _validate_select_where(self):
         """ Checks that a filterset will not create invalid select statement """
         # check that there's either a = or IN relationship with a primary key or indexed field
-        equal_ops = [self.model._columns.get(w.field) for w in self._where if isinstance(w.operator, EqualsOperator)]
+        equal_ops = []
+        for w in self._where:
+            if isinstance(w.operator, EqualsOperator):
+                op = self.model._columns.get(w.field)
+                if op == None:
+                    op = self.model._column_dict_by_db_field.get(w.field)
+                equal_ops.append(op)
         token_comparison = any([w for w in self._where if isinstance(w.value, Token)])
         if not any([w.primary_key or w.index for w in equal_ops]) and not token_comparison and not self._allow_filtering:
             raise QueryException('Where clauses require either a "=" or "IN" comparison with either a primary key or indexed field')
