From 8e7a3d78f433c187acb8806c8f27d2b83853ca89 Mon Sep 17 00:00:00 2001
From: James Murty <james@murty.co>
Date: Mon, 17 Oct 2016 14:30:58 +1100
Subject: [PATCH] Fix and merge SimpleEvent DB migrations

- adjust DB migrations to account for `Event` => `EventBase` rename
- combine two migrations into one to avoid trivial second migration.
---
 .../simple/migrations/0001_initial.py          |  7 ++++---
 .../migrations/0002_auto_20161014_1401.py      | 18 ------------------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 icekit_events/event_types/simple/migrations/0002_auto_20161014_1401.py

diff --git a/icekit_events/event_types/simple/migrations/0001_initial.py b/icekit_events/event_types/simple/migrations/0001_initial.py
index 59f2b53..cc029f2 100644
--- a/icekit_events/event_types/simple/migrations/0001_initial.py
+++ b/icekit_events/event_types/simple/migrations/0001_initial.py
@@ -7,19 +7,20 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('icekit_events', '0018_auto_20160929_2106'),
+        ('icekit_events', '0017_rename_event_to_eventbase'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='SimpleEvent',
             fields=[
-                ('event_ptr', models.OneToOneField(serialize=False, primary_key=True, auto_created=True, parent_link=True, to='icekit_events.Event')),
+                ('eventbase_ptr', models.OneToOneField(serialize=False, primary_key=True, auto_created=True, parent_link=True, to='icekit_events.EventBase')),
             ],
             options={
                 'abstract': False,
                 'ordering': ('title', 'pk'),
+                'verbose_name': 'Simple event',
             },
-            bases=('icekit_events.event',),
+            bases=('icekit_events.eventbase',),
         ),
     ]
diff --git a/icekit_events/event_types/simple/migrations/0002_auto_20161014_1401.py b/icekit_events/event_types/simple/migrations/0002_auto_20161014_1401.py
deleted file mode 100644
index 1fc93e7..0000000
--- a/icekit_events/event_types/simple/migrations/0002_auto_20161014_1401.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('icekit_event_types_simple', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='simpleevent',
-            options={'verbose_name': 'Simple event'},
-        ),
-    ]