Remove deprecated cqlengine.Model.__polymorphic_*__ attributes

aholmberg · aholmberg · commit 9d98c8e633d5 · 2015-10-06T14:38:36.000-05:00
diff --git a/cassandra/cqlengine/columns.py b/cassandra/cqlengine/columns.py
@@ -120,13 +120,6 @@ class Column(object):
     determines the order that the clustering keys are sorted on disk
     """
 
-    polymorphic_key = False
-    """
-    *Deprecated*
-
-    see :attr:`~.discriminator_column`
-    """
-
     discriminator_column = False
     """
     boolean, if set to True, this column will be used for discriminating records
@@ -151,7 +144,6 @@ def __init__(self,
                  default=None,
                  required=False,
                  clustering_order=None,
-                 polymorphic_key=False,
                  discriminator_column=False,
                  static=False):
         self.partition_key = partition_key
@@ -161,14 +153,7 @@ def __init__(self,
         self.default = default
         self.required = required
         self.clustering_order = clustering_order
-
-        if polymorphic_key:
-            msg = "polymorphic_key is deprecated. Use discriminator_column instead."
-            warnings.warn(msg, DeprecationWarning)
-            log.warning(msg)
-
-        self.discriminator_column = discriminator_column or polymorphic_key
-        self.polymorphic_key = self.discriminator_column
+        self.discriminator_column = discriminator_column
 
         # the column name in the model definition
         self.column_name = None
diff --git a/cassandra/cqlengine/models.py b/cassandra/cqlengine/models.py
@@ -310,7 +310,6 @@ class MultipleObjectsReturned(_MultipleObjectsReturned):
 
     __keyspace__ = None
 
-    __polymorphic_key__ = None  # DEPRECATED
     __discriminator_value__ = None
 
     __options__ = None
@@ -753,14 +752,7 @@ def __new__(cls, name, bases, attrs):
         is_abstract = attrs['__abstract__'] = attrs.get('__abstract__', False)
 
         # short circuit __discriminator_value__ inheritance
-        # __polymorphic_key__ is deprecated
-        poly_key = attrs.get('__polymorphic_key__', None)
-        if poly_key:
-            msg = '__polymorphic_key__ is deprecated. Use __discriminator_value__ instead'
-            warnings.warn(msg, DeprecationWarning)
-            log.warning(msg)
-        attrs['__discriminator_value__'] = attrs.get('__discriminator_value__', poly_key)
-        attrs['__polymorphic_key__'] = attrs['__discriminator_value__']
+        attrs['__discriminator_value__'] = attrs.get('__discriminator_value__')
 
         options = attrs.get('__options__') or {}
         attrs['__default_ttl__'] = options.get('default_time_to_live')
@@ -782,15 +774,15 @@ def _transform_column(col_name, col_obj):
         discriminator_columns = [c for c in column_definitions if c[1].discriminator_column]
         is_polymorphic = len(discriminator_columns) > 0
         if len(discriminator_columns) > 1:
-            raise ModelDefinitionException('only one discriminator_column (polymorphic_key (deprecated)) can be defined in a model, {0} found'.format(len(discriminator_columns)))
+            raise ModelDefinitionException('only one discriminator_column can be defined in a model, {0} found'.format(len(discriminator_columns)))
 
         if attrs['__discriminator_value__'] and not is_polymorphic:
             raise ModelDefinitionException('__discriminator_value__ specified, but no base columns defined with discriminator_column=True')
 
         discriminator_column_name, discriminator_column = discriminator_columns[0] if discriminator_columns else (None, None)
 
         if isinstance(discriminator_column, (columns.BaseContainerColumn, columns.Counter)):
-            raise ModelDefinitionException('counter and container columns cannot be used as discriminator columns (polymorphic_key (deprecated)) ')
+            raise ModelDefinitionException('counter and container columns cannot be used as discriminator columns')
 
         # find polymorphic base class
         polymorphic_base = None
@@ -946,13 +938,6 @@ class Model(BaseModel):
     (e.g. compaction, default ttl, cache settings, tec.)
     """
 
-    __polymorphic_key__ = None
-    """
-    *Deprecated.*
-
-    see :attr:`~.__discriminator_value__`
-    """
-
     __discriminator_value__ = None
     """
     *Optional* Specifies a value for the discriminator column when using model inheritance.
diff --git a/docs/api/cassandra/cqlengine/columns.rst b/docs/api/cassandra/cqlengine/columns.rst
@@ -29,8 +29,6 @@ Columns
 
     .. autoattribute:: clustering_order
 
-    .. autoattribute:: polymorphic_key
-
     .. autoattribute:: discriminator_column
 
     .. autoattribute:: static
diff --git a/docs/api/cassandra/cqlengine/models.rst b/docs/api/cassandra/cqlengine/models.rst
@@ -33,8 +33,6 @@ Model
     .. _ttl-change:
     .. autoattribute:: __default_ttl__
 
-    .. autoattribute:: __polymorphic_key__
-
     .. autoattribute:: __discriminator_value__
 
         See :ref:`model_inheritance` for usage examples.
diff --git a/tests/integration/cqlengine/model/test_polymorphism.py b/tests/integration/cqlengine/model/test_polymorphism.py
@@ -22,243 +22,6 @@
 from cassandra.cqlengine import management
 
 
-class TestPolymorphicClassConstruction(BaseCassEngTestCase):
-
-    def test_multiple_polymorphic_key_failure(self):
-        """ Tests that defining a model with more than one polymorphic key fails """
-        with self.assertRaises(models.ModelDefinitionException):
-            class M(models.Model):
-
-                partition = columns.Integer(primary_key=True)
-                type1 = columns.Integer(polymorphic_key=True)
-                type2 = columns.Integer(polymorphic_key=True)
-
-    def test_no_polymorphic_key_column_failure(self):
-        with self.assertRaises(models.ModelDefinitionException):
-            class M(models.Model):
-                __polymorphic_key__ = 1
-
-    def test_polymorphic_key_inheritance(self):
-        """ Tests that polymorphic_key attribute is not inherited """
-        class Base(models.Model):
-
-            partition = columns.Integer(primary_key=True)
-            type1 = columns.Integer(polymorphic_key=True)
-
-        class M1(Base):
-            __polymorphic_key__ = 1
-
-        class M2(M1):
-            pass
-
-        assert M2.__polymorphic_key__ is None
-
-    def test_polymorphic_metaclass(self):
-        """ Tests that the model meta class configures polymorphic models properly """
-        class Base(models.Model):
-
-            partition = columns.Integer(primary_key=True)
-            type1 = columns.Integer(polymorphic_key=True)
-
-        class M1(Base):
-            __polymorphic_key__ = 1
-
-        assert Base._is_polymorphic
-        assert M1._is_polymorphic
-
-        assert Base._is_polymorphic_base
-        assert not M1._is_polymorphic_base
-
-        assert Base._discriminator_column is Base._columns['type1']
-        assert M1._discriminator_column is M1._columns['type1']
-
-        assert Base._discriminator_column_name == 'type1'
-        assert M1._discriminator_column_name == 'type1'
-
-    def test_table_names_are_inherited_from_poly_base(self):
-        class Base(models.Model):
-
-            partition = columns.Integer(primary_key=True)
-            type1 = columns.Integer(polymorphic_key=True)
-
-        class M1(Base):
-            __polymorphic_key__ = 1
-
-        assert Base.column_family_name() == M1.column_family_name()
-
-    def test_collection_columns_cant_be_polymorphic_keys(self):
-        with self.assertRaises(models.ModelDefinitionException):
-            class Base(models.Model):
-
-                partition = columns.Integer(primary_key=True)
-                type1 = columns.Set(columns.Integer, polymorphic_key=True)
-
-
-class PolyBase(models.Model):
-
-    partition = columns.UUID(primary_key=True, default=uuid.uuid4)
-    row_type = columns.Integer(polymorphic_key=True)
-
-
-class Poly1(PolyBase):
-    __polymorphic_key__ = 1
-    data1 = columns.Text()
-
-
-class Poly2(PolyBase):
-    __polymorphic_key__ = 2
-    data2 = columns.Text()
-
-
-class TestPolymorphicModel(BaseCassEngTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        super(TestPolymorphicModel, cls).setUpClass()
-        management.sync_table(Poly1)
-        management.sync_table(Poly2)
-
-    @classmethod
-    def tearDownClass(cls):
-        super(TestPolymorphicModel, cls).tearDownClass()
-        management.drop_table(Poly1)
-        management.drop_table(Poly2)
-
-    def test_saving_base_model_fails(self):
-        with self.assertRaises(models.PolymorphicModelException):
-            PolyBase.create()
-
-    def test_saving_subclass_saves_poly_key(self):
-        p1 = Poly1.create(data1='pickle')
-        p2 = Poly2.create(data2='bacon')
-
-        assert p1.row_type == Poly1.__polymorphic_key__
-        assert p2.row_type == Poly2.__polymorphic_key__
-
-    def test_query_deserialization(self):
-        p1 = Poly1.create(data1='pickle')
-        p2 = Poly2.create(data2='bacon')
-
-        p1r = PolyBase.get(partition=p1.partition)
-        p2r = PolyBase.get(partition=p2.partition)
-
-        assert isinstance(p1r, Poly1)
-        assert isinstance(p2r, Poly2)
-
-    def test_delete_on_polymorphic_subclass_does_not_include_polymorphic_key(self):
-        p1 = Poly1.create()
-        session = get_session()
-        with mock.patch.object(session, 'execute') as m:
-            Poly1.objects(partition=p1.partition).delete()
-
-        # make sure our polymorphic key isn't in the CQL
-        # not sure how we would even get here if it was in there
-        # since the CQL would fail.
-
-        self.assertNotIn("row_type", m.call_args[0][0].query_string)
-
-
-class UnindexedPolyBase(models.Model):
-
-    partition = columns.UUID(primary_key=True, default=uuid.uuid4)
-    cluster = columns.UUID(primary_key=True, default=uuid.uuid4)
-    row_type = columns.Integer(polymorphic_key=True)
-
-
-class UnindexedPoly1(UnindexedPolyBase):
-    __polymorphic_key__ = 1
-    data1 = columns.Text()
-
-
-class UnindexedPoly2(UnindexedPolyBase):
-    __polymorphic_key__ = 2
-    data2 = columns.Text()
-
-
-class UnindexedPoly3(UnindexedPoly2):
-    __polymorphic_key__ = 3
-    data3 = columns.Text()
-
-
-class TestUnindexedPolymorphicQuery(BaseCassEngTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        super(TestUnindexedPolymorphicQuery, cls).setUpClass()
-        management.sync_table(UnindexedPoly1)
-        management.sync_table(UnindexedPoly2)
-        management.sync_table(UnindexedPoly3)
-
-        cls.p1 = UnindexedPoly1.create(data1='pickle')
-        cls.p2 = UnindexedPoly2.create(partition=cls.p1.partition, data2='bacon')
-        cls.p3 = UnindexedPoly3.create(partition=cls.p1.partition, data3='turkey')
-
-    @classmethod
-    def tearDownClass(cls):
-        super(TestUnindexedPolymorphicQuery, cls).tearDownClass()
-        management.drop_table(UnindexedPoly1)
-        management.drop_table(UnindexedPoly2)
-        management.drop_table(UnindexedPoly3)
-
-    def test_non_conflicting_type_results_work(self):
-        p1, p2, p3 = self.p1, self.p2, self.p3
-        assert len(list(UnindexedPoly1.objects(partition=p1.partition, cluster=p1.cluster))) == 1
-        assert len(list(UnindexedPoly2.objects(partition=p1.partition, cluster=p2.cluster))) == 1
-        assert len(list(UnindexedPoly3.objects(partition=p1.partition, cluster=p3.cluster))) == 1
-
-    def test_subclassed_model_results_work_properly(self):
-        p1, p2, p3 = self.p1, self.p2, self.p3
-        assert len(list(UnindexedPoly2.objects(partition=p1.partition, cluster__in=[p2.cluster, p3.cluster]))) == 2
-
-    def test_conflicting_type_results(self):
-        with self.assertRaises(models.PolymorphicModelException):
-            list(UnindexedPoly1.objects(partition=self.p1.partition))
-        with self.assertRaises(models.PolymorphicModelException):
-            list(UnindexedPoly2.objects(partition=self.p1.partition))
-
-
-class IndexedPolyBase(models.Model):
-
-    partition = columns.UUID(primary_key=True, default=uuid.uuid4)
-    cluster = columns.UUID(primary_key=True, default=uuid.uuid4)
-    row_type = columns.Integer(polymorphic_key=True, index=True)
-
-
-class IndexedPoly1(IndexedPolyBase):
-    __polymorphic_key__ = 1
-    data1 = columns.Text()
-
-
-class IndexedPoly2(IndexedPolyBase):
-    __polymorphic_key__ = 2
-    data2 = columns.Text()
-
-
-class TestIndexedPolymorphicQuery(BaseCassEngTestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        super(TestIndexedPolymorphicQuery, cls).setUpClass()
-        management.sync_table(IndexedPoly1)
-        management.sync_table(IndexedPoly2)
-
-        cls.p1 = IndexedPoly1.create(data1='pickle')
-        cls.p2 = IndexedPoly2.create(partition=cls.p1.partition, data2='bacon')
-
-    @classmethod
-    def tearDownClass(cls):
-        super(TestIndexedPolymorphicQuery, cls).tearDownClass()
-        management.drop_table(IndexedPoly1)
-        management.drop_table(IndexedPoly2)
-
-    def test_success_case(self):
-        assert len(list(IndexedPoly1.objects(partition=self.p1.partition))) == 1
-        assert len(list(IndexedPoly2.objects(partition=self.p1.partition))) == 1
-
-
-#########
-# Repeated tests for 'discriminator' properties, following deprecation of polymorphic variants
-#########
 class TestInheritanceClassConstruction(BaseCassEngTestCase):
 
     def test_multiple_discriminator_value_failure(self):
