Bladeren bron

HUE-8530 [organization] Keep migrations like before

Romain 6 jaren geleden
bovenliggende
commit
7a964afdd0
24 gewijzigde bestanden met toevoegingen van 540 en 477 verwijderingen
  1. 26 1
      apps/beeswax/src/beeswax/migrations/0001_initial.py
  2. 0 50
      apps/beeswax/src/beeswax/migrations/0002_auto_20190713_1747.py
  3. 20 1
      apps/jobsub/src/jobsub/migrations/0001_initial.py
  4. 0 45
      apps/jobsub/src/jobsub/migrations/0002_auto_20190713_1747.py
  5. 6 17
      apps/oozie/src/oozie/migrations/0001_initial.py
  6. 6 5
      apps/oozie/src/oozie/migrations/0002_initial.py
  7. 6 35
      apps/oozie/src/oozie/migrations/0003_initial.py
  8. 31 0
      apps/oozie/src/oozie/migrations/0004_initial.py
  9. 41 0
      apps/oozie/src/oozie/migrations/0005_initial.py
  10. 8 1
      apps/pig/src/pig/migrations/0001_initial.py
  11. 18 1
      apps/search/src/search/migrations/0001_initial.py
  12. 0 35
      apps/search/src/search/migrations/0002_auto_20190713_1747.py
  13. 0 35
      apps/search/src/search/migrations/0002_auto_20190716_1435.py
  14. 6 83
      apps/useradmin/src/useradmin/migrations/0001_initial.py
  15. 0 20
      apps/useradmin/src/useradmin/migrations/0002_auto_20190714_0932.py
  16. 139 0
      apps/useradmin/src/useradmin/models2.py
  17. 73 16
      desktop/core/src/desktop/migrations/0001_initial.py
  18. 0 132
      desktop/core/src/desktop/migrations/0002_auto_20190713_1747.py
  19. 38 0
      desktop/core/src/desktop/migrations/0002_initial.py
  20. 27 0
      desktop/core/src/desktop/migrations/0003_initial.py
  21. 31 0
      desktop/core/src/desktop/migrations/0004_initial.py
  22. 22 0
      desktop/core/src/desktop/migrations/0005_initial.py
  23. 21 0
      desktop/core/src/desktop/migrations/0006_initial.py
  24. 21 0
      desktop/core/src/desktop/migrations/0007_initial.py

+ 26 - 1
apps/beeswax/src/beeswax/migrations/0001_initial.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
+# Generated by Django 1.11 on 2018-06-06 18:55
 from __future__ import unicode_literals
 
+from django.conf import settings
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -10,6 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -60,6 +63,7 @@ class Migration(migrations.Migration):
                 ('is_auto', models.BooleanField(db_index=True, default=False)),
                 ('is_trashed', models.BooleanField(db_index=True, default=False, help_text='If this query is trashed.', verbose_name='Is trashed')),
                 ('is_redacted', models.BooleanField(default=False)),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'ordering': ['-mtime'],
@@ -76,6 +80,27 @@ class Migration(migrations.Migration):
                 ('last_used', models.DateTimeField(auto_now=True, db_index=True, verbose_name='Last used')),
                 ('application', models.CharField(default=b'beeswax', help_text='Application we communicate with.', max_length=128)),
                 ('properties', models.TextField(default=b'{}')),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
+        migrations.AddField(
+            model_name='queryhistory',
+            name='design',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='beeswax.SavedQuery'),
+        ),
+        migrations.AddField(
+            model_name='queryhistory',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.CreateModel(
+            name='HiveServerQueryHistory',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('beeswax.queryhistory',),
+        ),
     ]

+ 0 - 50
apps/beeswax/src/beeswax/migrations/0002_auto_20190713_1747.py

@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('beeswax', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='session',
-            name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='savedquery',
-            name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='queryhistory',
-            name='design',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='beeswax.SavedQuery'),
-        ),
-        migrations.AddField(
-            model_name='queryhistory',
-            name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.CreateModel(
-            name='HiveServerQueryHistory',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-                'indexes': [],
-            },
-            bases=('beeswax.queryhistory',),
-        ),
-    ]

