add defaults to migration

SEED-platform · May 2, 2019 · 41a307c · 41a307c
1 parent 2d004f8
commit 41a307c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/seed/migrations/0102_auto_20190415_1115.py → seed/migrations/0102_auto_20190502_1403.py b/seed/migrations/0102_auto_20190415_1115.py → seed/migrations/0102_auto_20190502_1403.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-04-15 18:15
+# Generated by Django 1.11.20 on 2019-05-02 21:03
 from __future__ import unicode_literals
 
 import django.db.models.deletion
@@ -70,8 +70,7 @@ class Migration(migrations.Migration):
             name='source',
             field=models.IntegerField(
                 choices=[(1, 'Portfolio Manager'), (2, 'GreenButton'), (3, 'BuildingSync')],
-                default=None),
-            preserve_default=False,
+                default=None, null=True),
         ),
         migrations.AddField(
             model_name='meter',
@@ -89,8 +88,7 @@ class Migration(migrations.Migration):
                          (11, 'Fuel Oil (No. 2)'), (12, 'Fuel Oil (No. 4)'),
                          (13, 'Fuel Oil (No. 5 & No. 6)'), (14, 'Kerosene'), (15, 'Natural Gas'),
                          (16, 'Other'), (17, 'Propane and Liquid Propane'), (18, 'Wood')],
-                default=None),
-            preserve_default=False,
+                default=None, null=True),
         ),
         migrations.AlterField(
             model_name='columnmapping',

diff --git a/seed/models/meters.py b/seed/models/meters.py
@@ -74,10 +74,10 @@ class Meter(models.Model):
         blank=True
     )
 
-    source = models.IntegerField(choices=SOURCES)
+    source = models.IntegerField(choices=SOURCES, default=None, null=True)
     source_id = models.CharField(max_length=255, null=True, blank=True)
 
-    type = models.IntegerField(choices=ENERGY_TYPES)
+    type = models.IntegerField(choices=ENERGY_TYPES, default=None, null=True)
 
 
 class MeterReading(models.Model):