IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependency on simplejson package.

Browse Source
This commit is contained in:
Matěj Cepl
2023-02-15 06:40:12 +01:00
committed by GitHub
parent d8c5bc4320
commit 7a4951f211
87 changed files with 311 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/pgadmin/browser/server_groups/__init__.py
View File

@@ -9,7 +9,7 @@
"""Defines views for management of server groups"""
import simplejson as json
import json
from abc import ABCMeta, abstractmethod
from flask import request, jsonify, render_template
@@ -235,7 +235,7 @@ class ServerGroupView(NodeView):
id=gid).first()
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
if servergroup is None:
@@ -294,7 +294,7 @@ class ServerGroupView(NodeView):
def create(self):
"""Creates new server-group """
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
if data['name'] != '':
try:

10
web/pgadmin/browser/server_groups/servers/__init__.py
View File

@@ -7,7 +7,7 @@
#
##########################################################################
import simplejson as json
import json
import pgadmin.browser.server_groups as sg
from flask import render_template, request, make_response, jsonify, \
current_app, url_for, session
@@ -781,7 +781,7 @@ class ServerNode(PGChildNodeView):
idx = 0
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
if 'db_res' in data:
data['db_res'] = ','.join(data['db_res'])
@@ -1040,7 +1040,7 @@ class ServerNode(PGChildNodeView):
required_args = ['name', 'db']
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Loop through data and if found any value is blank string then
@@ -1357,7 +1357,7 @@ class ServerNode(PGChildNodeView):
if request.form:
data = request.form
elif request.data:
data = json.loads(request.data, encoding='utf-8')
data = json.loads(request.data)
if data is None:
data = {}
@@ -1656,7 +1656,7 @@ class ServerNode(PGChildNodeView):
if request.form:
data = request.form
elif request.data:
data = json.loads(request.data, encoding='utf-8')
data = json.loads(request.data)
crypt_key = get_crypt_key()[1]

14
web/pgadmin/browser/server_groups/servers/databases/__init__.py
View File