+ 20 - 1
apps/jobsub/src/jobsub/migrations/0001_initial.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
+# Generated by Django 1.11 on 2018-06-06 18:55
 from __future__ import unicode_literals
 
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -11,6 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -31,6 +33,7 @@ class Migration(migrations.Migration):
                 ('last_modified', models.DateTimeField(auto_now=True)),
                 ('type', models.CharField(max_length=128)),
                 ('data', models.TextField()),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(
@@ -55,6 +58,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(help_text='Name of the design, which must be unique per user.', max_length=64)),
                 ('description', models.CharField(blank=True, max_length=1024)),
                 ('last_modified', models.DateTimeField(auto_now=True)),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(
@@ -94,4 +98,19 @@ class Migration(migrations.Migration):
             ],
             bases=('jobsub.oozieaction',),
         ),
+        migrations.AddField(
+            model_name='ooziedesign',
+            name='root_action',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='jobsub.OozieAction'),
+        ),
+        migrations.AddField(
+            model_name='jobhistory',
+            name='design',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='jobsub.OozieDesign'),
+        ),
+        migrations.AddField(
+            model_name='jobhistory',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
     ]

+ 0 - 45
apps/jobsub/src/jobsub/migrations/0002_auto_20190713_1747.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('jobsub', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='ooziedesign',
-            name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='ooziedesign',
-            name='root_action',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='jobsub.OozieAction'),
-        ),
-        migrations.AddField(
-            model_name='jobhistory',
-            name='design',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='jobsub.OozieDesign'),
-        ),
-        migrations.AddField(
-            model_name='jobhistory',
-            name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='jobdesign',
-            name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

+ 6 - 17
apps/oozie/src/oozie/migrations/0001_initial.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
+# Generated by Django 1.11 on 2018-06-06 18:55
 from __future__ import unicode_literals
 
+from django.conf import settings
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
@@ -12,6 +13,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -29,7 +31,7 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(help_text='The name of the variable of the workflow to automatically fill up.', max_length=40, validators=[django.core.validators.RegexValidator(message='Enter a valid value: combination of 2 - 40 letters and digits starting by a letter', regex=b'^[a-zA-Z_][\\-_a-zA-Z0-9]{1,39}$')], verbose_name='Name of an input variable in the workflow.')),
             ],
         ),
-        migrations.CreateModel(
+         migrations.CreateModel(
             name='DataOutput',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
@@ -400,22 +402,9 @@ class Migration(migrations.Migration):
                 ('job_xml', models.CharField(blank=True, default=b'', help_text='Refer to a Hadoop JobConf job.xml file bundled in the workflow deployment directory. Properties specified in the Job Properties element override properties specified in the files specified in the Job XML element.', max_length=512, verbose_name='Job XML')),
                 ('job_properties', models.TextField(default=b'[]', help_text='Job configuration properties used by all the actions of the workflow (e.g. mapred.job.queue.name=production)', verbose_name='Hadoop job properties')),
                 ('managed', models.BooleanField(default=True)),
+                ('end', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='end_workflow', to='oozie.End')),
+                ('start', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='start_workflow', to='oozie.Start')),
             ],
             bases=('oozie.job',),
         ),
-        migrations.AddField(
-            model_name='node',
-            name='children',
-            field=models.ManyToManyField(related_name='parents', through='oozie.Link', to='oozie.Node'),
-        ),
-        migrations.AddField(
-            model_name='link',
-            name='child',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='parent_node', to='oozie.Node', verbose_name=b''),
-        ),
-        migrations.AddField(
-            model_name='link',
-            name='parent',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='child_node', to='oozie.Node'),
-        ),
     ]

+ 6 - 5
apps/pig/src/pig/migrations/0002_document_owner.py → apps/oozie/src/oozie/migrations/0002_initial.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
+# Generated by Django 1.11 on 2018-06-06 18:55
 from __future__ import unicode_literals
 
 from django.conf import settings
