various fixes

test-data/typecheck/fields/test_base.yml

@@ -77,23 +77,6 @@
                 class User(models.Model):
                     my_pk = models.IntegerField(primary_key=True)
 
--   case: test_primary_key_on_optional_queryset_method
-    main: |
-        from myapp.models import User
-        reveal_type(User.objects.first().id)
-    out: |
-        main:2: note: Revealed type is 'Union[builtins.int*, Any]'
-        main:2: error: Item "None" of "Optional[User]" has no attribute "id"
-    installed_apps:
-        - myapp
-    files:
-        -   path: myapp/__init__.py
-        -   path: myapp/models.py
-            content: |
-                from django.db import models
-                class User(models.Model):
-                    pass
-
 -   case: blank_and_null_char_field_allows_none
     main: |
         from myapp.models import MyModel
@@ -126,4 +109,18 @@
             content: |
                 from django.db import models
                 class MyModel(models.Model):
-                    notnulltext=models.CharField(max_length=1, blank=True, null=False)
+                    notnulltext=models.CharField(max_length=1, blank=True, null=False)
+
+-   case: if_field_called_on_class_return_field_itself
+    main: |
+        from myapp.models import MyUser
+        reveal_type(MyUser.name)  # N: Revealed type is 'django.db.models.fields.CharField[Union[builtins.str, builtins.int, django.db.models.expressions.Combinable], builtins.str]'
+    installed_apps:
+        - myapp
+    files:
+        -   path: myapp/__init__.py
+        -   path: myapp/models.py
+            content: |
+                from django.db import models
+                class MyUser(models.Model):
+                    name = models.CharField(max_length=100)

test-data/typecheck/managers/querysets/test_basic_methods.yml

@@ -7,7 +7,7 @@
         reveal_type(qs.get(id=1)) # N: Revealed type is 'myapp.models.Blog*'
         reveal_type(iter(qs)) # N: Revealed type is 'typing.Iterator[myapp.models.Blog*]'
         reveal_type(qs.iterator()) # N: Revealed type is 'typing.Iterator[myapp.models.Blog*]'
-        reveal_type(qs.first()) # N: Revealed type is 'Union[myapp.models.Blog*, None]'
+        reveal_type(qs.first()) # N: Revealed type is 'myapp.models.Blog*'
         reveal_type(qs.earliest()) # N: Revealed type is 'myapp.models.Blog*'
         reveal_type(qs[0]) # N: Revealed type is 'myapp.models.Blog*'
         reveal_type(qs[:9]) # N: Revealed type is 'django.db.models.query.QuerySet[myapp.models.Blog*, myapp.models.Blog*]'

test-data/typecheck/managers/test_managers.yml

@@ -212,10 +212,10 @@
     main: |
         from myapp.models import UnrelatedModel, MyModel
         reveal_type(UnrelatedModel.objects) # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.UnrelatedModel]'
-        reveal_type(UnrelatedModel.objects.first()) # N: Revealed type is 'Union[myapp.models.UnrelatedModel*, None]'
+        reveal_type(UnrelatedModel.objects.first()) # N: Revealed type is 'myapp.models.UnrelatedModel*'
 
         reveal_type(MyModel.objects) # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.MyModel]'
-        reveal_type(MyModel.objects.first()) # N: Revealed type is 'Union[myapp.models.MyModel*, None]'
+        reveal_type(MyModel.objects.first()) # N: Revealed type is 'myapp.models.MyModel*'
     installed_apps:
         - myapp
     files:
@@ -233,10 +233,10 @@
     main: |
         from myapp.models import UnrelatedModel2, MyModel2
         reveal_type(UnrelatedModel2.objects) # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.UnrelatedModel2]'
-        reveal_type(UnrelatedModel2.objects.first()) # N: Revealed type is 'Union[myapp.models.UnrelatedModel2*, None]'
+        reveal_type(UnrelatedModel2.objects.first()) # N: Revealed type is 'myapp.models.UnrelatedModel2*'
 
         reveal_type(MyModel2.objects) # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.MyModel2]'
-        reveal_type(MyModel2.objects.first()) # N: Revealed type is 'Union[myapp.models.MyModel2*, None]'
+        reveal_type(MyModel2.objects.first()) # N: Revealed type is 'myapp.models.MyModel2*'
     installed_apps:
         - myapp
     files:
@@ -254,10 +254,10 @@
     main: |
         from myapp.models import ParentOfMyModel3, MyModel3
         reveal_type(ParentOfMyModel3.objects) # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.ParentOfMyModel3]'
-        reveal_type(ParentOfMyModel3.objects.first()) # N: Revealed type is 'Union[myapp.models.ParentOfMyModel3*, None]'
+        reveal_type(ParentOfMyModel3.objects.first()) # N: Revealed type is 'myapp.models.ParentOfMyModel3*'
 
         reveal_type(MyModel3.objects) # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.MyModel3]'
