From 94a5f83b9d151203b4528e7a78eca82331b7a541 Mon Sep 17 00:00:00 2001 From: erikvw Date: Tue, 5 Dec 2023 13:46:33 -0600 Subject: [PATCH 1/2] delete migrations related to form runner --- .../0032_validationerrors_and_more.py | 179 -------------- .../0033_delete_validationerrors.py | 15 -- edc_data_manager/migrations/0034_issue.py | 25 -- ...ptions_alter_dataquery_options_and_more.py | 223 ------------------ 4 files changed, 442 deletions(-) delete mode 100644 edc_data_manager/migrations/0032_validationerrors_and_more.py delete mode 100644 edc_data_manager/migrations/0033_delete_validationerrors.py delete mode 100644 edc_data_manager/migrations/0034_issue.py delete mode 100644 edc_data_manager/migrations/0035_alter_datadictionary_options_alter_dataquery_options_and_more.py diff --git a/edc_data_manager/migrations/0032_validationerrors_and_more.py b/edc_data_manager/migrations/0032_validationerrors_and_more.py deleted file mode 100644 index e42f9a5..0000000 --- a/edc_data_manager/migrations/0032_validationerrors_and_more.py +++ /dev/null @@ -1,179 +0,0 @@ -# Generated by Django 4.2.7 on 2023-11-23 05:40 - -import _socket -from django.db import migrations, models -import django.db.models.deletion -import django_audit_fields.fields.hostname_modification_field -import django_audit_fields.fields.userfield -import django_audit_fields.fields.uuid_auto_field -import django_audit_fields.models.audit_model_mixin -import django_revision.revision_field - - -class Migration(migrations.Migration): - dependencies = [ - ("sites", "0002_alter_domain_unique"), - ("edc_data_manager", "0031_alter_dataquery_visit_code_sequence_and_more"), - ] - - operations = [ - migrations.CreateModel( - name="ValidationErrors", - fields=[ - ( - "revision", - django_revision.revision_field.RevisionField( - blank=True, - editable=False, - help_text="System field. Git repository tag:branch:commit.", - max_length=75, - null=True, - verbose_name="Revision", - ), - ), - ( - "created", - models.DateTimeField( - blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow - ), - ), - ( - "modified", - models.DateTimeField( - blank=True, default=django_audit_fields.models.audit_model_mixin.utcnow - ), - ), - ( - "user_created", - django_audit_fields.fields.userfield.UserField( - blank=True, - help_text="Updated by admin.save_model", - max_length=50, - verbose_name="user created", - ), - ), - ( - "user_modified", - django_audit_fields.fields.userfield.UserField( - blank=True, - help_text="Updated by admin.save_model", - max_length=50, - verbose_name="user modified", - ), - ), - ( - "hostname_created", - models.CharField( - blank=True, - default=_socket.gethostname, - help_text="System field. (modified on create only)", - max_length=60, - verbose_name="Hostname created", - ), - ), - ( - "hostname_modified", - django_audit_fields.fields.hostname_modification_field.HostnameModificationField( - blank=True, - help_text="System field. (modified on every save)", - max_length=50, - verbose_name="Hostname modified", - ), - ), - ( - "device_created", - models.CharField(blank=True, max_length=10, verbose_name="Device created"), - ), - ( - "device_modified", - models.CharField( - blank=True, max_length=10, verbose_name="Device modified" - ), - ), - ( - "id", - django_audit_fields.fields.uuid_auto_field.UUIDAutoField( - blank=True, - editable=False, - help_text="System auto field. UUID primary key.", - primary_key=True, - serialize=False, - ), - ), - ("session_id", models.UUIDField(null=True)), - ("session_datetime", models.DateTimeField(null=True)), - ("label_lower", models.CharField(max_length=150)), - ("verbose_name", models.CharField(max_length=150)), - ("subject_identifier", models.CharField(max_length=150)), - ("visit_code", models.CharField(max_length=150)), - ("visit_code_sequence", models.CharField(max_length=150)), - ("field_name", models.CharField(max_length=150)), - ("raw_message", models.TextField(null=True)), - ("message", models.TextField(null=True)), - ("short_message", models.CharField(max_length=250, null=True)), - ("response", models.CharField(max_length=250, null=True)), - ("src_id", models.UUIDField(null=True)), - ("src_revision", models.CharField(max_length=150, null=True)), - ("src_report_datetime", models.DateTimeField(null=True)), - ("src_modified_datetime", models.DateTimeField(null=True)), - ("src_user_modified", models.CharField(max_length=150, null=True)), - ( - "status", - models.CharField( - choices=[ - ("New", "New"), - ("in_progress", "In progress"), - ("done", "Done"), - ], - default="New", - max_length=15, - ), - ), - ("extra_formfields", models.TextField(null=True)), - ("ignore_formfields", models.TextField(null=True)), - ( - "site", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to="sites.site" - ), - ), - ], - options={ - "verbose_name": "Validation Error", - "verbose_name_plural": "Validation Errors", - "ordering": ("-modified", "-created"), - "get_latest_by": "modified", - "abstract": False, - "default_permissions": ("add", "change", "delete", "view", "export", "import"), - "default_manager_name": "objects", - "indexes": [ - models.Index( - fields=["label_lower", "field_name", "short_message"], - name="edc_data_ma_label_l_90de2a_idx", - ), - models.Index( - fields=[ - "subject_identifier", - "visit_code", - "visit_code_sequence", - "short_message", - ], - name="edc_data_ma_subject_b241da_idx", - ), - ], - }, - ), - migrations.AddConstraint( - model_name="validationerrors", - constraint=models.UniqueConstraint( - fields=( - "label_lower", - "subject_identifier", - "field_name", - "visit_code", - "visit_code_sequence", - ), - name="unique_label_lower_subject_identifier_etc", - ), - ), - ] diff --git a/edc_data_manager/migrations/0033_delete_validationerrors.py b/edc_data_manager/migrations/0033_delete_validationerrors.py deleted file mode 100644 index 9c2f033..0000000 --- a/edc_data_manager/migrations/0033_delete_validationerrors.py +++ /dev/null @@ -1,15 +0,0 @@ -# Generated by Django 4.2.7 on 2023-11-28 19:37 - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("edc_data_manager", "0032_validationerrors_and_more"), - ] - - operations = [ - migrations.DeleteModel( - name="ValidationErrors", - ), - ] diff --git a/edc_data_manager/migrations/0034_issue.py b/edc_data_manager/migrations/0034_issue.py deleted file mode 100644 index 1cdd717..0000000 --- a/edc_data_manager/migrations/0034_issue.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 4.2.7 on 2023-11-28 20:09 - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ("edc_form_runners", "0001_initial"), - ("edc_data_manager", "0033_delete_validationerrors"), - ] - - operations = [ - migrations.CreateModel( - name="Issue", - fields=[], - options={ - "verbose_name": "Form validation issue", - "verbose_name_plural": "Form validation issues", - "proxy": True, - "indexes": [], - "constraints": [], - }, - bases=("edc_form_runners.issue",), - ), - ] diff --git a/edc_data_manager/migrations/0035_alter_datadictionary_options_alter_dataquery_options_and_more.py b/edc_data_manager/migrations/0035_alter_datadictionary_options_alter_dataquery_options_and_more.py deleted file mode 100644 index 73e573b..0000000 --- a/edc_data_manager/migrations/0035_alter_datadictionary_options_alter_dataquery_options_and_more.py +++ /dev/null @@ -1,223 +0,0 @@ -# Generated by Django 4.2.7 on 2023-12-03 00:22 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("edc_data_manager", "0034_issue"), - ] - - operations = [ - migrations.AlterModelOptions( - name="datadictionary", - options={ - "default_permissions": ("view", "export"), - "verbose_name": "Data Dictionary Item", - "verbose_name_plural": "Data Dictionary Items", - }, - ), - migrations.AlterModelOptions( - name="dataquery", - options={ - "default_manager_name": "objects", - "default_permissions": ( - "add", - "change", - "delete", - "view", - "export", - "import", - ), - "verbose_name": "Data Query", - "verbose_name_plural": "Data Queries", - }, - ), - migrations.AlterModelOptions( - name="queryrule", - options={ - "default_manager_name": "objects", - "default_permissions": ( - "add", - "change", - "delete", - "view", - "export", - "import", - ), - "verbose_name": "Query Rule", - "verbose_name_plural": "Query Rules", - }, - ), - migrations.AddField( - model_name="datadictionary", - name="locale_created", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale created", - ), - ), - migrations.AddField( - model_name="datadictionary", - name="locale_modified", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale modified", - ), - ), - migrations.AddField( - model_name="dataquery", - name="locale_created", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale created", - ), - ), - migrations.AddField( - model_name="dataquery", - name="locale_modified", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale modified", - ), - ), - migrations.AddField( - model_name="edcpermissions", - name="locale_created", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale created", - ), - ), - migrations.AddField( - model_name="edcpermissions", - name="locale_modified", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale modified", - ), - ), - migrations.AddField( - model_name="historicaldatadictionary", - name="locale_created", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale created", - ), - ), - migrations.AddField( - model_name="historicaldatadictionary", - name="locale_modified", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale modified", - ), - ), - migrations.AddField( - model_name="historicaldataquery", - name="locale_created", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale created", - ), - ), - migrations.AddField( - model_name="historicaldataquery", - name="locale_modified", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale modified", - ), - ), - migrations.AddField( - model_name="historicalqueryrule", - name="locale_created", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale created", - ), - ), - migrations.AddField( - model_name="historicalqueryrule", - name="locale_modified", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale modified", - ), - ), - migrations.AddField( - model_name="queryrule", - name="locale_created", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale created", - ), - ), - migrations.AddField( - model_name="queryrule", - name="locale_modified", - field=models.CharField( - blank=True, - help_text="Auto-updated by Modeladmin", - max_length=10, - null=True, - verbose_name="Locale modified", - ), - ), - migrations.AlterField( - model_name="datadictionary", - name="prompt", - field=models.CharField(max_length=500), - ), - migrations.AlterField( - model_name="historicaldatadictionary", - name="prompt", - field=models.CharField(max_length=500), - ), - migrations.AddIndex( - model_name="datadictionary", - index=models.Index( - fields=["model", "number", "prompt"], - name="edc_data_ma_model_92b469_idx", - ), - ), - ] From d5f58656bb2d4bb6cc837c11c34155a265d46efc Mon Sep 17 00:00:00 2001 From: erikvw Date: Tue, 5 Dec 2023 14:09:06 -0600 Subject: [PATCH 2/2] reset new migrations 0032-0035 --- ...2_alter_datadictionary_options_and_more.py | 38 ++++ ..._datadictionary_locale_created_and_more.py | 176 ++++++++++++++++++ edc_data_manager/migrations/0034_issue.py | 25 +++ ...dictionary_edc_data_ma_model_92b469_idx.py | 18 ++ 4 files changed, 257 insertions(+) create mode 100644 edc_data_manager/migrations/0032_alter_datadictionary_options_and_more.py create mode 100644 edc_data_manager/migrations/0033_datadictionary_locale_created_and_more.py create mode 100644 edc_data_manager/migrations/0034_issue.py create mode 100644 edc_data_manager/migrations/0035_datadictionary_edc_data_ma_model_92b469_idx.py diff --git a/edc_data_manager/migrations/0032_alter_datadictionary_options_and_more.py b/edc_data_manager/migrations/0032_alter_datadictionary_options_and_more.py new file mode 100644 index 0000000..4bd1805 --- /dev/null +++ b/edc_data_manager/migrations/0032_alter_datadictionary_options_and_more.py @@ -0,0 +1,38 @@ +# Generated by Django 4.2.7 on 2023-12-05 19:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("edc_data_manager", "0031_alter_dataquery_visit_code_sequence_and_more"), + ] + + operations = [ + migrations.AlterModelOptions( + name="datadictionary", + options={ + "default_permissions": ("view", "export"), + "verbose_name": "Data Dictionary Item", + "verbose_name_plural": "Data Dictionary Items", + }, + ), + migrations.AlterModelOptions( + name="dataquery", + options={ + "default_manager_name": "objects", + "default_permissions": ("add", "change", "delete", "view", "export", "import"), + "verbose_name": "Data Query", + "verbose_name_plural": "Data Queries", + }, + ), + migrations.AlterModelOptions( + name="queryrule", + options={ + "default_manager_name": "objects", + "default_permissions": ("add", "change", "delete", "view", "export", "import"), + "verbose_name": "Query Rule", + "verbose_name_plural": "Query Rules", + }, + ), + ] diff --git a/edc_data_manager/migrations/0033_datadictionary_locale_created_and_more.py b/edc_data_manager/migrations/0033_datadictionary_locale_created_and_more.py new file mode 100644 index 0000000..ffbda25 --- /dev/null +++ b/edc_data_manager/migrations/0033_datadictionary_locale_created_and_more.py @@ -0,0 +1,176 @@ +# Generated by Django 4.2.7 on 2023-12-05 19:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("edc_data_manager", "0032_alter_datadictionary_options_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="datadictionary", + name="locale_created", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale created", + ), + ), + migrations.AddField( + model_name="datadictionary", + name="locale_modified", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale modified", + ), + ), + migrations.AddField( + model_name="dataquery", + name="locale_created", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale created", + ), + ), + migrations.AddField( + model_name="dataquery", + name="locale_modified", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale modified", + ), + ), + migrations.AddField( + model_name="edcpermissions", + name="locale_created", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale created", + ), + ), + migrations.AddField( + model_name="edcpermissions", + name="locale_modified", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale modified", + ), + ), + migrations.AddField( + model_name="historicaldatadictionary", + name="locale_created", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale created", + ), + ), + migrations.AddField( + model_name="historicaldatadictionary", + name="locale_modified", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale modified", + ), + ), + migrations.AddField( + model_name="historicaldataquery", + name="locale_created", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale created", + ), + ), + migrations.AddField( + model_name="historicaldataquery", + name="locale_modified", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale modified", + ), + ), + migrations.AddField( + model_name="historicalqueryrule", + name="locale_created", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale created", + ), + ), + migrations.AddField( + model_name="historicalqueryrule", + name="locale_modified", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale modified", + ), + ), + migrations.AddField( + model_name="queryrule", + name="locale_created", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale created", + ), + ), + migrations.AddField( + model_name="queryrule", + name="locale_modified", + field=models.CharField( + blank=True, + help_text="Auto-updated by Modeladmin", + max_length=10, + null=True, + verbose_name="Locale modified", + ), + ), + migrations.AlterField( + model_name="datadictionary", + name="prompt", + field=models.CharField(max_length=500), + ), + migrations.AlterField( + model_name="historicaldatadictionary", + name="prompt", + field=models.CharField(max_length=500), + ), + ] diff --git a/edc_data_manager/migrations/0034_issue.py b/edc_data_manager/migrations/0034_issue.py new file mode 100644 index 0000000..e36a5c5 --- /dev/null +++ b/edc_data_manager/migrations/0034_issue.py @@ -0,0 +1,25 @@ +# Generated by Django 4.2.7 on 2023-12-05 19:50 + +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ("edc_data_manager", "0033_datadictionary_locale_created_and_more"), + ("edc_form_runners", "0002_alter_issue_options_and_more"), + ] + + operations = [ + migrations.CreateModel( + name="Issue", + fields=[], + options={ + "verbose_name": "Form validation issue", + "verbose_name_plural": "Form validation issues", + "proxy": True, + "indexes": [], + "constraints": [], + }, + bases=("edc_form_runners.issue",), + ), + ] diff --git a/edc_data_manager/migrations/0035_datadictionary_edc_data_ma_model_92b469_idx.py b/edc_data_manager/migrations/0035_datadictionary_edc_data_ma_model_92b469_idx.py new file mode 100644 index 0000000..7918dc1 --- /dev/null +++ b/edc_data_manager/migrations/0035_datadictionary_edc_data_ma_model_92b469_idx.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.7 on 2023-12-05 20:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("edc_data_manager", "0034_issue"), + ] + + operations = [ + migrations.AddIndex( + model_name="datadictionary", + index=models.Index( + fields=["model", "number", "prompt"], name="edc_data_ma_model_92b469_idx" + ), + ), + ]