Documentation updated.

Test_all_versions script added.
Some minor misc changes.
Added polybench.

polymorphic/__init__.py

@@ -12,10 +12,10 @@ from manager import PolymorphicManager
 from query import PolymorphicQuerySet
 from query_translate import translate_polymorphic_Q_object
 from showfields import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent
-#from showfields import ShowFieldTypes, ShowFields, ShowFieldsAndTypes # import old names for compatibility
+from showfields import ShowFields, ShowFieldTypes, ShowFieldsAndTypes # import old names for compatibility
 
 
-VERSION = (0, 5, 0, 'beta')
+VERSION = (1, 0 , 0, 'beta')
 
 def get_version():
     version = '%s.%s' % VERSION[0:2]

polymorphic/query.py

@@ -72,19 +72,23 @@ class PolymorphicQuerySet(QuerySet):
             a.lookup = translate_polymorphic_field_path(self.model, a.lookup)
 
     def annotate(self, *args, **kwargs):
-        """translate the field paths in the kwargs, then call vanilla annotate.
+        """translate the polymorphic field paths in the kwargs, then call vanilla annotate.
         _get_real_instances will do the rest of the job after executing the query."""
         self._process_aggregate_args(args, kwargs)
         return super(PolymorphicQuerySet, self).annotate(*args, **kwargs)
 
     def aggregate(self, *args, **kwargs):
-        """translate the field paths in the kwargs, then call vanilla aggregate.
+        """translate the polymorphic field paths in the kwargs, then call vanilla aggregate.
         We need no polymorphic object retrieval for aggregate => switch it off."""
         self._process_aggregate_args(args, kwargs)
         self.polymorphic_disabled = True
         return super(PolymorphicQuerySet, self).aggregate(*args, **kwargs)
 
     def extra(self, *args, **kwargs):
+        """only return polymorphic results if we get "polymorphic=True" as a keyword arg."""
+        #for key in kwargs.keys():
+        #    if key not in ['where','order_by', 'params']:
+        #        assert False,"""django_polymorphic: extras() does not support keyword argument %s.
         self.polymorphic_disabled = not bool(kwargs.pop('polymorphic', False))
         return super(PolymorphicQuerySet, self).extra(*args, **kwargs)
 

polymorphic/tests.py

@@ -40,6 +40,12 @@ class ModelShow3(ShowFieldTypeAndContent, PolymorphicModel):
     field1 = models.CharField(max_length=10)
     m2m = models.ManyToManyField('self')
 
+class ModelShow1_plain(PolymorphicModel):
+    field1 = models.CharField(max_length=10)
+class ModelShow2_plain(ModelShow1_plain):
+    field2 = models.CharField(max_length=10)
+
+
 class Base(ShowFieldType, PolymorphicModel):
     field_b = models.CharField(max_length=10)
 class ModelX(Base):
@@ -244,7 +250,7 @@ __test__ = {"doctest": """
 >>> settings.DEBUG=True
 
 >>> get_version()
-'0.5 beta'
+'1.0 rc1'
 
 
 ### simple inheritance
@@ -253,8 +259,7 @@ __test__ = {"doctest": """
 >>> o=Model2B.objects.create(field1='B1', field2='B2')
 >>> o=Model2C.objects.create(field1='C1', field2='C2', field3='C3')
 
->>> Model2A.objects.all()
-[ <Model2A: id 1, field1 (CharField)>,
+ [ <Model2A: id 1, field1 (CharField)>,
   <Model2B: id 2, field1 (CharField), field2 (CharField)>,
   <Model2C: id 3, field1 (CharField), field2 (CharField), field3 (CharField)> ]
 
@@ -287,7 +292,13 @@ __test__ = {"doctest": """
 [ <ModelShow2: id 1, field1: "abc", m2m: 1 - Ann: m2m__count: "1"> ]
 >>> ModelShow3.objects.all().annotate(Count('m2m'))
 [ <ModelShow3: id 1, field1 (CharField): "abc", m2m (ManyToManyField): 1 - Ann: m2m__count (int): "1"> ]
- 
+
+# no pretty printing
+>>> o=ModelShow1_plain.objects.create(field1='abc')
+>>> o=ModelShow2_plain.objects.create(field1='abc', field2='def')
+>>> ModelShow1_plain.objects.all()
+[<ModelShow1_plain: ModelShow1_plain object>, <ModelShow2_plain: ModelShow2_plain object>]
+
 
 ### extra() method