Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bmf0N-0008CD-Tu for pgadmin-hackers@arkaria.postgresql.org; Wed, 21 Sep 2016 10:43:56 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bmf0M-0008So-1M for pgadmin-hackers@arkaria.postgresql.org; Wed, 21 Sep 2016 10:43:54 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bmf0L-0008Si-IN for pgadmin-hackers@postgresql.org; Wed, 21 Sep 2016 10:43:53 +0000 Received: from mail-qt0-x22d.google.com ([2607:f8b0:400d:c0d::22d]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bmf0H-0006L9-P0 for pgadmin-hackers@postgresql.org; Wed, 21 Sep 2016 10:43:52 +0000 Received: by mail-qt0-x22d.google.com with SMTP id 93so20242525qtg.2 for ; Wed, 21 Sep 2016 03:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=ztKHvzn3hbdALamQmeNBDk4tyNrL28QQnUEoOtzjpk8=; b=Dh9GiAwyw2lv07kaPV+299HL0z5CneiLN2rvcC2fpgSpomEf/H1VWqSe9E/xcpBQyD trl6eB2YOuhe67yFxqCMng2N/1jZk56jKVTG7C/aFyDUnl7Cyib9dp0DEKJubUz/JYcB klB8+dDbfGCNsHQXc2MCG4wVYlhkHTD6i7VSRellocRXYa8mCDwY7CBfc9+eHcZPD+ds xK+wdZ8T0oLDIb+GRv17HIGVqINIbhsB3zo7JyCA5mqmFkUyEo/kS6dtCOHCXs4tOlif uD+55lWmDO6q1j6ALo2XfD3ugLYuOKfEF80dhKcixYmeNH5YxF2WKxCrmxnvq1eqbbDX Rdmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=ztKHvzn3hbdALamQmeNBDk4tyNrL28QQnUEoOtzjpk8=; b=FxrmoaeE0H8Kvmu+BLFJkt3zWkm+zE/2n0C2+q270BGdDzINsXoxq+wMXpVM9hn5IL ReYSGJgyWZ6Td+CgtZ9JVXBDuft8M/BLoxsWzZZa5dzRZLfvakPcam/ZYsPmWdiXG6Ic FZKDbEnLVE6+IMuKaeNQ8jPosLxyh2Cp76jIvc6BXazp7MJFwym1pFfLLB6enlR9Zd3C XKQz53TN4wNQVhsoQbqXl/f1euGj0EznjzNHXpMddnPuM64Mok+X1ijkHlRkgZEehGWh NsHJrpm270YgSv+eYEE8GOcsTge9kP/LfDfPV7wHnsrLVN90VSIHF4GOukXbPhYWtaO+ huoA== X-Gm-Message-State: AE9vXwP+N0hIuO7e5S9VEv66+KuiJnqDOzHmX9gVin5YyYVHUrBSX49b7IaXpfGOgFCXuBX+VS3KmrhRqQUx58BS X-Received: by 10.200.52.146 with SMTP id w18mr41837581qtb.115.1474454628074; Wed, 21 Sep 2016 03:43:48 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.129.194 with HTTP; Wed, 21 Sep 2016 03:43:27 -0700 (PDT) From: Murtuza Zabuawala Date: Wed, 21 Sep 2016 16:13:27 +0530 Message-ID: Subject: PATCH: To fix JSON array handling (pgAdmin4) To: pgadmin-hackers Content-Type: multipart/mixed; boundary=001a11359aa8585718053d02381b X-Pg-Spam-Score: -2.6 (--) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgadmin-hackers Precedence: bulk Sender: pgadmin-hackers-owner@postgresql.org --001a11359aa8585718053d02381b Content-Type: multipart/alternative; boundary=001a11359aa8585713053d023819 --001a11359aa8585713053d023819 Content-Type: text/plain; charset=UTF-8 Hi, PFA patch to fix the issue where SlickGrid was not displaying nested JSON data properly. This patch fixes: RM#1713 & RM#1404 *Issue:* Nested JSON data was not handled properly. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --001a11359aa8585713053d023819 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch to fix the issue where Sl= ickGrid was not displaying nested JSON data properly.
This patch = fixes: RM#1713 & RM#1404

Issue:
Nested JSON data was not handled properly.


--
Regards,<= /font>
Murtuza Zabuawala
<= span style=3D"color:rgb(136,136,136)">EnterpriseDB:=C2=A0http://www.enterprisedb.com
The Enterprise Postg= reSQL Company
--001a11359aa8585713053d023819-- --001a11359aa8585718053d02381b Content-Type: application/octet-stream; name="RM_1713.patch" Content-Disposition: attachment; filename="RM_1713.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_itcs5m2u0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zbGlja2dyaWQv c2xpY2sucGdhZG1pbi5lZGl0b3JzLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGlj L2pzL3NsaWNrZ3JpZC9zbGljay5wZ2FkbWluLmVkaXRvcnMuanMKaW5kZXgg NmYyOTg0YS4uMDVmYmI5MSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3Rh dGljL2pzL3NsaWNrZ3JpZC9zbGljay5wZ2FkbWluLmVkaXRvcnMuanMKKysr IGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NsaWNrZ3JpZC9zbGljay5wZ2Fk bWluLmVkaXRvcnMuanMKQEAgLTIzMCw2ICsyMzAsMTYgQEAKICAgICAgIHZh ciBkYXRhID0gZGVmYXVsdFZhbHVlID0gaXRlbVthcmdzLmNvbHVtbi5maWVs ZF07CiAgICAgICBpZiAodHlwZW9mIGRhdGEgPT09ICJvYmplY3QiICYmICFB cnJheS5pc0FycmF5KGRhdGEpKSB7CiAgICAgICAgIGRhdGEgPSBKU09OLnN0 cmluZ2lmeShkYXRhKTsKKyAgICAgIH0gZWxzZSBpZiAoQXJyYXkuaXNBcnJh eShkYXRhKSkgeworICAgICAgICB2YXIgdGVtcCA9IFtdOworICAgICAgICAk LmVhY2goZGF0YSwgZnVuY3Rpb24oaSwgdmFsKSB7CisgICAgICAgICAgaWYg KHR5cGVvZiB2YWwgPT09ICJvYmplY3QiKSB7CisgICAgICAgICAgICB0ZW1w LnB1c2goSlNPTi5zdHJpbmdpZnkodmFsKSk7CisgICAgICAgICAgfSBlbHNl IHsKKyAgICAgICAgICAgIHRlbXAucHVzaCh2YWwpCisgICAgICAgICAgfQor ICAgICAgICB9KTsKKyAgICAgICAgZGF0YSA9ICJbIiArIHRlbXAuam9pbigp ICsgIl0iOwogICAgICAgfQogICAgICAgJGlucHV0LnZhbChkYXRhKTsKICAg ICAgICRpbnB1dC5zZWxlY3QoKTsKQEAgLTQ2Niw2ICs0NzYsMTYgQEAKICAg ICAgIHZhciBkYXRhID0gZGVmYXVsdFZhbHVlID0gaXRlbVthcmdzLmNvbHVt bi5maWVsZF07CiAgICAgICBpZiAodHlwZW9mIGRhdGEgPT09ICJvYmplY3Qi ICYmICFBcnJheS5pc0FycmF5KGRhdGEpKSB7CiAgICAgICAgIGRhdGEgPSBK U09OLnN0cmluZ2lmeShkYXRhKTsKKyAgICAgIH0gZWxzZSBpZiAoQXJyYXku aXNBcnJheShkYXRhKSkgeworICAgICAgICB2YXIgdGVtcCA9IFtdOworICAg ICAgICAkLmVhY2goZGF0YSwgZnVuY3Rpb24oaSwgdmFsKSB7CisgICAgICAg ICAgaWYgKHR5cGVvZiB2YWwgPT09ICJvYmplY3QiKSB7CisgICAgICAgICAg ICB0ZW1wLnB1c2goSlNPTi5zdHJpbmdpZnkodmFsKSk7CisgICAgICAgICAg fSBlbHNlIHsKKyAgICAgICAgICAgIHRlbXAucHVzaCh2YWwpCisgICAgICAg ICAgfQorICAgICAgICB9KTsKKyAgICAgICAgZGF0YSA9ICJbIiArIHRlbXAu am9pbigpICsgIl0iOwogICAgICAgfQogICAgICAgJGlucHV0LnZhbChkYXRh KTsKICAgICAgICRpbnB1dC5zZWxlY3QoKTsKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL3N0YXRpYy9qcy9zbGlja2dyaWQvc2xpY2sucGdhZG1pbi5mb3Jt YXR0ZXJzLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NsaWNrZ3JpZC9z bGljay5wZ2FkbWluLmZvcm1hdHRlcnMuanMKaW5kZXggYjEzMTY1Ny4uM2I0 YWEzYyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NsaWNr Z3JpZC9zbGljay5wZ2FkbWluLmZvcm1hdHRlcnMuanMKKysrIGIvd2ViL3Bn YWRtaW4vc3RhdGljL2pzL3NsaWNrZ3JpZC9zbGljay5wZ2FkbWluLmZvcm1h dHRlcnMuanMKQEAgLTI0LDYgKzI0LDE2IEBACiAgICAgICAvLyBTdHJpbmdp Znkgb25seSBpZiBpdCdzIGpzb24gb2JqZWN0CiAgICAgICBpZiAodHlwZW9m IHZhbHVlID09PSAib2JqZWN0IiAmJiAhQXJyYXkuaXNBcnJheSh2YWx1ZSkp IHsKICAgICAgICAgcmV0dXJuIEpTT04uc3RyaW5naWZ5KHZhbHVlKTsKKyAg ICAgIH0gZWxzZSBpZiAoQXJyYXkuaXNBcnJheSh2YWx1ZSkpIHsKKyAgICAg ICAgdmFyIHRlbXAgPSBbXTsKKyAgICAgICAgJC5lYWNoKHZhbHVlLCBmdW5j dGlvbihpLCB2YWwpIHsKKyAgICAgICAgICBpZiAodHlwZW9mIHZhbCA9PT0g Im9iamVjdCIpIHsKKyAgICAgICAgICAgIHRlbXAucHVzaChKU09OLnN0cmlu Z2lmeSh2YWwpKTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg dGVtcC5wdXNoKHZhbCkKKyAgICAgICAgICB9CisgICAgICAgIH0pOworICAg ICAgICByZXR1cm4gIlsiICsgdGVtcC5qb2luKCkgKyAiXSIKICAgICAgIH0g ZWxzZSB7CiAgICAgICAgIHJldHVybiB2YWx1ZTsKICAgICAgIH0KZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci90ZW1wbGF0ZXMv c3FsZWRpdG9yL2pzL3NxbGVkaXRvci5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xz L3NxbGVkaXRvci90ZW1wbGF0ZXMvc3FsZWRpdG9yL2pzL3NxbGVkaXRvci5q cwppbmRleCA3NDUwMmM3Li5mN2NmMGFiIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi90b29scy9zcWxlZGl0b3IvdGVtcGxhdGVzL3NxbGVkaXRvci9qcy9z cWxlZGl0b3IuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9y L3RlbXBsYXRlcy9zcWxlZGl0b3IvanMvc3FsZWRpdG9yLmpzCkBAIC0xNzkw LDcgKzE3OTAsNyBAQCBkZWZpbmUoCiAgICAgICAgICAgICAgICAgICovCiAg ICAgICAgICAgICAgIHZhciBleHBsYWluX2RhdGFfYXJyYXkgPSBbXTsKICAg ICAgICAgICAgICAgaWYoCi0gICAgICAgICAgICAgICAgZGF0YS5yZXN1bHQg JiYgZGF0YS5yZXN1bHQubGVuZ3RoID4gMSAmJgorICAgICAgICAgICAgICAg IGRhdGEucmVzdWx0ICYmIGRhdGEucmVzdWx0Lmxlbmd0aCA+PSAxICYmCiAg ICAgICAgICAgICAgICAgICBkYXRhLnJlc3VsdFswXSAmJiBkYXRhLnJlc3Vs dFswXS5oYXNPd25Qcm9wZXJ0eSgKICAgICAgICAgICAgICAgICAgICAgJ1FV RVJZIFBMQU4nCiAgICAgICAgICAgICAgICAgICApICYmIF8uaXNPYmplY3Qo ZGF0YS5yZXN1bHRbMF1bJ1FVRVJZIFBMQU4nXSkK --001a11359aa8585718053d02381b Content-Type: text/plain Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 -- Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers --001a11359aa8585718053d02381b--