+import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -13,13 +14,13 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('pig', '0001_initial'),
+        ('oozie', '0001_initial'),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='document',
-            name='owner',
-            field=models.ForeignKey(help_text='User who can modify the job.', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+            model_name='node',
+            name='children',
+            field=models.ManyToManyField(related_name='parents', through='oozie.Link', to='oozie.Node'),
         ),
     ]

+ 6 - 35
apps/oozie/src/oozie/migrations/0002_auto_20190713_1747.py → apps/oozie/src/oozie/migrations/0003_initial.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
+# Generated by Django 1.11 on 2018-06-06 18:55
 from __future__ import unicode_literals
 
 from django.conf import settings
+import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -13,19 +14,14 @@ class Migration(migrations.Migration):
 
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('oozie', '0001_initial'),
+        ('oozie', '0002_initial'),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='job',
-            name='owner',
-            field=models.ForeignKey(help_text='Person who can modify the job.', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
-        ),
-        migrations.AddField(
-            model_name='history',
-            name='job',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='oozie.Job'),
+            model_name='subworkflow',
+            name='sub_workflow',
+            field=models.ForeignKey(blank=True, default=None, help_text='The sub-workflow application to include. You must own all the sub-workflows.', null=True, on_delete=django.db.models.deletion.CASCADE, to='oozie.Workflow', verbose_name='Sub-workflow'),
         ),
         migrations.AddField(
             model_name='history',
@@ -42,21 +38,6 @@ class Migration(migrations.Migration):
             name='dataset',
             field=models.OneToOneField(help_text='The pattern of the input data we want to process.', on_delete=django.db.models.deletion.CASCADE, to='oozie.Dataset', verbose_name='The dataset representing format of the data input.'),
         ),
-        migrations.AddField(
-            model_name='workflow',
-            name='end',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='end_workflow', to='oozie.End'),
-        ),
-        migrations.AddField(
-            model_name='workflow',
-            name='start',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='start_workflow', to='oozie.Start'),
-        ),
-        migrations.AddField(
-            model_name='subworkflow',
-            name='sub_workflow',
-            field=models.ForeignKey(blank=True, default=None, help_text='The sub-workflow application to include. You must own all the sub-workflows.', null=True, on_delete=django.db.models.deletion.CASCADE, to='oozie.Workflow', verbose_name='Sub-workflow'),
-        ),
         migrations.AddField(
             model_name='node',
             name='workflow',
@@ -77,11 +58,6 @@ class Migration(migrations.Migration):
             name='coordinator',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='oozie.Coordinator'),
         ),
-        migrations.AddField(
-            model_name='coordinator',
-            name='coordinatorworkflow',
-            field=models.ForeignKey(help_text='The workflow to schedule repeatedly.', null=True, on_delete=django.db.models.deletion.CASCADE, to='oozie.Workflow', verbose_name='Workflow'),
-        ),
         migrations.AddField(
             model_name='bundledcoordinator',
             name='bundle',
@@ -92,9 +68,4 @@ class Migration(migrations.Migration):
             name='coordinator',
             field=models.ForeignKey(help_text='The coordinator to batch with other coordinators.', on_delete=django.db.models.deletion.CASCADE, to='oozie.Coordinator', verbose_name='Coordinator'),
         ),
-        migrations.AddField(
-            model_name='bundle',
-            name='coordinators',
-            field=models.ManyToManyField(through='oozie.BundledCoordinator', to='oozie.Coordinator'),
-        ),
     ]

+ 31 - 0
apps/oozie/src/oozie/migrations/0004_initial.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-06-06 18:55
+from __future__ import unicode_literals
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('oozie', '0003_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='coordinator',
+            name='coordinatorworkflow',
+            field=models.ForeignKey(help_text='The workflow to schedule repeatedly.', null=True, on_delete=django.db.models.deletion.CASCADE, to='oozie.Workflow', verbose_name='Workflow'),
+        ),
+        migrations.AddField(
+            model_name='bundle',
+            name='coordinators',
+            field=models.ManyToManyField(through='oozie.BundledCoordinator', to='oozie.Coordinator'),
+        ),
+    ]

