github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: Merge conflicting migration files

pull/14602/head
feng 2024-12-05 16:50:18 +08:00 committed by feng626
parent 3559647fee
commit d9af381570
4 changed files with 36 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/accounts/migrations/0019_backupaccountautomation_and_more.py
View File

@ -113,4 +113,21 @@ class Migration(migrations.Migration):
migrations.DeleteModel(
name='AccountBackupExecution',
),
migrations.RemoveField(
model_name='gatheredaccount',
name='authorized_keys',
),
migrations.RemoveField(
model_name='gatheredaccount',
name='groups',
),
migrations.RemoveField(
model_name='gatheredaccount',
name='sudoers',
),
migrations.AddField(
model_name='gatheredaccount',
name='detail',
field=models.JSONField(blank=True, default=dict, verbose_name='Detail'),
),
]

30
apps/accounts/migrations/0019_remove_gatheredaccount_authorized_keys_and_more.py
View File

@ -1,30 +0,0 @@
# Generated by Django 4.1.13 on 2024-12-03 07:01
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('accounts', '0018_changesecretrecord_ignore_fail_and_more'),
]
operations = [
migrations.RemoveField(
model_name='gatheredaccount',
name='authorized_keys',
),
migrations.RemoveField(
model_name='gatheredaccount',
name='groups',
),
migrations.RemoveField(
model_name='gatheredaccount',
name='sudoers',
),
migrations.AddField(
model_name='gatheredaccount',
name='detail',
field=models.JSONField(blank=True, default=dict, verbose_name='Detail'),
),
]

31
apps/assets/migrations/0011_alter_automationexecution_status.py
View File

@ -1,31 +0,0 @@
# Generated by Django 4.1.13 on 2024-12-02 11:30
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("assets", "0010_alter_automationexecution_duration"),
]
operations = [
migrations.AlterField(
model_name="automationexecution",
name="status",
field=models.CharField(
choices=[
("ready", "Ready"),
("pending", "Pending"),
("running", "Running"),
("success", "Success"),
("failed", "Failed"),
("error", "Error"),
("canceled", "Canceled"),
],
default="pending",
max_length=16,
verbose_name="Status",
),
),
]

20
apps/assets/migrations/0011_auto_20241204_1516.py
View File

@ -1,6 +1,6 @@
# Generated by Django 4.1.13 on 2024-12-04 07:16
from django.db import migrations
from django.db import migrations, models
def migrate_platform_sqlserver_automation(apps, schema_editor):
@ -19,5 +19,23 @@ class Migration(migrations.Migration):
]
operations = [
migrations.AlterField(
model_name="automationexecution",
name="status",
field=models.CharField(
choices=[
("ready", "Ready"),
("pending", "Pending"),
("running", "Running"),
("success", "Success"),
("failed", "Failed"),
("error", "Error"),
("canceled", "Canceled"),
],
default="pending",
max_length=16,
verbose_name="Status",
),
),
migrations.RunPython(migrate_platform_sqlserver_automation)
]