Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bZfnb-0000EN-39 for pgadmin-hackers@arkaria.postgresql.org; Tue, 16 Aug 2016 14:57:03 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bZfna-0004JE-M5 for pgadmin-hackers@arkaria.postgresql.org; Tue, 16 Aug 2016 14:57:02 +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 1bZfnM-00041I-Ty for pgadmin-hackers@postgresql.org; Tue, 16 Aug 2016 14:56:49 +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 1bZfnI-00089J-0n for pgadmin-hackers@postgresql.org; Tue, 16 Aug 2016 14:56:48 +0000 Received: by mail-qk0-x229.google.com with SMTP id z190so41433674qkc.0 for ; Tue, 16 Aug 2016 07:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=dvNdNouF4GIuBxSO5YGWm6VcAV6ucF4oOwVCNX9eZhY=; b=LnDpxbGDL/RBvuTWoC/R03VhVCRroIcAFqULSw6fZvbUF7AlYcNgNfQZlAwFzgaMFK GuFGrBxEK1tZdYPSITX5LAdwV643xayPsMseOg8it4UMpsL4UKnTlHIQ7zsHWdkTx8L1 ITdAFHSf78/gSadkgwon+JT6B1dHBXla4uFonelYdJhOiA74FbhE+99g+syPcpMgcSaV v8bh22/Kxdy4qdsIHsdRuSt5VgbZQTwVhoL+n7Dupz+pAg2yKNTmMUG+nHN82j2FhUHd aSGgzlQn+w7zYZsGf+jYm4Ioim7NLvOJoI6iE4oXQDF2qrmXHCay8feM95tuuvStGwzp EYOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=dvNdNouF4GIuBxSO5YGWm6VcAV6ucF4oOwVCNX9eZhY=; b=XUsQtuhZPmRBXXgcR961s3ub/UYhu8Xj9LCbPJ+wSPNg8fAXQM9S6VO4cG6nZdoN6o 0xS3VWElwUEcM7p18kdg0kwr0+SF+Itqk19q3+LFoWtQJdB/k4nuQYeoVWm25xOC/9+g 1DfLe7Kih5DRib4a2g7FZEAVgle9/qbLX8J/Wj+NbiQqkxXcbDdSLheXp8HLtvnA+FEs OAbM+dswFz1lNfCywkLmU/iIVWtvirNZg9Ttg+Ov24G/FY6jy+DpzrVhGa8VPN54CoR+ giTHMFqeNo0Rpunx0GzC/9OVIf3KLBnh3EG7fXC3ZwHv4tFM5iI+Z2UcgcHlDYNcp3lK aIdA== X-Gm-Message-State: AEkoouvNLF/5b4aOPbR6hSUsioIiHSOEdSaAqMqovCKeTuVyW2hDA1QXmJLNFFBGkJmUVjpBT891Lfs/tnzbij2C X-Received: by 10.233.237.75 with SMTP id c72mr38450078qkg.170.1471359401827; Tue, 16 Aug 2016 07:56:41 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.195.24 with HTTP; Tue, 16 Aug 2016 07:56:21 -0700 (PDT) In-Reply-To: References: From: Murtuza Zabuawala Date: Tue, 16 Aug 2016 20:26:21 +0530 Message-ID: Subject: Re: PATCH: To fix the issue where message panel was showing incomplete info (pgAdmin4) To: Dave Page Cc: Ashesh Vashi , pgadmin-hackers Content-Type: multipart/mixed; boundary=94eb2c0c12727bfd36053a318e95 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 --94eb2c0c12727bfd36053a318e95 Content-Type: multipart/alternative; boundary=94eb2c0c12727bfd32053a318e93 --94eb2c0c12727bfd32053a318e93 Content-Type: text/plain; charset=UTF-8 Hi Dave, PFA updated patch. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Tue, Aug 16, 2016 at 8:16 PM, Dave Page wrote: > Hi > > On Tue, Aug 16, 2016 at 7:10 AM, Murtuza Zabuawala > wrote: > > Hi Dave, > > > > PFA patch with incremental messages. > > RM#1523 > > Can you rebase this please? > > (pgadmin4)piranha:pgadmin4 dpage$ git apply > ~/Downloads/RM_1523_with_incremental_msgs.patch > error: patch failed: > web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1296 > error: web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js: > patch does not apply > > Thanks. > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --94eb2c0c12727bfd32053a318e93 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Dave,

PFA updated patch.
=

--
Regards,
Murtuza Zabuawala
Enter= priseDB:=C2=A0http://www.enterpris= edb.com
The Enterprise PostgreSQL Company

