From d814778fc7734baa531f4bcf9a630a5b4641b193 Mon Sep 17 00:00:00 2001 From: Hugo bessa Date: Wed, 4 Jun 2025 20:36:08 -0300 Subject: [PATCH 1/2] Rename VirtualModel user field to avoid conflict --- CHANGELOG.md | 3 +++ django_virtual_models/__init__.py | 2 +- django_virtual_models/fields.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2abc2c..4e18f5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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.3.1] +- 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 diff --git a/django_virtual_models/__init__.py b/django_virtual_models/__init__.py index aa36853..8c6df3c 100644 --- a/django_virtual_models/__init__.py +++ b/django_virtual_models/__init__.py @@ -1,7 +1,7 @@ """Top-level package for django_virtual_models.""" import logging -__version__ = "0.3.0" +__version__ = "0.3.1" # Good practice: https://docs.python-guide.org/writing/logging/#logging-in-a-library logging.getLogger(__name__).addHandler(logging.NullHandler()) diff --git a/django_virtual_models/fields.py b/django_virtual_models/fields.py index d062dc4..4a4b85c 100644 --- a/django_virtual_models/fields.py +++ b/django_virtual_models/fields.py @@ -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 @@ -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( From b903a2130425de9c334017ab4a0ee2d3602dbe75 Mon Sep 17 00:00:00 2001 From: Hugo bessa Date: Fri, 6 Jun 2025 10:43:42 -0300 Subject: [PATCH 2/2] Adjust version bump to be minor instead of patch --- CHANGELOG.md | 2 +- django_virtual_models/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e18f5f..bc989a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.3.1] +## [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] diff --git a/django_virtual_models/__init__.py b/django_virtual_models/__init__.py index 8c6df3c..d45df2a 100644 --- a/django_virtual_models/__init__.py +++ b/django_virtual_models/__init__.py @@ -1,7 +1,7 @@ """Top-level package for django_virtual_models.""" import logging -__version__ = "0.3.1" +__version__ = "0.4.0" # Good practice: https://docs.python-guide.org/writing/logging/#logging-in-a-library logging.getLogger(__name__).addHandler(logging.NullHandler())