Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bxSA2-0006pC-6H for pgadmin-hackers@arkaria.postgresql.org; Fri, 21 Oct 2016 05:14:30 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bxSA1-0006Yq-P6 for pgadmin-hackers@arkaria.postgresql.org; Fri, 21 Oct 2016 05:14:29 +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 1bxSA0-0006Yh-Oh for pgadmin-hackers@postgresql.org; Fri, 21 Oct 2016 05:14:28 +0000 Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bxS9w-0007YL-6T for pgadmin-hackers@postgresql.org; Fri, 21 Oct 2016 05:14:27 +0000 Received: by mail-lf0-x22b.google.com with SMTP id x79so130649273lff.0 for ; Thu, 20 Oct 2016 22:14:23 -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=gFQNJYN980XgHEj+f7gwl92hWUhOsTxhdQvj/xuaa/Q=; b=NTsN92AAtaWsV6WcZ4N1Lqn45PH0jjxZUMav/Cj9XVvIF3/pYryupJEnOZePEM2KPI 8CpiX2MDyCmUFi+K3RnduiLKSAC7sT6LgZNVoUcBaNm8U46S119qmPV148cCJGKLh9qR eFjkBbxtO9QLCiW7vOUEQk/ehwH1i3DokHaBHfblpnd9bH5ywqcPK7ArgOdYQRFpQN2m gmHp6mwkUsZB8yBsq++dvRXVKShYEpu+spnHXPeUg/8VYVRdRvy457l8qvyvt5CSwRt/ acPpHjL+FB+Lpp55gT4Lg5MrRP4DcwGnxRpuz6DICgqFYKREtOwsuaIwM5DwvZP9ZbA5 MX6g== 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=gFQNJYN980XgHEj+f7gwl92hWUhOsTxhdQvj/xuaa/Q=; b=CRuJHsT+++o4PJBvkDbRD9V9rF1sAwF2JVLyUPDC5+PPMNRj5wvpZvK6XJG+k8dB2g i2W4Bccwd+eVUP0FGUqZVaezd5GER7cTgx+aFFuJO2npvG/UWDPhC8ibkZxYb8EYiQs5 ZV1aJiNd4XhJ6WBasG6AdFwiYuW8xobqwYEip8vQ8VMo7qhjLFlUoy4rK1NJdttZcDwS aWzLUn8f+PUOLVvRSZ9yv5jR6NhoZ6XUCnR+z/ssAFKOVSWQfv8Tdx3kXcWwPwDdXdhF Q7a1wpUkapl142XKWaozUHP2a1b0jHnOFvTJSaP7Lf7R8tULW718YChdpF0qH7MzOEoj AS8Q== X-Gm-Message-State: ABUngvcEsH2oJ6022HMl9Yemsv7La2t0MIY0XHMKCMrGCgG7pvX0Ba93+mCp4Oa7Z89TubTOlXB8JAdaPm4kd9jM X-Received: by 10.25.44.66 with SMTP id s63mr3206845lfs.69.1477026862372; Thu, 20 Oct 2016 22:14:22 -0700 (PDT) MIME-Version: 1.0 Received: by 10.25.87.3 with HTTP; Thu, 20 Oct 2016 22:14:21 -0700 (PDT) In-Reply-To: References: From: Khushboo Vashi Date: Fri, 21 Oct 2016 10:44:21 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch]: Fixed RM 1603 & RM 1220 To: Dave Page Cc: Ashesh Vashi , pgadmin-hackers Content-Type: multipart/mixed; boundary=001a113f250674c0fb053f591dc6 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 --001a113f250674c0fb053f591dc6 Content-Type: multipart/alternative; boundary=001a113f250674c0f5053f591dc4 --001a113f250674c0f5053f591dc4 Content-Type: text/plain; charset=UTF-8 Hi, Please find the attached patch to fix below RMs: 1603: [Web Based] Export database failed if object contains double quotes 1220: Backup database is not working with special characters 1221: Maintenance DB failed if database name contains special characters In Desktop mode, the import/export didn't work that is also fixed. Regarding, re-showing the dialogue multiple times, Murtuza is working on this issue, Murtuza, Please also look into this thread, so you can have more idea about the related bugs. Thanks, Khushboo On Thu, Oct 20, 2016 at 9:40 PM, Dave Page wrote: > On Thu, Oct 20, 2016 at 12:08 PM, Ashesh Vashi > wrote: > > On Thu, Oct 20, 2016 at 4:26 PM, Khushboo Vashi > > wrote: > >> > >> > >> > >> On Sat, Oct 15, 2016 at 11:52 AM, Dave Page wrote: > >>> > >>> > >>> > >>> On Friday, October 14, 2016, Ashesh Vashi < > ashesh.vashi@enterprisedb.com> > >>> wrote: > >>>> > >>>> On Sat, Oct 15, 2016 at 4:59 AM, Dave Page wrote: > >>>>> > >>>>> Hi > >>>>> > >>>>> On Friday, October 14, 2016, Khushboo Vashi > >>>>> wrote: > >>>>>> > >>>>>> Hi, > >>>>>> > >>>>>> Please find the attached patch to fix the below 2 bugs. > >>>>>> > >>>>>> RM 1603: [Web Based] Export database failed if object contains > double > >>>>>> quotes. > >>>>>> RM 1220: Backup database is not working with special characters > >>>>>> > >>>>>> The issues which were fixed: > >>>>>> > >>>>>> 1. Client side data were not unescaped > >>>>>> 2. Required command line arguments were quoted twice > >>>>> > >>>>> > >>>>> This is not working for me: I tested using Table Export as per > Fahar's > >>>>> instructions. As I'm in desktop mode, the first problem was that we > get an > >>>>> error at line 210 of import_export/__init__.py, because > get_server_directory > >>>>> returned None for the directory. If I fix that, then the job says > it's > >>>>> created, but as far as I can see, nothing else happens. > >>>> > >>>> hmm.. > >>> > >>> > >>> Yes, but please see my followup message. There's clearly something > funky > >>> going on with the process tracking - for whatever reason it didn't > pick up > >>> this process until after a restart, and per the bug I escalated earlier > >>> (which I think is essential to fix for 1.1 in a little over a week), it > >>> doesn't always detect completed processes and then keeps re-showing the > >>> alert. > >>> > >> > >> > >> The problem here is that, until we click the "Click for details here" > link > >> and close the another details dialogue, the acknowledgement does not > send to > >> the server. So, it keeps re-showing the alert. > >> > >> I think, we need to clearly mention the steps on the alertify notifier > >> itself, so the user can get the idea. > >> > >> Dave/Ashesh, > >> Any other suggestion? > > > > We can give a acknowledge link along with 'Click here for details' link > to > > delete the status, logs, when clicked. > > Dave? > > Sure, we can do that - but with so many instances being reported, > clearly there's a root cause to fix first. > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --001a113f250674c0f5053f591dc4 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,=C2=A0

