Merge branch 'fix-ldap-migration' into 'dev'

Fix LDAP migration #338

See merge request re2o/re2o!634

ldap_sync/migrations/0001_initial.py

@@ -29,8 +29,8 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='LdapServiceUser',
             fields=[
-                ('dn', ldapdb.models.fields.CharField(max_length=200, serialize=False)),
+                ('dn', ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False)),
-                ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, primary_key=True, serialize=False)),
+                ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, serialize=False)),
                 ('user_password', ldapdb.models.fields.CharField(blank=True, db_column='userPassword', max_length=200, null=True)),
             ],
             options={
@@ -40,8 +40,8 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='LdapServiceUserGroup',
             fields=[
-                ('dn', ldapdb.models.fields.CharField(max_length=200, serialize=False)),
+                ('dn', ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False)),
-                ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, primary_key=True, serialize=False)),
+                ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, serialize=False)),
                 ('members', ldapdb.models.fields.ListField(blank=True, db_column='member')),
             ],
             options={
@@ -51,9 +51,9 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='LdapUser',
             fields=[
-                ('dn', ldapdb.models.fields.CharField(max_length=200, serialize=False)),
+                ('dn', ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False)),
                 ('gid', ldapdb.models.fields.IntegerField(db_column='gidNumber')),
-                ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, primary_key=True, serialize=False)),
+                ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, serialize=False)),
                 ('uid', ldapdb.models.fields.CharField(db_column='uid', max_length=200)),
                 ('uidNumber', ldapdb.models.fields.IntegerField(db_column='uidNumber', unique=True)),
                 ('sn', ldapdb.models.fields.CharField(db_column='sn', max_length=200)),
@@ -76,33 +76,13 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='LdapUserGroup',
             fields=[
-                ('dn', ldapdb.models.fields.CharField(max_length=200, serialize=False)),
+                ('dn', ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False)),
                 ('gid', ldapdb.models.fields.IntegerField(db_column='gidNumber')),
                 ('members', ldapdb.models.fields.ListField(blank=True, db_column='memberUid')),
-                ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, primary_key=True, serialize=False)),
+                ('name', ldapdb.models.fields.CharField(db_column='cn', max_length=200, serialize=False)),
             ],
             options={
                 'abstract': False,
             },
         ),
-        migrations.AlterField(
-            model_name='ldapserviceuser',
-            name='dn',
-            field=ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='ldapserviceusergroup',
-            name='dn',
-            field=ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='ldapuser',
-            name='dn',
-            field=ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name='ldapusergroup',
-            name='dn',
-            field=ldapdb.models.fields.CharField(max_length=200, primary_key=True, serialize=False),
-        ),
     ]