Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bmHdr-0002IK-W9 for pgadmin-hackers@arkaria.postgresql.org; Tue, 20 Sep 2016 09:47:08 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bmHdr-0005jR-Fr for pgadmin-hackers@arkaria.postgresql.org; Tue, 20 Sep 2016 09:47:07 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bmHdq-0005jK-UQ for pgadmin-hackers@postgresql.org; Tue, 20 Sep 2016 09:47:06 +0000 Received: from mail-qk0-x229.google.com ([2607:f8b0:400d:c09::229]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bmHdj-0002qS-Sr for pgadmin-hackers@postgresql.org; Tue, 20 Sep 2016 09:47:06 +0000 Received: by mail-qk0-x229.google.com with SMTP id z190so9639490qkc.3 for ; Tue, 20 Sep 2016 02:46:59 -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=R/Qho9bladv/D946SQq6YMqqFd3+ug+CeP4BuK5Qjlg=; b=pzq1P0F+ke/JGtVBORDdl5SB8FCtM6F4izsRor8ae7it4PxapjV7s3dp142F1dMDxp fwUJU1JvzZ//kR0iJE1cFQob29m4TNJ865N433bc9QhKoWhuLjX6JwDlVIClXzxTWn5g 7vRCAk91HbvsvFg94MkvpYNp8WT3MNqkilzWU6mSzF+Kg56oEBkCC0Ctllcf17f8WG5o cs+dj5UIUZq6HVZlHcp2LACBCoQiqXicyF6h94F5ue7cZq8DEG871CO4iF6bnE/ZThKN g3mVQYqzlCeO/N252DdA30UHVbQGcC3WVL7gfuaiaMZQovtaCKChSfybznP1vCkkuChn w50g== 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=R/Qho9bladv/D946SQq6YMqqFd3+ug+CeP4BuK5Qjlg=; b=FH9SXzuB91R2L3k+NsgQmwpqmGlT16o1Dv6uSy7CIm6hdJsAO7+NG8tVW7jBEIttSP auCjP3PjMEVdJeyNEI2Ff+eaiBTKPbtlu558GPLFzKqV+nwTVvA7i1sgBQuZUfE6T8hb NUCtXOGiemjKJrjqRUTsSThIhjpbQRPWUmWTFIprphngXfcXbMq45NoaeFKuMHFs6z8k d0kMGgtOsqQ/ljfj7MLIcYNCrMdc+dX0Q/57tMI/hXETuTOZ4gbZPuuu2MpfiOhkfFty YKs42gbFEHUSY9SW6igrEx/wDb36wsQJuWUCbt3LVI4JhK1vO1As8bJy9R9tYWgPuyc7 /fBA== X-Gm-Message-State: AE9vXwPhwRmQDRWAY1BHp/LwNDNqf0i6v7nRB6WCtDssadh2mgs3mfG+7Kj9MUDl/Y6DkWPTPOjPgKCDtqrMYClB X-Received: by 10.55.22.22 with SMTP id g22mr32943676qkh.267.1474364817481; Tue, 20 Sep 2016 02:46:57 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.129.194 with HTTP; Tue, 20 Sep 2016 02:46:37 -0700 (PDT) From: Murtuza Zabuawala Date: Tue, 20 Sep 2016 15:16:37 +0530 Message-ID: Subject: PATCH: To fix the issue displaying composite result types in debugger (pgAdmin4) To: pgadmin-hackers Content-Type: multipart/mixed; boundary=001a1149439238bbd1053ced4f2a 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 --001a1149439238bbd1053ced4f2a Content-Type: multipart/alternative; boundary=001a1149439238bbcb053ced4f28 --001a1149439238bbcb053ced4f28 Content-Type: text/plain; charset=UTF-8 Hi, PFA patch to fix the issue in debugger where we were not displaying result properly in result tab for composite types. RM#1662 @Neel, Would you please review the patch? *Issue:* Column name key was hardcoded in dict causing overwriting other columns. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --001a1149439238bbcb053ced4f28 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

PFA patch to fix the issue in debug= ger where we were not displaying result properly in result tab for composit= e types.
RM#1662
=C2=A0
@Neel,
Woul= d you please review the patch?

Issue:
=
Column name key was hardcoded in dict causing overwriting other column= s.

--
<= span style=3D"color:rgb(136,136,136)">Regards,
Murtuza Zabuawala
EnterpriseDB:=C2=A0http://www.enterprisedb.com
The = Enterprise PostgreSQL Company
--001a1149439238bbcb053ced4f28-- --001a1149439238bbd1053ced4f2a Content-Type: application/octet-stream; name="RM_1662.patch" Content-Disposition: attachment; filename="RM_1662.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_itbaokjr0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RlYnVnZ2VyL19faW5p dF9fLnB5IGIvd2ViL3BnYWRtaW4vdG9vbHMvZGVidWdnZXIvX19pbml0X18u cHkKaW5kZXggMjJjYmQwNS4uZjdkMGU3YiAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vdG9vbHMvZGVidWdnZXIvX19pbml0X18ucHkKKysrIGIvd2ViL3Bn YWRtaW4vdG9vbHMvZGVidWdnZXIvX19pbml0X18ucHkKQEAgLTEzNDIsNyAr MTM0Miw3IEBAIGRlZiBwb2xsX2VuZF9leGVjdXRpb25fcmVzdWx0KHRyYW5z X2lkKToKIAogICAgIGlmIGNvbm4uY29ubmVjdGVkKCk6CiAgICAgICAgIHN0 YXR1c21zZyA9IGNvbm4uc3RhdHVzX21lc3NhZ2UoKQotICAgICAgICBzdGF0 dXMsIHJlc3VsdCwgbXlfcmVzdWx0ID0gY29ubi5wb2xsKCkKKyAgICAgICAg c3RhdHVzLCByZXN1bHQsIGNvbF9pbmZvID0gY29ubi5wb2xsKCkKICAgICAg ICAgaWYgc3RhdHVzID09IEFTWU5DX09LIGFuZCBzZXNzaW9uWydmdW5jdGlv bkRhdGEnXVtzdHIodHJhbnNfaWQpXVsnbGFuZ3VhZ2UnXSA9PSAnZWRic3Bs JzoKICAgICAgICAgICAgIHN0YXR1cyA9ICdTdWNjZXNzJwogICAgICAgICAg ICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZShzdWNjZXNzPTEsIGluZm89 Z2V0dGV4dCgiRXhlY3V0aW9uIENvbXBsZXRlZC4iKSwKQEAgLTEzNTQsMTQg KzEzNTQsMTkgQEAgZGVmIHBvbGxfZW5kX2V4ZWN1dGlvbl9yZXN1bHQodHJh bnNfaWQpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGF0YT17J3N0YXR1cyc6IHN0YXR1cywgJ3N0YXR1c19tZXNzYWdl JzogcmVzdWx0fSkKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAg ICAgc3RhdHVzID0gJ1N1Y2Nlc3MnCi0gICAgICAgICAgICAgICAgZGF0YSA9 IHt9Ci0gICAgICAgICAgICAgICAgZm9yIGkgaW4gcmVzdWx0OgotICAgICAg ICAgICAgICAgICAgICBmb3IgaywgdiBpbiBpLml0ZW1zKCk6Ci0gICAgICAg ICAgICAgICAgICAgICAgICBkYXRhWyJuYW1lIl0gPSBrCi0gICAgICAgICAg ICAgICAgICAgICAgICBkYXRhLnNldGRlZmF1bHQoInZhbHVlIiwgW10pLmFw cGVuZCh2KQorICAgICAgICAgICAgICAgIGNvbHVtbnMgPSBbXQorICAgICAg ICAgICAgICAgICMgQ2hlY2sgY29sdW1uIGluZm8gaXMgYXZhaWxhYmxlIG9y IG5vdAorICAgICAgICAgICAgICAgIGlmIGNvbF9pbmZvIGlzIG5vdCBOb25l IGFuZCBsZW4oY29sX2luZm8pID4gMDoKKyAgICAgICAgICAgICAgICAgICAg Zm9yIGNvbCBpbiBjb2xfaW5mbzoKKyAgICAgICAgICAgICAgICAgICAgICAg IGl0ZW1zID0gbGlzdChjb2wuaXRlbXMoKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgIGNvbHVtbiA9IGRpY3QoKQorICAgICAgICAgICAgICAgICAgICAg ICAgY29sdW1uWyduYW1lJ10gPSBpdGVtc1swXVsxXQorICAgICAgICAgICAg ICAgICAgICAgICAgY29sdW1uWyd0eXBlX2NvZGUnXSA9IGl0ZW1zWzFdWzFd CisgICAgICAgICAgICAgICAgICAgICAgICBjb2x1bW5zLmFwcGVuZChjb2x1 bW4pCiAKICAgICAgICAgICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jlc3Bv bnNlKHN1Y2Nlc3M9MSwgaW5mbz1nZXR0ZXh0KCJFeGVjdXRpb24gQ29tcGxl dGVkLiIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGF0YT17J3N0YXR1cyc6IHN0YXR1cywgJ3Jlc3VsdCc6IGRhdGEs ICdzdGF0dXNfbWVzc2FnZSc6IHN0YXR1c21zZ30pCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhPXsnc3RhdHVzJzog c3RhdHVzLCAncmVzdWx0JzogcmVzdWx0LAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2NvbF9pbmZvJzogY29s dW1ucywgJ3N0YXR1c19tZXNzYWdlJzogc3RhdHVzbXNnfSkKICAgICAgICAg ZWxzZToKICAgICAgICAgICAgIHN0YXR1cyA9ICdCdXN5JwogICAgIGVsc2U6 CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9kZWJ1Z2dlci90ZW1w bGF0ZXMvZGVidWdnZXIvanMvZGlyZWN0LmpzIGIvd2ViL3BnYWRtaW4vdG9v bHMvZGVidWdnZXIvdGVtcGxhdGVzL2RlYnVnZ2VyL2pzL2RpcmVjdC5qcwpp bmRleCBiZDFmODdlLi43ZWM1ZTk1IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi90b29scy9kZWJ1Z2dlci90ZW1wbGF0ZXMvZGVidWdnZXIvanMvZGlyZWN0 LmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2RlYnVnZ2VyL3RlbXBsYXRl cy9kZWJ1Z2dlci9qcy9kaXJlY3QuanMKQEAgLTQxNyw5ICs0MTcsOSBAQCBk ZWZpbmUoCiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgZWxzZSB7 CiAgICAgICAgICAgICAgICAgLy8gQ2FsbCBmdW5jdGlvbiB0byBjcmVhdGUg YW5kIHVwZGF0ZSBsb2NhbCB2YXJpYWJsZXMgLi4uLgotICAgICAgICAgICAg ICAgIGlmIChyZXMuZGF0YS5yZXN1bHQubmFtZSAhPSBudWxsKSB7CisgICAg ICAgICAgICAgICAgaWYgKHJlcy5kYXRhLnJlc3VsdCAhPSBudWxsKSB7CiAg ICAgICAgICAgICAgICAgICBwZ1Rvb2xzLkRpcmVjdERlYnVnLmVkaXRvci5y ZW1vdmVMaW5lQ2xhc3Moc2VsZi5hY3RpdmVfbGluZV9ubywgJ3dyYXAnLCAn Q29kZU1pcnJvci1hY3RpdmVsaW5lLWJhY2tncm91bmQnKTsKLSAgICAgICAg ICAgICAgICAgIHNlbGYuQWRkUmVzdWx0cyhyZXMuZGF0YS5yZXN1bHQpOwor ICAgICAgICAgICAgICAgICAgc2VsZi5BZGRSZXN1bHRzKHJlcy5kYXRhLmNv bF9pbmZvLCByZXMuZGF0YS5yZXN1bHQpOwogICAgICAgICAgICAgICAgICAg cGdUb29scy5EaXJlY3REZWJ1Zy5yZXN1bHRzX3BhbmVsLmZvY3VzKCk7CiAg ICAgICAgICAgICAgICAgICBwZ1Rvb2xzLkRpcmVjdERlYnVnLmRpcmVjdF9l eGVjdXRpb25fY29tcGxldGVkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAg IHBnVG9vbHMuRGlyZWN0RGVidWcucG9sbGluZ190aW1lb3V0X2lkbGUgPSB0 cnVlOwpAQCAtODQ2LDcgKzg0Niw3IEBAIGRlZmluZSgKIAogICAgICAgfSwK IAotICAgICAgQWRkUmVzdWx0czogZnVuY3Rpb24ocmVzdWx0KSB7CisgICAg ICBBZGRSZXN1bHRzOiBmdW5jdGlvbihjb2x1bW5zLCByZXN1bHQpIHsKICAg ICAgICAgdmFyIHNlbGYgPSB0aGlzOwogCiAgICAgICAgIC8vIFJlbW92ZSB0 aGUgZXhpc3RpbmcgY3JlYXRlZCBncmlkIGFuZCB1cGRhdGUgdGhlIHJlc3Vs dCB2YWx1ZXMKQEAgLTg2NiwyMiArODY2LDIzIEBAIGRlZmluZSgKICAgICAg ICAgICBtb2RlbDogRGVidWdnZXJSZXN1bHRzTW9kZWwKICAgICAgICAgfSk7 CiAKLSAgICAgICAgcmVzdWx0R3JpZENvbHMgPSBbCi0gICAgICAgICAge25h bWU6ICd2YWx1ZScsIGxhYmVsOnJlc3VsdC5uYW1lLCB0eXBlOid0ZXh0Jywg ZWRpdGFibGU6IGZhbHNlLCBjZWxsOidzdHJpbmcnfQotICAgICAgICBdOwot Ci0gICAgICAgIHZhciBteV9vYmogPSBbXTsKLSAgICAgICAgaWYgKHJlc3Vs dC52YWx1ZS5sZW5ndGggIT0gMCkKLSAgICAgICAgewotICAgICAgICAgIGZv ciAoaSA9IDA7IGkgPCByZXN1bHQudmFsdWUubGVuZ3RoOyBpKyspIHsKLSAg ICAgICAgICAgIG15X29iai5wdXNoKHsgInZhbHVlIjogcmVzdWx0LnZhbHVl W2ldfSk7Ci0gICAgICAgICAgfQorICAgICAgICB2YXIgcmVzdWx0R3JpZENv bHMgPSBbXTsKKyAgICAgICAgaWYoXy5zaXplKGNvbHVtbnMpKSB7CisgICAg ICAgICAgXy5lYWNoKGNvbHVtbnMsIGZ1bmN0aW9uKGMpIHsKKyAgICAgICAg ICAgIHZhciBjb2x1bW4gPSB7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdHlwZTondGV4dCcsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZWRpdGFibGU6IGZhbHNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNlbGw6J3N0cmluZycKKyAgICAgICAgICAgICAgICAgICAgICAgICB9Owor ICAgICAgICAgICAgY29sdW1uWyduYW1lJ10gPSBjb2x1bW5bJ2xhYmVsJ10g PSBjLm5hbWU7CisgICAgICAgICAgICByZXN1bHRHcmlkQ29scy5wdXNoKGNv bHVtbik7CisgICAgICAgICAgfSk7CiAgICAgICAgIH0KIAogICAgICAgICAv LyBJbml0aWFsaXplIGEgbmV3IEdyaWQgaW5zdGFuY2UKICAgICAgICAgdmFy IHJlc3VsdF9ncmlkID0gdGhpcy5yZXN1bHRfZ3JpZCA9IG5ldyBCYWNrZ3Jp ZC5HcmlkKHsKICAgICAgICAgICBjb2x1bW5zOiByZXN1bHRHcmlkQ29scywK LSAgICAgICAgICBjb2xsZWN0aW9uOiBuZXcgUmVzdWx0c0NvbGxlY3Rpb24o bXlfb2JqKSwKKyAgICAgICAgICBjb2xsZWN0aW9uOiBuZXcgUmVzdWx0c0Nv bGxlY3Rpb24ocmVzdWx0KSwKICAgICAgICAgICBjbGFzc05hbWU6ICJiYWNr Z3JpZCB0YWJsZS1ib3JkZXJlZCIKICAgICAgICAgfSk7CiAK --001a1149439238bbd1053ced4f2a 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 --001a1149439238bbd1053ced4f2a--