Please find the attached patc= h to fix below RMs:

1603: =C2=A0[Web Based] Export= database failed if object contains double quotes
1220: =C2=A0Bac= kup database is not working with special characters
1221: =C2=A0M= aintenance DB failed if database name contains special characters

In Desktop mode, the import/export didn't work that is = also fixed.

Regarding, re-showing the dialogue mul= tiple times, Murtuza is working on this issue,=C2=A0

Murtuza,
Please also look into this thread, so you can have mo= re idea about the related bugs.

Thanks,
= Khushboo


On Thu, Oct 20, 2016 at 9:40 PM, Dave Page <dpage@pgadmin.org>= ; wrote:
On Thu, Oct 20, 2016 at 12:08 PM, Ashes= h Vashi
<ashesh.vashi@enterprisedb.com> wrote:
> On Thu, Oct 20, 2016 at 4:26 PM, Khushboo Vashi
> <khushboo.vashi@= enterprisedb.com> wrote:
>>
>>
>>
>> On Sat, Oct 15, 2016 at 11:52 AM, Dave Page <dpage@pgadmin.org> wrote:
>>>
>>>
>>>
>>> On Friday, October 14, 2016, Ashesh Vashi <ashesh.vashi@enterprisedb.com>=
>>> wrote:
>>>>
>>>> On Sat, Oct 15, 2016 at 4:59 AM, Dave Page <dpage@pgadmin.org> wrote:
>>>>>
>>>>> Hi
>>>>>
>>>>> On Friday, October 14, 2016, Khushboo Vashi
>>>>> <khushboo.vashi@enterprisedb.com> wrote:
>>>>>>
>>>>>> Hi,
>>>>>>
>>>>>> Please find the attached patch to fix the below 2 = bugs.
>>>>>>
>>>>>> RM 1603: [Web Based] Export database failed if obj= ect contains double
>>>>>> quotes.
>>>>>> RM 1220: Backup database is not working with speci= al characters
>>>>>>
>>>>>> The issues which were fixed:
>>>>>>
>>>>>> 1. Client side data were not unescaped
>>>>>> 2. Required command line arguments were quoted twi= ce
>>>>>
>>>>>
>>>>> This is not working for me: I tested using Table Expor= t as per Fahar's
>>>>> instructions. As I'm in desktop mode, the first pr= oblem was that we get an
>>>>> error at line 210 of import_export/__init__.py, becaus= e get_server_directory
>>>>> returned None for the directory. If I fix that, then t= he job says it's
>>>>> created, but as far as I can see, nothing else happens= .
>>>>
>>>> hmm..
>>>
>>>
>>> Yes, but please see my followup message. There's clearly s= omething funky
>>> going on with the process tracking - for whatever reason it di= dn't pick up
>>> this process until after a restart, and per the bug I escalate= d earlier
>>> (which I think is essential to fix for 1.1 in a little over a = week), it
>>> doesn't always detect completed processes and then keeps r= e-showing the
>>> alert.
>>>
>>
>>
>> The problem here is that, until we click the "Click for detai= ls here" link
>> and close the another details dialogue, the acknowledgement does n= ot send to
>> the server. So, it keeps re-showing the alert.
>>
>> I think, we need to clearly mention the steps on the alertify noti= fier
>> itself, so the user can get the idea.
>>
>> Dave/Ashesh,
>> Any other suggestion?
>
> We can give a acknowledge link along with 'Click here for details&= #39; link to
> delete the status, logs, when clicked.
> Dave?

