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

Make API queries involving json fields cast the fields to text

Browse Source 
This restores compatibility with the way it previously worked -- we
never supported proper json operator queries through the API.
This commit is contained in:
Jeff Bradberry
2022-02-23 10:55:21 -05:00
parent 38ccea0f1f
commit eb8a1fec49
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/filters.py
View File

@@ -9,8 +9,9 @@ from functools import reduce
# Django # Django
from django.core.exceptions import FieldError, ValidationError, FieldDoesNotExist from django.core.exceptions import FieldError, ValidationError, FieldDoesNotExist
from django.db import models from django.db import models
from django.db.models import Q, CharField, IntegerField, BooleanField from django.db.models import Q, CharField, IntegerField, BooleanField, TextField, JSONField
from django.db.models.fields.related import ForeignObjectRel, ManyToManyField, ForeignKey from django.db.models.fields.related import ForeignObjectRel, ManyToManyField, ForeignKey
from django.db.models.functions import Cast
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.fields import GenericForeignKey
from django.utils.encoding import force_str from django.utils.encoding import force_str
@@ -241,6 +242,8 @@ class FieldLookupBackend(BaseFilterBackend):
new_lookups.append('{}__{}__icontains'.format(new_lookup[:-8], rm_field.name)) new_lookups.append('{}__{}__icontains'.format(new_lookup[:-8], rm_field.name))
return value, new_lookups, needs_distinct return value, new_lookups, needs_distinct
else: else:
if isinstance(field, JSONField):
new_lookup = new_lookup.replace(field.name, f'{field.name}_as_txt')
value = self.value_to_python_for_field(field, value) value = self.value_to_python_for_field(field, value)
return value, new_lookup, needs_distinct return value, new_lookup, needs_distinct
@@ -322,6 +325,9 @@ class FieldLookupBackend(BaseFilterBackend):
value, new_key, distinct = self.value_to_python(queryset.model, key, value) value, new_key, distinct = self.value_to_python(queryset.model, key, value)
if distinct: if distinct:
needs_distinct = True needs_distinct = True
if '_as_txt' in new_key:
fname = next(item for item in new_key.split('__') if item.endswith('_as_txt'))
queryset = queryset.annotate(**{fname: Cast(fname[:-7], output_field=TextField())})
if q_chain: if q_chain:
chain_filters.append((q_not, new_key, value)) chain_filters.append((q_not, new_key, value))
elif q_or: elif q_or: