0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:46fb46bf26b8ff964e231340c2ad11b4ad1970df
Branches Tags
0x2620:master
0x2620:stable
...
compare: 0x2620:302af9cda4d4840040938a0d4a0012d6682e06b0
Branches Tags
0x2620:master
0x2620:stable

2 commits
46fb46bf26 ... 302af9cda4

Author SHA1 Message Date
j
302af9cda4 fix findindex in postgresql 10 2019-03-12 17:48:03 +00:00
j
894a609f3f json_dump shortcut 2019-03-12 15:51:13 +00:00
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pandora/item/management/commands/sqlfindindex.py
View file

@ -45,12 +45,16 @@ class Command(BaseCommand):
indexes = connection.introspection.get_indexes(cursor, table) indexes = connection.introspection.get_indexes(cursor, table)
drop = [] drop = []
if column in indexes: if column in indexes:
sql = "SELECT indexname, indexdef FROM pg_catalog.pg_indexes " + \ for sql in (
"WHERE indexdef LIKE '%ON {table}%' AND indexdef LIKE '%{column}%'".format(table=table, column=column) "SELECT indexname, indexdef FROM pg_catalog.pg_indexes " + \
cursor.execute(sql) "WHERE indexdef LIKE '%ON {table}%' AND indexdef LIKE '%{column}%'".format(table=table, column=column),
for r in cursor: "SELECT indexname, indexdef FROM pg_catalog.pg_indexes " + \
if 'USING gin' not in r[1]: "WHERE indexdef LIKE '%ON public.{table}%' AND indexdef LIKE '%{column}%'".format(table=table, column=column),
drop.append(r[0]) ):
cursor.execute(sql)
for r in cursor:
if 'USING gin' not in r[1]:
drop.append(r[0])
if drop: if drop:
for idx in drop: for idx in drop:
sql = 'DROP INDEX ' + idx sql = 'DROP INDEX ' + idx

10
pandora/oxdjango/shortcuts.py
View file

@ -25,14 +25,20 @@ def _to_json(python_object):
return python_object.strftime('%Y-%m-%dT%H:%M:%SZ') 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))) 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): def render_to_json_response(dictionary, content_type="application/json", status=200):
indent = None indent = None
if settings.DEBUG: if settings.DEBUG:
content_type = "text/javascript" content_type = "text/javascript"
indent = 2 indent = 2
if getattr(settings, 'JSON_DEBUG', False): if getattr(settings, 'JSON_DEBUG', False):
print(json.dumps(dictionary, indent=2, default=_to_json, ensure_ascii=False).encode('utf-8')) print(json_dumps(dictionary, indent=2).encode('utf-8'))
response = json.dumps(dictionary, indent=indent, default=_to_json, ensure_ascii=False) response = json_dumps(dictionary, indent=indent)
if not isinstance(response, bytes): if not isinstance(response, bytes):
response = response.encode('utf-8') response = response.encode('utf-8')
return HttpResponse(response, content_type=content_type, status=status) return HttpResponse(response, content_type=content_type, status=status)