From 28541c48f7233ea3f2f417a5b5735b1839581006 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Tue, 30 Aug 2022 12:50:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=81=E7=A7=BB=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0022_auto_20220714_1046.py | 23 --------- .../migrations/0022_auto_20220817_1346.py | 11 ++++- .../migrations/0023_auto_20220715_1556.py | 48 ------------------- .../migrations/0023_auto_20220817_1716.py | 36 +++++++++++++- .../0013_alter_organization_options.py | 3 ++ .../0013_delete_organizationmember.py | 16 ------- .../migrations/0052_auto_20220713_1417.py | 11 +++-- ...707_1726.py => 0053_auto_20220830_1244.py} | 4 +- ...18_applyapplicationticket_apply_actions.py | 10 ++-- .../migrations/0018_auto_20220728_1125.py | 23 --------- .../0019_delete_applyapplicationticket.py | 2 +- .../migrations/0020_auto_20220817_1346.py | 10 ++++ .../migrations/0040_alter_user_source.py | 18 +++++++ 13 files changed, 93 insertions(+), 122 deletions(-) delete mode 100644 apps/applications/migrations/0022_auto_20220714_1046.py delete mode 100644 apps/applications/migrations/0023_auto_20220715_1556.py delete mode 100644 apps/orgs/migrations/0013_delete_organizationmember.py rename apps/terminal/migrations/{0052_auto_20220707_1726.py => 0053_auto_20220830_1244.py} (88%) delete mode 100644 apps/tickets/migrations/0018_auto_20220728_1125.py create mode 100644 apps/users/migrations/0040_alter_user_source.py diff --git a/apps/applications/migrations/0022_auto_20220714_1046.py b/apps/applications/migrations/0022_auto_20220714_1046.py deleted file mode 100644 index 8ecb1cbe6..000000000 --- a/apps/applications/migrations/0022_auto_20220714_1046.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.12 on 2022-07-14 02:46 - -from django.db import migrations - - -def migrate_db_oracle_version_to_attrs(apps, schema_editor): - db_alias = schema_editor.connection.alias - model = apps.get_model("applications", "Application") - oracles = list(model.objects.using(db_alias).filter(type='oracle')) - for o in oracles: - o.attrs['version'] = '12c' - model.objects.using(db_alias).bulk_update(oracles, ['attrs']) - - -class Migration(migrations.Migration): - - dependencies = [ - ('applications', '0021_auto_20220629_1826'), - ] - - operations = [ - migrations.RunPython(migrate_db_oracle_version_to_attrs) - ] diff --git a/apps/applications/migrations/0022_auto_20220817_1346.py b/apps/applications/migrations/0022_auto_20220817_1346.py index eae021831..0cf950848 100644 --- a/apps/applications/migrations/0022_auto_20220817_1346.py +++ b/apps/applications/migrations/0022_auto_20220817_1346.py @@ -3,13 +3,22 @@ from django.db import migrations -class Migration(migrations.Migration): +def migrate_db_oracle_version_to_attrs(apps, schema_editor): + db_alias = schema_editor.connection.alias + model = apps.get_model("applications", "Application") + oracles = list(model.objects.using(db_alias).filter(type='oracle')) + for o in oracles: + o.attrs['version'] = '12c' + model.objects.using(db_alias).bulk_update(oracles, ['attrs']) + +class Migration(migrations.Migration): dependencies = [ ('applications', '0021_auto_20220629_1826'), ] operations = [ + migrations.RunPython(migrate_db_oracle_version_to_attrs), migrations.AlterUniqueTogether( name='account', unique_together=None, diff --git a/apps/applications/migrations/0023_auto_20220715_1556.py b/apps/applications/migrations/0023_auto_20220715_1556.py deleted file mode 100644 index 03123efab..000000000 --- a/apps/applications/migrations/0023_auto_20220715_1556.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 3.1.14 on 2022-07-15 07:56 -import time -from collections import defaultdict - -from django.db import migrations - - -def migrate_account_dirty_data(apps, schema_editor): - db_alias = schema_editor.connection.alias - account_model = apps.get_model('applications', 'Account') - - count = 0 - bulk_size = 1000 - - while True: - accounts = account_model.objects.using(db_alias) \ - .filter(org_id='')[count:count + bulk_size] - - if not accounts: - break - - accounts = list(accounts) - start = time.time() - for i in accounts: - if i.app: - org_id = i.app.org_id - elif i.systemuser: - org_id = i.systemuser.org_id - else: - org_id = '' - if org_id: - i.org_id = org_id - - account_model.objects.bulk_update(accounts, ['org_id', ]) - print("Update account org is empty: {}-{} using: {:.2f}s".format( - count, count + len(accounts), time.time() - start - )) - count += len(accounts) - - -class Migration(migrations.Migration): - dependencies = [ - ('applications', '0022_auto_20220714_1046'), - ] - - operations = [ - migrations.RunPython(migrate_account_dirty_data), - ] diff --git a/apps/applications/migrations/0023_auto_20220817_1716.py b/apps/applications/migrations/0023_auto_20220817_1716.py index b506fcc3b..6f49aff69 100644 --- a/apps/applications/migrations/0023_auto_20220817_1716.py +++ b/apps/applications/migrations/0023_auto_20220817_1716.py @@ -1,10 +1,43 @@ # Generated by Django 3.2.14 on 2022-08-17 09:16 +import time from django.db import migrations -class Migration(migrations.Migration): +def migrate_account_dirty_data(apps, schema_editor): + db_alias = schema_editor.connection.alias + account_model = apps.get_model('applications', 'Account') + count = 0 + bulk_size = 1000 + + while True: + accounts = account_model.objects.using(db_alias) \ + .filter(org_id='')[count:count + bulk_size] + + if not accounts: + break + + accounts = list(accounts) + start = time.time() + for i in accounts: + if i.app: + org_id = i.app.org_id + elif i.systemuser: + org_id = i.systemuser.org_id + else: + org_id = '' + if org_id: + i.org_id = org_id + + account_model.objects.bulk_update(accounts, ['org_id', ]) + print("Update account org is empty: {}-{} using: {:.2f}s".format( + count, count + len(accounts), time.time() - start + )) + count += len(accounts) + + +class Migration(migrations.Migration): dependencies = [ ('applications', '0022_auto_20220817_1346'), ('perms', '0031_auto_20220816_1600'), @@ -14,6 +47,7 @@ class Migration(migrations.Migration): ] operations = [ + migrations.RunPython(migrate_account_dirty_data), migrations.DeleteModel( name='Account', ), diff --git a/apps/orgs/migrations/0013_alter_organization_options.py b/apps/orgs/migrations/0013_alter_organization_options.py index e868a87a3..6dfd004da 100644 --- a/apps/orgs/migrations/0013_alter_organization_options.py +++ b/apps/orgs/migrations/0013_alter_organization_options.py @@ -14,4 +14,7 @@ class Migration(migrations.Migration): name='organization', options={'permissions': (('view_rootorg', 'Can view root org'), ('view_alljoinedorg', 'Can view all joined org')), 'verbose_name': 'Organization'}, ), + migrations.DeleteModel( + name='OrganizationMember', + ), ] diff --git a/apps/orgs/migrations/0013_delete_organizationmember.py b/apps/orgs/migrations/0013_delete_organizationmember.py deleted file mode 100644 index 78d8ad655..000000000 --- a/apps/orgs/migrations/0013_delete_organizationmember.py +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by Django 3.2.14 on 2022-08-11 07:11 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('orgs', '0012_auto_20220118_1054'), - ] - - operations = [ - migrations.DeleteModel( - name='OrganizationMember', - ), - ] diff --git a/apps/terminal/migrations/0052_auto_20220713_1417.py b/apps/terminal/migrations/0052_auto_20220713_1417.py index 87ad6ba6a..c30032c23 100644 --- a/apps/terminal/migrations/0052_auto_20220713_1417.py +++ b/apps/terminal/migrations/0052_auto_20220713_1417.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.12 on 2022-07-13 06:17 +# Generated by Django 3.1.14 on 2022-04-07 09:26 import common.db.fields import django.core.validators @@ -6,7 +6,6 @@ from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('terminal', '0051_sessionsharing_users'), ] @@ -15,11 +14,15 @@ class Migration(migrations.Migration): migrations.AddField( model_name='endpoint', name='oracle_11g_port', - field=common.db.fields.PortField(default=15211, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(65535)], verbose_name='Oracle 11g Port'), + field=common.db.fields.PortField(default=15211, validators=[ + django.core.validators.MinValueValidator(0), + django.core.validators.MaxValueValidator(65535)], verbose_name='Oracle 11g Port'), ), migrations.AddField( model_name='endpoint', name='oracle_12c_port', - field=common.db.fields.PortField(default=15212, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(65535)], verbose_name='Oracle 12c Port'), + field=common.db.fields.PortField(default=15212, validators=[ + django.core.validators.MinValueValidator(0), + django.core.validators.MaxValueValidator(65535)], verbose_name='Oracle 12c Port'), ), ] diff --git a/apps/terminal/migrations/0052_auto_20220707_1726.py b/apps/terminal/migrations/0053_auto_20220830_1244.py similarity index 88% rename from apps/terminal/migrations/0052_auto_20220707_1726.py rename to apps/terminal/migrations/0053_auto_20220830_1244.py index a8c0b0052..90c188df9 100644 --- a/apps/terminal/migrations/0052_auto_20220707_1726.py +++ b/apps/terminal/migrations/0053_auto_20220830_1244.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.14 on 2022-04-07 09:26 +# Generated by Django 3.2.13 on 2022-08-30 04:44 from django.db import migrations, models @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('terminal', '0051_sessionsharing_users'), + ('terminal', '0052_auto_20220713_1417'), ] operations = [ diff --git a/apps/tickets/migrations/0018_applyapplicationticket_apply_actions.py b/apps/tickets/migrations/0018_applyapplicationticket_apply_actions.py index 74f5ed7a3..a2890c82d 100644 --- a/apps/tickets/migrations/0018_applyapplicationticket_apply_actions.py +++ b/apps/tickets/migrations/0018_applyapplicationticket_apply_actions.py @@ -1,10 +1,9 @@ -# Generated by Django 3.1.14 on 2022-07-22 08:03 +# Generated by Django 3.2.14 on 2022-07-28 03:25 from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ ('tickets', '0017_auto_20220623_1027'), ] @@ -13,6 +12,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='applyapplicationticket', name='apply_actions', - field=models.IntegerField(choices=[(255, 'All'), (1, 'Connect'), (2, 'Upload file'), (4, 'Download file'), (6, 'Upload download'), (8, 'Clipboard copy'), (16, 'Clipboard paste'), (24, 'Clipboard copy paste')], default=255, verbose_name='Actions'), + field=models.IntegerField( + choices=[ + (255, 'All'), (1, 'Connect'), (2, 'Upload file'), (4, 'Download file'), (6, 'Upload download'), + (8, 'Clipboard copy'), (16, 'Clipboard paste'), (24, 'Clipboard copy paste') + ], default=255, + verbose_name='Actions'), ), ] diff --git a/apps/tickets/migrations/0018_auto_20220728_1125.py b/apps/tickets/migrations/0018_auto_20220728_1125.py deleted file mode 100644 index 70bb7c6bd..000000000 --- a/apps/tickets/migrations/0018_auto_20220728_1125.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.14 on 2022-07-28 03:25 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('tickets', '0017_auto_20220623_1027'), - ] - - operations = [ - migrations.AlterField( - model_name='applyapplicationticket', - name='apply_permission_name', - field=models.CharField(max_length=128, verbose_name='Permission name'), - ), - migrations.AlterField( - model_name='applyassetticket', - name='apply_permission_name', - field=models.CharField(max_length=128, verbose_name='Permission name'), - ), - ] diff --git a/apps/tickets/migrations/0019_delete_applyapplicationticket.py b/apps/tickets/migrations/0019_delete_applyapplicationticket.py index 67586593d..d198f2228 100644 --- a/apps/tickets/migrations/0019_delete_applyapplicationticket.py +++ b/apps/tickets/migrations/0019_delete_applyapplicationticket.py @@ -6,7 +6,7 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('tickets', '0018_auto_20220728_1125'), + ('tickets', '0018_applyapplicationticket_apply_actions'), ] operations = [ diff --git a/apps/tickets/migrations/0020_auto_20220817_1346.py b/apps/tickets/migrations/0020_auto_20220817_1346.py index b657e7fd3..6b6e9626b 100644 --- a/apps/tickets/migrations/0020_auto_20220817_1346.py +++ b/apps/tickets/migrations/0020_auto_20220817_1346.py @@ -50,6 +50,16 @@ class Migration(migrations.Migration): ] operations = [ + migrations.AlterField( + model_name='applyapplicationticket', + name='apply_permission_name', + field=models.CharField(max_length=128, verbose_name='Permission name'), + ), + migrations.AlterField( + model_name='applyassetticket', + name='apply_permission_name', + field=models.CharField(max_length=128, verbose_name='Permission name'), + ), migrations.AddField( model_name='applyassetticket', name='apply_accounts', diff --git a/apps/users/migrations/0040_alter_user_source.py b/apps/users/migrations/0040_alter_user_source.py new file mode 100644 index 000000000..a72d97d13 --- /dev/null +++ b/apps/users/migrations/0040_alter_user_source.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.13 on 2022-08-30 03:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0039_auto_20211229_1852'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='source', + field=models.CharField(choices=[('local', 'Local'), ('ldap', 'LDAP/AD'), ('openid', 'OpenID'), ('radius', 'Radius'), ('cas', 'CAS'), ('saml2', 'SAML2'), ('oauth2', 'OAuth2')], default='local', max_length=30, verbose_name='Source'), + ), + ]