From 63a695571aabc9602831fdab9a50c2041fea0188 Mon Sep 17 00:00:00 2001 From: Nicolas Setton Date: Wed, 6 Sep 2017 16:14:28 -0400 Subject: [PATCH] Squash migrations --- compile_server/app/migrations/0001_initial.py | 23 ------------------- ...001_squashed_0004_example_original_dir.py} | 18 ++++++++++++--- 2 files changed, 15 insertions(+), 26 deletions(-) delete mode 100644 compile_server/app/migrations/0001_initial.py rename compile_server/app/migrations/{0002_example_resource_tooloutput.py => 0001_squashed_0004_example_original_dir.py} (70%) diff --git a/compile_server/app/migrations/0001_initial.py b/compile_server/app/migrations/0001_initial.py deleted file mode 100644 index 9dc3810..0000000 --- a/compile_server/app/migrations/0001_initial.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-05-05 17:06 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Program', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.TextField()), - ], - ), - ] diff --git a/compile_server/app/migrations/0002_example_resource_tooloutput.py b/compile_server/app/migrations/0001_squashed_0004_example_original_dir.py similarity index 70% rename from compile_server/app/migrations/0002_example_resource_tooloutput.py rename to compile_server/app/migrations/0001_squashed_0004_example_original_dir.py index 7ec5130..f712d49 100644 --- a/compile_server/app/migrations/0002_example_resource_tooloutput.py +++ b/compile_server/app/migrations/0001_squashed_0004_example_original_dir.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-05-06 01:37 +# Generated by Django 1.11.4 on 2017-09-06 20:11 from __future__ import unicode_literals from django.db import migrations, models @@ -7,8 +7,9 @@ from django.db import migrations, models class Migration(migrations.Migration): + initial = True + dependencies = [ - ('app', '0001_initial'), ] operations = [ @@ -24,7 +25,7 @@ class Migration(migrations.Migration): name='Resource', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.TextField()), + ('basename', models.TextField()), ('contents', models.TextField()), ], ), @@ -36,4 +37,15 @@ class Migration(migrations.Migration): ('output', models.TextField()), ], ), + migrations.AddField( + model_name='example', + name='resources', + field=models.ManyToManyField(to=b'app.Resource'), + ), + migrations.AddField( + model_name='example', + name='original_dir', + field=models.TextField(default=''), + preserve_default=False, + ), ]