Prodream/ormar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add aliases to test prefetch_related

Browse Source
This commit is contained in:
collerek
2020-11-26 06:33:24 +01:00
parent 6893aa5095
commit f8dbb76965
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ormar/models/modelproxy.py
View File

@ -236,9 +236,7 @@ class ModelTableProxy:
@staticmethod @staticmethod
def _populate_pk_column( def _populate_pk_column(
model: Type["Model"], model: Type["Model"], columns: List[str], use_alias: bool = False,
columns: List[str],
use_alias: bool = False,
) -> List[str]: ) -> List[str]:
pk_alias = ( pk_alias = (
model.get_column_alias(model.Meta.pkname) model.get_column_alias(model.Meta.pkname)

3
ormar/queryset/prefetch_query.py
View File

@ -385,6 +385,7 @@ class PrefetchQuery:
instance = self._populate_nested_related( instance = self._populate_nested_related(
model=instance, prefetch_dict=prefetch_dict, model=instance, prefetch_dict=prefetch_dict,
) )
field_db_name = target_model.get_column_alias(field_name)
self.already_extracted[target_model.get_name()].setdefault( self.already_extracted[target_model.get_name()].setdefault(
field_name, dict() field_name, dict()
).setdefault(row[field_name], []).append(instance) ).setdefault(row[field_db_name], []).append(instance)

15
tests/test_prefetch_related.py
View File

@ -17,7 +17,7 @@ class RandomSet(ormar.Model):
metadata = metadata metadata = metadata
database = database database = database
id: int = ormar.Integer(primary_key=True) id: int = ormar.Integer(name='random_id', primary_key=True)
name: str = ormar.String(max_length=100) name: str = ormar.String(max_length=100)
@ -28,7 +28,7 @@ class Tonation(ormar.Model):
database = database database = database
id: int = ormar.Integer(primary_key=True) id: int = ormar.Integer(primary_key=True)
name: str = ormar.String(max_length=100) name: str = ormar.String(name='tonation_name', max_length=100)
rand_set: Optional[RandomSet] = ormar.ForeignKey(RandomSet) rand_set: Optional[RandomSet] = ormar.ForeignKey(RandomSet)
@ -38,7 +38,7 @@ class Division(ormar.Model):
metadata = metadata metadata = metadata
database = database database = database
id: int = ormar.Integer(primary_key=True) id: int = ormar.Integer(name='division_id', primary_key=True)
name: str = ormar.String(max_length=100) name: str = ormar.String(max_length=100)
@ -77,11 +77,11 @@ class Track(ormar.Model):
metadata = metadata metadata = metadata
database = database database = database
id: int = ormar.Integer(primary_key=True) id: int = ormar.Integer(name='track_id', primary_key=True)
album: Optional[Album] = ormar.ForeignKey(Album) album: Optional[Album] = ormar.ForeignKey(Album)
title: str = ormar.String(max_length=100) title: str = ormar.String(max_length=100)
position: int = ormar.Integer() position: int = ormar.Integer()
tonation: Optional[Tonation] = ormar.ForeignKey(Tonation) tonation: Optional[Tonation] = ormar.ForeignKey(Tonation, name='tonation_id')
class Cover(ormar.Model): class Cover(ormar.Model):
@ -91,7 +91,7 @@ class Cover(ormar.Model):
database = database database = database
id: int = ormar.Integer(primary_key=True) id: int = ormar.Integer(primary_key=True)
album: Optional[Album] = ormar.ForeignKey(Album, related_name="cover_pictures") album: Optional[Album] = ormar.ForeignKey(Album, related_name="cover_pictures", name='album_id')
title: str = ormar.String(max_length=100) title: str = ormar.String(max_length=100)
artist: str = ormar.String(max_length=200, nullable=True) artist: str = ormar.String(max_length=200, nullable=True)
@ -221,7 +221,8 @@ async def test_prefetch_related_with_select_related():
await Track.objects.create(album=album, title="Heart don't stand a chance", position=2, tonation=ton1) await Track.objects.create(album=album, title="Heart don't stand a chance", position=2, tonation=ton1)
await Track.objects.create(album=album, title="The Waters", position=3, tonation=ton1) await Track.objects.create(album=album, title="The Waters", position=3, tonation=ton1)
album = await Album.objects.select_related('tracks__tonation__rand_set').filter(name='Malibu').prefetch_related( album = await Album.objects.select_related('tracks__tonation__rand_set').filter(
name='Malibu').prefetch_related(
['cover_pictures', 'shops__division']).get() ['cover_pictures', 'shops__division']).get()
assert len(album.tracks) == 3 assert len(album.tracks) == 3
assert album.tracks[0].tonation == album.tracks[2].tonation == ton1 assert album.tracks[0].tonation == album.tracks[2].tonation == ton1