-        reveal_type(MyModel3.objects.first()) # N: Revealed type is 'Union[myapp.models.MyModel3*, None]'
+        reveal_type(MyModel3.objects.first()) # N: Revealed type is 'myapp.models.MyModel3*'
     installed_apps:
         - myapp
     files:
@@ -275,10 +275,10 @@
     main: |
         from myapp.models import ParentOfMyModel4, MyModel4
         reveal_type(ParentOfMyModel4.objects) # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.ParentOfMyModel4]'
-        reveal_type(ParentOfMyModel4.objects.first()) # N: Revealed type is 'Union[myapp.models.ParentOfMyModel4*, None]'
+        reveal_type(ParentOfMyModel4.objects.first()) # N: Revealed type is 'myapp.models.ParentOfMyModel4*'
 
         reveal_type(MyModel4.objects) # N: Revealed type is 'django.db.models.manager.Manager[myapp.models.MyModel4]'
-        reveal_type(MyModel4.objects.first()) # N: Revealed type is 'Union[myapp.models.MyModel4*, None]'
+        reveal_type(MyModel4.objects.first()) # N: Revealed type is 'myapp.models.MyModel4*'
     installed_apps:
         - myapp
     files:
@@ -290,4 +290,31 @@
                     objects = models.Manager()
 
                 class MyModel4(ParentOfMyModel4):
-                    objects = models.Manager['MyModel4']()
+                    objects = models.Manager['MyModel4']()
+
+# TODO: make it work someday
+#-   case: inheritance_of_two_models_with_custom_objects_manager
+#    main: |
+#        from myapp.models import MyBaseUser, MyUser
+#        reveal_type(MyBaseUser.objects)  # N: Revealed type is 'myapp.models.MyBaseManager[myapp.models.MyBaseUser]'
+#        reveal_type(MyBaseUser.objects.get())  # N: Revealed type is 'myapp.models.MyBaseUser'
+#
+#        reveal_type(MyUser.objects)  # N: Revealed type is 'myapp.models.MyManager[myapp.models.MyUser]'
+#        reveal_type(MyUser.objects.get())  # N: Revealed type is 'myapp.models.MyUser'
+#    installed_apps:
+#        - myapp
+#    files:
+#        -   path: myapp/__init__.py
+#        -   path: myapp/models.py
+#            content: |
+#                from django.db import models
+#
+#                class MyBaseManager(models.Manager):
+#                    pass
+#                class MyBaseUser(models.Model):
+#                    objects = MyBaseManager()
+#
+#                class MyManager(models.Manager):
+#                    pass
+#                class MyUser(MyBaseUser):
+#                    objects = MyManager()

test-data/typecheck/models/test_meta_options.yml

@@ -15,12 +15,14 @@
 -   case: get_field_returns_proper_field_type
     main: |
         from myapp.models import MyUser
+        reveal_type(MyUser._meta.get_field('base_name'))  # N: Revealed type is 'django.db.models.fields.CharField[Any, Any]'
         reveal_type(MyUser._meta.get_field('name'))  # N: Revealed type is 'django.db.models.fields.CharField[Any, Any]'
         reveal_type(MyUser._meta.get_field('age'))  # N: Revealed type is 'django.db.models.fields.IntegerField[Any, Any]'
         reveal_type(MyUser._meta.get_field('unknown'))
+        reveal_type(MyUser._meta.get_field('to_user'))  # N: Revealed type is 'django.db.models.fields.related.ForeignKey[Any, Any]'
     out: |
-        main:4: note: Revealed type is 'Any'
-        main:4: error: MyUser has no field named 'unknown'
+        main:5: note: Revealed type is 'Any'
+        main:5: error: MyUser has no field named 'unknown'
     installed_apps:
         - myapp
     files:
@@ -28,6 +30,9 @@
         -   path: myapp/models.py
             content: |
                 from django.db import models
-                class MyUser(models.Model):
+                class MyBaseUser(models.Model):
+                    base_name = models.CharField(max_length=100)
+                class MyUser(MyBaseUser):
                     name = models.CharField(max_length=100)
                     age = models.IntegerField()
+                    to_user = models.ForeignKey('self', on_delete=models.SET_NULL)

test-data/typecheck/test_config.yml

@@ -22,7 +22,7 @@
                 class MyModel(models.Model):
                     user = models.ForeignKey('auth.User', on_delete=models.CASCADE)
                 if TYPE_CHECKING:
-                    reveal_type(MyModel.user)  # N: Revealed type is 'django.contrib.auth.models.User*'
+                    reveal_type(MyModel().user)  # N: Revealed type is 'django.contrib.auth.models.User*'
 
 -   case: generate_pyproject_toml_and_settings_file_from_installed_apps_key
     main: |