From d9bc0dd5fda836238ac562279ae11b95017e2c4a Mon Sep 17 00:00:00 2001 From: nswain Date: Wed, 9 Sep 2020 13:09:42 -0600 Subject: [PATCH 1/3] Fix migration script. --- mfa/migrations/0009_user_keys_owned_by_enterprise.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfa/migrations/0009_user_keys_owned_by_enterprise.py b/mfa/migrations/0009_user_keys_owned_by_enterprise.py index 9132913..f4e6018 100644 --- a/mfa/migrations/0009_user_keys_owned_by_enterprise.py +++ b/mfa/migrations/0009_user_keys_owned_by_enterprise.py @@ -16,5 +16,5 @@ class Migration(migrations.Migration): name='owned_by_enterprise', field=models.NullBooleanField(default=None), ), - migrations.RunSQL("update mfa_user_keys set owned_by_enterprise = %s where key_type='FIDO2'"%(1 if getattr(settings,"MFA_OWNED_BY_ENTERPRISE",False) else 0 )) + migrations.RunSQL("update mfa_user_keys set owned_by_enterprise = %s where key_type='FIDO2'"%(True if getattr(settings,"MFA_OWNED_BY_ENTERPRISE",False) else False )) ] From f5218bdbdb4f71f4824982283410c8333813bd08 Mon Sep 17 00:00:00 2001 From: nswain Date: Wed, 9 Sep 2020 13:16:28 -0600 Subject: [PATCH 2/3] Simplify migration script. --- mfa/migrations/0009_user_keys_owned_by_enterprise.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfa/migrations/0009_user_keys_owned_by_enterprise.py b/mfa/migrations/0009_user_keys_owned_by_enterprise.py index f4e6018..aa9d1aa 100644 --- a/mfa/migrations/0009_user_keys_owned_by_enterprise.py +++ b/mfa/migrations/0009_user_keys_owned_by_enterprise.py @@ -16,5 +16,5 @@ class Migration(migrations.Migration): name='owned_by_enterprise', field=models.NullBooleanField(default=None), ), - migrations.RunSQL("update mfa_user_keys set owned_by_enterprise = %s where key_type='FIDO2'"%(True if getattr(settings,"MFA_OWNED_BY_ENTERPRISE",False) else False )) + migrations.RunSQL("update mfa_user_keys set owned_by_enterprise = %s where key_type='FIDO2'"%(getattr(settings,"MFA_OWNED_BY_ENTERPRISE",False))) ] From f3483868ed9c01498f909630e4bcff8dcfff5edc Mon Sep 17 00:00:00 2001 From: nswain Date: Wed, 9 Sep 2020 17:32:09 -0600 Subject: [PATCH 3/3] Use the ORM to perform migration query. --- mfa/migrations/0009_user_keys_owned_by_enterprise.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mfa/migrations/0009_user_keys_owned_by_enterprise.py b/mfa/migrations/0009_user_keys_owned_by_enterprise.py index aa9d1aa..9185fcc 100644 --- a/mfa/migrations/0009_user_keys_owned_by_enterprise.py +++ b/mfa/migrations/0009_user_keys_owned_by_enterprise.py @@ -4,6 +4,12 @@ from __future__ import unicode_literals from django.db import models, migrations from django.conf import settings + +def update_owned_by_enterprise(apps, schema_editor): + user_keys = apps.get_model('mfa', 'user_keys') + user_keys.objects.filter(key_type='FIDO2').update(owned_by_enterprise=getattr(settings,"MFA_OWNED_BY_ENTERPRISE",False)) + + class Migration(migrations.Migration): dependencies = [ @@ -16,5 +22,5 @@ class Migration(migrations.Migration): name='owned_by_enterprise', field=models.NullBooleanField(default=None), ), - migrations.RunSQL("update mfa_user_keys set owned_by_enterprise = %s where key_type='FIDO2'"%(getattr(settings,"MFA_OWNED_BY_ENTERPRISE",False))) + migrations.RunPython(update_owned_by_enterprise) ]