Sure, we can do that - but with so many instances being reporte= d,
clearly there's a root cause to fix first.


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

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

--001a113f250674c0f5053f591dc4-- --001a113f250674c0fb053f591dc6 Content-Type: text/x-patch; charset=US-ASCII; name="RM_1603_1220_1221.patch" Content-Disposition: attachment; filename="RM_1603_1220_1221.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iujbkfrz0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9fX2luaXRf Xy5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9fX2luaXRfXy5weQpp bmRleCA3NzFiM2ZmLi5hY2ZjNmUxIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1p bi90b29scy9iYWNrdXAvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4v dG9vbHMvYmFja3VwL19faW5pdF9fLnB5CkBAIC0yNzYsNyArMjc2LDcgQEAg ZGVmIGNyZWF0ZV9iYWNrdXBfam9iKHNpZCk6CiAgICAgICAgIHNlcnZlci51 c2VybmFtZSwKICAgICAgICAgJy0tbm8tcGFzc3dvcmQnLAogICAgICAgICAn LS1kYXRhYmFzZScsCi0gICAgICAgIGRyaXZlci5xdElkZW50KGNvbm4sIHNl cnZlci5tYWludGVuYW5jZV9kYikKKyAgICAgICAgc2VydmVyLm1haW50ZW5h bmNlX2RiCiAgICAgXQogICAgIGlmICdyb2xlJyBpbiBkYXRhIGFuZCBkYXRh Wydyb2xlJ106CiAgICAgICAgIGFyZ3MuYXBwZW5kKCctLXJvbGUnKQpAQCAt NDI4LDE0ICs0MjgsMTQgQEAgZGVmIGNyZWF0ZV9iYWNrdXBfb2JqZWN0c19q b2Ioc2lkKToKICAgICBzZXRfdmFsdWUoJ25vX29mX2pvYnMnLCAnLS1qb2Jz JywgVHJ1ZSkKIAogICAgIGZvciBzIGluIGRhdGFbJ3NjaGVtYXMnXToKLSAg ICAgICAgYXJncy5leHRlbmQoWyctLXNjaGVtYScsIGRyaXZlci5xdElkZW50 KGNvbm4sIHMpXSkKKyAgICAgICAgYXJncy5leHRlbmQoWyctLXNjaGVtYScs IHNdKQogCiAgICAgZm9yIHMsIHQgaW4gZGF0YVsndGFibGVzJ106CiAgICAg ICAgIGFyZ3MuZXh0ZW5kKFsKICAgICAgICAgICAgICctLXRhYmxlJywgZHJp dmVyLnF0SWRlbnQoY29ubiwgcywgdCkKICAgICAgICAgXSkKIAotICAgIGFy Z3MuYXBwZW5kKGRyaXZlci5xdElkZW50KGNvbm4sIGRhdGFbJ2RhdGFiYXNl J10pKQorICAgIGFyZ3MuYXBwZW5kKGRhdGFbJ2RhdGFiYXNlJ10pCiAKICAg ICB0cnk6CiAgICAgICAgIHAgPSBCYXRjaFByb2Nlc3MoCmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvdGVtcGxhdGVzL2JhY2t1cC9q cy9iYWNrdXAuanMgYi93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvdGVtcGxh dGVzL2JhY2t1cC9qcy9iYWNrdXAuanMKaW5kZXggYTEzYTMxYy4uOWQ4NjM4 NiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvYmFja3VwL3RlbXBs YXRlcy9iYWNrdXAvanMvYmFja3VwLmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rv b2xzL2JhY2t1cC90ZW1wbGF0ZXMvYmFja3VwL2pzL2JhY2t1cC5qcwpAQCAt NzQ3LDIwICs3NDcsMjAgQEAgVE9ETyBMSVNUIEZPUiBCQUNLVVA6CiAgICAg ICAgICAgICAgICAgICB2YXIgdHJlZUluZm8gPSBub2RlLmdldFRyZWVOb2Rl SGllcmFyY2h5LmFwcGx5KG5vZGUsIFtpXSk7CiAKICAgICAgICAgICAgICAg ICAgIC8vIFNldCBjdXJyZW50IGRhdGFiYXNlIGludG8gbW9kZWwKLSAgICAg ICAgICAgICAgICAgIHRoaXMudmlldy5tb2RlbC5zZXQoJ2RhdGFiYXNlJywg dHJlZUluZm8uZGF0YWJhc2UubGFiZWwpOworICAgICAgICAgICAgICAgICAg dGhpcy52aWV3Lm1vZGVsLnNldCgnZGF0YWJhc2UnLCB0cmVlSW5mby5kYXRh YmFzZS5fbGFiZWwpOwogCiAgICAgICAgICAgICAgICAgICAvLyBXZSB3aWxs IHJlbW92ZSBvbmNlIG9iamVjdCB0cmVlIGlzIGltcGxlbWVudGVkCiAgICAg ICAgICAgICAgICAgICAvLyBJZiBzZWxlY3RlZCBub2RlIGlzIFNjaGVtYSB0 aGVuIGFkZCBpdCBpbiBtb2RlbAogICAgICAgICAgICAgICAgICAgaWYoZC5f dHlwZSA9PSAnc2NoZW1hJykgewogICAgICAgICAgICAgICAgICAgICB2YXIg c2NoZW1hcyA9IFtdOwotICAgICAgICAgICAgICAgICAgICBzY2hlbWFzLnB1 c2goZC5sYWJlbCk7CisgICAgICAgICAgICAgICAgICAgIHNjaGVtYXMucHVz aChkLl9sYWJlbCk7CiAgICAgICAgICAgICAgICAgICAgIHRoaXMudmlldy5t b2RlbC5zZXQoJ3NjaGVtYXMnLCBzY2hlbWFzKTsKICAgICAgICAgICAgICAg ICAgIH0KICAgICAgICAgICAgICAgICAgIC8vIElmIHNlbGVjdGVkIG5vZGUg aXMgVGFibGUgdGhlbiBhZGQgaXQgaW4gbW9kZWwgYWxvbmcgd2l0aAogICAg ICAgICAgICAgICAgICAgLy8gaXRzIHNjaGVtYQogICAgICAgICAgICAgICAg ICAgaWYoZC5fdHlwZSA9PSAndGFibGUnKSB7CiAgICAgICAgICAgICAgICAg ICAgIHRoaXMudmlldy5tb2RlbC5zZXQoCi0gICAgICAgICAgICAgICAgICAg ICAgJ3RhYmxlcycsIFtbdHJlZUluZm8uc2NoZW1hLmxhYmVsLCBkLmxhYmVs XV0KKyAgICAgICAgICAgICAgICAgICAgICAndGFibGVzJywgW1t0cmVlSW5m by5zY2hlbWEuX2xhYmVsLCBkLl9sYWJlbF1dCiAgICAgICAgICAgICAgICAg ICAgICk7CiAgICAgICAgICAgICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL3Rvb2xzL2ltcG9ydF9leHBvcnQvX19pbml0X18ucHkgYi93 ZWIvcGdhZG1pbi90b29scy9pbXBvcnRfZXhwb3J0L19faW5pdF9fLnB5Cmlu ZGV4IGUxZGMwNjEuLjI5YzBkZDQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L3Rvb2xzL2ltcG9ydF9leHBvcnQvX19pbml0X18ucHkKKysrIGIvd2ViL3Bn YWRtaW4vdG9vbHMvaW1wb3J0X2V4cG9ydC9fX2luaXRfXy5weQpAQCAtMjA2 LDggKzIwNiwxMSBAQCBkZWYgY3JlYXRlX2ltcG9ydF9leHBvcnRfam9iKHNp ZCk6CiAgICAgICAgICAgICAgICAgc3RvcmFnZV9kaXIgPSBzdG9yYWdlX2Rp ci5yZXBsYWNlKCcvJywgJ1xcJykKICAgICAgICAgICAgIGRhdGFbJ2ZpbGVu YW1lJ10gPSBkYXRhWydmaWxlbmFtZSddLnJlcGxhY2UoJ1xcJywgJ1xcXFwn KQogICAgICAgICAgICAgZGF0YVsnZmlsZW5hbWUnXSA9IG9zLnBhdGguam9p bihzdG9yYWdlX2RpciwgZGF0YVsnZmlsZW5hbWUnXS5sc3RyaXAoJy8nKSkK LSAgICAgICAgZWxzZToKKyAgICAgICAgZWxpZiBzdG9yYWdlX2RpcjoKICAg ICAgICAgICAgIGRhdGFbJ2ZpbGVuYW1lJ10gPSBvcy5wYXRoLmpvaW4oc3Rv cmFnZV9kaXIsIGRhdGFbJ2ZpbGVuYW1lJ10ubHN0cmlwKCcvJykpCisgICAg ICAgIGVsc2U6CisgICAgICAgICAgICBkYXRhWydmaWxlbmFtZSddID0gZGF0 YVsnZmlsZW5hbWUnXQorCiAgICAgZWxzZToKICAgICAgICAgcmV0dXJuIG1h a2VfanNvbl9yZXNwb25zZSgKICAgICAgICAgICAgIGRhdGE9eydzdGF0dXMn OiBGYWxzZSwgJ2luZm8nOiAnUGxlYXNlIHNwZWNpZnkgYSB2YWxpZCBmaWxl J30KQEAgLTI1NCw4ICsyNTcsNyBAQCBkZWYgY3JlYXRlX2ltcG9ydF9leHBv cnRfam9iKHNpZCk6CiAKICAgICBhcmdzID0gWwogICAgICAgICAnLS1ob3N0 Jywgc2VydmVyLmhvc3QsICctLXBvcnQnLCBzdHIoc2VydmVyLnBvcnQpLAot ICAgICAgICAnLS11c2VybmFtZScsIHNlcnZlci51c2VybmFtZSwgJy0tZGJu YW1lJywKLSAgICAgICAgZHJpdmVyLnF0SWRlbnQoY29ubiwgZGF0YVsnZGF0 YWJhc2UnXSksCisgICAgICAgICctLXVzZXJuYW1lJywgc2VydmVyLnVzZXJu YW1lLCAnLS1kYm5hbWUnLCBkYXRhWydkYXRhYmFzZSddLAogICAgICAgICAn LS1jb21tYW5kJywgcXVlcnkKICAgICBdCiAKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL3Rvb2xzL2ltcG9ydF9leHBvcnQvdGVtcGxhdGVzL2ltcG9ydF9l eHBvcnQvanMvaW1wb3J0X2V4cG9ydC5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xz L2ltcG9ydF9leHBvcnQvdGVtcGxhdGVzL2ltcG9ydF9leHBvcnQvanMvaW1w b3J0X2V4cG9ydC5qcwppbmRleCBmNTY0YTBlLi42MTI5OTJjIDEwMDY0NAot LS0gYS93ZWIvcGdhZG1pbi90b29scy9pbXBvcnRfZXhwb3J0L3RlbXBsYXRl cy9pbXBvcnRfZXhwb3J0L2pzL2ltcG9ydF9leHBvcnQuanMKKysrIGIvd2Vi L3BnYWRtaW4vdG9vbHMvaW1wb3J0X2V4cG9ydC90ZW1wbGF0ZXMvaW1wb3J0 X2V4cG9ydC9qcy9pbXBvcnRfZXhwb3J0LmpzCkBAIC00MDAsOSArNDAwLDkg QEAgZGVmaW5lKAogICAgICAgICAgICAgICAgICAgICB0cmVlSW5mbyA9IG4u Z2V0VHJlZU5vZGVIaWVyYXJjaHkuYXBwbHkobiwgW2ldKQogCiAgICAgICAg ICAgICAgICAgICB0aGlzLnZpZXcubW9kZWwuc2V0KHsKLSAgICAgICAgICAg ICAgICAgICAgJ2RhdGFiYXNlJzogdHJlZUluZm8uZGF0YWJhc2UubGFiZWws Ci0gICAgICAgICAgICAgICAgICAgICdzY2hlbWEnOiB0cmVlSW5mby5zY2hl bWEubGFiZWwsCi0gICAgICAgICAgICAgICAgICAgICd0YWJsZSc6IHRyZWVJ bmZvLnRhYmxlLmxhYmVsCisgICAgICAgICAgICAgICAgICAgICdkYXRhYmFz ZSc6IHRyZWVJbmZvLmRhdGFiYXNlLl9sYWJlbCwKKyAgICAgICAgICAgICAg ICAgICAgJ3NjaGVtYSc6IHRyZWVJbmZvLnNjaGVtYS5fbGFiZWwsCisgICAg ICAgICAgICAgICAgICAgICd0YWJsZSc6IHRyZWVJbmZvLnRhYmxlLl9sYWJl bAogICAgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICAgICAgICB2 YXIgc2VsZiA9IHRoaXMsCiAgICAgICAgICAgICAgICAgICAgICAgYmFzZVVy bCA9ICJ7eyB1cmxfZm9yKCdpbXBvcnRfZXhwb3J0LmluZGV4JykgfX0iICsK ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvX19p bml0X18ucHkKaW5kZXggODg1M2M4Yi4uNDIyOTE5MiAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvX19pbml0X18ucHkKKysr IGIvd2ViL3BnYWRtaW4vdG9vbHMvbWFpbnRlbmFuY2UvX19pbml0X18ucHkK QEAgLTIxNyw3ICsyMTcsNyBAQCBkZWYgY3JlYXRlX21haW50ZW5hbmNlX2pv YihzaWQsIGRpZCk6CiAgICAgYXJncyA9IFsKICAgICAgICAgJy0taG9zdCcs IHNlcnZlci5ob3N0LCAnLS1wb3J0Jywgc3RyKHNlcnZlci5wb3J0KSwKICAg ICAgICAgJy0tdXNlcm5hbWUnLCBzZXJ2ZXIudXNlcm5hbWUsICctLWRibmFt ZScsCi0gICAgICAgIGRyaXZlci5xdElkZW50KGNvbm4sIGRhdGFbJ2RhdGFi YXNlJ10pLAorICAgICAgICBkYXRhWydkYXRhYmFzZSddLAogICAgICAgICAn LS1jb21tYW5kJywgcXVlcnkKICAgICBdCiAKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL3RlbXBsYXRlcy9tYWludGVuYW5j ZS9qcy9tYWludGVuYW5jZS5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL21haW50 ZW5hbmNlL3RlbXBsYXRlcy9tYWludGVuYW5jZS9qcy9tYWludGVuYW5jZS5q cwppbmRleCA3YTg1NmI2Li41ZmNmNzBjIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi90b29scy9tYWludGVuYW5jZS90ZW1wbGF0ZXMvbWFpbnRlbmFuY2Uv anMvbWFpbnRlbmFuY2UuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvbWFp bnRlbmFuY2UvdGVtcGxhdGVzL21haW50ZW5hbmNlL2pzL21haW50ZW5hbmNl LmpzCkBAIC0yOTUsMjEgKzI5NSwyMSBAQCBkZWZpbmUoCiAgICAgICAgICAg ICAgICAgICB2YXIgdHJlZUluZm8gPSBub2RlLmdldFRyZWVOb2RlSGllcmFy Y2h5LmFwcGx5KG5vZGUsIFtpXSk7CiAKICAgICAgICAgICAgICAgICAgIGlm ICh0cmVlSW5mby5zY2hlbWEgIT0gdW5kZWZpbmVkKSB7Ci0gICAgICAgICAg ICAgICAgICAgIHNjaGVtYSA9IHRyZWVJbmZvLnNjaGVtYS5sYWJlbDsKKyAg ICAgICAgICAgICAgICAgICAgc2NoZW1hID0gdHJlZUluZm8uc2NoZW1hLl9s YWJlbDsKICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAg IGlmICh0cmVlSW5mby50YWJsZSAhPSB1bmRlZmluZWQpIHsKLSAgICAgICAg ICAgICAgICAgICAgdGFibGUgPSB0cmVlSW5mby50YWJsZS5sYWJlbDsKKyAg ICAgICAgICAgICAgICAgICAgdGFibGUgPSB0cmVlSW5mby50YWJsZS5fbGFi ZWw7CiAgICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAg IGlmICh0cmVlSW5mby5wcmltYXJ5X2tleSAhPSB1bmRlZmluZWQpIHsKLSAg ICAgICAgICAgICAgICAgICAgcHJpbWFyeV9rZXkgPSB0cmVlSW5mby5wcmlt YXJ5X2tleS5sYWJlbDsKKyAgICAgICAgICAgICAgICAgICAgcHJpbWFyeV9r ZXkgPSB0cmVlSW5mby5wcmltYXJ5X2tleS5fbGFiZWw7CiAgICAgICAgICAg ICAgICAgICB9IGVsc2UgaWYgKHRyZWVJbmZvLnVuaXF1ZV9jb25zdHJhaW50 ICE9IHVuZGVmaW5lZCkgewotICAgICAgICAgICAgICAgICAgICB1bmlxdWVf Y29uc3RyYWludCA9IHRyZWVJbmZvLnVuaXF1ZV9jb25zdHJhaW50LmxhYmVs OworICAgICAgICAgICAgICAgICAgICB1bmlxdWVfY29uc3RyYWludCA9IHRy ZWVJbmZvLnVuaXF1ZV9jb25zdHJhaW50Ll9sYWJlbDsKICAgICAgICAgICAg ICAgICAgIH0gZWxzZSBpZiAodHJlZUluZm8uaW5kZXggIT0gdW5kZWZpbmVk KSB7Ci0gICAgICAgICAgICAgICAgICAgIGluZGV4ID0gdHJlZUluZm8uaW5k ZXgubGFiZWw7CisgICAgICAgICAgICAgICAgICAgIGluZGV4ID0gdHJlZUlu Zm8uaW5kZXguX2xhYmVsOwogICAgICAgICAgICAgICAgICAgfQogCi0gICAg ICAgICAgICAgICAgICB0aGlzLnZpZXcubW9kZWwuc2V0KHsnZGF0YWJhc2Un OiB0cmVlSW5mby5kYXRhYmFzZS5sYWJlbCwKKyAgICAgICAgICAgICAgICAg IHRoaXMudmlldy5tb2RlbC5zZXQoeydkYXRhYmFzZSc6IHRyZWVJbmZvLmRh dGFiYXNlLl9sYWJlbCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ3NjaGVtYSc6IHNjaGVtYSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ3RhYmxlJzogdGFibGUsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdwcmltYXJ5X2tleSc6 IHByaW1hcnlfa2V5LApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMv cmVzdG9yZS90ZW1wbGF0ZXMvcmVzdG9yZS9qcy9yZXN0b3JlLmpzIGIvd2Vi L3BnYWRtaW4vdG9vbHMvcmVzdG9yZS90ZW1wbGF0ZXMvcmVzdG9yZS9qcy9y ZXN0b3JlLmpzCmluZGV4IDJiYzM1ZTguLjcwNjRmYTMgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL3Rvb2xzL3Jlc3RvcmUvdGVtcGxhdGVzL3Jlc3RvcmUv anMvcmVzdG9yZS5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9yZXN0b3Jl L3RlbXBsYXRlcy9yZXN0b3JlL2pzL3Jlc3RvcmUuanMKQEAgLTQ3MiwyNiAr NDcyLDI2IEBAIGRlZmluZShbCiAgICAgICAgICAgICAgICAgICB2YXIgaW5m byA9IG5vZGUuZ2V0VHJlZU5vZGVIaWVyYXJjaHkuYXBwbHkobm9kZSwgW2ld KSwKICAgICAgICAgICAgICAgICAgICAgICBtID0gdGhpcy52aWV3Lm1vZGVs OwogICAgICAgICAgICAgICAgICAgLy8gU2V0IGN1cnJlbnQgbm9kZSBpbmZv IGludG8gbW9kZWwKLSAgICAgICAgICAgICAgICAgIG0uc2V0KCdkYXRhYmFz ZScsIGluZm8uZGF0YWJhc2UubGFiZWwpOworICAgICAgICAgICAgICAgICAg bS5zZXQoJ2RhdGFiYXNlJywgaW5mby5kYXRhYmFzZS5fbGFiZWwpOwogICAg ICAgICAgICAgICAgICAgaWYgKCFtLmdldCgnY3VzdG9tJykpIHsKICAgICAg ICAgICAgICAgICAgICAgc3dpdGNoIChkLl90eXBlKSB7CiAgICAgICAgICAg ICAgICAgICAgICAgY2FzZSAnc2NoZW1hJzoKLSAgICAgICAgICAgICAgICAg ICAgICAgIG0uc2V0KCdzY2hlbWFzJywgZC5sYWJlbCk7CisgICAgICAgICAg ICAgICAgICAgICAgICBtLnNldCgnc2NoZW1hcycsIGQuX2xhYmVsKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAg ICAgICAgIGNhc2UgJ3RhYmxlJzoKLSAgICAgICAgICAgICAgICAgICAgICAg IG0uc2V0KCd0YWJsZXMnLCBbaW5mby5zY2hlbWEubGFiZWwsIGQubGFiZWxd KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG0uc2V0KCd0YWJsZXMnLCBb aW5mby5zY2hlbWEuX2xhYmVsLCBkLl9sYWJlbF0pOwogICAgICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgICAgY2Fz ZSAnZnVuY3Rpb24nOgotICAgICAgICAgICAgICAgICAgICAgICAgbS5zZXQo J2Z1bmN0aW9ucycsIFtpbmZvLnNjaGVtYS5sYWJlbCwgZC5sYWJlbF0pOwor ICAgICAgICAgICAgICAgICAgICAgICAgbS5zZXQoJ2Z1bmN0aW9ucycsIFtp bmZvLnNjaGVtYS5fbGFiZWwsIGQuX2xhYmVsXSk7CiAgICAgICAgICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICAgICAgICBjYXNl ICdpbmRleCc6Ci0gICAgICAgICAgICAgICAgICAgICAgICBtLnNldCgnaW5k ZXhlcycsIFtpbmZvLnNjaGVtYS5sYWJlbCwgZC5sYWJlbF0pOworICAgICAg ICAgICAgICAgICAgICAgICAgbS5zZXQoJ2luZGV4ZXMnLCBbaW5mby5zY2hl bWEuX2xhYmVsLCBkLl9sYWJlbF0pOwogICAgICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgICAgY2FzZSAndHJpZ2dl cic6Ci0gICAgICAgICAgICAgICAgICAgICAgICBtLnNldCgndHJpZ2dlcnMn LCBbaW5mby5zY2hlbWEubGFiZWwsIGQubGFiZWxdKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIG0uc2V0KCd0cmlnZ2VycycsIFtpbmZvLnNjaGVtYS5f bGFiZWwsIGQuX2xhYmVsXSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgICAgICAgICAgICAgICBjYXNlICd0cmlnZ2VyX2Z1 bmMnOgotICAgICAgICAgICAgICAgICAgICAgICAgbS5zZXQoJ3RyaWdnZXJf ZnVuY3MnLCBbaW5mby5zY2hlbWEubGFiZWwsIGQubGFiZWxdKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIG0uc2V0KCd0cmlnZ2VyX2Z1bmNzJywgW2lu Zm8uc2NoZW1hLl9sYWJlbCwgZC5fbGFiZWxdKTsKICAgICAgICAgICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgICB9IGVsc2Ugewo= --001a113f250674c0fb053f591dc6 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 --001a113f250674c0fb053f591dc6--