diff --git a/web/pgadmin/static/js/slickgrid/slick.pgadmin.editors.js b/web/pgadmin/static/js/slickgrid/slick.pgadmin.editors.js index 6f2984a..05fbb91 100644 --- a/web/pgadmin/static/js/slickgrid/slick.pgadmin.editors.js +++ b/web/pgadmin/static/js/slickgrid/slick.pgadmin.editors.js @@ -230,6 +230,16 @@ var data = defaultValue = item[args.column.field]; if (typeof data === "object" && !Array.isArray(data)) { data = JSON.stringify(data); + } else if (Array.isArray(data)) { + var temp = []; + $.each(data, function(i, val) { + if (typeof val === "object") { + temp.push(JSON.stringify(val)); + } else { + temp.push(val) + } + }); + data = "[" + temp.join() + "]"; } $input.val(data); $input.select(); @@ -466,6 +476,16 @@ var data = defaultValue = item[args.column.field]; if (typeof data === "object" && !Array.isArray(data)) { data = JSON.stringify(data); + } else if (Array.isArray(data)) { + var temp = []; + $.each(data, function(i, val) { + if (typeof val === "object") { + temp.push(JSON.stringify(val)); + } else { + temp.push(val) + } + }); + data = "[" + temp.join() + "]"; } $input.val(data); $input.select(); diff --git a/web/pgadmin/static/js/slickgrid/slick.pgadmin.formatters.js b/web/pgadmin/static/js/slickgrid/slick.pgadmin.formatters.js index b131657..3b4aa3c 100644 --- a/web/pgadmin/static/js/slickgrid/slick.pgadmin.formatters.js +++ b/web/pgadmin/static/js/slickgrid/slick.pgadmin.formatters.js @@ -24,6 +24,16 @@ // Stringify only if it's json object if (typeof value === "object" && !Array.isArray(value)) { return JSON.stringify(value); + } else if (Array.isArray(value)) { + var temp = []; + $.each(value, function(i, val) { + if (typeof val === "object") { + temp.push(JSON.stringify(val)); + } else { + temp.push(val) + } + }); + return "[" + temp.join() + "]" } else { return value; } diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js b/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js index 74502c7..f7cf0ab 100644 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js +++ b/web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js @@ -1790,7 +1790,7 @@ define( */ var explain_data_array = []; if( - data.result && data.result.length > 1 && + data.result && data.result.length >= 1 && data.result[0] && data.result[0].hasOwnProperty( 'QUERY PLAN' ) && _.isObject(data.result[0]['QUERY PLAN'])