@@ -12,7 +12,7 @@
import re
from functools import wraps
import simplejson as json
import json
from flask import render_template, current_app, request, jsonify
from flask_babel import gettext as _
from flask_security import current_user
@@ -661,7 +661,7 @@ class DatabaseView(PGChildNodeView):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
@@ -823,7 +823,7 @@ class DatabaseView(PGChildNodeView):
def _get_data_from_request(self):
return request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
@check_precondition(action='update')
@@ -960,7 +960,7 @@ class DatabaseView(PGChildNodeView):
if did is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [did]}
@@ -1028,7 +1028,7 @@ class DatabaseView(PGChildNodeView):
if k in ('comments',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
status, res = self.get_sql(gid, sid, data, did)
@@ -1096,7 +1096,7 @@ class DatabaseView(PGChildNodeView):
acls = render_template(
"/".join([self.template_path, 'allowed_privs.json'])
)
acls = json.loads(acls, encoding='utf-8')
acls = json.loads(acls)
except Exception as e:
current_app.logger.exception(e)
@@ -1132,7 +1132,7 @@ class DatabaseView(PGChildNodeView):
acls = render_template(
"/".join([self.template_path, 'allowed_privs.json'])
)
acls = json.loads(acls, encoding='utf-8')
acls = json.loads(acls)
except Exception as e:
current_app.logger.exception(e)

10
web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Cast Node"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups.servers import databases
@@ -378,7 +378,7 @@ class CastView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -436,7 +436,7 @@ class CastView(PGChildNodeView, SchemaDiffObjectCompare):
:return:
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
sql, name = self.get_sql(gid, sid, did, data, cid)
@@ -476,7 +476,7 @@ class CastView(PGChildNodeView, SchemaDiffObjectCompare):
if cid is None:
data = request_object.form if request_object.form else \
json.loads(request_object.data, encoding='utf-8')
json.loads(request_object.data)
else:
data = {'ids': [cid]}
@@ -624,7 +624,7 @@ class CastView(PGChildNodeView, SchemaDiffObjectCompare):
"""
res = []
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
sql = render_template("/".join([self.template_path,

10
web/pgadmin/browser/server_groups/servers/databases/event_triggers/__init__.py
View File

@@ -7,7 +7,7 @@
#
##########################################################################
import simplejson as json
import json
import re
from functools import wraps
@@ -387,7 +387,7 @@ class EventTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
required_args = {
@@ -461,7 +461,7 @@ class EventTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -521,7 +521,7 @@ class EventTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
if etid is None:
data = request_object.form if request_object.form else \
json.loads(request_object.data, encoding='utf-8')
json.loads(request_object.data)
else:
data = {'ids': [etid]}
@@ -606,7 +606,7 @@ class EventTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
data = {}
for k, v in request.args.items():
try:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
try:

8
web/pgadmin/browser/server_groups/servers/databases/extensions/__init__.py
View File

@@ -9,7 +9,7 @@
""" Implements Extension Node """
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups.servers import databases
@@ -267,7 +267,7 @@ class ExtensionView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
@@ -311,7 +311,7 @@ class ExtensionView(PGChildNodeView, SchemaDiffObjectCompare):
This function will update an extension object
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -343,7 +343,7 @@ class ExtensionView(PGChildNodeView, SchemaDiffObjectCompare):
if eid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [eid]}

10
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Foreign Data Wrapper Node"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups.servers import databases
@@ -425,7 +425,7 @@ class ForeignDataWrapperView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -493,7 +493,7 @@ class ForeignDataWrapperView(PGChildNodeView, SchemaDiffObjectCompare):
fid: foreign data wrapper ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -533,7 +533,7 @@ class ForeignDataWrapperView(PGChildNodeView, SchemaDiffObjectCompare):
if fid is None:
data = request_object.form if request_object.form else \
json.loads(request_object.data, encoding='utf-8')
json.loads(request_object.data)
else:
data = {'ids': [fid]}
@@ -620,7 +620,7 @@ class ForeignDataWrapperView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
try:

10
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Foreign Server Node"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups.servers import databases
@@ -414,7 +414,7 @@ class ForeignServerView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -490,7 +490,7 @@ class ForeignServerView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -532,7 +532,7 @@ class ForeignServerView(PGChildNodeView, SchemaDiffObjectCompare):
if fsid is None:
data = request_object.form if request_object.form else \
json.loads(request_object.data, encoding='utf-8')
json.loads(request_object.data)
else:
data = {'ids': [fsid]}
@@ -621,7 +621,7 @@ class ForeignServerView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
try:

10
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements User Mapping Node"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups import servers
@@ -412,7 +412,7 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -489,7 +489,7 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
sql, name = self.get_sql(data=data, fsid=fsid, umid=umid)
@@ -530,7 +530,7 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare):
if umid is None:
data = request_object.form if request_object.form else \
json.loads(request_object.data, encoding='utf-8')
json.loads(request_object.data)
else:
data = {'ids': [umid]}
@@ -652,7 +652,7 @@ class UserMappingView(PGChildNodeView, SchemaDiffObjectCompare):
data = {}
for k, v in request.args.items():
try:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
try:

10
web/pgadmin/browser/server_groups/servers/databases/languages/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Language Node"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups.servers import databases
@@ -418,7 +418,7 @@ class LanguageView(PGChildNodeView, SchemaDiffObjectCompare):
lid: Language ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -457,7 +457,7 @@ class LanguageView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -516,7 +516,7 @@ class LanguageView(PGChildNodeView, SchemaDiffObjectCompare):
"""
if lid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [lid]}
@@ -577,7 +577,7 @@ class LanguageView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
try:

10
web/pgadmin/browser/server_groups/servers/databases/publications/__init__.py
View File

@@ -8,7 +8,7 @@
##########################################################################
"""Implements Publication Node"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups.servers import databases
@@ -414,7 +414,7 @@ class PublicationView(PGChildNodeView, SchemaDiffObjectCompare):
pbid: Publication ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -455,7 +455,7 @@ class PublicationView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -511,7 +511,7 @@ class PublicationView(PGChildNodeView, SchemaDiffObjectCompare):
"""
if pbid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [pbid]}
@@ -573,7 +573,7 @@ class PublicationView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
try:

12
web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py
View File

