Merge pull request #38 from vintasoftware/fix/rename-virtualmodel-user-field

Rename VirtualModel user field to avoid conflict

Author: hugobessa

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.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

django_virtual_models/__init__.py

@@ -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())

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(