From f847bdcf7ebc7bf0faafdd526218a544dd7306c5 Mon Sep 17 00:00:00 2001
From: Mike Graves <mgraves@redhat.com>
Date: Thu, 17 Oct 2024 13:43:32 -0400
Subject: [PATCH] Update migrations after rebase

---
 ...itystream_o_auth2_access_token_and_more.py | 29 --------------
 .../0197_delete_oauth2application.py          | 16 --------
 ...th2application_unique_together_and_more.py | 39 +++++++++++++++++++
 3 files changed, 39 insertions(+), 45 deletions(-)
 delete mode 100644 awx/main/migrations/0196_remove_activitystream_o_auth2_access_token_and_more.py
 delete mode 100644 awx/main/migrations/0197_delete_oauth2application.py
 create mode 100644 awx/main/migrations/0198_alter_oauth2application_unique_together_and_more.py

diff --git a/awx/main/migrations/0196_remove_activitystream_o_auth2_access_token_and_more.py b/awx/main/migrations/0196_remove_activitystream_o_auth2_access_token_and_more.py
deleted file mode 100644
index 1de270a19b99..000000000000
--- a/awx/main/migrations/0196_remove_activitystream_o_auth2_access_token_and_more.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Generated by Django 4.2.10 on 2024-08-07 15:38
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0195_EE_permissions'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='activitystream',
-            name='o_auth2_access_token',
-        ),
-        migrations.RemoveField(
-            model_name='activitystream',
-            name='o_auth2_application',
-        ),
-        migrations.AlterField(
-            model_name='oauth2application',
-            name='client_id',
-            field=models.CharField(db_index=True, default=lambda: "", max_length=100, unique=True),
-        ),
-        migrations.DeleteModel(
-            name='OAuth2AccessToken',
-        ),
-    ]
diff --git a/awx/main/migrations/0197_delete_oauth2application.py b/awx/main/migrations/0197_delete_oauth2application.py
deleted file mode 100644
index 027777e972e4..000000000000
--- a/awx/main/migrations/0197_delete_oauth2application.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by Django 4.2.10 on 2024-08-07 15:39
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0196_remove_activitystream_o_auth2_access_token_and_more'),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name='OAuth2Application',
-        ),
-    ]
diff --git a/awx/main/migrations/0198_alter_oauth2application_unique_together_and_more.py b/awx/main/migrations/0198_alter_oauth2application_unique_together_and_more.py
new file mode 100644
index 000000000000..5b8b622cfa06
--- /dev/null
+++ b/awx/main/migrations/0198_alter_oauth2application_unique_together_and_more.py
@@ -0,0 +1,39 @@
+# Generated by Django 4.2.10 on 2024-10-17 17:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0197_remove_sso_app_content'),
+    ]
+
+    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',
+        ),
+    ]