@@ -10,7 +10,7 @@
import re
from functools import wraps
import simplejson as json
import json
from flask import render_template, request, jsonify, current_app
from flask_babel import gettext
@@ -344,7 +344,7 @@ class SchemaView(PGChildNodeView):
acls = render_template(
"/".join([self.template_path, 'allowed_privs.json'])
)
acls = json.loads(acls, encoding='utf-8')
acls = json.loads(acls)
except Exception as e:
current_app.logger.exception(e)
@@ -660,7 +660,7 @@ It may have been removed by another user.
did: Database ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
required_args = {
@@ -726,7 +726,7 @@ It may have been removed by another user.
scid: Schema ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
SQL, name = self.get_sql(gid, sid, data, scid)
@@ -761,7 +761,7 @@ It may have been removed by another user.
if scid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [scid]}
@@ -832,7 +832,7 @@ It may have been removed by another user.
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

10
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py
View File

@@ -11,7 +11,7 @@
from functools import wraps
import simplejson as json
import json
from flask import render_template, request, jsonify
from flask_babel import gettext
@@ -449,7 +449,7 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
required_args = [
@@ -523,7 +523,7 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare):
coid: Collation ID
only_sql: Return only sql if True
"""
data = json.loads(request.data, encoding='utf-8') if coid is None \
data = json.loads(request.data) if coid is None \
else {'ids': [coid]}
# Below will decide if it's simple drop or drop with cascade call
@@ -580,7 +580,7 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare):
coid: Collation ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
SQL, name = self.get_sql(gid, sid, data, scid, coid)
# Most probably this is due to error
@@ -631,7 +631,7 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

8
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py
View File

@@ -11,7 +11,7 @@
from functools import wraps
import simplejson as json
import json
from flask import render_template, make_response, request, jsonify
from flask_babel import gettext
@@ -193,7 +193,7 @@ class DomainView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
:return: if any error return error, else return req.
"""
if request.data:
req = json.loads(request.data, encoding='utf-8')
req = json.loads(request.data)
else:
req = request.args or request.form
@@ -232,7 +232,7 @@ class DomainView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
req[key] is not None
):
# Coverts string into python list as expected.
data[key] = json.loads(req[key], encoding='utf-8')
data[key] = json.loads(req[key])
elif key == 'typnotnull':
if req[key] == 'true' or req[key] is True:
data[key] = True
@@ -634,7 +634,7 @@ AND relkind != 'c'))"""
"""
if doid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [doid]}

6
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/__init__.py
View File

@@ -12,7 +12,7 @@
from functools import wraps
import simplejson as json
import json
from flask import render_template, request, jsonify
from flask_babel import gettext
@@ -188,7 +188,7 @@ class DomainConstraintView(PGChildNodeView):
:return: if any error return error with error msg else return req data
"""
if request.data:
req = json.loads(request.data, encoding='utf-8')
req = json.loads(request.data)
else:
req = request.args or request.form
@@ -484,7 +484,7 @@ class DomainConstraintView(PGChildNodeView):
"""
if coid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [coid]}

8
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
View File

@@ -13,7 +13,7 @@ import sys
import traceback
from functools import wraps
import simplejson as json
import json
from flask import render_template, make_response, request, jsonify, \
current_app
from flask_babel import gettext
@@ -237,7 +237,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader,
def wrap(self, **kwargs):
if request.data:
req = json.loads(request.data, encoding='utf-8')
req = json.loads(request.data)
else:
req = request.args or request.form
@@ -336,7 +336,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader,
"""
if not isinstance(req[key], list) and req[key]:
data[key] = json.loads(req[key], encoding='utf-8')
data[key] = json.loads(req[key])
elif req[key]:
data[key] = req[key]
@@ -748,7 +748,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader,
"""
if foid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [foid]}

10
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py
View File

@@ -11,7 +11,7 @@
from functools import wraps
import simplejson as json
import json
from flask import render_template, make_response, current_app, request, jsonify
from flask_babel import gettext as _
@@ -423,7 +423,7 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -503,7 +503,7 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare):
:param cfgid: fts Configuration id
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Fetch sql query to update fts Configuration
sql, name = self.get_sql(gid, sid, did, scid, data, cfgid)
@@ -553,7 +553,7 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare):
"""
if cfgid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [cfgid]}
@@ -627,7 +627,7 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

10
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py
View File

@@ -11,7 +11,7 @@
from functools import wraps
import simplejson as json
import json
from flask import render_template, make_response, current_app, request, jsonify
from flask_babel import gettext as _
@@ -432,7 +432,7 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -498,7 +498,7 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare):
:param dcid: fts dictionary id
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Fetch sql query to update fts dictionary
@@ -549,7 +549,7 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare):
"""
if dcid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [dcid]}
@@ -623,7 +623,7 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

