zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-21 07:21:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

inherit from jsonbfield package not jsonfield

Browse Source 
* jsonbfield supports json querying. jsonfield package is still a jsonb
postgres data type, but doesn't support jsonb style querying.
* add undo migration support to GIN index
This commit is contained in:
Chris Meyers
2017-04-05 11:11:46 -04:00
parent f7fb541fe2
commit 02795e526c
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/fields.py
View File

@@ -27,6 +27,7 @@ from django.db.models import Q
# Django-JSONField
from jsonfield import JSONField as upstream_JSONField
from jsonbfield.fields import JSONField as upstream_JSONBField
# AWX
from awx.main.models.rbac import batch_role_ancestor_rebuilding, Role
@@ -47,7 +48,7 @@ class JSONField(upstream_JSONField):
return super(JSONField, self).from_db_value(value, expression, connection, context)
class JSONBField(upstream_JSONField):
class JSONBField(upstream_JSONBField):
def get_db_prep_value(self, value, connection, prepared=False):
if connection.vendor == 'sqlite':
# sqlite (which we use for tests) does not support jsonb;
@@ -399,8 +400,10 @@ class DynamicFilterField(models.TextField):
last_v = new_v
last_kv = new_kv
contains_count += 1
if contains_count > 1:
if contains_count == 1 and isinstance(assembled_v, basestring):
assembled_v = '"' + assembled_v + '"'
elif contains_count > 1:
if type(last_v) is list:
last_v.append(v)
if type(last_v) is dict: