From 85437fc6c0f4e5a99d284b454a07278153e0076c Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Thu, 23 Apr 2020 23:20:12 +0200 Subject: [PATCH] Simplify and rewrite migrations --- users/migrations/0092_auto_20200423_1804.py | 4 ++-- users/migrations/0093_auto_20200423_2028.py | 18 ---------------- users/migrations/0094_auto_20200423_2030.py | 23 --------------------- 3 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 users/migrations/0093_auto_20200423_2028.py delete mode 100644 users/migrations/0094_auto_20200423_2030.py diff --git a/users/migrations/0092_auto_20200423_1804.py b/users/migrations/0092_auto_20200423_1804.py index c49d65ed..839c047a 100644 --- a/users/migrations/0092_auto_20200423_1804.py +++ b/users/migrations/0092_auto_20200423_1804.py @@ -46,9 +46,9 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name="ldapuser", - name="ssh_keys", + name="sshkeys", field=ldapdb.models.fields.ListField( - blank=True, db_column="sshkeys", null=True + blank=True, db_column="sshkeys", max_length=200, null=True ), ), ] diff --git a/users/migrations/0093_auto_20200423_2028.py b/users/migrations/0093_auto_20200423_2028.py deleted file mode 100644 index 99010e6f..00000000 --- a/users/migrations/0093_auto_20200423_2028.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.28 on 2020-04-23 18:28 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("users", "0092_auto_20200423_1804"), - ] - - operations = [ - migrations.RenameField( - model_name="ldapuser", old_name="ssh_keys", new_name="sshkeys", - ), - ] diff --git a/users/migrations/0094_auto_20200423_2030.py b/users/migrations/0094_auto_20200423_2030.py deleted file mode 100644 index a642d823..00000000 --- a/users/migrations/0094_auto_20200423_2030.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.28 on 2020-04-23 18:30 -from __future__ import unicode_literals - -from django.db import migrations -import ldapdb.models.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ("users", "0093_auto_20200423_2028"), - ] - - operations = [ - migrations.AlterField( - model_name="ldapuser", - name="sshkeys", - field=ldapdb.models.fields.ListField( - blank=True, db_column="sshkeys", max_length=200, null=True - ), - ), - ]