10
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py
View File

@@ -11,7 +11,7 @@
from functools import wraps
import simplejson as json
import json
from flask import render_template, request, jsonify, current_app
from flask_babel import gettext as _
@@ -378,7 +378,7 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -444,7 +444,7 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare):
:param pid: fts parser id
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Fetch sql query to update fts parser
sql, name = self.get_sql(gid, sid, did, scid, data, pid)
@@ -495,7 +495,7 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare):
"""
if pid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [pid]}
@@ -568,7 +568,7 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

10
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py
View File

@@ -11,7 +11,7 @@
from functools import wraps
import simplejson as json
import json
from flask import render_template, make_response, request, jsonify
from flask_babel import gettext
@@ -349,7 +349,7 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -415,7 +415,7 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare):
:param tid: fts tempate id
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Fetch sql query to update fts template
@@ -460,7 +460,7 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare):
"""
if tid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [tid]}
@@ -526,7 +526,7 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

8
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
View File

@@ -15,7 +15,7 @@ import sys
import traceback
from functools import wraps
import simplejson as json
import json
from flask import render_template, request, jsonify, \
current_app
from flask_babel import gettext
@@ -263,7 +263,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
if key in list_params and req[key] != '' and req[key] is not None:
# Coverts string into python list as expected.
data[key] = json.loads(req[key], encoding='utf-8')
data[key] = json.loads(req[key])
elif (key == 'proretset' or key == 'proisstrict' or
key == 'prosecdef' or key == 'proiswindow' or
key == 'proleakproof'):
@@ -294,7 +294,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
:return:
"""
if request.data:
req = json.loads(request.data, encoding='utf-8')
req = json.loads(request.data)
else:
req = request.args or request.form
return req
@@ -882,7 +882,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
"""
if fnid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [fnid]}

10
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py
View File

@@ -11,7 +11,7 @@
import re
from functools import wraps
import simplejson as json
import json
from flask import render_template, make_response, request, jsonify
from flask_babel import gettext as _
@@ -386,7 +386,7 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
@@ -448,7 +448,7 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare):
if pkgid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [pkgid]}
@@ -514,7 +514,7 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
sql, name = self.getSQL(data=data, scid=scid, pkgid=pkgid)
@@ -552,7 +552,7 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare):
data = {}
for k, v in request.args.items():
try:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v

10
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py
View File

@@ -11,7 +11,7 @@
from functools import wraps
import simplejson as json
import json
from flask import render_template, request, jsonify
from flask_babel import gettext as _
@@ -388,7 +388,7 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
@@ -469,7 +469,7 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare):
"""
if seid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [seid]}
@@ -533,7 +533,7 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
sql, name = self.get_SQL(gid, sid, did, data, scid, seid)
# Most probably this is due to error
@@ -585,7 +585,7 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

12
web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py
View File

@@ -9,7 +9,7 @@
""" Implements Synonym Node """
import simplejson as json
import json
from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
@@ -344,7 +344,7 @@ class SynonymView(PGChildNodeView, SchemaDiffObjectCompare):
data = dict()
for k, v in request.args.items():
try:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
@@ -443,7 +443,7 @@ class SynonymView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
required_args = [
@@ -506,7 +506,7 @@ class SynonymView(PGChildNodeView, SchemaDiffObjectCompare):
"""
if syid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [syid]}
@@ -561,7 +561,7 @@ class SynonymView(PGChildNodeView, SchemaDiffObjectCompare):
syid: Synonym ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
SQL, name = self.get_sql(gid, sid, data, scid, syid)
# Most probably this is due to error
@@ -600,7 +600,7 @@ class SynonymView(PGChildNodeView, SchemaDiffObjectCompare):
data = dict()
for k, v in request.args.items():
try:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

18
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
View File

