Sfoglia il codice sorgente

HUE-8530 [oganization] Update org DB migrations

    Updated:
          vim desktop/core/src/desktop/migrations/0001_initial.py
          -->
          bases=(models.Model, django_prometheus.models.ExportModelOperationsMixin('Document2')),

        Skipped for now:
        ./build/env/bin/hue makemigrations jobsub
        ./build/env/bin/hue makemigrations oozie
        ./build/env/bin/hue makemigrations pig
        ./build/env/bin/hue makemigrations search
Romain 5 anni fa
parent
commit
f4a804df43

+ 9 - 1
apps/useradmin/src/useradmin/org_migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2020-01-12 14:53
+# Generated by Django 1.11.20 on 2020-01-15 19:35
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -14,6 +14,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('desktop', '0001_initial'),
         ('auth', '0008_alter_user_username_max_length'),
     ]
 
@@ -56,8 +57,11 @@ class Migration(migrations.Migration):
                 ('app', models.CharField(max_length=30)),
                 ('action', models.CharField(max_length=100)),
                 ('description', models.CharField(max_length=255)),
+                ('connector', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='desktop.Connector')),
             ],
             options={
+                'verbose_name': 'Connector permission',
+                'verbose_name_plural': 'Connector permissions',
                 'abstract': False,
             },
         ),
@@ -151,4 +155,8 @@ class Migration(migrations.Migration):
             name='organizationgroup',
             unique_together=set([('name', 'organization')]),
         ),
+        migrations.AlterUniqueTogether(
+            name='huepermission',
+            unique_together=set([('connector', 'action', 'organization')]),
+        ),
     ]

+ 12 - 2
desktop/core/src/desktop/org_migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2020-01-12 14:53
+# Generated by Django 1.11.20 on 2020-01-15 19:35
 from __future__ import unicode_literals
 
 import desktop.models
@@ -15,6 +15,17 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Connector',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(default='', max_length=255)),
+                ('description', models.TextField(default='')),
+                ('dialect', models.CharField(db_index=True, help_text='Type of connector, e.g. hive, mysql... ', max_length=32)),
+                ('settings', models.TextField(default='{}')),
+                ('last_modified', models.DateTimeField(auto_now=True, db_index=True, verbose_name='Time last modified')),
+            ],
+        ),
         migrations.CreateModel(
             name='DefaultConfiguration',
             fields=[
@@ -60,7 +71,6 @@ class Migration(migrations.Migration):
                 'ordering': ['-last_modified', 'name'],
             },
             bases=(models.Model, django_prometheus.models.ExportModelOperationsMixin('Document2')),
-            #bases=(models.Model, django_prometheus.models.Mixin),
         ),
         migrations.CreateModel(
             name='Document2Permission',

+ 0 - 132
desktop/core/src/desktop/org_migrations/0002_auto_20200112_0653.py

@@ -1,132 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2020-01-12 14:53
-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),
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('useradmin', '0001_initial'),
-        ('desktop', '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='documentpermission_groups', to='useradmin.OrganizationGroup'),
-        ),
-        migrations.AddField(
-            model_name='documentpermission',
-            name='users',
-            field=models.ManyToManyField(db_index=True, db_table='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='documentpermission2_groups', to='useradmin.OrganizationGroup'),
-        ),
-        migrations.AddField(
-            model_name='document2permission',
-            name='users',
-            field=models.ManyToManyField(db_index=True, db_table='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='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')]),
-        ),
-    ]

+ 0 - 37
desktop/core/src/desktop/org_migrations/0003_auto_20200113_0601.py

@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.20 on 2020-01-13 14:01
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('useradmin', '0001_initial'),
-        ('desktop', '0002_auto_20200112_0653'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Connector',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(default='', max_length=255)),
-                ('description', models.TextField(default='')),
-                ('dialect', models.CharField(db_index=True, help_text='Type of connector, e.g. hive, mysql... ', max_length=32)),
-                ('settings', models.TextField(default='{}')),
-                ('last_modified', models.DateTimeField(auto_now=True, db_index=True, verbose_name='Time last modified')),
-                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='useradmin.Organization')),
-            ],
-            options={
-                'verbose_name': 'connector',
-                'verbose_name_plural': 'connectors',
-            },
-        ),
-        migrations.AlterUniqueTogether(
-            name='connector',
-            unique_together=set([('name', 'organization')]),
-        ),
-    ]