External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-27 05:45:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

Attempt 2 at making jenkins' sqlite happy

Browse Source
This commit is contained in:
Akita Noek
2016-04-18 15:26:09 -04:00
parent fa98b59b6c
commit 96aa3e2555
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/models/rbac.py
View File

@@ -304,9 +304,14 @@ class Role(CommonModelNameNotUnique):
if insert_ct == 0 and delete_ct == 0: if insert_ct == 0 and delete_ct == 0:
break break
role_ids_to_rebuild = Role.objects.distinct() \ new_role_ids_to_rebuild = set()
.filter(id__in=role_ids_to_rebuild, children__id__isnull=False) \ for ids in split_ids_for_sqlite(role_ids_to_rebuild):
.values_list('children__id', flat=True) sql_params['ids'] = ','.join(str(x) for x in ids)
new_role_ids_to_rebuild.update(set(Role.objects.distinct()
.filter(id__in=ids, children__id__isnull=False)
.values_list('children__id', flat=True)))
role_ids_to_rebuild = list(new_role_ids_to_rebuild)