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

JSONinfy all data in new mode for the Backbone.Model.

Browse Source 
Also, takes care about not quoting the identifier, when found any digit
in the name (except it starts with a digit).
This commit is contained in:
Ashesh Vashi 2016-01-07 09:40:38 +05:30
parent a086820288
commit 5e67ca959d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/browser/templates/browser/js/node.js
View File

@ -1430,7 +1430,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
* only from the parent object.
*/
toJSON: function(session, level, method) {
var self = this, res;
var self = this, res, isNew = self.isNew();
// We will run JSON.stringify(..) only from the main object, not for
// the JSON object within the objects.
@ -1438,7 +1438,7 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
session = (typeof(session) != "undefined" && session == true);
if (!session) {
if (!session || isNew) {
res = Backbone.Model.prototype.toJSON.call(this, arguments);
} else {
res = {};
@ -1460,11 +1460,11 @@ function($, _, S, pgAdmin, Menu, Backbone, Alertify, Backform) {
*/
if (session) {
if (obj && obj.sessChanged && obj.sessChanged()) {
res[k] = ((level== 0 && method == 'GET') ?
res[k] = ((level== 0 && method && method == 'GET') ?
// Convert the JSON data to string, which will allow us to
// send the data to the server in GET HTTP method, and will
// not be translated to wierd format.
(obj && JSON.stringify(obj.toJSON(session && !self.isNew(), level + 1))) :
(obj && JSON.stringify(obj.toJSON(session && !isNew, level + 1))) :
(obj && obj.toJSON(session && !self.isNew(), level + 1))
);
}

3
web/pgadmin/utils/driver/psycopg2/__init__.py
View File

@ -829,7 +829,8 @@ class Driver(BaseDriver):
return True
for c in valNoArray:
if not (u'a' <= c <= u'z') and c != u'_':
if (not (u'a' <= c <= u'z') and c != u'_' and
not (u'0' <= c <= u'9')):
return True
# check string is keywaord or not