+ 41 - 0
apps/oozie/src/oozie/migrations/0005_initial.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-06-06 18:55
+from __future__ import unicode_literals
+
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('oozie', '0004_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='link',
+            name='child',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='parent_node', to='oozie.Node', verbose_name=b''),
+        ),
+        migrations.AddField(
+            model_name='link',
+            name='parent',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='child_node', to='oozie.Node'),
+        ),
+        migrations.AddField(
+            model_name='job',
+            name='owner',
+            field=models.ForeignKey(help_text='Person who can modify the job.', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+         migrations.AddField(
+            model_name='history',
+            name='job',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='oozie.Job'),
+        ),
+    ]

+ 8 - 1
apps/pig/src/pig/migrations/0001_initial.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
+# Generated by Django 1.11 on 2018-06-06 18:55
 from __future__ import unicode_literals
 
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -11,6 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -29,4 +31,9 @@ class Migration(migrations.Migration):
             ],
             bases=('pig.document',),
         ),
+        migrations.AddField(
+            model_name='document',
+            name='owner',
+            field=models.ForeignKey(help_text='User who can modify the job.', on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
     ]

+ 18 - 1
apps/search/src/search/migrations/0001_initial.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
+# Generated by Django 1.11 on 2018-06-06 18:55
 from __future__ import unicode_literals
 
+from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -11,6 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -53,4 +55,19 @@ class Migration(migrations.Migration):
             name='facets',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='search.Facet'),
         ),
+        migrations.AddField(
+            model_name='collection',
+            name='owner',
+            field=models.ForeignKey(default=None, help_text='User who created the job.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AddField(
+            model_name='collection',
+            name='result',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='search.Result'),
+        ),
+        migrations.AddField(
+            model_name='collection',
+            name='sorting',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='search.Sorting'),
+        ),
     ]

+ 0 - 35
apps/search/src/search/migrations/0002_auto_20190713_1747.py

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('search', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='collection',
-            name='owner',
-            field=models.ForeignKey(default=None, help_text='User who created the job.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
-        ),
-        migrations.AddField(
-            model_name='collection',
-            name='result',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='search.Result'),
-        ),
-        migrations.AddField(
-            model_name='collection',
-            name='sorting',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='search.Sorting'),
-        ),
-    ]

+ 0 - 35
apps/search/src/search/migrations/0002_auto_20190716_1435.py

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-16 14:35
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('search', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='collection',
-            name='owner',
-            field=models.ForeignKey(default=None, help_text='User who created the job.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
-        ),
-        migrations.AddField(
-            model_name='collection',
-            name='result',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='search.Result'),
-        ),
-        migrations.AddField(
-            model_name='collection',
-            name='sorting',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='search.Sorting'),
-        ),
-    ]

+ 6 - 83
apps/useradmin/src/useradmin/migrations/0001_initial.py

@@ -1,12 +1,10 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
+# Generated by Django 1.11 on 2018-06-06 18:55
 from __future__ import unicode_literals
 
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import django.utils.timezone
-import useradmin.models
 
 
 class Migration(migrations.Migration):
@@ -14,40 +12,16 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('auth', '0001_initial'),
+        ('auth', '0008_alter_user_username_max_length'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='OrganizationUser',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
-                ('last_name', models.CharField(blank=True, max_length=30, verbose_name='last name')),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
-                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('email', models.EmailField(max_length=254, unique=True, verbose_name='email address')),
-                ('token', models.CharField(default=None, max_length=128, null=True, verbose_name='token')),
-                ('customer_id', models.CharField(default=None, max_length=128, null=True, verbose_name='Customer id')),
-                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
-            ],
-            options={
-                'abstract': False,
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-            },
-            managers=[
-                ('objects', useradmin.models.UserManager()),
-            ],
-        ),
         migrations.CreateModel(
             name='GroupPermission',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.Group')),
             ],
         ),
         migrations.CreateModel(
@@ -57,38 +31,16 @@ class Migration(migrations.Migration):
                 ('app', models.CharField(max_length=30)),
                 ('action', models.CharField(max_length=100)),
                 ('description', models.CharField(max_length=255)),
+                ('groups', models.ManyToManyField(through='useradmin.GroupPermission', to='auth.Group')),
             ],
         ),
         migrations.CreateModel(
             name='LdapGroup',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='group', to='auth.Group')),
             ],
         ),
