migrations: Add missing elidable tags on RunPython/RunSQL steps.

This helps the squashmigrations tool know that it can squash these.

analytics/migrations/0009_remove_messages_to_stream_stat.py

@@ -26,5 +26,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(delete_messages_sent_to_stream_stat),
+        migrations.RunPython(delete_messages_sent_to_stream_stat, elidable=True),
     ]

analytics/migrations/0010_clear_messages_sent_values.py

@@ -24,5 +24,5 @@ class Migration(migrations.Migration):
     dependencies = [("analytics", "0009_remove_messages_to_stream_stat")]
 
     operations = [
-        migrations.RunPython(clear_message_sent_by_message_type_values),
+        migrations.RunPython(clear_message_sent_by_message_type_values, elidable=True),
     ]

analytics/migrations/0011_clear_analytics_tables.py

@@ -23,5 +23,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(clear_analytics_tables),
+        migrations.RunPython(clear_analytics_tables, elidable=True),
     ]

analytics/migrations/0015_clear_duplicate_counts.py

@@ -60,5 +60,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(clear_duplicate_counts, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            clear_duplicate_counts, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]

analytics/migrations/0018_remove_usercount_active_users_audit.py

@@ -10,6 +10,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunSQL(
-            "DELETE FROM analytics_usercount WHERE property = 'active_users_audit:is_bot:day'"
+            "DELETE FROM analytics_usercount WHERE property = 'active_users_audit:is_bot:day'",
+            elidable=True,
         )
     ]

analytics/migrations/0019_remove_unused_counts.py

@@ -21,6 +21,7 @@ class Migration(migrations.Migration):
                     "DELETE FROM analytics_installationcount WHERE property IN %s",
                     (REMOVED_COUNTS,),
                 ),
-            ]
+            ],
+            elidable=True,
         )
     ]

corporate/migrations/0024_zulipsponsorshiprequest_fill_customer_data.py

@@ -13,6 +13,7 @@ class Migration(migrations.Migration):
             SET customer_id = (
                 SELECT id FROM corporate_customer WHERE corporate_customer.realm_id = corporate_zulipsponsorshiprequest.realm_id
             )
-        """
+        """,
+            elidable=True,
         ),
     ]

corporate/migrations/0035_update_legacy_plan_next_invoice_date.py

@@ -24,5 +24,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(update_legacy_plan_next_invoice_date),
+        migrations.RunPython(update_legacy_plan_next_invoice_date, elidable=True),
     ]

corporate/migrations/0036_fix_customer_plans_scheduled_after_legacy_plan.py

@@ -36,5 +36,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(fix_customer_plans_scheduled_after_legacy_plan),
+        migrations.RunPython(fix_customer_plans_scheduled_after_legacy_plan, elidable=True),
     ]

corporate/migrations/0039_backfill_end_date_for_fixed_price_plans.py

@@ -58,5 +58,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.RunPython(
             backfill_end_date_for_fixed_price_plans,
+            elidable=True,
         ),
     ]

corporate/migrations/0041_fix_plans_on_free_trial_with_changes_in_schedule.py

@@ -46,5 +46,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.RunPython(
             fix_plans_on_free_trial_with_changes_in_schedule,
+            elidable=True,
         ),
     ]

corporate/migrations/0043_remove_customer_default_discount_and_more.py

@@ -75,7 +75,7 @@ class Migration(migrations.Migration):
             field=models.IntegerField(default=0),
         ),
         # Populate the new discounted price fields based on existing default discount.
-        migrations.RunPython(calculate_discounted_price),
+        migrations.RunPython(calculate_discounted_price, elidable=True),
         migrations.RemoveField(
             model_name="customer",
             name="default_discount",

zerver/migrations/0261_pregistrationuser_clear_invited_as_admin.py

@@ -36,6 +36,8 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(
-            clear_preregistrationuser_invited_as_admin, reverse_code=migrations.RunPython.noop
+            clear_preregistrationuser_invited_as_admin,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
         ),
     ]

zerver/migrations/0301_fix_unread_messages_in_deactivated_streams.py

@@ -23,5 +23,6 @@ class Migration(migrations.Migration):
                 AND zerver_stream.deactivated;
             """,
             reverse_sql="",
+            elidable=True,
         ),
     ]

zerver/migrations/0306_custom_profile_field_date_format.py

@@ -26,5 +26,6 @@ class Migration(migrations.Migration):
                     END;
             """,
             reverse_sql="",
