Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.4.0]
- Rename internal `user` attribute from `VirtualModel` to `_user` to avoid conflict with ForeignKey and OneToOneField fields with the same name

## [0.3.0]

- Include `py.typed` file for type hints
Expand Down
2 changes: 1 addition & 1 deletion django_virtual_models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Top-level package for django_virtual_models."""
import logging

__version__ = "0.3.0"
__version__ = "0.4.0"

# Good practice: https://docs.python-guide.org/writing/logging/#logging-in-a-library
logging.getLogger(__name__).addHandler(logging.NullHandler())
Expand Down
4 changes: 2 additions & 2 deletions django_virtual_models/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def __init__(
if to_attr is not None and lookup is None:
raise InvalidVirtualModelParams("Always provide a `lookup` when providing a `to_attr`")

self.user = user
self._user = user
if manager is None:
self.manager = self.Meta.model._default_manager
self.model_cls = self.Meta.model
Expand Down Expand Up @@ -352,7 +352,7 @@ def get_optimized_queryset(
new_qs = self._hydrate_queryset_with_nested_declared_fields(
qs=qs,
lookup_list=new_lookup_list,
user=self.user,
user=self._user,
**kwargs,
)
new_qs = _defer_fields(
Expand Down
Loading