Json fields: change default and db index (refs #3077)

7 files changed, 34 insertions, 34 deletions

diff --git a/archaeological_context_records/migrations/0012_auto_20171017_1730.py b/archaeological_context_records/migrations/0012_auto_20171017_1840.py
index 49a3ee5f3..6de4abb0f 100644
--- a/archaeological_context_records/migrations/0012_auto_20171017_1730.py
+++ b/archaeological_context_records/migrations/0012_auto_20171017_1840.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-10-17 17:30
+# Generated by Django 1.11 on 2017-10-17 18:40
 from __future__ import unicode_literals
 
 import django.contrib.postgres.fields.jsonb
@@ -16,11 +16,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='contextrecord',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='historicalcontextrecord',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
     ]
diff --git a/archaeological_files/migrations/0010_auto_20171017_1730.py b/archaeological_files/migrations/0010_auto_20171017_1840.py
index d2e6dde4c..04eb5b1cc 100644
--- a/archaeological_files/migrations/0010_auto_20171017_1730.py
+++ b/archaeological_files/migrations/0010_auto_20171017_1840.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-10-17 17:30
+# Generated by Django 1.11 on 2017-10-17 18:40
 from __future__ import unicode_literals
 
 import django.contrib.postgres.fields.jsonb
@@ -16,11 +16,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='file',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='historicalfile',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
     ]
diff --git a/archaeological_finds/migrations/0012_auto_20171017_1730.py b/archaeological_finds/migrations/0012_auto_20171017_1840.py
index 7ddca1e18..8c347b270 100644
--- a/archaeological_finds/migrations/0012_auto_20171017_1730.py
+++ b/archaeological_finds/migrations/0012_auto_20171017_1840.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-10-17 17:30
+# Generated by Django 1.11 on 2017-10-17 18:40
 from __future__ import unicode_literals
 
 import django.contrib.postgres.fields.jsonb
@@ -16,46 +16,46 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='basefind',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='find',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='historicalbasefind',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='historicalfind',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='historicaltreatment',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='historicaltreatmentfile',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='property',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='treatment',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='treatmentfile',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
     ]
diff --git a/archaeological_operations/migrations/0011_auto_20171017_1730.py b/archaeological_operations/migrations/0011_auto_20171017_1840.py
index 8621cfcfe..cd169957a 100644
--- a/archaeological_operations/migrations/0011_auto_20171017_1730.py
+++ b/archaeological_operations/migrations/0011_auto_20171017_1840.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-10-17 17:30
+# Generated by Django 1.11 on 2017-10-17 18:40
 from __future__ import unicode_literals
 
 import django.contrib.postgres.fields.jsonb
@@ -16,36 +16,36 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='administrativeact',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='archaeologicalsite',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='historicaladministrativeact',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='historicaloperation',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='operation',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='parcel',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='parcelowner',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
     ]
diff --git a/archaeological_warehouse/migrations/0010_auto_20171017_1730.py b/archaeological_warehouse/migrations/0010_auto_20171017_1840.py
index ca5873ddc..e45c44674 100644
--- a/archaeological_warehouse/migrations/0010_auto_20171017_1730.py
+++ b/archaeological_warehouse/migrations/0010_auto_20171017_1840.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-10-17 17:30
+# Generated by Django 1.11 on 2017-10-17 18:40
 from __future__ import unicode_literals
 
 import django.contrib.postgres.fields.jsonb
@@ -16,16 +16,16 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='collection',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='container',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='warehouse',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
     ]
diff --git a/ishtar_common/migrations/0018_auto_20171017_1730.py b/ishtar_common/migrations/0018_auto_20171017_1840.py
index 5c974be17..0c617a3d5 100644
--- a/ishtar_common/migrations/0018_auto_20171017_1730.py
+++ b/ishtar_common/migrations/0018_auto_20171017_1840.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11 on 2017-10-17 17:30
+# Generated by Django 1.11 on 2017-10-17 18:40
 from __future__ import unicode_literals
 
 import django.contrib.postgres.fields.jsonb
@@ -47,22 +47,22 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='historicalorganization',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='historicalperson',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='organization',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='person',
             name='data',
-            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True),
+            field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}),
         ),
         migrations.AddField(
             model_name='jsondatafield',
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 8d4511809..becb37516 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -953,7 +953,7 @@ class JsonDataField(models.Model):
 
 
 class JsonData(models.Model):
-    data = JSONField(null=True, blank=True)
+    data = JSONField(default={}, db_index=True)
 
     class Meta:
         abstract = True