nested class Meta support

test/test-data/model-fields.test

@@ -14,3 +14,47 @@ reveal_type(user.small_int)  # E: Revealed type is 'builtins.int'
 reveal_type(user.name)  # E: Revealed type is 'builtins.str'
 reveal_type(user.slug)  # E: Revealed type is 'builtins.str'
 reveal_type(user.text)  # E: Revealed type is 'builtins.str'
+
+[CASE test_add_id_field_if_no_primary_key_defined]
+from django.db import models
+
+class User(models.Model):
+    pass
+
+reveal_type(User().id)  # E: Revealed type is 'builtins.int'
+
+[CASE test_do_not_add_id_if_field_with_primary_key_True_defined]
+from django.db import models
+
+class User(models.Model):
+    my_pk = models.IntegerField(primary_key=True)
+
+reveal_type(User().my_pk)  # E: Revealed type is 'builtins.int'
+reveal_type(User().id)  # E: Revealed type is 'Any'
+[out]
+main:7: error: "User" has no attribute "id"
+
+[CASE test_meta_nested_class_allows_subclassing_in_multiple_inheritance]
+from typing import Any
+from django.db import models
+
+class Mixin1(models.Model):
+    class Meta:
+        abstract = True
+
+class Mixin2(models.Model):
+    class Meta:
+        abstract = True
+
+class User(Mixin1, Mixin2):
+    pass
+[out]
+
+[CASE test_inheritance_from_abstract_model_does_not_fail_if_field_with_id_exists]
+from django.db import models
+class Abstract(models.Model):
+    class Meta:
+        abstract = True
+class User(Abstract):
+    id = models.AutoField(primary_key=True)
+[out]

test/test-data/model-relations.test

@@ -21,11 +21,14 @@ class Publisher(models.Model):
     pass
 
 class Book(models.Model):
-    publisher = models.ForeignKey(to=Publisher, on_delete=models.CASCADE,
-                                  related_name='books')
+    publisher = models.ForeignKey(to=Publisher, on_delete=models.CASCADE)
+    class StylesheetError(Exception):
+        pass
+    owner = models.ForeignKey(db_column='model_id', to='db.Unknown', on_delete=models.CASCADE)
 
 book = Book()
 reveal_type(book.publisher_id)  # E: Revealed type is 'builtins.int'
+reveal_type(book.owner_id)  # E: Revealed type is 'builtins.int'
 
 [CASE test_foreign_key_field_different_order_of_params]
 from django.db import models
@@ -36,18 +39,77 @@ class Publisher(models.Model):
 class Book(models.Model):
     publisher = models.ForeignKey(on_delete=models.CASCADE, to=Publisher,
                                   related_name='books')
+    publisher2 = models.ForeignKey(to=Publisher, related_name='books2', on_delete=models.CASCADE)
 
 book = Book()
 reveal_type(book.publisher)  # E: Revealed type is 'main.Publisher*'
+reveal_type(book.publisher2)  # E: Revealed type is 'main.Publisher*'
 
 publisher = Publisher()
 reveal_type(publisher.books)  # E: Revealed type is 'django.db.models.query.QuerySet[main.Book]'
+reveal_type(publisher.books2)  # E: Revealed type is 'django.db.models.query.QuerySet[main.Book]'
 
-[CASE test_to_parameter_as_string_fallbacks_to_any]
+[CASE test_to_parameter_as_string_with_application_name__model_imported]
+from django.db import models
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from myapp.models import Publisher
+
+class Book(models.Model):
+    publisher = models.ForeignKey(to='myapp.Publisher', on_delete=models.CASCADE)
+
+book = Book()
+reveal_type(book.publisher)  # E: Revealed type is 'myapp.models.Publisher*'
+
+[file myapp/__init__.py]
+[file myapp/models.py]
+from django.db import models
+class Publisher(models.Model):
+    pass
+
+[CASE test_to_parameter_as_string_with_application_name__fallbacks_to_any_if_model_not_present_in_dependency_graph]
 from django.db import models
 
 class Book(models.Model):
-    publisher = models.ForeignKey(to='Publisher', on_delete=models.CASCADE)
+    publisher = models.ForeignKey(to='myapp.Publisher', on_delete=models.CASCADE)
 
 book = Book()
 reveal_type(book.publisher)  # E: Revealed type is 'Any'
+
+[file myapp/__init__.py]
+[file myapp/models.py]
+from django.db import models
+class Publisher(models.Model):
+    pass
+
+[CASE test_circular_dependency_in_imports_with_foreign_key]
+from django.db import models
+
+class App(models.Model):
+    def method(self) -> None:
+        reveal_type(self.views)  # E: Revealed type is 'django.db.models.query.QuerySet[main.View]'
+        reveal_type(self.members)  # E: Revealed type is 'django.db.models.query.QuerySet[main.Member]'
+        reveal_type(self.sheets)  # E: Revealed type is 'django.db.models.query.QuerySet[main.Sheet]'
+        reveal_type(self.profile)  # E: Revealed type is 'main.Profile'
+class View(models.Model):
+    app = models.ForeignKey(to=App, related_name='views', on_delete=models.CASCADE)
+class Member(models.Model):
+    app = models.ForeignKey(related_name='members', on_delete=models.CASCADE, to=App)
+class Sheet(models.Model):
+    app = models.ForeignKey(App, related_name='sheets', on_delete=models.CASCADE)
+class Profile(models.Model):
+    app = models.OneToOneField(App, related_name='profile', on_delete=models.CASCADE)
+
+[CASE test_circular_dependency_in_imports_with_string_based]
+from django.db import models
+from myapp.models import App
+class View(models.Model):
+    app = models.ForeignKey(to='myapp.App', related_name='views', on_delete=models.CASCADE)
+
+[file myapp/__init__.py]
+[file myapp/models.py]
+from django.db import models
+class App(models.Model):
+    def method(self) -> None:
+        reveal_type(self.views)  # E: Revealed type is 'django.db.models.query.QuerySet[main.View]'

test/test-data/parse-settings.test

@@ -19,11 +19,36 @@ OBJ = LazyObject()
 [CASE test_settings_could_be_defined_in_different_module_and_imported_with_star]
 from django.conf import settings
 
-reveal_type(settings.BASE)  # E: Revealed type is 'builtins.int'
-reveal_type(settings.NESTED)  # E: Revealed type is 'builtins.str'
+reveal_type(settings.ROOT_DIR)  # E: Revealed type is 'pathlib.Path'
+reveal_type(settings.SETUP)  # E: Revealed type is 'builtins.int'
+reveal_type(settings.DATABASES)  # E: Revealed type is 'builtins.dict[builtins.str, builtins.str]'
 [env DJANGO_SETTINGS_MODULE=mysettings]
 [file mysettings.py]
+from local import *
+DATABASES = {'default': 'mydb'}
+[file local.py]
 from base import *
-NESTED = '1122'
+SETUP = 3
 [file base.py]
-BASE = 1
+from pathlib import Path
+
+ROOT_DIR = Path(__file__)
+
+[CASE test_circular_dependency_in_settings]
+from django.conf import settings
+
+class Class:
+    pass
+
+reveal_type(settings.MYSETTING)  # E: Revealed type is 'builtins.int'
+reveal_type(settings.REGISTRY)  # E: Revealed type is 'Any'
+
+[file mysettings.py]
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .main import Class
+
+MYSETTING = 1122
+REGISTRY: Optional['Class'] = None
+