@@ -9,7 +9,7 @@
""" Implements Table Node """
import simplejson as json
import json
import re
import pgadmin.browser.server_groups.servers.databases as database
@@ -884,7 +884,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare):
if 'coll_inherits' in data and \
isinstance(data['coll_inherits'], str):
data['coll_inherits'] = json.loads(
data['coll_inherits'], encoding='utf-8'
data['coll_inherits']
)
if 'foreign_key' in data:
@@ -920,7 +920,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare):
scid: Schema ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
@@ -930,7 +930,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -1024,7 +1024,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare):
tid: Table ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
@@ -1034,7 +1034,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -1067,7 +1067,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare):
"""
if tid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [tid]}
@@ -1159,7 +1159,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare):
"""
# Below will decide if it's simple drop or drop with cascade call
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Convert str 'true' to boolean type
is_enable_trigger = data['is_enable_trigger']
@@ -1294,7 +1294,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v

13
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py
View File

@@ -9,7 +9,7 @@
""" Implements Column Node """
import simplejson as json
import json
from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
@@ -364,7 +364,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader):
tid: Table ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
@@ -373,8 +373,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8',
cls=ColParamsJSONDecoder)
data[k] = json.loads(v, cls=ColParamsJSONDecoder)
required_args = {
'name': 'Name',
@@ -446,7 +445,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader):
"""
if clid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [clid]}
@@ -512,7 +511,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader):
clid: Column ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Adding parent into data dict, will be using it while creating sql
@@ -556,7 +555,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader):
"""
data = dict()
for k, v in request.args.items():
data[k] = json.loads(v, encoding='utf-8', cls=ColParamsJSONDecoder)
data[k] = json.loads(v, cls=ColParamsJSONDecoder)
# Adding parent into data dict, will be using it while creating sql
data['schema'] = self.schema

14
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py
View File

@@ -9,7 +9,7 @@
""" Implements Compound Trigger Node """
import simplejson as json
import json
from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
@@ -477,7 +477,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
tid: Table ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
@@ -487,7 +487,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -554,7 +554,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
if trid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [trid]}
@@ -621,7 +621,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
trid: Trigger ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -698,7 +698,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
@@ -761,7 +761,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Convert str 'true' to boolean type

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Constraint Node"""
import simplejson as json
import json
from flask import request
from functools import wraps
from pgadmin.utils.driver import get_driver
@@ -172,7 +172,7 @@ def delete(**kwargs):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8')
request.data)
if 'delete' in request.base_url:
cmd = {"cmd": "delete"}

12
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements the Check Constraint Module."""
import simplejson as json
import json
from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
@@ -460,7 +460,7 @@ class CheckConstraintView(PGChildNodeView):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
try:
@@ -469,7 +469,7 @@ class CheckConstraintView(PGChildNodeView):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -610,7 +610,7 @@ class CheckConstraintView(PGChildNodeView):
"""
if cid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [cid]}
@@ -668,7 +668,7 @@ class CheckConstraintView(PGChildNodeView):
cid: Check Constraint Id
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -778,7 +778,7 @@ class CheckConstraintView(PGChildNodeView):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

12
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Exclusion constraint Node"""
import simplejson as json
import json
from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
@@ -482,7 +482,7 @@ class ExclusionConstraintView(PGChildNodeView):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -521,7 +521,7 @@ class ExclusionConstraintView(PGChildNodeView):
"""
required_args = ['columns']
data = json.loads(request.data, encoding='utf-8')
data = json.loads(request.data)
data = self.parse_input_data(data)
arg_missing = self.check_required_args(data, required_args)
if arg_missing is not None:
@@ -616,7 +616,7 @@ class ExclusionConstraintView(PGChildNodeView):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -669,7 +669,7 @@ class ExclusionConstraintView(PGChildNodeView):
"""
if exid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [exid]}
@@ -743,7 +743,7 @@ class ExclusionConstraintView(PGChildNodeView):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

