Skip to content

Fixed regression calling instance.full_clean #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackton1 merged 6 commits into from
Apr 22, 2021
Merged

Fixed regression calling instance.full_clean #296

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5bd37d2
Fixed regression calling instance.full_clean.
jackton1 Apr 22, 2021
1714acc
Improve test coverage.
jackton1 Apr 22, 2021
cf8039e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 22, 2021
f679835
Updated test.
jackton1 Apr 22, 2021
1aac16e
Merge branch 'fix-regression-with-calling-full-clean' of https://gith…
jackton1 Apr 22, 2021
b27e591
Updated coverage config.
jackton1 Apr 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions model_clone/tests/test_clone_mixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
Room,
Furniture,
Cover,
BackCover, Tag, BookTag,
BackCover,
BookTag,
Tag,
)

User = get_user_model()
Expand Down Expand Up @@ -214,8 +216,8 @@ def test_cloning_with_explicit_clone_m2m_fields(
list(book_clone_1.authors.values_list("first_name", "last_name")),
)

tag_1 = Tag.objects.create(name='test-tag-1')
tag_2 = Tag.objects.create(name='test-tag-2')
tag_1 = Tag.objects.create(name="test-tag-1")
tag_2 = Tag.objects.create(name="test-tag-2")

_clone_m2m_fields_mock.return_value = ["tags"]

Expand Down
132 changes: 89 additions & 43 deletions sample/migrations/0014_auto_20210422_1449.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,85 +8,131 @@
class Migration(migrations.Migration):

dependencies = [
('sample', '0013_edition'),
("sample", "0013_edition"),
]

operations = [
migrations.CreateModel(
name='Tag',
name="Tag",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=255)),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=255)),
],
options={
'abstract': False,
"abstract": False,
},
bases=(model_clone.mixins.clone.CloneMixin, models.Model),
),
migrations.AlterField(
model_name='assignment',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="assignment",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name='author',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="author",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name='backcover',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="backcover",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name='book',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="book",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name='cover',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="cover",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name='edition',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="edition",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name='furniture',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="furniture",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name='house',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="house",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name='page',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="page",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.AlterField(
model_name='room',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="room",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
migrations.CreateModel(
name='BookTag',
name="BookTag",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('book', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sample.book')),
('tag', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='sample.tag')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"book",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="sample.book"
),
),
(
"tag",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT, to="sample.tag"
),
),
],
options={
'unique_together': {('book', 'tag')},
"unique_together": {("book", "tag")},
},
),
migrations.AddField(
model_name='book',
name='tags',
field=models.ManyToManyField(through='sample.BookTag', to='sample.Tag'),
model_name="book",
name="tags",
field=models.ManyToManyField(through="sample.BookTag", to="sample.Tag"),
),
]
4 changes: 2 additions & 2 deletions sample/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Book(CloneModel):
on_delete=models.PROTECT,
)
created_at = models.DateTimeField(auto_now_add=True)
tags = models.ManyToManyField(Tag, through='BookTag')
tags = models.ManyToManyField(Tag, through="BookTag")

def __str__(self):
return _(self.name)
Expand All @@ -63,7 +63,7 @@ class BookTag(models.Model):

class Meta:
unique_together = [
('book', 'tag'),
("book", "tag"),
]


Expand Down
10 changes: 6 additions & 4 deletions sample_assignment/migrations/0002_alter_contract_id.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
class Migration(migrations.Migration):

dependencies = [
('sample_assignment', '0001_initial'),
("sample_assignment", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name='contract',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="contract",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
]
10 changes: 6 additions & 4 deletions sample_company/migrations/0002_alter_companydepot_id.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
class Migration(migrations.Migration):

dependencies = [
('sample_company', '0001_initial'),
("sample_company", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name='companydepot',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="companydepot",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
]
10 changes: 6 additions & 4 deletions sample_driver/migrations/0002_alter_driver_id.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
class Migration(migrations.Migration):

dependencies = [
('sample_driver', '0001_initial'),
("sample_driver", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name='driver',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="driver",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
]