From 96aa3e255505de1caa3e13fd5b139f413fc59962 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Mon, 18 Apr 2016 15:26:09 -0400 Subject: [PATCH] Attempt 2 at making jenkins' sqlite happy --- awx/main/models/rbac.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/awx/main/models/rbac.py b/awx/main/models/rbac.py index 23920eb75b..6ca5ef4109 100644 --- a/awx/main/models/rbac.py +++ b/awx/main/models/rbac.py @@ -304,9 +304,14 @@ class Role(CommonModelNameNotUnique): if insert_ct == 0 and delete_ct == 0: break - role_ids_to_rebuild = Role.objects.distinct() \ - .filter(id__in=role_ids_to_rebuild, children__id__isnull=False) \ - .values_list('children__id', flat=True) + new_role_ids_to_rebuild = set() + for ids in split_ids_for_sqlite(role_ids_to_rebuild): + 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) +