Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7hYo-00062c-VD for pgadmin-hackers@arkaria.postgresql.org; Mon, 08 May 2017 12:14:43 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1d7hYn-0004xk-Qx for pgadmin-hackers@arkaria.postgresql.org; Mon, 08 May 2017 12:14:41 +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 1d7hYZ-0004Yy-0C for pgadmin-hackers@postgresql.org; Mon, 08 May 2017 12:14:27 +0000 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1d7hYU-0002II-OJ for pgadmin-hackers@postgresql.org; Mon, 08 May 2017 12:14:26 +0000 Received: by mail-wm0-x236.google.com with SMTP id u65so82385428wmu.1 for ; Mon, 08 May 2017 05:14:22 -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=S4kn0xTikHLIjjwsmHFcctTpmoRZERQhn/aTUQ2OHXo=; b=Ow9VfOP7l872cGegXUtZ95OUlhHdBh3hJKOA98I2Lb1c2PJkM9CUiv4GrTNkQZulc4 VmHGgyhGEA6LLLLMLCXsYVUld+mJg0y/yd+cbWhb/oRL3VPzWqrGBu6GmMKpLfk6OZ8X +gFZGqkKciON1iF3JDbB1hLaoeiX3dlE+wyx8p0MPaao4hZrRqP8I04lHdioc/9AaoMN Hhj/upFJNcGCgfW0H5/znzxC8EYQ2ohnjIJvqQnPYOP4eFnzbteLl8Vqo2VUU72XX2lF FXxUZtnRv0JkX86aYXLcqN5eJZWjIquL4Ef++zvJgUuTaB11puoc+Jb4KiEhycwC1ubV j+0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=S4kn0xTikHLIjjwsmHFcctTpmoRZERQhn/aTUQ2OHXo=; b=XzEfw8+Z1XAw4hvcZafOxBDKgEogjOY/1WcB4hWcPhfP7puR3C1JZTKnd7AJM4zbmj O9z79lqB8sfUQw0tHCn7u7tjjYs5joViq+7BpU2Zih4eFg/UGMnRB0ISBc6ueL1uzk0B N6C8a/3iuGhQcSIN1U45+/p5f3VmVjrdHVkip+BLX+DdV/xTAe92I+OTw39gAPp4yik8 3lmFDuOLPt5GD42c6o0yOFLUKkE6L+rb13tJdCQ20VN1fOEUHA3YQoeXAclx3qyVqrVo P/Dm5WzZlChTaKyqIzTgSvxqhca0Q+JhMS/95tls/QHr5k3Ft/yi/2e5Io8AqVNp/g3Z QFgA== X-Gm-Message-State: AN3rC/6ZLOjer9FNUS3o8geUv77YrHr+TL4vG8VRMBIJ6SshiGc65263 KOIAJr+DZmyPt3d4TYkjT75Ng62MFHNq3kE= X-Received: by 10.28.107.77 with SMTP id g74mr12084820wmc.58.1494245660917; Mon, 08 May 2017 05:14:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.223.136.70 with HTTP; Mon, 8 May 2017 05:14:00 -0700 (PDT) From: Murtuza Zabuawala Date: Mon, 8 May 2017 17:44:00 +0530 Message-ID: Subject: [pgAdmin4][PATCH] To fix the issues with CSV file download To: pgadmin-hackers Content-Type: multipart/mixed; boundary=001a11468d9ad4804a054f022d00 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 --001a11468d9ad4804a054f022d00 Content-Type: multipart/alternative; boundary=001a11468d9ad48045054f022dfe --001a11468d9ad48045054f022dfe Content-Type: text/plain; charset=UTF-8 Hi, Please find the patch to fix the issues in CSV file download feature, 1) To handle non-ascii filenames which we set from table name RM#2314 2) To handle non-ascii query data RM#2353 3) To dump JSON type columns properly in csv RM#2360 Please review. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company --001a11468d9ad48045054f022dfe Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

Please find the patch to fix the is= sues in CSV file download feature,

1) To handle no= n-ascii filenames which we set from table name
RM#2314

2) To handle non-ascii query data
R= M#2353

3) To dump JSON type columns properly i= n csv
RM#2360