-        migrations.CreateModel(
-            name='Organization',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(help_text='The name of the organization', max_length=200)),
-                ('is_active', models.BooleanField(default=True)),
-            ],
-            managers=[
-                ('objects', useradmin.models.OrganizationManager()),
-            ],
-        ),
-        migrations.CreateModel(
-            name='OrganizationGroup',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=80, verbose_name='name')),
-                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='useradmin.Organization')),
-                ('permissions', models.ManyToManyField(blank=True, to='useradmin.HuePermission', verbose_name='permissions')),
-            ],
-            options={
-                'verbose_name': 'organization group',
-                'verbose_name_plural': 'organization groups',
-            },
-        ),
         migrations.CreateModel(
             name='UserProfile',
             fields=[
@@ -100,38 +52,9 @@ class Migration(migrations.Migration):
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
-        migrations.AddField(
-            model_name='ldapgroup',
-            name='group',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='group', to='useradmin.OrganizationGroup'),
-        ),
-        migrations.AddField(
-            model_name='huepermission',
-            name='groups',
-            field=models.ManyToManyField(through='useradmin.GroupPermission', to='useradmin.OrganizationGroup'),
-        ),
-        migrations.AddField(
-            model_name='grouppermission',
-            name='group',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='useradmin.OrganizationGroup'),
-        ),
         migrations.AddField(
             model_name='grouppermission',
             name='hue_permission',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='useradmin.HuePermission'),
         ),
-        migrations.AddField(
-            model_name='organizationuser',
-            name='organization',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='useradmin.Organization'),
-        ),
-        migrations.AddField(
-            model_name='organizationuser',
-            name='user_permissions',
-            field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'),
-        ),
-        migrations.AlterUniqueTogether(
-            name='organizationgroup',
-            unique_together=set([('name', 'organization')]),
-        ),
     ]

+ 0 - 20
apps/useradmin/src/useradmin/migrations/0002_auto_20190714_0932.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-14 09:32
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('useradmin', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='organizationuser',
-            name='groups',
-            field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='useradmin.OrganizationGroup', verbose_name='groups'),
-        ),
-    ]

+ 139 - 0
apps/useradmin/src/useradmin/models2.py

