mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-06 02:39:12 +00:00
Code Issues 32 Releases Wiki Activity

queryset-refactor: Whilst writing a test to bullet-proof [7141], a bug showed up.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-02-22 04:58:53 +00:00
parent b7be3d63e3
commit 83e00a2371
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/models/options.py
View File

@ -59,7 +59,10 @@ class Options(object):
del meta_attrs['__module__'] del meta_attrs['__module__']
del meta_attrs['__doc__'] del meta_attrs['__doc__']
for attr_name in DEFAULT_NAMES: for attr_name in DEFAULT_NAMES:
setattr(self, attr_name, meta_attrs.pop(attr_name, getattr(self, attr_name))) if attr_name in meta_attrs:
setattr(self, attr_name, meta_attrs.pop(attr_name))
elif hasattr(self.meta, attr_name):
setattr(self, attr_name, getattr(self.meta, attr_name))
# unique_together can be either a tuple of tuples, or a single # unique_together can be either a tuple of tuples, or a single
# tuple of two strings. Normalize it to a tuple of tuples, so that # tuple of two strings. Normalize it to a tuple of tuples, so that

10
tests/modeltests/model_inheritance/models.py
View File

@ -46,11 +46,15 @@ class Rating(models.Model):
class Meta: class Meta:
abstract = True abstract = True
ordering = ['-rating']
class Restaurant(Place, Rating): class Restaurant(Place, Rating):
serves_hot_dogs = models.BooleanField() serves_hot_dogs = models.BooleanField()
serves_pizza = models.BooleanField() serves_pizza = models.BooleanField()
class Meta(Rating.Meta):
db_table = 'my_restaurant'
def __unicode__(self): def __unicode__(self):
return u"%s the restaurant" % self.name return u"%s the restaurant" % self.name
@ -124,7 +128,7 @@ Test constructor for Restaurant.
>>> r.save() >>> r.save()
# Test the constructor for ItalianRestaurant. # Test the constructor for ItalianRestaurant.
>>> ir = ItalianRestaurant(name='Ristorante Miron', address='1234 W. Elm', serves_hot_dogs=False, serves_pizza=False, serves_gnocchi=True) >>> ir = ItalianRestaurant(name='Ristorante Miron', address='1234 W. Elm', serves_hot_dogs=False, serves_pizza=False, serves_gnocchi=True, rating=4)
>>> ir.save() >>> ir.save()
# Make sure Restaurant and ItalianRestaurant have the right fields in the right # Make sure Restaurant and ItalianRestaurant have the right fields in the right
@ -133,6 +137,8 @@ Test constructor for Restaurant.
['id', 'name', 'address', 'place_ptr', 'rating', 'serves_hot_dogs', 'serves_pizza'] ['id', 'name', 'address', 'place_ptr', 'rating', 'serves_hot_dogs', 'serves_pizza']
>>> [f.name for f in ItalianRestaurant._meta.fields] >>> [f.name for f in ItalianRestaurant._meta.fields]
['id', 'name', 'address', 'place_ptr', 'rating', 'serves_hot_dogs', 'serves_pizza', 'restaurant_ptr', 'serves_gnocchi'] ['id', 'name', 'address', 'place_ptr', 'rating', 'serves_hot_dogs', 'serves_pizza', 'restaurant_ptr', 'serves_gnocchi']
>>> Restaurant._meta.ordering
['-rating']
# Even though p.supplier for a Place 'p' (a parent of a Supplier), a Restaurant # Even though p.supplier for a Place 'p' (a parent of a Supplier), a Restaurant
# object cannot access that reverse relation, since it's not part of the # object cannot access that reverse relation, since it's not part of the
@ -198,7 +204,7 @@ DoesNotExist: Restaurant matching query does not exist.
[<Supplier: Luigi's Pasta the supplier>, <Supplier: Joe's Chickens the supplier>] [<Supplier: Luigi's Pasta the supplier>, <Supplier: Joe's Chickens the supplier>]
>>> Restaurant.objects.filter(provider__name__contains="Chickens") >>> Restaurant.objects.filter(provider__name__contains="Chickens")
[<Restaurant: Demon Dogs the restaurant>, <Restaurant: Ristorante Miron the restaurant>] [<Restaurant: Ristorante Miron the restaurant>, <Restaurant: Demon Dogs the restaurant>]
>>> ItalianRestaurant.objects.filter(provider__name__contains="Chickens") >>> ItalianRestaurant.objects.filter(provider__name__contains="Chickens")
[<ItalianRestaurant: Ristorante Miron the italian restaurant>] [<ItalianRestaurant: Ristorante Miron the italian restaurant>]