From 7db221c8dccbce9d8340e5dca0e25ecf8f4cc963 Mon Sep 17 00:00:00 2001 From: PIG208 <39874143+PIG208@users.noreply.github.com> Date: Fri, 14 Oct 2022 20:52:28 -0400 Subject: [PATCH] migrations: Remove noop realm filters operations. We followed a same approach as in #22611 to mark migrations as noops. We might eventually squash them. Migration operations that only change the validators should be removed as they are essentially noops that do not affect the database schema. However, ./manage.py makemigration still generates a new migration for validators change regardless. So we still have to keep one migration that updates the validators to the latest state. We prefer to keep the earliest one for this purpose. Signed-off-by: Zixuan James Li --- zerver/migrations/0094_realm_filter_url_validator.py | 5 +---- .../0368_alter_realmfilter_url_format_string.py | 12 +++--------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/zerver/migrations/0094_realm_filter_url_validator.py b/zerver/migrations/0094_realm_filter_url_validator.py index 18bf4bbc2c..d2923001ad 100644 --- a/zerver/migrations/0094_realm_filter_url_validator.py +++ b/zerver/migrations/0094_realm_filter_url_validator.py @@ -1,5 +1,4 @@ # Generated by Django 1.11.2 on 2017-07-22 13:44 -import django.core.validators from django.db import migrations, models from zerver.models import filter_format_validator @@ -15,8 +14,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="realmfilter", name="url_format_string", - field=models.TextField( - validators=[django.core.validators.URLValidator(), filter_format_validator] - ), + field=models.TextField(validators=[filter_format_validator]), ), ] diff --git a/zerver/migrations/0368_alter_realmfilter_url_format_string.py b/zerver/migrations/0368_alter_realmfilter_url_format_string.py index 0ceed9c1e5..9f0bfa05c0 100644 --- a/zerver/migrations/0368_alter_realmfilter_url_format_string.py +++ b/zerver/migrations/0368_alter_realmfilter_url_format_string.py @@ -1,8 +1,8 @@ # Generated by Django 3.2.8 on 2021-10-20 23:42 -from django.db import migrations, models +from typing import List -from zerver.models import filter_format_validator +from django.db import migrations class Migration(migrations.Migration): @@ -11,10 +11,4 @@ class Migration(migrations.Migration): ("zerver", "0367_scimclient"), ] - operations = [ - migrations.AlterField( - model_name="realmfilter", - name="url_format_string", - field=models.TextField(validators=[filter_format_validator]), - ), - ] + operations: List[migrations.operations.base.Operation] = []