14
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Foreign key constraint Node"""
import simplejson as json
import json
from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
@@ -492,7 +492,7 @@ class ForeignKeyConstraintView(PGChildNodeView):
return: Data.
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
@@ -502,7 +502,7 @@ class ForeignKeyConstraintView(PGChildNodeView):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -670,7 +670,7 @@ class ForeignKeyConstraintView(PGChildNodeView):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -731,7 +731,7 @@ class ForeignKeyConstraintView(PGChildNodeView):
"""
if fkid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [fkid]}
@@ -802,7 +802,7 @@ class ForeignKeyConstraintView(PGChildNodeView):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
@@ -993,7 +993,7 @@ class ForeignKeyConstraintView(PGChildNodeView):
index = None
try:
if data and 'cols' in data:
cols = set(json.loads(data['cols'], encoding='utf-8'))
cols = set(json.loads(data['cols']))
index = fkey_utils.search_coveringindex(self.conn, tid, cols)
return make_json_response(

12
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Primary key constraint Node"""
import simplejson as json
import json
from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
@@ -498,7 +498,7 @@ class IndexConstraintView(PGChildNodeView):
return: data.
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
@@ -508,7 +508,7 @@ class IndexConstraintView(PGChildNodeView):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -658,7 +658,7 @@ class IndexConstraintView(PGChildNodeView):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -713,7 +713,7 @@ class IndexConstraintView(PGChildNodeView):
"""
if cid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [cid]}
@@ -794,7 +794,7 @@ class IndexConstraintView(PGChildNodeView):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

12
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py
View File

@@ -9,7 +9,7 @@
""" Implements Index Node """
import simplejson as json
import json
from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
@@ -564,7 +564,7 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare):
tid: Table ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
@@ -574,7 +574,7 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -678,7 +678,7 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare):
if idx is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [idx]}
@@ -744,7 +744,7 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare):
idx: Index ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
data['schema'] = self.schema
data['table'] = self.table
@@ -791,7 +791,7 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

12
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py
View File

@@ -11,7 +11,7 @@
import re
import secrets
import simplejson as json
import json
import pgadmin.browser.server_groups.servers.databases.schemas as schema
from flask import render_template, request, current_app
from flask_babel import gettext
@@ -634,7 +634,7 @@ class PartitionsView(BaseTableView, DataTypeReader, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -668,7 +668,7 @@ class PartitionsView(BaseTableView, DataTypeReader, SchemaDiffObjectCompare):
ptid: Partition Table ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
@@ -678,7 +678,7 @@ class PartitionsView(BaseTableView, DataTypeReader, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -738,7 +738,7 @@ class PartitionsView(BaseTableView, DataTypeReader, SchemaDiffObjectCompare):
"""
if ptid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [ptid]}
@@ -794,7 +794,7 @@ class PartitionsView(BaseTableView, DataTypeReader, SchemaDiffObjectCompare):
ptid: Partition Table ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Convert str 'true' to boolean type
is_enable_trigger = data['is_enable_trigger']

8
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements policy Node"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups.servers import databases
@@ -350,7 +350,7 @@ class RowSecurityView(PGChildNodeView):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
data['schema'] = self.schema
data['table'] = self.table
@@ -405,7 +405,7 @@ class RowSecurityView(PGChildNodeView):
:return:
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
sql, name = row_security_policies_utils.get_sql(
@@ -441,7 +441,7 @@ class RowSecurityView(PGChildNodeView):
"""
if plid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [plid]}

8
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Rule Node"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups.servers.databases import schemas
@@ -326,7 +326,7 @@ class RuleView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -368,7 +368,7 @@ class RuleView(PGChildNodeView, SchemaDiffObjectCompare):
This function will update a rule object
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
SQL, name = self.getSQL(gid, sid, data, tid, rid)
@@ -402,7 +402,7 @@ class RuleView(PGChildNodeView, SchemaDiffObjectCompare):
if rid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [rid]}

14
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py
View File

@@ -9,7 +9,7 @@
""" Implements Trigger Node """
import simplejson as json
import json
from functools import wraps
import pgadmin.browser.server_groups.servers.databases as database
@@ -564,7 +564,7 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare):
tid: Table ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for k, v in data.items():
@@ -574,7 +574,7 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except (ValueError, TypeError, KeyError):
data[k] = v
@@ -644,7 +644,7 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare):
if trid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [trid]}
@@ -710,7 +710,7 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare):
trid: Trigger ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -790,7 +790,7 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
@@ -897,7 +897,7 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
is_enable_trigger = data['is_enable_trigger']

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
View File

