From 8638f1e3d1e71a5b7734a1310a2b9a73d3ee865d Mon Sep 17 00:00:00 2001 From: Chris Church Date: Fri, 7 Feb 2014 17:09:08 -0500 Subject: [PATCH] AC-1020 Fix django-jsonfield to avoid generating PostgreSQL error. --- awx/lib/site-packages/README | 2 +- awx/lib/site-packages/jsonfield/fields.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/lib/site-packages/README b/awx/lib/site-packages/README index a4c257621e..31524309de 100644 --- a/awx/lib/site-packages/README +++ b/awx/lib/site-packages/README @@ -17,7 +17,7 @@ distribute==0.7.3 (no files) django-auth-ldap==1.1.7 (django_auth_ldap/*) django-celery==3.1.1 (djcelery/*) django-extensions==1.2.5 (django_extensions/*) -django-jsonfield==0.9.12 (jsonfield/*) +django-jsonfield==0.9.12 (jsonfield/*, minor fix in jsonfield/fields.py) django-split-settings==0.1.1 (split_settings/*) django-taggit==0.11.2 (taggit/*) djangorestframework==2.3.10 (rest_framework/*) diff --git a/awx/lib/site-packages/jsonfield/fields.py b/awx/lib/site-packages/jsonfield/fields.py index f6aab486c3..5c936b7ff7 100644 --- a/awx/lib/site-packages/jsonfield/fields.py +++ b/awx/lib/site-packages/jsonfield/fields.py @@ -69,6 +69,8 @@ class JSONField(six.with_metaclass(models.SubfieldBase, models.Field)): return 'TextField' def db_type(self, connection): + return 'text' # HACK: Fix for Ansible Tower to avoid generating errors + # in PostgreSQL log. cache_key = DB_TYPE_CACHE_KEY % connection.settings_dict db_type = cache.get(cache_key)