@@ -0,0 +1,139 @@
+#!/usr/bin/env python
+# Licensed to Cloudera, Inc. under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  Cloudera, Inc. licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+
+from django.contrib.auth.models import models, AbstractUser, BaseUserManager
+from django.utils.translation import ugettext_lazy as _t
+
+
+LOG = logging.getLogger(__name__)
+
+
+# -----------------------------------------------------------------------
+#  Organizations
+# -----------------------------------------------------------------------
+
+class OrganizationManager(models.Manager):
+    use_in_migrations = True
+
+    def get_by_natural_key(self, name):
+      return self.get(name=name)
+
+class Organization(models.Model):
+  name = models.CharField(max_length=200, help_text=_t("The name of the organization"))
+  is_active = models.BooleanField(default=True)
+
+  objects = OrganizationManager()
+
+
+class OrganizationGroupManager(models.Manager):
+
+  def natural_key(self):
+    return (self.organization, self.name,)
+
+class OrganizationGroup(models.Model):
+  name = models.CharField(_t('name'), max_length=80, unique=False)
+  organization = models.ForeignKey(Organization)
+
+  permissions = models.ManyToManyField(
+      'HuePermission',
+      verbose_name=_t('permissions'),
+      blank=True,
+  )
+
+  objects = OrganizationGroupManager()
+
+  class Meta:
+    verbose_name = _t('organization group')
+    verbose_name_plural = _t('organization groups')
+    unique_together = ('name', 'organization',)
+
+  def __str__(self):
+    return '%s %s' % (self.organization, self.name)
+
+
+class UserManager(BaseUserManager):
+  """Define a model manager for User model with no username field."""
+
+  use_in_migrations = True
+
+  def _create_user(self, email, password, **extra_fields):
+      """Create and save a User with the given email and password."""
+      if not email:
+          raise ValueError('The given email must be set')
+      email = self.normalize_email(email)
+      user = self.model(email=email, **extra_fields)
+      user.set_password(password)
+      user.save(using=self._db)
+      return user
+
+  def create_user(self, email, password=None, **extra_fields):
+      """Create and save a regular User with the given email and password."""
+      extra_fields.setdefault('is_staff', False)
+      extra_fields.setdefault('is_superuser', False)
+      return self._create_user(email, password, **extra_fields)
+
+  def create_superuser(self, email, password, **extra_fields):
+      """Create and save a SuperUser with the given email and password."""
+      extra_fields.setdefault('is_staff', True)
+      extra_fields.setdefault('is_superuser', True)
+
+      if extra_fields.get('is_staff') is not True:
+          raise ValueError('Superuser must have is_staff=True.')
+      if extra_fields.get('is_superuser') is not True:
+          raise ValueError('Superuser must have is_superuser=True.')
+
+      return self._create_user(email, password, **extra_fields)
+
+def default_organization():
+  default_organization, created = Organization.objects.get_or_create(name='default')
+  return default_organization
+
+class OrganizationUser(AbstractUser):
+    """User model."""
+
+    username = None
+    email = models.EmailField(_t('email address'), unique=True)
+    token = models.CharField(_t('token'), max_length=128, default=None, null=True)
+    customer_id = models.CharField(_t('Customer id'), max_length=128, default=None, null=True)
+    organization = models.ForeignKey(Organization, on_delete=models.CASCADE)
+
+    groups = models.ManyToManyField(
+        OrganizationGroup,
+        verbose_name=_t('groups'),
+        blank=True,
+        help_text=_t(
+            'The groups this user belongs to. A user will get all permissions '
+            'granted to each of their groups.'
+        ),
+        related_name="user_set",
+        related_query_name="user",
+    )
+
+    USERNAME_FIELD = 'email'
+    REQUIRED_FIELDS = []
+
+    objects = UserManager()
+
+    @property
+    def username(self):
+      return self.email
+
+    @username.setter
+    def username(self, value):
+      pass

+ 73 - 16
desktop/core/src/desktop/migrations/0001_initial.py

@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
+# Generated by Django 1.11 on 2018-06-06 18:55
 from __future__ import unicode_literals
 
 import desktop.models
+from django.conf import settings
+import django.contrib.auth.models
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -11,21 +14,12 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('auth', '0008_alter_user_username_max_length'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('contenttypes', '0002_remove_content_type_name'),
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='DefaultConfiguration',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('app', models.CharField(db_index=True, help_text='App that this configuration belongs to.', max_length=32)),
-                ('properties', models.TextField(default=b'[]', help_text='JSON-formatted default properties values.')),
-                ('is_default', models.BooleanField(db_index=True, default=False)),
-            ],
-            options={
-                'ordering': ['app', '-is_default', 'user'],
-            },
-        ),
         migrations.CreateModel(
             name='Document',
             fields=[
@@ -36,6 +30,7 @@ class Migration(migrations.Migration):
                 ('version', models.SmallIntegerField(default=1, verbose_name='Schema version')),
                 ('extra', models.TextField(default=b'')),
                 ('object_id', models.PositiveIntegerField()),
+                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
             ],
         ),
         migrations.CreateModel(
@@ -48,12 +43,10 @@ class Migration(migrations.Migration):
                 ('type', models.CharField(db_index=True, default=b'', help_text='Type of document, e.g. Hive query, Oozie workflow, Search Dashboard...', max_length=32)),
                 ('data', models.TextField(default=b'{}')),
                 ('extra', models.TextField(default=b'')),
-                ('search', models.TextField(blank=True, help_text='Searchable text for the document.', null=True)),
                 ('last_modified', models.DateTimeField(auto_now=True, db_index=True, verbose_name='Time last modified')),
                 ('version', models.SmallIntegerField(db_index=True, default=1, verbose_name='Document version')),
                 ('is_history', models.BooleanField(db_index=True, default=False)),
-                ('is_managed', models.BooleanField(db_index=True, default=False, verbose_name='If managed under the cover by Hue and never by the user')),
-                ('is_trashed', models.NullBooleanField(db_index=True, default=False, verbose_name='True if trashed')),
+                ('dependencies', models.ManyToManyField(db_index=True, related_name='dependents', to='desktop.Document2')),
             ],
             options={
                 'ordering': ['-last_modified', 'name'],
@@ -64,6 +57,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('perms', models.CharField(choices=[(b'read', b'read'), (b'write', b'write'), (b'comment', b'comment')], db_index=True, default=b'read', max_length=10)),
+                ('doc', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='desktop.Document2')),
+                ('groups', models.ManyToManyField(db_index=True, db_table=b'documentpermission2_groups', to='auth.Group')),
             ],
         ),
         migrations.CreateModel(
@@ -71,6 +66,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('perms', models.CharField(choices=[(b'read', b'read'), (b'write', b'write')], default=b'read', max_length=10)),
+                ('doc', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='desktop.Document')),
+                ('groups', models.ManyToManyField(db_index=True, db_table=b'documentpermission_groups', to='auth.Group')),
             ],
         ),
         migrations.CreateModel(
@@ -96,4 +93,64 @@ class Migration(migrations.Migration):
                 ('value', models.TextField(max_length=4096)),
             ],
         ),
