From 6c7f0e98b3b6721bdb54d81806c68af3b8abfbae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Thu, 5 Mar 2020 16:24:45 +0100
Subject: [PATCH] Rebuild paymentmethod/stripe migrations from master

---
 ...0305_0851.py => 0002_auto_20200305_1524.py} | 16 ++++++++++------
 .../migrations/0017_auto_20200304_1723.py      | 17 -----------------
 .../migrations/0020_auto_20200305_0911.py      | 18 ------------------
 3 files changed, 10 insertions(+), 41 deletions(-)
 rename uncloud/uncloud_pay/migrations/{0019_auto_20200305_0851.py => 0002_auto_20200305_1524.py} (53%)
 delete mode 100644 uncloud/uncloud_pay/migrations/0017_auto_20200304_1723.py
 delete mode 100644 uncloud/uncloud_pay/migrations/0020_auto_20200305_0911.py

diff --git a/uncloud/uncloud_pay/migrations/0019_auto_20200305_0851.py b/uncloud/uncloud_pay/migrations/0002_auto_20200305_1524.py
similarity index 53%
rename from uncloud/uncloud_pay/migrations/0019_auto_20200305_0851.py
rename to uncloud/uncloud_pay/migrations/0002_auto_20200305_1524.py
index f8b56cc..0768dd0 100644
--- a/uncloud/uncloud_pay/migrations/0019_auto_20200305_0851.py
+++ b/uncloud/uncloud_pay/migrations/0002_auto_20200305_1524.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.4 on 2020-03-05 08:51
+# Generated by Django 3.0.3 on 2020-03-05 15:24
 
 from django.db import migrations, models
 
@@ -6,18 +6,22 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('uncloud_pay', '0017_auto_20200304_1723'),
+        ('uncloud_pay', '0001_initial'),
     ]
 
     operations = [
+        migrations.RenameField(
+            model_name='paymentmethod',
+            old_name='stripe_card_id',
+            new_name='stripe_payment_method_id',
+        ),
         migrations.AddField(
             model_name='paymentmethod',
             name='stripe_setup_intent_id',
             field=models.CharField(blank=True, max_length=32, null=True),
         ),
-        migrations.AlterField(
-            model_name='paymentmethod',
-            name='stripe_card_id',
-            field=models.CharField(blank=True, max_length=32, null=True),
+        migrations.AlterUniqueTogether(
+            name='paymentmethod',
+            unique_together=set(),
         ),
     ]
diff --git a/uncloud/uncloud_pay/migrations/0017_auto_20200304_1723.py b/uncloud/uncloud_pay/migrations/0017_auto_20200304_1723.py
deleted file mode 100644
index 48142e4..0000000
--- a/uncloud/uncloud_pay/migrations/0017_auto_20200304_1723.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 3.0.4 on 2020-03-04 17:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('uncloud_pay', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name='paymentmethod',
-            unique_together=set(),
-        ),
-    ]
diff --git a/uncloud/uncloud_pay/migrations/0020_auto_20200305_0911.py b/uncloud/uncloud_pay/migrations/0020_auto_20200305_0911.py
deleted file mode 100644
index 9e1b677..0000000
--- a/uncloud/uncloud_pay/migrations/0020_auto_20200305_0911.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.0.4 on 2020-03-05 09:11
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('uncloud_pay', '0019_auto_20200305_0851'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='paymentmethod',
-            old_name='stripe_card_id',
-            new_name='stripe_payment_method_id',
-        ),
-    ]