burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

Test migration removal

Browse Source
This commit is contained in:
Adolfo Gómez García 2021-06-24 12:35:47 +02:00
parent 55f9820f37
commit 52ac406853
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/src/uds/migrations/0041_auto_20210624_1222.py → server/src/uds/migrations/0041_auto_20210624_1233.py
View File

@ -1,4 +1,4 @@
# Generated by Django 3.2.4 on 2021-06-24 12:22
# Generated by Django 3.2.4 on 2021-06-24 12:33
from django.db import migrations, models
@ -58,4 +58,22 @@ class Migration(migrations.Migration):
model_name='userserviceproperty',
constraint=models.UniqueConstraint(fields=('name', 'user_service'), name='u_uprop_name_userservice'),
),
# Add user and groups constrains before removing old unique_together
migrations.AddConstraint(
model_name='user',
constraint=models.UniqueConstraint(fields=('manager', 'name'), name='u_usr_manager_name'),
),
migrations.AddConstraint(
model_name='group',
constraint=models.UniqueConstraint(fields=('manager', 'name'), name='u_grp_manager_name'),
),
# These must be removed after created contrains, because they are used in foreign keys
migrations.AlterUniqueTogether(
name='user',
unique_together=set(),
),
migrations.AlterUniqueTogether(
name='group',
unique_together=set(),
),
]

8
server/src/uds/models/group.py
View File

@ -77,10 +77,10 @@ class Group(UUIDModel):
ordering = ('name',)
app_label = 'uds'
unique_together = (("manager", "name"),)
# constraints = [
# models.UniqueConstraint(fields=['manager', 'name'], name='u_grp_manager_name')
# ]
# unique_together = (("manager", "name"),)
constraints = [
models.UniqueConstraint(fields=['manager', 'name'], name='u_grp_manager_name')
]
@property
def pretty_name(self) -> str:

8
server/src/uds/models/user.py
View File

@ -88,10 +88,10 @@ class User(UUIDModel):
ordering = ('name',)
app_label = 'uds'
unique_together = (("manager", "name"),)
# constraints = [
# models.UniqueConstraint(fields=['manager', 'name'], name='u_usr_manager_name')
#]
# unique_together = (("manager", "name"),)
constraints = [
models.UniqueConstraint(fields=['manager', 'name'], name='u_usr_manager_name')
]
def getUsernameForAuth(self) -> str:
"""