@@ -12,7 +12,7 @@
import re
import copy
from functools import wraps
import simplejson as json
import json
from flask import render_template, jsonify, request
from flask_babel import gettext
@@ -1962,7 +1962,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable, VacuumSettings):
"""
# Below will decide if it's simple drop or drop with cascade call
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
# Convert str 'true' to boolean type
is_cascade = data.get('cascade') or False

10
web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py
View File

@@ -11,7 +11,7 @@
from functools import wraps
import simplejson as json
import json
from flask import render_template, request, jsonify
from flask_babel import gettext
import re
@@ -1001,7 +1001,7 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
tid: Type ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
is_error, errmsg = TypeView._checks_for_create_type(data)
@@ -1078,7 +1078,7 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
SQL, name = self.get_sql(gid, sid, data, scid, tid)
@@ -1118,7 +1118,7 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
"""
if tid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [tid]}
@@ -1214,7 +1214,7 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
# converting nested request data in proper json format
for key, val in req.items():
if key in ['composite', 'enum', 'seclabels', 'typacl']:
data[key] = json.loads(val, encoding='utf-8')
data[key] = json.loads(val)
else:
data[key] = val

14
web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
View File

@@ -13,7 +13,7 @@ import copy
import re
from functools import wraps
import simplejson as json
import json
from flask import render_template, request, jsonify, current_app
from flask_babel import gettext
from flask_security import current_user
@@ -256,7 +256,7 @@ def check_precondition(f):
self.allowed_acls = render_template(
"/".join([self.template_path, self._ALLOWED_PRIVS_JSON])
)
self.allowed_acls = json.loads(self.allowed_acls, encoding='utf-8')
self.allowed_acls = json.loads(self.allowed_acls)
except Exception as e:
current_app.logger.exception(e)
@@ -547,7 +547,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -601,7 +601,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
This function will update a view object
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
SQL, name = self.getSQL(gid, sid, did, data, vid)
@@ -649,7 +649,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
"""
if vid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [vid]}
@@ -735,7 +735,7 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare):
if k in ('comment',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
@@ -2158,7 +2158,7 @@ class MViewNode(ViewNode, VacuumSettings):
# Below will decide if it's refresh data or refresh concurrently
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
is_concurrent = data['concurrent']

10
web/pgadmin/browser/server_groups/servers/databases/subscriptions/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Subscription Node"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups.servers import databases
@@ -402,7 +402,7 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare):
subid: Subscription ID
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -441,7 +441,7 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
if arg not in data:
@@ -497,7 +497,7 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare):
"""
if subid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [subid]}
@@ -558,7 +558,7 @@ class SubscriptionView(PGChildNodeView, SchemaDiffObjectCompare):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
try:

4
web/pgadmin/browser/server_groups/servers/pgagent/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements the pgAgent Jobs Node"""
from functools import wraps
import simplejson as json
import json
from datetime import datetime, time
from flask import render_template, request, jsonify
@@ -407,7 +407,7 @@ SELECT EXISTS(
if jid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [jid]}

6
web/pgadmin/browser/server_groups/servers/pgagent/schedules/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements pgAgent Job Schedule Node"""
import simplejson as json
import json
from functools import wraps
from flask import render_template, request, jsonify
@@ -341,7 +341,7 @@ class JobScheduleView(PGChildNodeView):
sid: Server ID
jid: Job ID
"""
data = json.loads(request.data, encoding='utf-8')
data = json.loads(request.data)
# convert python list literal to postgres array literal.
format_schedule_data(data)
@@ -460,7 +460,7 @@ class JobScheduleView(PGChildNodeView):
if jscid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [jscid]}

2
web/pgadmin/browser/server_groups/servers/pgagent/schedules/tests/test_pgagent_add_schedule.py
View File

@@ -7,7 +7,7 @@
#
##########################################################################
from unittest.mock import patch
import simplejson as json
import json
import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression.python_test_utils import test_utils as utils

4
web/pgadmin/browser/server_groups/servers/pgagent/steps/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements pgAgent Job Step Node"""
import simplejson as json
import json
from functools import wraps
from flask import render_template, request, jsonify
@@ -480,7 +480,7 @@ SELECT EXISTS(
if jstid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [jstid]}

2
web/pgadmin/browser/server_groups/servers/pgagent/steps/tests/test_pgagent_add_steps.py
View File

@@ -8,7 +8,7 @@
##########################################################################
from unittest.mock import patch
import simplejson as json
import json
import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression.python_test_utils import test_utils as utils