+            elidable=True,
         ),
     ]

zerver/migrations/0313_finish_is_user_active_migration.py

@@ -41,7 +41,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(backfill_is_user_active, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            backfill_is_user_active, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
         # Make the field non-null now that we backfilled.
         migrations.AlterField(
             model_name="subscription",

zerver/migrations/0371_invalid_characters_in_topics.py

@@ -75,5 +75,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(fix_topics, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(fix_topics, reverse_code=migrations.RunPython.noop, elidable=True),
     ]

zerver/migrations/0373_fix_deleteduser_dummies.py

@@ -83,5 +83,6 @@ class Migration(migrations.Migration):
         migrations.RunPython(
             fix_dummy_users,
             reverse_code=migrations.RunPython.noop,
+            elidable=True,
         )
     ]

zerver/migrations/0375_invalid_characters_in_stream_names.py

@@ -76,5 +76,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(fix_stream_names, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            fix_stream_names,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
+        ),
     ]

zerver/migrations/0376_set_realmemoji_author_and_reupload_realmemoji.py

@@ -38,5 +38,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(set_emoji_author, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            set_emoji_author, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]

zerver/migrations/0377_message_edit_history_format.py

@@ -164,5 +164,6 @@ class Migration(migrations.Migration):
         migrations.RunPython(
             copy_and_update_message_edit_history,
             reverse_code=migrations.RunPython.noop,
+            elidable=True,
         ),
     ]

zerver/migrations/0380_userprofile_uuid_backfill.py

@@ -36,5 +36,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(backfill_user_profile_uuid, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            backfill_user_profile_uuid, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]

zerver/migrations/0386_fix_attachment_caches.py

@@ -72,5 +72,7 @@ class Migration(migrations.Migration):
                 to="zerver.ArchivedMessage",
             ),
         ),
-        migrations.RunPython(fix_attachment_caches, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            fix_attachment_caches, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]

zerver/migrations/0387_reupload_realmemoji_again.py

@@ -43,5 +43,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(reupload_realm_emoji, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            reupload_realm_emoji, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]

zerver/migrations/0429_user_topic_case_insensitive_unique_toghether.py

@@ -18,7 +18,8 @@ class Migration(migrations.Migration):
         migrations.RunSQL(
             """
         DELETE FROM zerver_usertopic WHERE id NOT IN (SELECT max(id) FROM zerver_usertopic GROUP BY (user_profile_id, stream_id, upper(topic_name::text)));
-        """
+        """,
+            elidable=True,
         ),
         migrations.AddConstraint(
             model_name="usertopic",

zerver/migrations/0436_realmauthenticationmethods.py

@@ -49,5 +49,5 @@ class Migration(migrations.Migration):
                 "unique_together": {("realm", "name")},
             },
         ),
-        migrations.RunPython(fill_RealmAuthenticationMethod_data),
+        migrations.RunPython(fill_RealmAuthenticationMethod_data, elidable=True),
     ]

zerver/migrations/0444_userpresence_fill_data.py

@@ -66,4 +66,6 @@ class Migration(migrations.Migration):
         ("zerver", "0443_userpresence_new_table_schema"),
     ]
 
-    operations = [migrations.RunPython(fill_new_columns, reverse_code=clear_new_columns)]
+    operations = [
+        migrations.RunPython(fill_new_columns, reverse_code=clear_new_columns, elidable=True)
+    ]

zerver/migrations/0457_backfill_scheduledmessagenotificationemail_trigger.py

@@ -20,6 +20,7 @@ class Migration(migrations.Migration):
             SET trigger = 'wildcard_mentioned'
             WHERE trigger = 'stream_wildcard_mentioned';
             """,
+            elidable=True,
         ),
         migrations.RunSQL(
             """
@@ -32,5 +33,6 @@ class Migration(migrations.Migration):
             SET trigger = 'followed_topic_wildcard_mentioned'
             WHERE trigger = 'stream_wildcard_mentioned_in_followed_topic';
             """,
+            elidable=True,
         ),
     ]

zerver/migrations/0465_backfill_scheduledmessagenotificationemail_trigger.py

