Commit 0204714b authored by Markus Holtermann's avatar Markus Holtermann
Browse files

Cleaned up schema tests 

Thanks Tim Graham for the review.
parent 44ad6915

tests/schema/fields.py

+4 −0
Original line number Diff line number Diff line
@@ -52,3 +52,7 @@ class CustomManyToManyField(RelatedField): 
    _get_m2m_attr = ManyToManyField.__dict__['_get_m2m_attr']

    _get_m2m_reverse_attr = ManyToManyField.__dict__['_get_m2m_reverse_attr']

    _get_m2m_db_table = ManyToManyField.__dict__['_get_m2m_db_table']





class InheritedManyToManyField(ManyToManyField):

    pass

tests/schema/models.py

+21 −69
Original line number Diff line number Diff line
@@ -25,24 +25,9 @@ class AuthorWithDefaultHeight(models.Model): 
        apps = new_apps





class AuthorWithM2M(models.Model):

    name = models.CharField(max_length=255)



    class Meta:

        apps = new_apps





class AuthorWithM2MThrough(models.Model):

class AuthorWithEvenLongerName(models.Model):

    name = models.CharField(max_length=255)

    tags = models.ManyToManyField("schema.TagM2MTest", related_name="authors", through="AuthorTag")



    class Meta:

        apps = new_apps





class AuthorTag(models.Model):

    author = models.ForeignKey("schema.AuthorWithM2MThrough")

    tag = models.ForeignKey("schema.TagM2MTest")

    height = models.PositiveIntegerField(null=True, blank=True)



    class Meta:

        apps = new_apps
@@ -67,39 +52,21 @@ class BookWeak(models.Model): 
        apps = new_apps





class BookWithO2O(models.Model):

    author = models.OneToOneField(Author)

    title = models.CharField(max_length=100, db_index=True)

    pub_date = models.DateTimeField()

class BookWithLongName(models.Model):

    author_foreign_key_with_really_long_field_name = models.ForeignKey(AuthorWithEvenLongerName)



    class Meta:

        apps = new_apps

        db_table = "schema_book"





class BookWithM2M(models.Model):

    author = models.ForeignKey(Author)

class BookWithO2O(models.Model):

    author = models.OneToOneField(Author)

    title = models.CharField(max_length=100, db_index=True)

    pub_date = models.DateTimeField()

    tags = models.ManyToManyField("TagM2MTest", related_name="books")



    class Meta:

        apps = new_apps





class TagThrough(models.Model):

    book = models.ForeignKey("schema.BookWithM2MThrough")

    tag = models.ForeignKey("schema.TagM2MTest")



    class Meta:

        apps = new_apps





class BookWithM2MThrough(models.Model):

    tags = models.ManyToManyField("TagM2MTest", related_name="books", through=TagThrough)



    class Meta:

        apps = new_apps

        db_table = "schema_book"





class BookWithSlug(models.Model):
@@ -113,6 +80,10 @@ class BookWithSlug(models.Model): 
        db_table = "schema_book"





class Note(models.Model):

    info = models.TextField()





class Tag(models.Model):

    title = models.CharField(max_length=255)

    slug = models.SlugField(unique=True)
@@ -121,21 +92,21 @@ class Tag(models.Model): 
        apps = new_apps





class TagM2MTest(models.Model):

class TagIndexed(models.Model):

    title = models.CharField(max_length=255)

    slug = models.SlugField(unique=True)



    class Meta:

        apps = new_apps

        index_together = [["slug", "title"]]





class TagIndexed(models.Model):

class TagM2MTest(models.Model):

    title = models.CharField(max_length=255)

    slug = models.SlugField(unique=True)



    class Meta:

        apps = new_apps

        index_together = [["slug", "title"]]





class TagUniqueRename(models.Model):
@@ -147,30 +118,6 @@ class TagUniqueRename(models.Model): 
        db_table = "schema_tag"





class UniqueTest(models.Model):

    year = models.IntegerField()

    slug = models.SlugField(unique=False)



    class Meta:

        apps = new_apps

        unique_together = ["year", "slug"]





class AuthorWithEvenLongerName(models.Model):

    name = models.CharField(max_length=255)

    height = models.PositiveIntegerField(null=True, blank=True)



    class Meta:

        apps = new_apps





class BookWithLongName(models.Model):

    author_foreign_key_with_really_long_field_name = models.ForeignKey(AuthorWithEvenLongerName)



    class Meta:

        apps = new_apps





# Based on tests/reserved_names/models.py

@python_2_unicode_compatible

class Thing(models.Model):
@@ -183,5 +130,10 @@ class Thing(models.Model): 
        return self.when





class Note(models.Model):

    info = models.TextField()
 
class UniqueTest(models.Model):

    year = models.IntegerField()

    slug = models.SlugField(unique=False)



    class Meta:

        apps = new_apps

        unique_together = ["year", "slug"]

tests/schema/tests.py

+290 −362

File changed.

Preview size limit exceeded, changes collapsed.