2
web/pgadmin/browser/server_groups/servers/pgagent/steps/tests/test_pgagent_put_steps.py
View File

@@ -8,7 +8,7 @@
##########################################################################
from unittest.mock import patch
import simplejson as json
import json
import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression.python_test_utils import test_utils as utils

2
web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_job_add.py
View File

@@ -8,7 +8,7 @@
##########################################################################
from unittest.mock import patch
import simplejson as json
import json
import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression.python_test_utils import test_utils as utils

2
web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_job_get_msql.py
View File

@@ -8,7 +8,7 @@
##########################################################################
from unittest.mock import patch
import simplejson as json
import json
import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression.python_test_utils import test_utils as utils

2
web/pgadmin/browser/server_groups/servers/pgagent/tests/test_pgagent_job_put.py
View File

@@ -8,7 +8,7 @@
##########################################################################
from unittest.mock import patch
import simplejson as json
import json
import uuid
from pgadmin.utils.route import BaseTestGenerator
from regression.python_test_utils import test_utils as utils

10
web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py
View File

@@ -9,7 +9,7 @@
"""Implements Resource Groups for PPAS 9.4 and above"""
import simplejson as json
import json
from functools import wraps
from pgadmin.browser.server_groups import servers
@@ -388,7 +388,7 @@ class ResourceGroupView(NodeView):
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
is_error, errmsg = ResourceGroupView._check_req_parameters(
@@ -484,7 +484,7 @@ class ResourceGroupView(NodeView):
'name', 'cpu_rate_limit', 'dirty_rate_limit'
]
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -539,7 +539,7 @@ class ResourceGroupView(NodeView):
"""
if rg_id is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [rg_id]}
@@ -598,7 +598,7 @@ class ResourceGroupView(NodeView):
data = dict()
for k, v in request.args.items():
try:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v

14
web/pgadmin/browser/server_groups/servers/roles/__init__.py
View File

@@ -10,7 +10,7 @@ import re
from functools import wraps
import pgadmin.browser.server_groups as sg
import simplejson as json
import json
from flask import render_template, request, jsonify, current_app
from flask_babel import gettext as _
import dateutil.parser as dateutil_parser
@@ -526,7 +526,7 @@ rolmembership:{
@wraps(f)
def wrap(self, **kwargs):
if request.data:
data = json.loads(request.data, encoding='utf-8')
data = json.loads(request.data)
else:
data = dict()
req = request.args or request.form
@@ -540,7 +540,7 @@ rolmembership:{
'rolcatupdate', 'variables', 'rolmembership',
'seclabels', 'rolmembers'
]:
data[key] = json.loads(val, encoding='utf-8')
data[key] = json.loads(val)
else:
data[key] = val
@@ -854,7 +854,7 @@ rolmembership:{
if rid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [rid]}
@@ -1319,12 +1319,12 @@ WHERE
data = dict()
if request.data:
data = json.loads(request.data, encoding='utf-8')
data = json.loads(request.data)
else:
rargs = request.args or request.form
for k, v in rargs.items():
try:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError:
data[k] = v
@@ -1369,7 +1369,7 @@ WHERE
Returns: Json object with success/failure status
"""
if request.data:
data = json.loads(request.data, encoding='utf-8')
data = json.loads(request.data)
else:
data = request.args or request.form

10
web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py
View File

@@ -6,7 +6,7 @@
# This software is released under the PostgreSQL Licence
#
##########################################################################
import simplejson as json
import json
import re
from functools import wraps
@@ -292,7 +292,7 @@ class TablespaceView(PGChildNodeView):
}
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
for arg in required_args:
@@ -375,7 +375,7 @@ class TablespaceView(PGChildNodeView):
This function will update tablespace object
"""
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
try:
@@ -408,7 +408,7 @@ class TablespaceView(PGChildNodeView):
"""
if tsid is None:
data = request.form if request.form else json.loads(
request.data, encoding='utf-8'
request.data
)
else:
data = {'ids': [tsid]}
@@ -469,7 +469,7 @@ class TablespaceView(PGChildNodeView):
if k in ('description',):
data[k] = v
else:
data[k] = json.loads(v, encoding='utf-8')
data[k] = json.loads(v)
except ValueError as ve:
current_app.logger.exception(ve)
data[k] = v