@@ -20,5 +20,6 @@ class Migration(migrations.Migration):
             SET trigger = 'private_message'
             WHERE trigger = 'direct_message';
             """,
+            elidable=True,
         ),
     ]

zerver/migrations/0468_rename_followup_day_email_templates.py

@@ -91,5 +91,6 @@ class Migration(migrations.Migration):
         migrations.RunPython(
             update_for_followup_day_email_templates_rename,
             reverse_code=revert_followup_day_email_templates_rename,
+            elidable=True,
         ),
     ]

zerver/migrations/0480_realm_backfill_uuid_and_secret.py

@@ -64,6 +64,8 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(
-            backfill_realm_uuid_and_secret, reverse_code=migrations.RunPython.noop
+            backfill_realm_uuid_and_secret,
+            reverse_code=migrations.RunPython.noop,
+            elidable=True,
         ),
     ]

zerver/migrations/0496_alter_scheduledmessage_read_by_sender.py

@@ -42,6 +42,7 @@ class Migration(migrations.Migration):
         migrations.RunPython(
             populate_read_by_sender,
             reverse_code=migrations.RunPython.noop,
+            elidable=True,
         ),
         migrations.AlterField(
             model_name="scheduledmessage",

zerver/migrations/0500_realm_zulip_update_announcements_stream.py

@@ -36,5 +36,6 @@ class Migration(migrations.Migration):
         migrations.RunPython(
             set_initial_value_for_zulip_update_announcements_stream,
             reverse_code=migrations.RunPython.noop,
+            elidable=True,
         ),
     ]

zerver/migrations/0501_delete_dangling_usermessages.py

@@ -202,7 +202,9 @@ class Migration(migrations.Migration):
     operations = [
         migrations.RunSQL(BUILD_BAD_MOVES_TABLE, elidable=True),
         migrations.RunSQL(BROADEN_MOVES, elidable=True),
-        migrations.RunPython(log_extra_usermessage_rows, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            log_extra_usermessage_rows, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
         migrations.RunSQL(
             """
             DELETE FROM zerver_usermessage

zerver/migrations/0501_mark_introduce_zulip_view_modals_as_read.py

@@ -71,5 +71,6 @@ class Migration(migrations.Migration):
         migrations.RunPython(
             mark_introduce_zulip_view_modals_as_read,
             reverse_code=mark_introduce_zulip_view_modals_as_unread,
+            elidable=True,
         ),
     ]

zerver/migrations/0563_zulipinternal_can_delete.py

@@ -8,6 +8,7 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunSQL(
-            "UPDATE zerver_realm SET delete_own_message_policy = 1 where string_id = 'zulipinternal'"
+            "UPDATE zerver_realm SET delete_own_message_policy = 1 where string_id = 'zulipinternal'",
+            elidable=True,
         )
     ]

zerver/migrations/0564_purge_nagios_messages.py

@@ -87,10 +87,9 @@ def purge_nagios_messages(apps: StateApps, schema_editor: BaseDatabaseSchemaEdit
 
 class Migration(migrations.Migration):
     atomic = False
-    elidable = True
 
     dependencies = [
         ("zerver", "0563_zulipinternal_can_delete"),
     ]
 
-    operations = [migrations.RunPython(purge_nagios_messages)]
+    operations = [migrations.RunPython(purge_nagios_messages, elidable=True)]

zilencer/migrations/0032_remotepushdevicetoken_backfill_ios_app_id.py

@@ -32,5 +32,6 @@ class Migration(migrations.Migration):
             # The updated table is still valid with the old schema;
             # so to reverse, a no-op suffices.
             reverse_sql=[],
+            elidable=True,
         ),
     ]

zilencer/migrations/0037_alter_remoteinstallationcount_unique_together_and_more.py

@@ -49,7 +49,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(clear_duplicate_counts, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            clear_duplicate_counts, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
         migrations.AddConstraint(
             model_name="remoteinstallationcount",
             constraint=models.UniqueConstraint(

zilencer/migrations/0052_alter_remoterealm_plan_type_and_more.py

@@ -35,5 +35,7 @@ class Migration(migrations.Migration):
             name="plan_type",
             field=models.PositiveSmallIntegerField(default=PLAN_TYPE_SELF_MANAGED),
         ),
-        migrations.RunPython(renumber_plan_types, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(
+            renumber_plan_types, reverse_code=migrations.RunPython.noop, elidable=True
+        ),
     ]