On Tue, Aug 16, 2016 at 8:16 PM, Dave Page <= span dir=3D"ltr"><dpage@pgadmin.org> wrote:
= Hi

On Tue, Aug 16, 2016 at 7:10 AM, Murtuza Zabuawala
<murtuza.zabuawala= @enterprisedb.com> wrote:
> Hi Dave,
>
> PFA patch with incremental messages.
> RM#1523

Can you rebase this please?

(pgadmin4)piranha:pgadmin4 dpage$ git apply
~/Downloads/RM_1523_with_incremental_msgs.patch
error: patch failed:
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js:1= 296
error: web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqledit= or.js:
patch does not apply

Thanks.

--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

--94eb2c0c12727bfd32053a318e93-- --94eb2c0c12727bfd36053a318e95 Content-Type: text/x-patch; charset=US-ASCII; name="RM_1523_with_incremental_msgs_Rebased.patch" Content-Disposition: attachment; filename="RM_1523_with_incremental_msgs_Rebased.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_irxldb1v0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2lu aXRfXy5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2luaXRf Xy5weQppbmRleCBiYjVjMjZiLi42ZGU0MmIwIDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi90b29scy9zcWxlZGl0b3IvX19pbml0X18ucHkKKysrIGIvd2Vi L3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL19faW5pdF9fLnB5CkBAIC00MDYs OCArNDA2LDEwIEBAIGRlZiBwb2xsKHRyYW5zX2lkKToKICAgICAgICAgdHJh bnNfaWQ6IHVuaXF1ZSB0cmFuc2FjdGlvbiBpZAogICAgICIiIgogICAgIGNv bF9pbmZvID0gTm9uZQorICAgIHJlc3VsdCA9IE5vbmUKICAgICBwcmltYXJ5 X2tleXMgPSBOb25lCiAgICAgcm93c19hZmZlY3RlZCA9IDAKKyAgICBhZGRp dGlvbmFsX3Jlc3VsdCA9IFtdCiAKICAgICAjIENoZWNrIHRoZSB0cmFuc2Fj dGlvbiBhbmQgY29ubmVjdGlvbiBzdGF0dXMKICAgICBzdGF0dXMsIGVycm9y X21zZywgY29ubiwgdHJhbnNfb2JqLCBzZXNzaW9uX29iaiA9IGNoZWNrX3Ry YW5zYWN0aW9uX3N0YXR1cyh0cmFuc19pZCkKQEAgLTQzMCw2ICs0MzIsMTAg QEAgZGVmIHBvbGwodHJhbnNfaWQpOgogICAgICAgICAgICAgc3RhdHVzID0g J0NhbmNlbCcKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHN0YXR1cyA9 ICdCdXN5JworICAgICAgICAgICAgbWVzc2FnZXMgPSBjb25uLm1lc3NhZ2Vz KCkKKyAgICAgICAgICAgIGlmIG1lc3NhZ2VzIGFuZCBsZW4obWVzc2FnZXMp ID4gMDoKKyAgICAgICAgICAgICAgICByZXN1bHQgPSAnJy5qb2luKG1lc3Nh Z2VzKQorCiAgICAgZWxzZToKICAgICAgICAgc3RhdHVzID0gJ05vdENvbm5l Y3RlZCcKICAgICAgICAgcmVzdWx0ID0gZXJyb3JfbXNnCkBAIC00NTAsMjAg KzQ1NiwyNSBAQCBkZWYgcG9sbCh0cmFuc19pZCk6CiAgICAgICAgICMgcmVz dG9yZSBpdCBhbmQgdXBkYXRlIHRoZSBzZXNzaW9uIHZhcmlhYmxlLgogICAg ICAgICBzZXNzaW9uX29ialsnY29sdW1uc19pbmZvJ10gPSBjb2x1bW5zCiAg ICAgICAgIHVwZGF0ZV9zZXNzaW9uX2dyaWRfdHJhbnNhY3Rpb24odHJhbnNf aWQsIHNlc3Npb25fb2JqKQotICAgIGVsc2U6Ci0gICAgICAgIGlmIHJlc3Vs dCBpcyBOb25lOgotICAgICAgICAgICAgcmVzdWx0ID0gY29ubi5zdGF0dXNf bWVzc2FnZSgpCi0gICAgICAgICAgICBhZGRpdGlvbmFsX3Jlc3VsdCA9IGNv bm4ubWVzc2FnZXMoKQotICAgICAgICAgICAgIiIiCi0gICAgICAgICAgICBQ cm9jZWR1cmUvRnVuY3Rpb24gb3V0cHV0IG1heSBjb21lcyBpbiB0aGUgZm9y bSBvZiBOb3RpY2VzIGZyb20gdGhlCi0gICAgICAgICAgICBkYXRhYmFzZSBz ZXJ2ZXIsIHNvIHdlIG5lZWQgdG8gYXBwZW5kIHRob3NlIG91dHB1dHMgd2l0 aCB0aGUKLSAgICAgICAgICAgIG9yaWdpbmFsIHJlc3VsdC4KLSAgICAgICAg ICAgICIiIgotICAgICAgICAgICAgaWYgaXNpbnN0YW5jZShhZGRpdGlvbmFs X3Jlc3VsdCwgbGlzdCkgXAotICAgICAgICAgICAgICAgICAgICBhbmQgbGVu KGFkZGl0aW9uYWxfcmVzdWx0KSA+IDA6Ci0gICAgICAgICAgICAgICAgcmVz dWx0ID0gInswfSB7MX0iLmZvcm1hdChhZGRpdGlvbmFsX3Jlc3VsdFstMV0s IHJlc3VsdCkKLQotICAgICAgICAgICAgcm93c19hZmZlY3RlZCA9IGNvbm4u cm93c19hZmZlY3RlZCgpCisKKyAgICAiIiIKKyAgICAgICAgUHJvY2VkdXJl L0Z1bmN0aW9uIG91dHB1dCBtYXkgY29tZXMgaW4gdGhlIGZvcm0gb2YgTm90 aWNlcyBmcm9tIHRoZQorICAgICAgICBkYXRhYmFzZSBzZXJ2ZXIsIHNvIHdl IG5lZWQgdG8gYXBwZW5kIHRob3NlIG91dHB1dHMgd2l0aCB0aGUKKyAgICAg ICAgb3JpZ2luYWwgcmVzdWx0LgorICAgICIiIgorICAgIGlmIHN0YXR1cyA9 PSAnU3VjY2VzcycgYW5kIHJlc3VsdCBpcyBOb25lOgorICAgICAgICByZXN1 bHQgPSBjb25uLnN0YXR1c19tZXNzYWdlKCkKKyAgICAgICAgbWVzc2FnZXMg PSBjb25uLm1lc3NhZ2VzKCkKKyAgICAgICAgaWYgbWVzc2FnZXM6CisgICAg ICAgICAgICBhZGRpdGlvbmFsX3Jlc3VsdCA9ICcnLmpvaW4obWVzc2FnZXMp CisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBhZGRpdGlvbmFsX3Jlc3Vs dCA9ICcnCisgICAgICAgIGlmIHJlc3VsdCAhPSAnU0VMRUNUIDEnIGFuZCBy ZXN1bHQgaXMgbm90IE5vbmU6CisgICAgICAgICAgICByZXN1bHQgPSBhZGRp dGlvbmFsX3Jlc3VsdCArIHJlc3VsdAorICAgICAgICBlbHNlOgorICAgICAg ICAgICAgcmVzdWx0ID0gYWRkaXRpb25hbF9yZXN1bHQKKworICAgICAgICBy b3dzX2FmZmVjdGVkID0gY29ubi5yb3dzX2FmZmVjdGVkKCkKIAogICAgIHJl dHVybiBtYWtlX2pzb25fcmVzcG9uc2UoCiAgICAgICAgIGRhdGE9ewpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3RlbXBsYXRl cy9zcWxlZGl0b3IvanMvc3FsZWRpdG9yLmpzIGIvd2ViL3BnYWRtaW4vdG9v bHMvc3FsZWRpdG9yL3RlbXBsYXRlcy9zcWxlZGl0b3IvanMvc3FsZWRpdG9y LmpzCmluZGV4IDIyMzM1ODYuLjkxM2MzZjUgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL3Rvb2xzL3NxbGVkaXRvci90ZW1wbGF0ZXMvc3FsZWRpdG9yL2pz L3NxbGVkaXRvci5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0 b3IvdGVtcGxhdGVzL3NxbGVkaXRvci9qcy9zcWxlZGl0b3IuanMKQEAgLTEy OTEsNyArMTI5MSw5IEBAIGRlZmluZSgKICAgICAgICAgICAgICAgICAgICAg ZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgLy8gU2hvdyBtZXNzYWdl IGluIG1lc3NhZ2UgYW5kIGhpc3RvcnkgdGFiIGluIGNhc2Ugb2YgcXVlcnkg dG9vbAogICAgICAgICAgICAgICAgICAgICAgIHNlbGYudG90YWxfdGltZSA9 IHNlbGYuZ2V0X3F1ZXJ5X3J1bl90aW1lKHNlbGYucXVlcnlfc3RhcnRfdGlt ZSwgc2VsZi5xdWVyeV9lbmRfdGltZSk7Ci0gICAgICAgICAgICAgICAgICAg ICAgc2VsZi51cGRhdGVfbXNnX2hpc3RvcnkodHJ1ZSwgcmVzLmRhdGEucmVz dWx0KTsKKyAgICAgICAgICAgICAgICAgICAgICBzZWxmLnVwZGF0ZV9tc2df aGlzdG9yeSh0cnVlLCByZXMuZGF0YS5yZXN1bHQsIGZhbHNlKTsKKyAgICAg ICAgICAgICAgICAgICAgICB2YXIgbXNnID0gUygne3sgXygnVG90YWwgcXVl cnkgcnVudGltZTogJXMuJykgfX0nKS5zcHJpbnRmKHNlbGYudG90YWxfdGlt ZSkudmFsdWUoKTsKKyAgICAgICAgICAgICAgICAgICAgICBhbGVydGlmeS5z dWNjZXNzKG1zZywgc2VsZi5pbmZvX25vdGlmaWVyX3RpbWVvdXQpOwogICAg ICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAgICAgLy8g RW5hYmxlL0Rpc2FibGUgcXVlcnkgdG9vbCBidXR0b24gb25seSBpZiBpc19x dWVyeV90b29sIGlzIHRydWUuCkBAIC0xMzA1LDYgKzEzMDcsOSBAQCBkZWZp bmUoCiAgICAgICAgICAgICAgICAgICAgIC8vIElmIHN0YXR1cyBpcyBCdXN5 IHRoZW4gcG9sbCB0aGUgcmVzdWx0IGJ5IHJlY3Vyc2l2ZSBjYWxsIHRvIHRo ZSBwb2xsIGZ1bmN0aW9uCiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3Bv bGwoKTsKICAgICAgICAgICAgICAgICAgICAgaXNfcXVlcnlfcnVubmluZyA9 IHRydWU7CisgICAgICAgICAgICAgICAgICAgIGlmIChyZXMuZGF0YS5yZXN1 bHQpIHsKKyAgICAgICAgICAgICAgICAgICAgICBzZWxmLnVwZGF0ZV9tc2df aGlzdG9yeShyZXMuZGF0YS5zdGF0dXMsIHJlcy5kYXRhLnJlc3VsdCwgZmFs c2UpOworICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAg ICB9CiAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChyZXMuZGF0YS5zdGF0 dXMgPT09ICdOb3RDb25uZWN0ZWQnKSB7CiAKQEAgLTEzMTMsMTAgKzEzMTgs MTAgQEAgZGVmaW5lKAogICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZGlz YWJsZV90b29sX2J1dHRvbnMoZmFsc2UpOwogICAgICAgICAgICAgICAgICAg ICAgICQoIiNidG4tY2FuY2VsLXF1ZXJ5IikucHJvcCgnZGlzYWJsZWQnLCB0 cnVlKTsKICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAg ICAgICBzZWxmLnVwZGF0ZV9tc2dfaGlzdG9yeShmYWxzZSwgcmVzLmRhdGEu cmVzdWx0KTsKKyAgICAgICAgICAgICAgICAgICAgc2VsZi51cGRhdGVfbXNn X2hpc3RvcnkoZmFsc2UsIHJlcy5kYXRhLnJlc3VsdCwgdHJ1ZSk7CiAgICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICBlbHNlIGlmIChy ZXMuZGF0YS5zdGF0dXMgPT09ICdDYW5jZWwnKSB7Ci0gICAgICAgICAgICAg ICAgICAgIHNlbGYudXBkYXRlX21zZ19oaXN0b3J5KGZhbHNlLCAiRXhlY3V0 aW9uIENhbmNlbGxlZCEiKQorICAgICAgICAgICAgICAgICAgICBzZWxmLnVw ZGF0ZV9tc2dfaGlzdG9yeShmYWxzZSwgIkV4ZWN1dGlvbiBDYW5jZWxsZWQh IiwgdHJ1ZSkKICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICB9LAogICAgICAgICAgICAgICAgIGVycm9yOiBmdW5jdGlvbihlKSB7CkBA IC0xNjkxLDMxICsxNjk2LDM1IEBAIGRlZmluZSgKICAgICAgICAgICBpZiAo Y2xlYXJfZ3JpZCA9PT0gdW5kZWZpbmVkKQogICAgICAgICAgICAgY2xlYXJf Z3JpZCA9IHRydWU7CiAKLSAgICAgICAgICBzZWxmLnRyaWdnZXIoJ3BnYWRt aW4tc3FsZWRpdG9yOmxvYWRpbmctaWNvbjpoaWRlJyk7Ci0gICAgICAgICAg JCgiI2J0bi1mbGFzaCIpLnByb3AoJ2Rpc2FibGVkJywgZmFsc2UpOwotCi0g ICAgICAgICAgJCgnLnNxbC1lZGl0b3ItbWVzc2FnZScpLnRleHQobXNnKTsK ICAgICAgICAgICBzZWxmLmdyaWRWaWV3Lm1lc3NhZ2VzX3BhbmVsLmZvY3Vz KCk7CiAKLSAgICAgICAgICBpZiAoc2VsZi5pc19xdWVyeV90b29sICYmIGNs ZWFyX2dyaWQpIHsKLSAgICAgICAgICAgIC8vIERlbGV0ZSBncmlkIGFuZCBw YWdpbmF0b3IKLSAgICAgICAgICAgIGlmIChzZWxmLmdyaWRWaWV3LmdyaWQp IHsKLSAgICAgICAgICAgICAgc2VsZi5ncmlkVmlldy5ncmlkLnJlbW92ZSgp OworICAgICAgICAgIGlmIChzZWxmLmlzX3F1ZXJ5X3Rvb2wpIHsKKyAgICAg ICAgICAgIGlmIChjbGVhcl9ncmlkKSB7CisgICAgICAgICAgICAgIC8vIERl bGV0ZSBncmlkIGFuZCBwYWdpbmF0b3IKKyAgICAgICAgICAgICAgaWYgKHNl bGYuZ3JpZFZpZXcuZ3JpZCkgeworICAgICAgICAgICAgICAgIHNlbGYuZ3Jp ZFZpZXcuZ3JpZC5yZW1vdmUoKTsKKyAgICAgICAgICAgICAgfQorICAgICAg ICAgICAgICAvLyBNaXNjIGNsZWFuaW5nCiAgICAgICAgICAgICAgIHNlbGYu Y29sdW1ucyA9IHVuZGVmaW5lZDsKICAgICAgICAgICAgICAgc2VsZi5jb2xs ZWN0aW9uID0gdW5kZWZpbmVkOwotICAgICAgICAgICAgfQogCi0gICAgICAg ICAgICBpZiAoc2VsZi5ncmlkVmlldy5wYWdpbmF0b3IpCi0gICAgICAgICAg ICAgc2VsZi5ncmlkVmlldy5wYWdpbmF0b3IucmVtb3ZlKCk7CisgICAgICAg ICAgICAgIGlmIChzZWxmLmdyaWRWaWV3LnBhZ2luYXRvcikKKyAgICAgICAg ICAgICAgICBzZWxmLmdyaWRWaWV3LnBhZ2luYXRvci5yZW1vdmUoKTsKKyAg ICAgICAgICAgICAgJCgnLnNxbC1lZGl0b3ItbWVzc2FnZScpLnRleHQobXNn KTsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICQoJy5z cWwtZWRpdG9yLW1lc3NhZ2UnKS5hcHBlbmQobXNnKTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICB9CisgICAgICAgICAgaWYoc3RhdHVzICE9ICdCdXN5 JykgeworICAgICAgICAgICAgJCgiI2J0bi1mbGFzaCIpLnByb3AoJ2Rpc2Fi bGVkJywgZmFsc2UpOworICAgICAgICAgICAgc2VsZi50cmlnZ2VyKCdwZ2Fk bWluLXNxbGVkaXRvcjpsb2FkaW5nLWljb246aGlkZScpOworICAgICAgICAg ICAgc2VsZi5ncmlkVmlldy5oaXN0b3J5X2NvbGxlY3Rpb24uYWRkKHsKKyAg ICAgICAgICAgICAgJ3N0YXR1cycgOiBzdGF0dXMsICdzdGFydF90aW1lJzog c2VsZi5xdWVyeV9zdGFydF90aW1lLnRvU3RyaW5nKCksCisgICAgICAgICAg ICAgICdxdWVyeSc6IHNlbGYucXVlcnksICdyb3dfYWZmZWN0ZWQnOiBzZWxm LnJvd3NfYWZmZWN0ZWQsCisgICAgICAgICAgICAgICd0b3RhbF90aW1lJzog c2VsZi50b3RhbF90aW1lLCAnbWVzc2FnZSc6bXNnCisgICAgICAgICAgICB9 KTsKKyAgICAgICAgICAgIHNlbGYuZ3JpZFZpZXcuaGlzdG9yeV9jb2xsZWN0 aW9uLnNvcnQoKTsKICAgICAgICAgICB9Ci0KLSAgICAgICAgICBzZWxmLmdy aWRWaWV3Lmhpc3RvcnlfY29sbGVjdGlvbi5hZGQoCi0gICAgICAgICAgICB7 J3N0YXR1cycgOiBzdGF0dXMsICdzdGFydF90aW1lJzogc2VsZi5xdWVyeV9z dGFydF90aW1lLnRvU3RyaW5nKCksCi0gICAgICAgICAgICAgJ3F1ZXJ5Jzog c2VsZi5xdWVyeSwgJ3Jvd19hZmZlY3RlZCc6IHNlbGYucm93c19hZmZlY3Rl ZCwKLSAgICAgICAgICAgICAndG90YWxfdGltZSc6IHNlbGYudG90YWxfdGlt ZSwgJ21lc3NhZ2UnOm1zZwotICAgICAgICAgIH0pOwotCi0gICAgICAgICAg c2VsZi5ncmlkVmlldy5oaXN0b3J5X2NvbGxlY3Rpb24uc29ydCgpOwogICAg ICAgICB9LAogCiAgICAgICAgIC8vIFRoaXMgZnVuY3Rpb24gd2lsbCByZXR1 cm4gdGhlIHRvdGFsIHF1ZXJ5IGV4ZWN1dGlvbiBUaW1lLgpAQCAtMjE0MCwx MCArMjE0OSwxMiBAQCBkZWZpbmUoCiAgICAgICAgICAgdmFyIHNlbGYgPSB0 aGlzOwogCiAgICAgICAgICAgLy8gU3RhcnQgZXhlY3V0aW9uIG9mIHRoZSBx dWVyeS4KLSAgICAgICAgICBpZiAoc2VsZi5pc19xdWVyeV90b29sKQorICAg ICAgICAgIGlmIChzZWxmLmlzX3F1ZXJ5X3Rvb2wpIHsKKyAgICAgICAgICAg ICQoJy5zcWwtZWRpdG9yLW1lc3NhZ2UnKS5odG1sKCcnKTsKICAgICAgICAg ICAgIHNlbGYuX2V4ZWN1dGUoKTsKLSAgICAgICAgICBlbHNlCisgICAgICAg ICAgfSBlbHNlIHsKICAgICAgICAgICAgIHNlbGYuX2V4ZWN1dGVfZGF0YV9x dWVyeSgpOworICAgICAgICAgIH0KICAgICAgICAgfSwKIAogICAgICAgICAv LyBUaGlzIGZ1bmN0aW9uIHdpbGwgc2hvdyB0aGUgZmlsdGVyIGluIHRoZSB0 ZXh0IGFyZWEuCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi91dGlscy9kcml2 ZXIvcHN5Y29wZzIvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi91dGlscy9k cml2ZXIvcHN5Y29wZzIvX19pbml0X18ucHkKaW5kZXggZmJkZTYwMy4uYmRl ZDkzMSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdXRpbHMvZHJpdmVyL3Bz eWNvcGcyL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL3V0aWxzL2Ry aXZlci9wc3ljb3BnMi9fX2luaXRfXy5weQpAQCAtMTc4LDYgKzE3OCw3IEBA IGNsYXNzIENvbm5lY3Rpb24oQmFzZUNvbm5lY3Rpb24pOgogICAgICAgICBz ZWxmLl9fYmFja2VuZF9waWQgPSBOb25lCiAgICAgICAgIHNlbGYuZXhlY3V0 aW9uX2Fib3J0ZWQgPSBGYWxzZQogICAgICAgICBzZWxmLnJvd19jb3VudCA9 IDAKKyAgICAgICAgc2VsZi5fX25vdGljZXMgPSBOb25lCiAKICAgICAgICAg c3VwZXIoQ29ubmVjdGlvbiwgc2VsZikuX19pbml0X18oKQogCkBAIC02Mzks NiArNjQwLDcgQEAgQXR0ZW1wdCB0byByZWNvbm5lY3QgaXQgZmFpbGVkIHdp dGggdGhlIGVycm9yOgogICAgICAgICApCiAKICAgICAgICAgdHJ5OgorICAg ICAgICAgICAgc2VsZi5fX25vdGljZXMgPSBbXQogICAgICAgICAgICAgc2Vs Zi5leGVjdXRpb25fYWJvcnRlZCA9IEZhbHNlCiAgICAgICAgICAgICBjdXIu ZXhlY3V0ZShxdWVyeSwgcGFyYW1zKQogICAgICAgICAgICAgcmVzID0gc2Vs Zi5fd2FpdF90aW1lb3V0KGN1ci5jb25uZWN0aW9uLCBBU1lOQ19XQUlUX1RJ TUVPVVQpCkBAIC05MDQsMzEgKzkwNiw5IEBAIEZhaWxlZCB0byByZXNldCB0 aGUgY29ubmVjdGlvbiB0byB0aGUgc2VydmVyIGR1ZSB0byBmb2xsb3dpbmcg ZXJyb3I6CiAgICAgICAgIGlmIHN0YXRlID09IHBzeWNvcGcyLmV4dGVuc2lv bnMuUE9MTF9PSzoKICAgICAgICAgICAgIHJldHVybiBzZWxmLkFTWU5DX09L CiAgICAgICAgIGVsaWYgc3RhdGUgPT0gcHN5Y29wZzIuZXh0ZW5zaW9ucy5Q T0xMX1dSSVRFOgotICAgICAgICAgICAgIyBXYWl0IGZvciB0aGUgZ2l2ZW4g dGltZSBhbmQgdGhlbiBjaGVjayB0aGUgcmV0dXJuIHN0YXR1cwotICAgICAg ICAgICAgIyBJZiB0aHJlZSBlbXB0eSBsaXN0cyBhcmUgcmV0dXJuZWQgdGhl biB0aGUgdGltZS1vdXQgaXMgcmVhY2hlZC4KLSAgICAgICAgICAgIHRpbWVv dXRfc3RhdHVzID0gc2VsZWN0LnNlbGVjdChbXSwgW2Nvbm4uZmlsZW5vKCld LCBbXSwgdGltZSkKLSAgICAgICAgICAgIGlmIHRpbWVvdXRfc3RhdHVzID09 IChbXSwgW10sIFtdKToKLSAgICAgICAgICAgICAgICByZXR1cm4gc2VsZi5B U1lOQ19XUklURV9USU1FT1VUCi0KLSAgICAgICAgICAgICMgcG9sbCBhZ2Fp biB0byBjaGVjayB0aGUgc3RhdGUgaWYgaXQgaXMgc3RpbGwgUE9MTF9XUklU RQotICAgICAgICAgICAgIyB0aGVuIHJldHVybiBBU1lOQ19XUklURV9USU1F T1VUIGVsc2UgcmV0dXJuIEFTWU5DX09LLgotICAgICAgICAgICAgc3RhdGUg PSBjb25uLnBvbGwoKQotICAgICAgICAgICAgaWYgc3RhdGUgPT0gcHN5Y29w ZzIuZXh0ZW5zaW9ucy5QT0xMX1dSSVRFOgotICAgICAgICAgICAgICAgIHJl dHVybiBzZWxmLkFTWU5DX1dSSVRFX1RJTUVPVVQKLSAgICAgICAgICAgIHJl dHVybiBzZWxmLkFTWU5DX09LCisgICAgICAgICAgICByZXR1cm4gc2VsZi5B U1lOQ19XUklURV9USU1FT1VUCiAgICAgICAgIGVsaWYgc3RhdGUgPT0gcHN5 Y29wZzIuZXh0ZW5zaW9ucy5QT0xMX1JFQUQ6Ci0gICAgICAgICAgICAjIFdh aXQgZm9yIHRoZSBnaXZlbiB0aW1lIGFuZCB0aGVuIGNoZWNrIHRoZSByZXR1 cm4gc3RhdHVzCi0gICAgICAgICAgICAjIElmIHRocmVlIGVtcHR5IGxpc3Rz IGFyZSByZXR1cm5lZCB0aGVuIHRoZSB0aW1lLW91dCBpcyByZWFjaGVkLgot ICAgICAgICAgICAgdGltZW91dF9zdGF0dXMgPSBzZWxlY3Quc2VsZWN0KFtj b25uLmZpbGVubygpXSwgW10sIFtdLCB0aW1lKQotICAgICAgICAgICAgaWYg dGltZW91dF9zdGF0dXMgPT0gKFtdLCBbXSwgW10pOgotICAgICAgICAgICAg ICAgIHJldHVybiBzZWxmLkFTWU5DX1JFQURfVElNRU9VVAotCi0gICAgICAg ICAgICAjIHBvbGwgYWdhaW4gdG8gY2hlY2sgdGhlIHN0YXRlIGlmIGl0IGlz IHN0aWxsIFBPTExfUkVBRAotICAgICAgICAgICAgIyB0aGVuIHJldHVybiBB U1lOQ19SRUFEX1RJTUVPVVQgZWxzZSByZXR1cm4gQVNZTkNfT0suCi0gICAg ICAgICAgICBzdGF0ZSA9IGNvbm4ucG9sbCgpCi0gICAgICAgICAgICBpZiBz dGF0ZSA9PSBwc3ljb3BnMi5leHRlbnNpb25zLlBPTExfUkVBRDoKLSAgICAg ICAgICAgICAgICByZXR1cm4gc2VsZi5BU1lOQ19SRUFEX1RJTUVPVVQKLSAg ICAgICAgICAgIHJldHVybiBzZWxmLkFTWU5DX09LCisgICAgICAgICAgICBy ZXR1cm4gc2VsZi5BU1lOQ19SRUFEX1RJTUVPVVQKICAgICAgICAgZWxzZToK ICAgICAgICAgICAgIHJhaXNlIHBzeWNvcGcyLk9wZXJhdGlvbmFsRXJyb3Io CiAgICAgICAgICAgICAgICAgInBvbGwoKSByZXR1cm5lZCAlcyBmcm9tIF93 YWl0X3RpbWVvdXQgZnVuY3Rpb24iICUgc3RhdGUKQEAgLTk2NSw2ICs5NDUs MTAgQEAgRmFpbGVkIHRvIHJlc2V0IHRoZSBjb25uZWN0aW9uIHRvIHRoZSBz ZXJ2ZXIgZHVlIHRvIGZvbGxvd2luZyBlcnJvcjoKICAgICAgICAgICAgIGVy cm1zZyA9IHNlbGYuX2Zvcm1hdHRlZF9leGNlcHRpb25fbXNnKHBlLCBmb3Jt YXR0ZWRfZXhjZXB0aW9uX21zZykKICAgICAgICAgICAgIHJldHVybiBGYWxz ZSwgZXJybXNnLCBOb25lCiAKKyAgICAgICAgaWYgc2VsZi5jb25uLm5vdGlj ZXMgYW5kIHNlbGYuX19ub3RpY2VzIGlzIG5vdCBOb25lOgorICAgICAgICAg ICAgd2hpbGUgc2VsZi5jb25uLm5vdGljZXM6CisgICAgICAgICAgICAgICAg c2VsZi5fX25vdGljZXMuYXBwZW5kKHNlbGYuY29ubi5ub3RpY2VzLnBvcCgw KVs6XSkKKwogICAgICAgICBjb2xpbmZvID0gTm9uZQogICAgICAgICByZXN1 bHQgPSBOb25lCiAgICAgICAgIHNlbGYucm93X2NvdW50ID0gMApAQCAtOTk2 LDcgKzk4MCw2IEBAIEZhaWxlZCB0byByZXNldCB0aGUgY29ubmVjdGlvbiB0 byB0aGUgc2VydmVyIGR1ZSB0byBmb2xsb3dpbmcgZXJyb3I6CiAgICAgICAg ICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKGRpY3Qocm93KSkKICAg ICAgICAgICAgICAgICBleGNlcHQgcHN5Y29wZzIuUHJvZ3JhbW1pbmdFcnJv cjoKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gTm9uZQotCiAgICAg ICAgIHJldHVybiBzdGF0dXMsIHJlc3VsdCwgY29saW5mbwogCiAgICAgZGVm IHN0YXR1c19tZXNzYWdlKHNlbGYpOgpAQCAtMTA5NCw3ICsxMDc3LDcgQEAg RmFpbGVkIHRvIHJlc2V0IHRoZSBjb25uZWN0aW9uIHRvIHRoZSBzZXJ2ZXIg ZHVlIHRvIGZvbGxvd2luZyBlcnJvcjoKICAgICAgICAgIiIiCiAgICAgICAg IFJldHVybnMgdGhlIGxpc3Qgb2YgdGhlIG1lc3NhZ2VzL25vdGljZXMgc2Vu ZCBmcm9tIHRoZSBkYXRhYmFzZSBzZXJ2ZXIuCiAgICAgICAgICIiIgotICAg ICAgICByZXR1cm4gc2VsZi5jb25uLm5vdGljZXMgaWYgc2VsZi5jb25uIGVs c2UgW10KKyAgICAgICAgcmV0dXJuIHNlbGYuX19ub3RpY2VzCiAKICAgICBk ZWYgX2Zvcm1hdHRlZF9leGNlcHRpb25fbXNnKHNlbGYsIGV4Y2VwdGlvbl9v YmosIGZvcm1hdHRlZF9tc2cpOgogICAgICAgICAiIiIK --94eb2c0c12727bfd36053a318e95 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 --94eb2c0c12727bfd36053a318e95--