diff --git a/pandora/item/management/commands/sqlfindindex.py b/pandora/item/management/commands/sqlfindindex.py index c651e18f..bba3a247 100644 --- a/pandora/item/management/commands/sqlfindindex.py +++ b/pandora/item/management/commands/sqlfindindex.py @@ -45,16 +45,12 @@ class Command(BaseCommand): indexes = connection.introspection.get_indexes(cursor, table) drop = [] if column in indexes: - for sql in ( - "SELECT indexname, indexdef FROM pg_catalog.pg_indexes " + \ - "WHERE indexdef LIKE '%ON {table}%' AND indexdef LIKE '%{column}%'".format(table=table, column=column), - "SELECT indexname, indexdef FROM pg_catalog.pg_indexes " + \ - "WHERE indexdef LIKE '%ON public.{table}%' AND indexdef LIKE '%{column}%'".format(table=table, column=column), - ): - cursor.execute(sql) - for r in cursor: - if 'USING gin' not in r[1]: - drop.append(r[0]) + sql = "SELECT indexname, indexdef FROM pg_catalog.pg_indexes " + \ + "WHERE indexdef LIKE '%ON {table}%' AND indexdef LIKE '%{column}%'".format(table=table, column=column) + cursor.execute(sql) + for r in cursor: + if 'USING gin' not in r[1]: + drop.append(r[0]) if drop: for idx in drop: sql = 'DROP INDEX ' + idx diff --git a/pandora/oxdjango/shortcuts.py b/pandora/oxdjango/shortcuts.py index 8246a98a..f2a98662 100644 --- a/pandora/oxdjango/shortcuts.py +++ b/pandora/oxdjango/shortcuts.py @@ -25,20 +25,14 @@ def _to_json(python_object): return python_object.strftime('%Y-%m-%dT%H:%M:%SZ') raise TypeError(u'%s %s is not JSON serializable' % (repr(python_object), type(python_object))) -def json_dump(data, fp, indent=4): - return json.dump(data, fp, indent=indent, default=_to_json, ensure_ascii=False) - -def json_dumps(data, indent=4): - return json.dumps(data, indent=indent, default=_to_json, ensure_ascii=False) - def render_to_json_response(dictionary, content_type="application/json", status=200): indent = None if settings.DEBUG: content_type = "text/javascript" indent = 2 if getattr(settings, 'JSON_DEBUG', False): - print(json_dumps(dictionary, indent=2).encode('utf-8')) - response = json_dumps(dictionary, indent=indent) + print(json.dumps(dictionary, indent=2, default=_to_json, ensure_ascii=False).encode('utf-8')) + response = json.dumps(dictionary, indent=indent, default=_to_json, ensure_ascii=False) if not isinstance(response, bytes): response = response.encode('utf-8') return HttpResponse(response, content_type=content_type, status=status)