From 31ee509dd5b8aae65effb65f4919cf33d9f391da Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Tue, 3 Jun 2025 16:23:09 -0400 Subject: [PATCH] Combine migration numbers 201-205 into 201 for ease of management (#16008) * Add new squashed migrations file * Squash migrations related to recent removals --- awx/main/migrations/0201_delete_profile.py | 15 --- .../migrations/0201_squashed_deletions.py | 100 ++++++++++++++++++ .../migrations/0202_remove_sso_app_content.py | 26 ----- ...3_alter_inventorysource_source_and_more.py | 23 ---- ...th2application_unique_together_and_more.py | 39 ------- .../0205_delete_token_cleanup_job.py | 44 -------- 6 files changed, 100 insertions(+), 147 deletions(-) delete mode 100644 awx/main/migrations/0201_delete_profile.py create mode 100644 awx/main/migrations/0201_squashed_deletions.py delete mode 100644 awx/main/migrations/0202_remove_sso_app_content.py delete mode 100644 awx/main/migrations/0203_alter_inventorysource_source_and_more.py delete mode 100644 awx/main/migrations/0204_alter_oauth2application_unique_together_and_more.py delete mode 100644 awx/main/migrations/0205_delete_token_cleanup_job.py diff --git a/awx/main/migrations/0201_delete_profile.py b/awx/main/migrations/0201_delete_profile.py deleted file mode 100644 index 3d364221e9..0000000000 --- a/awx/main/migrations/0201_delete_profile.py +++ /dev/null @@ -1,15 +0,0 @@ -# Generated by Django 4.2.10 on 2024-09-16 10:22 - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ('main', '0200_template_name_constraint'), - ] - - operations = [ - migrations.DeleteModel( - name='Profile', - ), - ] diff --git a/awx/main/migrations/0201_squashed_deletions.py b/awx/main/migrations/0201_squashed_deletions.py new file mode 100644 index 0000000000..5e90755d48 --- /dev/null +++ b/awx/main/migrations/0201_squashed_deletions.py @@ -0,0 +1,100 @@ +# Generated by Django 4.2.10 on 2024-09-16 10:22 + +from django.db import migrations, models + +from awx.main.migrations._create_system_jobs import delete_clear_tokens_sjt + + +class Migration(migrations.Migration): + dependencies = [ + ('main', '0200_template_name_constraint'), + ] + + operations = [ + migrations.DeleteModel( + name='Profile', + ), + # Remove SSO app content + # delete all sso application migrations + migrations.RunSQL("DELETE FROM django_migrations WHERE app = 'sso';"), + # delete all sso application content group permissions + migrations.RunSQL( + "DELETE FROM auth_group_permissions " + "WHERE permission_id IN " + "(SELECT id FROM auth_permission WHERE content_type_id in (SELECT id FROM django_content_type WHERE app_label = 'sso'));" + ), + # delete all sso application content permissions + migrations.RunSQL("DELETE FROM auth_permission " "WHERE content_type_id IN (SELECT id FROM django_content_type WHERE app_label = 'sso');"), + # delete sso application content type + migrations.RunSQL("DELETE FROM django_content_type WHERE app_label = 'sso';"), + # drop sso application created table + migrations.RunSQL("DROP TABLE IF EXISTS sso_userenterpriseauth;"), + # Alter inventory source source field + migrations.AlterField( + model_name='inventorysource', + name='source', + field=models.CharField(default=None, max_length=32), + ), + migrations.AlterField( + model_name='inventoryupdate', + name='source', + field=models.CharField(default=None, max_length=32), + ), + # Alter OAuth2Application unique together + migrations.AlterUniqueTogether( + name='oauth2application', + unique_together=None, + ), + migrations.RemoveField( + model_name='oauth2application', + name='organization', + ), + migrations.RemoveField( + model_name='oauth2application', + name='user', + ), + migrations.RemoveField( + model_name='activitystream', + name='o_auth2_access_token', + ), + migrations.RemoveField( + model_name='activitystream', + name='o_auth2_application', + ), + migrations.DeleteModel( + name='OAuth2AccessToken', + ), + migrations.DeleteModel( + name='OAuth2Application', + ), + # Delete system token cleanup jobs, because tokens were deleted + migrations.RunPython(delete_clear_tokens_sjt, migrations.RunPython.noop), + migrations.AlterField( + model_name='systemjob', + name='job_type', + field=models.CharField( + blank=True, + choices=[ + ('cleanup_jobs', 'Remove jobs older than a certain number of days'), + ('cleanup_activitystream', 'Remove activity stream entries older than a certain number of days'), + ('cleanup_sessions', 'Removes expired browser sessions from the database'), + ], + default='', + max_length=32, + ), + ), + migrations.AlterField( + model_name='systemjobtemplate', + name='job_type', + field=models.CharField( + blank=True, + choices=[ + ('cleanup_jobs', 'Remove jobs older than a certain number of days'), + ('cleanup_activitystream', 'Remove activity stream entries older than a certain number of days'), + ('cleanup_sessions', 'Removes expired browser sessions from the database'), + ], + default='', + max_length=32, + ), + ), + ] diff --git a/awx/main/migrations/0202_remove_sso_app_content.py b/awx/main/migrations/0202_remove_sso_app_content.py deleted file mode 100644 index 87d7b30d72..0000000000 --- a/awx/main/migrations/0202_remove_sso_app_content.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 4.2.10 on 2024-09-16 15:21 - -from django.db import migrations - - -class Migration(migrations.Migration): - dependencies = [ - ('main', '0201_delete_profile'), - ] - - operations = [ - # delete all sso application migrations - migrations.RunSQL("DELETE FROM django_migrations WHERE app = 'sso';"), - # delete all sso application content group permissions - migrations.RunSQL( - "DELETE FROM auth_group_permissions " - "WHERE permission_id IN " - "(SELECT id FROM auth_permission WHERE content_type_id in (SELECT id FROM django_content_type WHERE app_label = 'sso'));" - ), - # delete all sso application content permissions - migrations.RunSQL("DELETE FROM auth_permission " "WHERE content_type_id IN (SELECT id FROM django_content_type WHERE app_label = 'sso');"), - # delete sso application content type - migrations.RunSQL("DELETE FROM django_content_type WHERE app_label = 'sso';"), - # drop sso application created table - migrations.RunSQL("DROP TABLE IF EXISTS sso_userenterpriseauth;"), - ] diff --git a/awx/main/migrations/0203_alter_inventorysource_source_and_more.py b/awx/main/migrations/0203_alter_inventorysource_source_and_more.py deleted file mode 100644 index 2b9dd7fe6b..0000000000 --- a/awx/main/migrations/0203_alter_inventorysource_source_and_more.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.2.10 on 2024-10-22 15:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0202_remove_sso_app_content'), - ] - - operations = [ - migrations.AlterField( - model_name='inventorysource', - name='source', - field=models.CharField(default=None, max_length=32), - ), - migrations.AlterField( - model_name='inventoryupdate', - name='source', - field=models.CharField(default=None, max_length=32), - ), - ] diff --git a/awx/main/migrations/0204_alter_oauth2application_unique_together_and_more.py b/awx/main/migrations/0204_alter_oauth2application_unique_together_and_more.py deleted file mode 100644 index 28ffec9846..0000000000 --- a/awx/main/migrations/0204_alter_oauth2application_unique_together_and_more.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 4.2.10 on 2024-10-24 14:06 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0203_alter_inventorysource_source_and_more'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='oauth2application', - unique_together=None, - ), - migrations.RemoveField( - model_name='oauth2application', - name='organization', - ), - migrations.RemoveField( - model_name='oauth2application', - name='user', - ), - migrations.RemoveField( - model_name='activitystream', - name='o_auth2_access_token', - ), - migrations.RemoveField( - model_name='activitystream', - name='o_auth2_application', - ), - migrations.DeleteModel( - name='OAuth2AccessToken', - ), - migrations.DeleteModel( - name='OAuth2Application', - ), - ] diff --git a/awx/main/migrations/0205_delete_token_cleanup_job.py b/awx/main/migrations/0205_delete_token_cleanup_job.py deleted file mode 100644 index f9aa830923..0000000000 --- a/awx/main/migrations/0205_delete_token_cleanup_job.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 4.2.16 on 2024-12-18 16:05 - -from django.db import migrations, models - -from awx.main.migrations._create_system_jobs import delete_clear_tokens_sjt - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0204_alter_oauth2application_unique_together_and_more'), - ] - - operations = [ - migrations.RunPython(delete_clear_tokens_sjt, migrations.RunPython.noop), - migrations.AlterField( - model_name='systemjob', - name='job_type', - field=models.CharField( - blank=True, - choices=[ - ('cleanup_jobs', 'Remove jobs older than a certain number of days'), - ('cleanup_activitystream', 'Remove activity stream entries older than a certain number of days'), - ('cleanup_sessions', 'Removes expired browser sessions from the database'), - ], - default='', - max_length=32, - ), - ), - migrations.AlterField( - model_name='systemjobtemplate', - name='job_type', - field=models.CharField( - blank=True, - choices=[ - ('cleanup_jobs', 'Remove jobs older than a certain number of days'), - ('cleanup_activitystream', 'Remove activity stream entries older than a certain number of days'), - ('cleanup_sessions', 'Removes expired browser sessions from the database'), - ], - default='', - max_length=32, - ), - ), - ]