Please review.

--
Regards,
Murtuza Zabuawala
<= span style=3D"color:rgb(136,136,136)">EnterpriseDB:=C2=A0http://www.enterprisedb.com
The Enterprise Postg= reSQL Company
--001a11468d9ad48045054f022dfe-- --001a11468d9ad4804a054f022d00 Content-Type: text/plain; charset=US-ASCII; name="fixes_for_csv_download.diff" Content-Disposition: attachment; filename="fixes_for_csv_download.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j2g36fxb0 ZGlmZiAtLWdpdCBhL3JlcXVpcmVtZW50cy50eHQgYi9yZXF1aXJlbWVudHMu dHh0CmluZGV4IDhhZmViNTIuLjkwZWQwNTcgMTAwNjQ0Ci0tLSBhL3JlcXVp cmVtZW50cy50eHQKKysrIGIvcmVxdWlyZW1lbnRzLnR4dApAQCAtNDAsMyAr NDAsNCBAQCBTUUxBbGNoZW15PT0xLjAuMTQKIHNxbHBhcnNlPT0wLjEuMTkK IFdlcmt6ZXVnPT0wLjkuNgogV1RGb3Jtcz09Mi4wLjIKK2JhY2twb3J0cy5j c3Y9PTEuMC40OyBweXRob25fdmVyc2lvbiA8PSAnMi43JwpcIE5vIG5ld2xp bmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rv b2xzL3NxbGVkaXRvci9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL3Rvb2xz L3NxbGVkaXRvci9fX2luaXRfXy5weQppbmRleCBkMTE0OTg4Li4yZDFkNGU1 IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvX19p bml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL19f aW5pdF9fLnB5CkBAIC0xMzM3LDcgKzEzMzcsOCBAQCBkZWYgc2F2ZV9maWxl KCk6CiBAbG9naW5fcmVxdWlyZWQKIGRlZiBzdGFydF9xdWVyeV9kb3dubG9h ZF90b29sKHRyYW5zX2lkKToKICAgICBzeW5jX2Nvbm4gPSBOb25lCi0gICAg c3RhdHVzLCBlcnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwgc2Vzc2lvbl9v YmogPSBjaGVja190cmFuc2FjdGlvbl9zdGF0dXModHJhbnNfaWQpCisgICAg c3RhdHVzLCBlcnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwgXAorICAgICAg ICBzZXNzaW9uX29iaiA9IGNoZWNrX3RyYW5zYWN0aW9uX3N0YXR1cyh0cmFu c19pZCkKIAogICAgIGlmIHN0YXR1cyBhbmQgY29ubiBpcyBub3QgTm9uZSBc CiAgICAgICAgICAgICBhbmQgdHJhbnNfb2JqIGlzIG5vdCBOb25lIGFuZCBz ZXNzaW9uX29iaiBpcyBub3QgTm9uZToKQEAgLTEzNjEsMTEgKzEzNjIsMTUg QEAgZGVmIHN0YXJ0X3F1ZXJ5X2Rvd25sb2FkX3Rvb2wodHJhbnNfaWQpOgog ICAgICAgICAgICAgICAgICAgICBkZWwgY29ubi5tYW5hZ2VyLmNvbm5lY3Rp b25zW3N5bmNfY29ubi5jb25uX2lkXQogCiAgICAgICAgICAgICAgICAgIyBU aGlzIHJldHVybnMgZ2VuZXJhdG9yIG9mIHJlY29yZHMuCi0gICAgICAgICAg ICAgICAgc3RhdHVzLCBnZW4gPSBzeW5jX2Nvbm4uZXhlY3V0ZV9vbl9zZXJ2 ZXJfYXNfY3N2KHNxbCwgcmVjb3Jkcz0yMDAwKQorICAgICAgICAgICAgICAg IHN0YXR1cywgZ2VuID0gc3luY19jb25uLmV4ZWN1dGVfb25fc2VydmVyX2Fz X2NzdigKKyAgICAgICAgICAgICAgICAgICAgc3FsLCByZWNvcmRzPTIwMDAK KyAgICAgICAgICAgICAgICApCiAKICAgICAgICAgICAgICAgICBpZiBub3Qg c3RhdHVzOgogICAgICAgICAgICAgICAgICAgICByID0gUmVzcG9uc2UoJyJ7 MH0iJy5mb3JtYXQoZ2VuKSwgbWltZXR5cGU9J3RleHQvY3N2JykKLSAgICAg ICAgICAgICAgICAgICAgci5oZWFkZXJzWyJDb250ZW50LURpc3Bvc2l0aW9u Il0gPSAiYXR0YWNobWVudDtmaWxlbmFtZT1lcnJvci5jc3YiCisgICAgICAg ICAgICAgICAgICAgIHIuaGVhZGVyc1sKKyAgICAgICAgICAgICAgICAgICAg ICAgICJDb250ZW50LURpc3Bvc2l0aW9uIgorICAgICAgICAgICAgICAgICAg ICBdID0gImF0dGFjaG1lbnQ7ZmlsZW5hbWU9ZXJyb3IuY3N2IgogICAgICAg ICAgICAgICAgICAgICByLmNhbGxfb25fY2xvc2UoY2xlYW51cCkKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHIKIApAQCAtMTM3Nyw3ICsxMzgyLDE4 IEBAIGRlZiBzdGFydF9xdWVyeV9kb3dubG9hZF90b29sKHRyYW5zX2lkKToK ICAgICAgICAgICAgICAgICAgICAgaW1wb3J0IHRpbWUKICAgICAgICAgICAg ICAgICAgICAgZmlsZW5hbWUgPSBzdHIoaW50KHRpbWUudGltZSgpKSkgKyAi LmNzdiIKIAotICAgICAgICAgICAgICAgIHIuaGVhZGVyc1siQ29udGVudC1E aXNwb3NpdGlvbiJdID0gImF0dGFjaG1lbnQ7ZmlsZW5hbWU9ezB9Ii5mb3Jt YXQoZmlsZW5hbWUpCisgICAgICAgICAgICAgICAgIyBXZSB3aWxsIHRyeSB0 byBlbmNvZGUgcmVwb3J0IGZpbGUgbmFtZSB3aXRoIGxhdGluLTEKKyAgICAg ICAgICAgICAgICAjIElmIGl0IGZhaWxzIHRoZW4gd2Ugd2lsbCBmYWxsYmFj ayB0byBkZWZhdWx0IGFzY2lpIGZpbGUgbmFtZQorICAgICAgICAgICAgICAg ICMgd2Vya3pldWcgb25seSBzdXBwb3J0cyBsYXRpbi0xIGVuY29kaW5nIHN1 cHBvcnRlZCB2YWx1ZXMKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAg ICAgICAgICAgICAgIHRtcF9maWxlX25hbWUgPSBmaWxlbmFtZQorICAgICAg ICAgICAgICAgICAgICB0bXBfZmlsZV9uYW1lLmVuY29kZSgnbGF0aW4tMScs ICdzdHJpY3QnKQorICAgICAgICAgICAgICAgIGV4Y2VwdCBVbmljb2RlRW5j b2RlRXJyb3I6CisgICAgICAgICAgICAgICAgICAgIGZpbGVuYW1lID0gImRv d25sb2FkLmNzdiIKKworICAgICAgICAgICAgICAgIHIuaGVhZGVyc1sKKyAg ICAgICAgICAgICAgICAgICAgIkNvbnRlbnQtRGlzcG9zaXRpb24iCisgICAg ICAgICAgICAgICAgXSA9ICJhdHRhY2htZW50O2ZpbGVuYW1lPXswfSIuZm9y bWF0KGZpbGVuYW1lKQogCiAgICAgICAgICAgICAgICAgci5jYWxsX29uX2Ns b3NlKGNsZWFudXApCiAgICAgICAgICAgICAgICAgcmV0dXJuIHIKQEAgLTEz ODgsNCArMTQwNCw2IEBAIGRlZiBzdGFydF9xdWVyeV9kb3dubG9hZF90b29s KHRyYW5zX2lkKToKICAgICAgICAgICAgIHIuY2FsbF9vbl9jbG9zZShjbGVh bnVwKQogICAgICAgICAgICAgcmV0dXJuIHIKICAgICBlbHNlOgotICAgICAg ICByZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPWdldHRl eHQoIlRyYW5zYWN0aW9uIHN0YXR1cyBjaGVjayBmYWlsZWQuIikpCisgICAg ICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoCisgICAgICAgICAg ICBlcnJvcm1zZz1nZXR0ZXh0KCJUcmFuc2FjdGlvbiBzdGF0dXMgY2hlY2sg ZmFpbGVkLiIpCisgICAgICAgICkKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L3V0aWxzL2RyaXZlci9wc3ljb3BnMi9fX2luaXRfXy5weSBiL3dlYi9wZ2Fk bWluL3V0aWxzL2RyaXZlci9wc3ljb3BnMi9fX2luaXRfXy5weQppbmRleCBl NDc0ODE3Li5mMmU0YjcyIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi91dGls cy9kcml2ZXIvcHN5Y29wZzIvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRt aW4vdXRpbHMvZHJpdmVyL3BzeWNvcGcyL19faW5pdF9fLnB5CkBAIC0xOCw4 ICsxOCw4IEBAIGltcG9ydCBvcwogaW1wb3J0IHJhbmRvbQogaW1wb3J0IHNl bGVjdAogaW1wb3J0IHN5cwotaW1wb3J0IGNzdgogCitpbXBvcnQgc2ltcGxl anNvbiBhcyBqc29uCiBpbXBvcnQgcHN5Y29wZzIKIGltcG9ydCBwc3ljb3Bn Mi5leHRyYXMKIGZyb20gZmxhc2sgaW1wb3J0IGcsIGN1cnJlbnRfYXBwLCBz ZXNzaW9uCkBAIC0zNiwxMSArMzYsMTUgQEAgZnJvbSAuLmFic3RyYWN0IGlt cG9ydCBCYXNlRHJpdmVyLCBCYXNlQ29ubmVjdGlvbgogZnJvbSAuY3Vyc29y IGltcG9ydCBEaWN0Q3Vyc29yCiAKIGlmIHN5cy52ZXJzaW9uX2luZm8gPCAo MywpOgorICAgICMgUHl0aG9uMiBpbi1idWlsdCBjc3YgbW9kdWxlIGRvIG5v dCBoYW5kbGUgdW5pY29kZQorICAgICMgYmFja3BvcnRzLmNzdiBtb2R1bGUg cG9ydGVkIGZyb20gUFkzIGNzdiBtb2R1bGUgZm9yIHVuaWNvZGUgaGFuZGxp bmcKKyAgICBmcm9tIGJhY2twb3J0cyBpbXBvcnQgY3N2CiAgICAgZnJvbSBT dHJpbmdJTyBpbXBvcnQgU3RyaW5nSU8KICAgICBwc3ljb3BnMi5leHRlbnNp b25zLnJlZ2lzdGVyX3R5cGUocHN5Y29wZzIuZXh0ZW5zaW9ucy5VTklDT0RF KQogICAgIHBzeWNvcGcyLmV4dGVuc2lvbnMucmVnaXN0ZXJfdHlwZShwc3lj b3BnMi5leHRlbnNpb25zLlVOSUNPREVBUlJBWSkKIGVsc2U6CiAgICAgZnJv bSBpbyBpbXBvcnQgU3RyaW5nSU8KKyAgICBpbXBvcnQgY3N2CiAKIF8gPSBn ZXR0ZXh0CiAKQEAgLTU5Niw3ICs2MDAsMjIgQEAgV0hFUkUKICAgICAgICAg aWYgc2VsZi5hc3luYyA9PSAxOgogICAgICAgICAgICAgc2VsZi5fd2FpdChj dXIuY29ubmVjdGlvbikKIAotICAgIGRlZiBleGVjdXRlX29uX3NlcnZlcl9h c19jc3Yoc2VsZiwgcXVlcnksIHBhcmFtcz1Ob25lLCBmb3JtYXR0ZWRfZXhj ZXB0aW9uX21zZz1GYWxzZSwgcmVjb3Jkcz0yMDAwKToKKyAgICBkZWYgZXhl Y3V0ZV9vbl9zZXJ2ZXJfYXNfY3N2KHNlbGYsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBxdWVyeSwgcGFyYW1zPU5vbmUsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmb3JtYXR0ZWRfZXhjZXB0aW9u X21zZz1GYWxzZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJlY29yZHM9MjAwMCk6CisgICAgICAgICIiIgorICAgICAgICBUbyBmZXRj aCBxdWVyeSByZXN1bHQgYW5kIGdlbmVyYXRlIENTViBvdXRwdXQKKworICAg ICAgICBBcmdzOgorICAgICAgICAgICAgcXVlcnk6IFNRTAorICAgICAgICAg ICAgcGFyYW1zOiBBZGRpdGlvbmFsIHBhcmFtZXRlcnMKKyAgICAgICAgICAg IGZvcm1hdHRlZF9leGNlcHRpb25fbXNnOiBGb3IgZXhjZXB0aW9uCisgICAg ICAgICAgICByZWNvcmRzOiBOdW1iZXIgb2YgaW5pdGlhbCByZWNvcmRzCisK KyAgICAgICAgUmV0dXJuczoKKyAgICAgICAgICAgIEdlbmVyYXRvciByZXNw b25zZQorICAgICAgICAiIiIKICAgICAgICAgc3RhdHVzLCBjdXIgPSBzZWxm Ll9fY3Vyc29yKHNlcnZlcl9jdXJzb3I9VHJ1ZSkKICAgICAgICAgc2VsZi5y b3dfY291bnQgPSAwCiAKQEAgLTYwNywyMSArNjI2LDI2IEBAIFdIRVJFCiAg ICAgICAgIGlmIHN5cy52ZXJzaW9uX2luZm8gPCAoMywpIGFuZCB0eXBlKHF1 ZXJ5KSA9PSB1bmljb2RlOgogICAgICAgICAgICAgcXVlcnkgPSBxdWVyeS5l bmNvZGUoJ3V0Zi04JykKIAotICAgICAgICBjdXJyZW50X2FwcC5sb2dnZXIu bG9nKDI1LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHUiRXhl Y3V0ZSAod2l0aCBzZXJ2ZXIgY3Vyc29yKSBmb3Igc2VydmVyICN7c2VydmVy X2lkfSAtIHtjb25uX2lkfSAoUXVlcnktaWQ6IHtxdWVyeV9pZH0pOlxue3F1 ZXJ5fSIuZm9ybWF0KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzZXJ2ZXJfaWQ9c2VsZi5tYW5hZ2VyLnNpZCwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29ubl9pZD1zZWxmLmNvbm5faWQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHF1ZXJ5PXF1 ZXJ5LmRlY29kZSgndXRmLTgnKSBpZiBzeXMudmVyc2lvbl9pbmZvIDwgKDMs KSBlbHNlIHF1ZXJ5LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBxdWVyeV9pZD1xdWVyeV9pZAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAp CisgICAgICAgIGN1cnJlbnRfYXBwLmxvZ2dlci5sb2coCisgICAgICAgICAg IDI1LAorICAgICAgICAgICB1IkV4ZWN1dGUgKHdpdGggc2VydmVyIGN1cnNv cikgZm9yIHNlcnZlciAje3NlcnZlcl9pZH0gLSB7Y29ubl9pZH0gIgorICAg ICAgICAgICB1IihRdWVyeS1pZDoge3F1ZXJ5X2lkfSk6XG57cXVlcnl9Ii5m b3JtYXQoCisgICAgICAgICAgICAgICBzZXJ2ZXJfaWQ9c2VsZi5tYW5hZ2Vy LnNpZCwKKyAgICAgICAgICAgICAgIGNvbm5faWQ9c2VsZi5jb25uX2lkLAor ICAgICAgICAgICAgICAgcXVlcnk9cXVlcnkuZGVjb2RlKCd1dGYtOCcpIGlm CisgICAgICAgICAgICAgICBzeXMudmVyc2lvbl9pbmZvIDwgKDMsKSBlbHNl IHF1ZXJ5LAorICAgICAgICAgICAgICAgcXVlcnlfaWQ9cXVlcnlfaWQKKyAg ICAgICAgICAgKQorICAgICAgICApCiAgICAgICAgIHRyeToKICAgICAgICAg ICAgIHNlbGYuX19pbnRlcm5hbF9ibG9ja2luZ19leGVjdXRlKGN1ciwgcXVl cnksIHBhcmFtcykKICAgICAgICAgZXhjZXB0IHBzeWNvcGcyLkVycm9yIGFz IHBlOgogICAgICAgICAgICAgY3VyLmNsb3NlKCkKICAgICAgICAgICAgIGVy cm1zZyA9IHNlbGYuX2Zvcm1hdHRlZF9leGNlcHRpb25fbXNnKHBlLCBmb3Jt YXR0ZWRfZXhjZXB0aW9uX21zZykKICAgICAgICAgICAgIGN1cnJlbnRfYXBw LmxvZ2dlci5lcnJvcigKLSAgICAgICAgICAgICAgICB1ImZhaWxlZCB0byBl eGVjdXRlIHF1ZXJ5ICgod2l0aCBzZXJ2ZXIgY3Vyc29yKSBmb3IgdGhlIHNl cnZlciAje3NlcnZlcl9pZH0gLSB7Y29ubl9pZH0gKHF1ZXJ5LWlkOiB7cXVl cnlfaWR9KTpcbmVycm9yIG1lc3NhZ2U6e2Vycm1zZ30iLmZvcm1hdCgKKyAg ICAgICAgICAgICAgICB1ImZhaWxlZCB0byBleGVjdXRlIHF1ZXJ5ICgod2l0 aCBzZXJ2ZXIgY3Vyc29yKSAiCisgICAgICAgICAgICAgICAgdSJmb3IgdGhl IHNlcnZlciAje3NlcnZlcl9pZH0gLSB7Y29ubl9pZH0gIgorICAgICAgICAg ICAgICAgIHUiKHF1ZXJ5LWlkOiB7cXVlcnlfaWR9KTpcbmVycm9yIG1lc3Nh Z2U6e2Vycm1zZ30iLmZvcm1hdCgKICAgICAgICAgICAgICAgICAgICAgc2Vy dmVyX2lkPXNlbGYubWFuYWdlci5zaWQsCiAgICAgICAgICAgICAgICAgICAg IGNvbm5faWQ9c2VsZi5jb25uX2lkLAogICAgICAgICAgICAgICAgICAgICBx dWVyeT1xdWVyeSwKQEAgLTYzMSw2ICs2NTUsMzMgQEAgV0hFUkUKICAgICAg ICAgICAgICkKICAgICAgICAgICAgIHJldHVybiBGYWxzZSwgZXJybXNnCiAK KyAgICAgICAgZGVmIGhhbmRsZV9qc29uX2RhdGEoanNvbl9jb2x1bW5zLCBy ZXN1bHRzKToKKyAgICAgICAgICAgICIiIgorICAgICAgICAgICAgWyBUaGlz IGlzIG9ubHkgZm9yIFB5dGhvbjIueF0KKyAgICAgICAgICAgIFRoaXMgZnVu Y3Rpb24gd2lsbCBiZSB1c2VmdWwgdG8gaGFuZGxlIGpzb24gZGF0YSB0eXBl cy4KKyAgICAgICAgICAgIFdlIHdpbGwgZHVtcCBqc29uIGRhdGEgYXMgcHJv cGVyIGpzb24gaW5zdGVhZCBvZiB1bmljb2RlIHZhbHVlcworCisgICAgICAg ICAgICBBcmdzOgorICAgICAgICAgICAgICAgIGpzb25fY29sdW1uczogQ29s dW1ucyB3aGljaCBjb250YWlucyBqc29uIGRhdGEKKyAgICAgICAgICAgICAg ICByZXN1bHRzOiBRdWVyeSByZXN1bHQKKworICAgICAgICAgICAgUmV0dXJu czoKKyAgICAgICAgICAgICAgICByZXN1bHRzCisgICAgICAgICAgICAiIiIK KyAgICAgICAgICAgICMgT25seSBpZiBQeXRob24yIGFuZCB0aGVyZSBhcmUg Y29sdW1ucyB3aXRoIEpTT04gdHlwZQorICAgICAgICAgICAgaWYgc3lzLnZl cnNpb25faW5mbyA8ICgzLCkgYW5kIGxlbihqc29uX2NvbHVtbnMpID4gMDoK KyAgICAgICAgICAgICAgICB0ZW1wX3Jlc3VsdHMgPSBbXQorICAgICAgICAg ICAgICAgIGZvciByb3cgaW4gcmVzdWx0czoKKyAgICAgICAgICAgICAgICAg ICAgcmVzID0gZGljdCgpCisgICAgICAgICAgICAgICAgICAgIGZvciBrLCB2 IGluIHJvdy5pdGVtcygpOgorICAgICAgICAgICAgICAgICAgICAgICAgaWYg ayBpbiBqc29uX2NvbHVtbnM6CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmVzW2tdID0ganNvbi5kdW1wcyh2KQorICAgICAgICAgICAgICAgICAg ICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNb a10gPSB2CisgICAgICAgICAgICAgICAgICAgIHRlbXBfcmVzdWx0cy5hcHBl bmQocmVzKQorICAgICAgICAgICAgICAgIHJlc3VsdHMgPSB0ZW1wX3Jlc3Vs dHMKKyAgICAgICAgICAgIHJldHVybiByZXN1bHRzCisKICAgICAgICAgZGVm IGdlbigpOgogCiAgICAgICAgICAgICByZXN1bHRzID0gY3VyLmZldGNobWFu eShyZWNvcmRzKQpAQCAtNjM5LDE1ICs2OTAsMjYgQEAgV0hFUkUKICAgICAg ICAgICAgICAgICAgICAgY3VyLmNsb3NlKCkKICAgICAgICAgICAgICAgICB5 aWVsZCBnZXR0ZXh0KCdUaGUgcXVlcnkgZXhlY3V0ZWQgZGlkIG5vdCByZXR1 cm4gYW55IGRhdGEuJykKICAgICAgICAgICAgICAgICByZXR1cm4KLQotICAg ICAgICAgICAgaGVhZGVyID0gW2MudG9fZGljdCgpWyduYW1lJ10gZm9yIGMg aW4gY3VyLm9yZGVyZWRfZGVzY3JpcHRpb24oKV0KLQorICAgICAgICAgICAg aGVhZGVyID0gW10KKyAgICAgICAgICAgIGpzb25fY29sdW1ucyA9IFtdCisg ICAgICAgICAgICAjIGpzb24sIGpzb25iLCBqc29uW10sIGpzb25iW10KKyAg ICAgICAgICAgIGpzb25fdHlwZXMgPSAoMTE0LCAxOTksIDM4MDIsIDM4MDcp CisgICAgICAgICAgICBmb3IgYyBpbiBjdXIub3JkZXJlZF9kZXNjcmlwdGlv bigpOgorICAgICAgICAgICAgICAgICMgVGhpcyBpcyB0byBoYW5kbGUgdGhl IGNhc2UgaW4gd2hpY2ggY29sdW1uIG5hbWUgaXMgbm9uLWFzY2lpCisgICAg ICAgICAgICAgICAgaGVhZGVyLmFwcGVuZCh1IiIgKyBjLnRvX2RpY3QoKVsn bmFtZSddKQorICAgICAgICAgICAgICAgIGlmIGMudG9fZGljdCgpWyd0eXBl X2NvZGUnXSBpbiBqc29uX3R5cGVzOgorICAgICAgICAgICAgICAgICAgICBq c29uX2NvbHVtbnMuYXBwZW5kKAorICAgICAgICAgICAgICAgICAgICAgICAg dSIiICsgYy50b19kaWN0KClbJ25hbWUnXQorICAgICAgICAgICAgICAgICAg ICApCiAgICAgICAgICAgICByZXNfaW8gPSBTdHJpbmdJTygpCiAKICAgICAg ICAgICAgIGNzdl93cml0ZXIgPSBjc3YuRGljdFdyaXRlcigKLSAgICAgICAg ICAgICAgICByZXNfaW8sIGZpZWxkbmFtZXM9aGVhZGVyLCBkZWxpbWl0ZXI9 c3RyKCcsJyksIHF1b3Rpbmc9Y3N2LlFVT1RFX05PTk5VTUVSSUMKKyAgICAg ICAgICAgICAgICByZXNfaW8sIGZpZWxkbmFtZXM9aGVhZGVyLCBkZWxpbWl0 ZXI9dScsJywKKyAgICAgICAgICAgICAgICBxdW90aW5nPWNzdi5RVU9URV9O T05OVU1FUklDCiAgICAgICAgICAgICApCisKICAgICAgICAgICAgIGNzdl93 cml0ZXIud3JpdGVoZWFkZXIoKQorICAgICAgICAgICAgcmVzdWx0cyA9IGhh bmRsZV9qc29uX2RhdGEoanNvbl9jb2x1bW5zLCByZXN1bHRzKQogICAgICAg ICAgICAgY3N2X3dyaXRlci53cml0ZXJvd3MocmVzdWx0cykKIAogICAgICAg ICAgICAgeWllbGQgcmVzX2lvLmdldHZhbHVlKCkKQEAgLTY2Miw4ICs3MjQs MTAgQEAgV0hFUkUKICAgICAgICAgICAgICAgICByZXNfaW8gPSBTdHJpbmdJ TygpCiAKICAgICAgICAgICAgICAgICBjc3Zfd3JpdGVyID0gY3N2LkRpY3RX cml0ZXIoCi0gICAgICAgICAgICAgICAgICAgIHJlc19pbywgZmllbGRuYW1l cz1oZWFkZXIsIGRlbGltaXRlcj1zdHIoJywnKSwgcXVvdGluZz1jc3YuUVVP VEVfTk9OTlVNRVJJQworICAgICAgICAgICAgICAgICAgICByZXNfaW8sIGZp ZWxkbmFtZXM9aGVhZGVyLCBkZWxpbWl0ZXI9dScsJywKKyAgICAgICAgICAg ICAgICAgICAgcXVvdGluZz1jc3YuUVVPVEVfTk9OTlVNRVJJQwogICAgICAg ICAgICAgICAgICkKKyAgICAgICAgICAgICAgICByZXN1bHRzID0gaGFuZGxl X2pzb25fZGF0YShqc29uX2NvbHVtbnMsIHJlc3VsdHMpCiAgICAgICAgICAg ICAgICAgY3N2X3dyaXRlci53cml0ZXJvd3MocmVzdWx0cykKICAgICAgICAg ICAgICAgICB5aWVsZCByZXNfaW8uZ2V0dmFsdWUoKQogCkBAIC0xNDg3LDgg KzE1NTEsOCBAQCBjbGFzcyBTZXJ2ZXJNYW5hZ2VyKG9iamVjdCk6CiAgICAg ICAgICAgICAgICAgICAgIG5vdCBpc2luc3RhbmNlKGRhdGFiYXNlLCB1bmlj b2RlKToKICAgICAgICAgICAgICAgICBkYXRhYmFzZSA9IGRhdGFiYXNlLmRl Y29kZSgndXRmLTgnKQogICAgICAgICAgICAgaWYgZGlkIGlzIG5vdCBOb25l OgotICAgICAgICAgICAgICAgIGlmIGRpZCBpbiBzZWxmLmRiX2luZm86ICAg ICAgICAgICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgICAgIHNl bGYuZGJfaW5mb1tkaWRdWydkYXRuYW1lJ109ZGF0YWJhc2UgICAgICAgICAg ICAKKyAgICAgICAgICAgICAgICBpZiBkaWQgaW4gc2VsZi5kYl9pbmZvOgor ICAgICAgICAgICAgICAgICAgICBzZWxmLmRiX2luZm9bZGlkXVsnZGF0bmFt ZSddPWRhdGFiYXNlCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBpZiBk aWQgaXMgTm9uZToKICAgICAgICAgICAgICAgICBkYXRhYmFzZSA9IHNlbGYu ZGIK --001a11468d9ad4804a054f022d00 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 --001a11468d9ad4804a054f022d00--