+        migrations.AddField(
+            model_name='userpreferences',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='documenttag',
+            name='owner',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='documentpermission',
+            name='users',
+            field=models.ManyToManyField(db_index=True, db_table=b'documentpermission_users', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='document2permission',
+            name='users',
+            field=models.ManyToManyField(db_index=True, db_table=b'documentpermission2_users', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='document2',
+            name='owner',
+            field=models.ForeignKey(help_text='Creator.', on_delete=django.db.models.deletion.CASCADE, related_name='doc2_owner', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AddField(
+            model_name='document2',
+            name='parent_directory',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='desktop.Document2'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='owner',
+            field=models.ForeignKey(help_text='User who can own the job.', on_delete=django.db.models.deletion.CASCADE, related_name='doc_owner', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='tags',
+            field=models.ManyToManyField(db_index=True, to='desktop.DocumentTag'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='documenttag',
+            unique_together=set([('owner', 'tag')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='documentpermission',
+            unique_together=set([('doc', 'perms')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='document2permission',
+            unique_together=set([('doc', 'perms')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='document2',
+            unique_together=set([('uuid', 'version', 'is_history')]),
+        ),
+        migrations.AlterUniqueTogether(
+            name='document',
+            unique_together=set([('content_type', 'object_id')]),
+        ),
     ]

+ 0 - 132
desktop/core/src/desktop/migrations/0002_auto_20190713_1747.py

@@ -1,132 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2019-07-13 17:47
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('desktop', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('useradmin', '0001_initial'),
-        ('contenttypes', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='userpreferences',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='documenttag',
-            name='owner',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='documentpermission',
-            name='doc',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='desktop.Document'),
-        ),
-        migrations.AddField(
-            model_name='documentpermission',
-            name='groups',
-            field=models.ManyToManyField(db_index=True, db_table=b'documentpermission_groups', to='useradmin.OrganizationGroup'),
-        ),
-        migrations.AddField(
-            model_name='documentpermission',
-            name='users',
-            field=models.ManyToManyField(db_index=True, db_table=b'documentpermission_users', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='document2permission',
-            name='doc',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='desktop.Document2'),
-        ),
-        migrations.AddField(
-            model_name='document2permission',
-            name='groups',
-            field=models.ManyToManyField(db_index=True, db_table=b'documentpermission2_groups', to='useradmin.OrganizationGroup'),
-        ),
-        migrations.AddField(
-            model_name='document2permission',
-            name='users',
-            field=models.ManyToManyField(db_index=True, db_table=b'documentpermission2_users', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AddField(
-            model_name='document2',
-            name='dependencies',
-            field=models.ManyToManyField(db_index=True, related_name='dependents', to='desktop.Document2'),
-        ),
-        migrations.AddField(
-            model_name='document2',
-            name='owner',
-            field=models.ForeignKey(help_text='Creator.', on_delete=django.db.models.deletion.CASCADE, related_name='doc2_owner', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
-        ),
-        migrations.AddField(
-            model_name='document2',
-            name='parent_directory',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='desktop.Document2'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='content_type',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='owner',
-            field=models.ForeignKey(help_text='User who can own the job.', on_delete=django.db.models.deletion.CASCADE, related_name='doc_owner', to=settings.AUTH_USER_MODEL, verbose_name='Owner'),
-        ),
-        migrations.AddField(
-            model_name='document',
-            name='tags',
-            field=models.ManyToManyField(db_index=True, to='desktop.DocumentTag'),
-        ),
-        migrations.AddField(
-            model_name='defaultconfiguration',
-            name='groups',
-            field=models.ManyToManyField(db_index=True, db_table=b'defaultconfiguration_groups', to='useradmin.OrganizationGroup'),
-        ),
-        migrations.AddField(
-            model_name='defaultconfiguration',
-            name='user',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.CreateModel(
-            name='Directory',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-                'indexes': [],
-            },
-            bases=('desktop.document2',),
-        ),
-        migrations.AlterUniqueTogether(
-            name='documenttag',
-            unique_together=set([('owner', 'tag')]),
-        ),
-        migrations.AlterUniqueTogether(
-            name='documentpermission',
-            unique_together=set([('doc', 'perms')]),
-        ),
-        migrations.AlterUniqueTogether(
-            name='document2permission',
-            unique_together=set([('doc', 'perms')]),
-        ),
-        migrations.AlterUniqueTogether(
-            name='document2',
-            unique_together=set([('uuid', 'version', 'is_history')]),
-        ),
-        migrations.AlterUniqueTogether(
-            name='document',
-            unique_together=set([('content_type', 'object_id')]),
-        ),
-    ]

+ 38 - 0
desktop/core/src/desktop/migrations/0002_initial.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-06-13 10:46
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('desktop', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DefaultConfiguration',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('app', models.CharField(db_index=True, help_text='App that this configuration belongs to.', max_length=32)),
+                ('properties', models.TextField(default=b'[]', help_text='JSON-formatted default properties values.')),
+                ('is_default', models.BooleanField(db_index=True, default=False)),
+                ('groups', models.ManyToManyField(db_index=True, db_table=b'defaultconfiguration_groups', to='auth.Group')),
+            ],
+            options={
+                'ordering': ['app', '-is_default', 'user'],
+            },
+        ),
+        migrations.AddField(
+            model_name='defaultconfiguration',
+            name='user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

+ 27 - 0
desktop/core/src/desktop/migrations/0003_initial.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-06-13 10:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('desktop', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Directory',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('desktop.document2',),
+        ),
+    ]

+ 31 - 0
desktop/core/src/desktop/migrations/0004_initial.py

@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-06-13 10:46
+from __future__ import unicode_literals
+
+import django.contrib.auth.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('desktop', '0003_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='HueUser',
+            fields=[
+            ],
+            options={
+                'proxy': True,
+                'indexes': [],
+            },
+            bases=('auth.user',),
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+    ]

+ 22 - 0
desktop/core/src/desktop/migrations/0005_initial.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-06-13 10:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('desktop', '0004_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='document2',
+            name='search',
+            field=models.TextField(blank=True, help_text='Searchable text for the document.', null=True),
+        ),
+    ]

+ 21 - 0
desktop/core/src/desktop/migrations/0006_initial.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-06-13 10:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('desktop', '0005_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='document2',
+            name='is_trashed',
+            field=models.NullBooleanField(db_index=True, default=False, verbose_name='True if trashed'),
+        ),
+    ]

+ 21 - 0
desktop/core/src/desktop/migrations/0007_initial.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-06-13 10:46
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('desktop', '0006_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='document2',
+            name='is_managed',
+            field=models.BooleanField(db_index=True, default=False, verbose_name='If managed under the cover by Hue and never by the user'),
+        ),
+    ]