Clean up superfluous changes

This commit is contained in:
Tom Picton 2020-08-12 11:23:09 -07:00
parent 1eee5a42e9
commit 3da80b5ec2
10 changed files with 89 additions and 208 deletions

View File

@ -10,46 +10,24 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [] dependencies = [
]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name="Category", name='Category',
fields=[ fields=[
( ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('name', models.CharField(max_length=100)),
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=100)),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="Ingredient", name='Ingredient',
fields=[ fields=[
( ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('name', models.CharField(max_length=100)),
models.AutoField( ('notes', models.TextField()),
auto_created=True, ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ingredients', to='ingredients.Category')),
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=100)),
("notes", models.TextField()),
(
"category",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="ingredients",
to="ingredients.Category",
),
),
], ],
), ),
] ]

View File

@ -7,12 +7,14 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [("ingredients", "0001_initial")] dependencies = [
('ingredients', '0001_initial'),
]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name="ingredient", model_name='ingredient',
name="notes", name='notes',
field=models.TextField(blank=True, null=True), field=models.TextField(blank=True, null=True),
) ),
] ]

View File

@ -5,10 +5,13 @@ from django.db import migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [("ingredients", "0002_auto_20161104_0050")] dependencies = [
('ingredients', '0002_auto_20161104_0050'),
]
operations = [ operations = [
migrations.AlterModelOptions( migrations.AlterModelOptions(
name="category", options={"verbose_name_plural": "Categories"} name='category',
) options={'verbose_name_plural': 'Categories'},
),
] ]

View File

@ -10,61 +10,27 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [("ingredients", "0001_initial")] dependencies = [
('ingredients', '0001_initial'),
]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name="Recipe", name='Recipe',
fields=[ fields=[
( ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('title', models.CharField(max_length=100)),
models.AutoField( ('instructions', models.TextField()),
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("title", models.CharField(max_length=100)),
("instructions", models.TextField()),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="RecipeIngredient", name='RecipeIngredient',
fields=[ fields=[
( ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('amount', models.FloatField()),
models.AutoField( ('unit', models.CharField(choices=[('kg', 'Kilograms'), ('l', 'Litres'), ('', 'Units')], max_length=20)),
auto_created=True, ('ingredient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='used_by', to='ingredients.Ingredient')),
primary_key=True, ('recipes', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='amounts', to='recipes.Recipe')),
serialize=False,
verbose_name="ID",
),
),
("amount", models.FloatField()),
(
"unit",
models.CharField(
choices=[("kg", "Kilograms"), ("l", "Litres"), ("", "Units")],
max_length=20,
),
),
(
"ingredient",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="used_by",
to="ingredients.Ingredient",
),
),
(
"recipes",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="amounts",
to="recipes.Recipe",
),
),
], ],
), ),
] ]

View File

@ -7,23 +7,19 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [("recipes", "0001_initial")] dependencies = [
('recipes', '0001_initial'),
]
operations = [ operations = [
migrations.RenameField( migrations.RenameField(
model_name="recipeingredient", old_name="recipes", new_name="recipe" model_name='recipeingredient',
old_name='recipes',
new_name='recipe',
), ),
migrations.AlterField( migrations.AlterField(
model_name="recipeingredient", model_name='recipeingredient',
name="unit", name='unit',
field=models.CharField( field=models.CharField(choices=[(b'unit', b'Units'), (b'kg', b'Kilograms'), (b'l', b'Litres'), (b'st', b'Shots')], max_length=20),
choices=[
(b"unit", b"Units"),
(b"kg", b"Kilograms"),
(b"l", b"Litres"),
(b"st", b"Shots"),
],
max_length=20,
),
), ),
] ]

View File

@ -5,20 +5,14 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [("recipes", "0002_auto_20161104_0106")] dependencies = [
('recipes', '0002_auto_20161104_0106'),
]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name="recipeingredient", model_name='recipeingredient',
name="unit", name='unit',
field=models.CharField( field=models.CharField(choices=[('unit', 'Units'), ('kg', 'Kilograms'), ('l', 'Litres'), ('st', 'Shots')], max_length=20),
choices=[ ),
("unit", "Units"),
("kg", "Kilograms"),
("l", "Litres"),
("st", "Shots"),
],
max_length=20,
),
)
] ]

View File

@ -10,46 +10,24 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [] dependencies = [
]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name="Category", name='Category',
fields=[ fields=[
( ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('name', models.CharField(max_length=100)),
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=100)),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="Ingredient", name='Ingredient',
fields=[ fields=[
( ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('name', models.CharField(max_length=100)),
models.AutoField( ('notes', models.TextField()),
auto_created=True, ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ingredients', to='ingredients.Category')),
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=100)),
("notes", models.TextField()),
(
"category",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="ingredients",
to="ingredients.Category",
),
),
], ],
), ),
] ]

View File

@ -7,12 +7,14 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [("ingredients", "0001_initial")] dependencies = [
('ingredients', '0001_initial'),
]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name="ingredient", model_name='ingredient',
name="notes", name='notes',
field=models.TextField(blank=True, null=True), field=models.TextField(blank=True, null=True),
) ),
] ]

View File

@ -10,61 +10,27 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [("ingredients", "0001_initial")] dependencies = [
('ingredients', '0001_initial'),
]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name="Recipe", name='Recipe',
fields=[ fields=[
( ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('title', models.CharField(max_length=100)),
models.AutoField( ('instructions', models.TextField()),
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("title", models.CharField(max_length=100)),
("instructions", models.TextField()),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="RecipeIngredient", name='RecipeIngredient',
fields=[ fields=[
( ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
"id", ('amount', models.FloatField()),
models.AutoField( ('unit', models.CharField(choices=[('kg', 'Kilograms'), ('l', 'Litres'), ('', 'Units')], max_length=20)),
auto_created=True, ('ingredient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='used_by', to='ingredients.Ingredient')),
primary_key=True, ('recipes', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='amounts', to='recipes.Recipe')),
serialize=False,
verbose_name="ID",
),
),
("amount", models.FloatField()),
(
"unit",
models.CharField(
choices=[("kg", "Kilograms"), ("l", "Litres"), ("", "Units")],
max_length=20,
),
),
(
"ingredient",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="used_by",
to="ingredients.Ingredient",
),
),
(
"recipes",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="amounts",
to="recipes.Recipe",
),
),
], ],
), ),
] ]

View File

@ -7,23 +7,19 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [("recipes", "0001_initial")] dependencies = [
('recipes', '0001_initial'),
]
operations = [ operations = [
migrations.RenameField( migrations.RenameField(
model_name="recipeingredient", old_name="recipes", new_name="recipe" model_name='recipeingredient',
old_name='recipes',
new_name='recipe',
), ),
migrations.AlterField( migrations.AlterField(
model_name="recipeingredient", model_name='recipeingredient',
name="unit", name='unit',
field=models.CharField( field=models.CharField(choices=[(b'unit', b'Units'), (b'kg', b'Kilograms'), (b'l', b'Litres'), (b'st', b'Shots')], max_length=20),
choices=[
(b"unit", b"Units"),
(b"kg", b"Kilograms"),
(b"l", b"Litres"),
(b"st", b"Shots"),
],
max_length=20,
),
), ),
] ]