Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSPUu-00010K-6r for pgadmin-hackers@arkaria.postgresql.org; Wed, 27 Jul 2016 14:07:44 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bSPUt-0001Iq-Pg for pgadmin-hackers@arkaria.postgresql.org; Wed, 27 Jul 2016 14:07:43 +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 1bSPUs-0001If-FR for pgadmin-hackers@postgresql.org; Wed, 27 Jul 2016 14:07:42 +0000 Received: from mail-oi0-x231.google.com ([2607:f8b0:4003:c06::231]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bSPUm-0008NB-Ps for pgadmin-hackers@postgresql.org; Wed, 27 Jul 2016 14:07:41 +0000 Received: by mail-oi0-x231.google.com with SMTP id w18so18936453oiw.3 for ; Wed, 27 Jul 2016 07:07:36 -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=7vFGtfl/VIPJI9vGemZUjCAHavg4nps9oI9aoJEN1m0=; b=YCcqkdhRMfpA6PViQeEctWbdjm41/6F04hNH6ZQqXdCjMZ34a0dnM0vPjgRBkPY5oz +yEP74rr0c3lhwQOhhHT9v7O+GXh+kbTLEdc2InKwKXbAr5Z+VuxZ2enZkyyBTY8v2eW y30dhti0RWCl0ipteVhLEJXWHyIV7i3QlWD2Vrt4cx0I7/x7SJW+vxBD6yerNjBiMBCn z0mu1RMor/9z+B6GEk48qOotrf6pIs2Uocb+Ng5d/XYwg7qEzjUIalr74n5Qz/vVc0Ou tW9lZTGBAgq2KWAh4TZ7NBw7BUaUWNJQQXQb0FgGluTsOx+1TmFYmjEoG66xBflxRxe5 mrHw== 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=7vFGtfl/VIPJI9vGemZUjCAHavg4nps9oI9aoJEN1m0=; b=UK3kSdgr8dVhfUwetKIWQzV+7IKBwJ9oKtBY9ZZEsALsxxOkD/PRwQXR7x8BDZAL0N d2r/z91d+3WzkqpborE8e4z5sd3qhzM4RKTiq4ahJ4wwFA5i7Z4L71I4ZouK7z2V1oVC zGcKrZEFRTG/6cG58bhS4pkI9YGb7mp+UDr0Nxtz6indHaIKNTmxr0qdFKDlXUNhD/bg coU2+t4Tpbp5LPGneqotnb7hbVm2hi1TqS/Gq5KOYeCXLJUiDkEE5vukuMhBu/CIzR1y NuZgYfNq8Fd4XX2E88gVAbYCOgo/rXXRYItlrrldANXfceHJcvo3ZkeYyGf+btRAGM58 PAoA== X-Gm-Message-State: AEkoousObfskd0Z4GKqn4SxxllN1dfA+ZuS5AUdqxeOezTBAbmH6YXRrCLQE7COy429jyn160pe2RLdjw41jSp68 X-Received: by 10.202.74.205 with SMTP id x196mr16689843oia.74.1469628455000; Wed, 27 Jul 2016 07:07:35 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.5.99 with HTTP; Wed, 27 Jul 2016 07:07:34 -0700 (PDT) In-Reply-To: References: From: Harshal Dhumal Date: Wed, 27 Jul 2016 19:37:34 +0530 Message-ID: Subject: Re: patch for issue RM1260 [pgAdmin4] To: Ashesh Vashi Cc: Dave Page , pgadmin-hackers Content-Type: multipart/mixed; boundary=001a113dbc2a0368b005389e8a18 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 --001a113dbc2a0368b005389e8a18 Content-Type: multipart/alternative; boundary=001a113dbc2a0368aa05389e8a16 --001a113dbc2a0368aa05389e8a16 Content-Type: text/plain; charset=UTF-8 Hi, PFA updated patch for RM1260 (V4). Fixed create and delete operations for foreign table. -- *Harshal Dhumal* *Software Engineer* EnterpriseDB India: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Wed, Jul 27, 2016 at 6:53 PM, Ashesh Vashi wrote: > Hi Harshal, > > During testing, I found that create, and delete operation on foreign table > is not working. > Foreign table node uses, it's own version of Select2 Control, which should > have used maximum functionalities from the original NodeAjaxOptionsControl > for consistency reason. > Hence - I have made the changes. > > Can you please take a look at the create, and delete operations, and > submit combined patch for all those problems? > > -- > > Thanks & Regards, > > Ashesh Vashi > EnterpriseDB INDIA: Enterprise PostgreSQL Company > > > > *http://www.linkedin.com/in/asheshvashi* > > > On Wed, Jul 27, 2016 at 3:54 PM, Harshal Dhumal < > harshal.dhumal@enterprisedb.com> wrote: > >> and patch file >> >> -- >> *Harshal Dhumal* >> *Software Engineer* >> >> EnterpriseDB India: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> >> On Wed, Jul 27, 2016 at 3:49 PM, Harshal Dhumal < >> harshal.dhumal@enterprisedb.com> wrote: >> >>> Hi, >>> >>> PFA updated patch for RM1260. >>> >>> In addition to RM1260 issue I have added following changes in this patch. >>> 1] datamodel.js: Added option check against undefined. >>> 2] foreign key: fixed first empty option issue. >>> >>> -- >>> *Harshal Dhumal* >>> *Software Engineer* >>> >>> EnterpriseDB India: http://www.enterprisedb.com >>> The Enterprise PostgreSQL Company >>> >>> On Thu, Jul 7, 2016 at 5:08 PM, Ashesh Vashi < >>> ashesh.vashi@enterprisedb.com> wrote: >>> >>>> Sure - I will do. >>>> >>>> -- >>>> >>>> Thanks & Regards, >>>> >>>> Ashesh Vashi >>>> EnterpriseDB INDIA: Enterprise PostgreSQL Company >>>> >>>> >>>> >>>> *http://www.linkedin.com/in/asheshvashi* >>>> >>>> >>>> On Thu, Jul 7, 2016 at 2:33 PM, Dave Page wrote: >>>> >>>>> Ashesh, can you review/commit please? >>>>> >>>>> Thanks. >>>>> >>>>> On Thu, Jul 7, 2016 at 7:50 AM, Harshal Dhumal < >>>>> harshal.dhumal@enterprisedb.com> wrote: >>>>> >>>>>> Hi, >>>>>> >>>>>> By mistake I deleted a line which was not supposed to be deleted, and >>>>>> that line of code was initialization of select2. >>>>>> >>>>>> -- >>>>>> *Harshal Dhumal* >>>>>> *Software Engineer* >>>>>> >>>>>> EnterpriseDB India: http://www.enterprisedb.com >>>>>> The Enterprise PostgreSQL Company >>>>>> >>>>>> On Thu, Jul 7, 2016 at 12:13 PM, Ashesh Vashi < >>>>>> ashesh.vashi@enterprisedb.com> wrote: >>>>>> >>>>>>> Hi Harshal, >>>>>>> >>>>>>> Can you please explain - what was missing in the last patch? >>>>>>> >>>>>>> -- >>>>>>> >>>>>>> Thanks & Regards, >>>>>>> >>>>>>> Ashesh Vashi >>>>>>> EnterpriseDB INDIA: Enterprise PostgreSQL Company >>>>>>> >>>>>>> >>>>>>> >>>>>>> *http://www.linkedin.com/in/asheshvashi* >>>>>>> >>>>>>> >>>>>>> On Thu, Jul 7, 2016 at 12:12 PM, Harshal Dhumal < >>>>>>> harshal.dhumal@enterprisedb.com> wrote: >>>>>>> >>>>>>>> Hi, >>>>>>>> >>>>>>>> PFA updated patch for issue RM1260 >>>>>>>> >>>>>>>> -- >>>>>>>> *Harshal Dhumal* >>>>>>>> *Software Engineer* >>>>>>>> >>>>>>>> EnterpriseDB India: http://www.enterprisedb.com >>>>>>>> The Enterprise PostgreSQL Company >>>>>>>> >>>>>>>> On Thu, Jul 7, 2016 at 12:04 PM, Harshal Dhumal < >>>>>>>> harshal.dhumal@enterprisedb.com> wrote: >>>>>>>> >>>>>>>>> Hi, >>>>>>>>> Please ignore this patch as this has some minor issue. I'll sent >>>>>>>>> updated one. >>>>>>>>> >>>>>>>>> -- >>>>>>>>> *Harshal Dhumal* >>>>>>>>> *Software Engineer* >>>>>>>>> >>>>>>>>> EnterpriseDB India: http://www.enterprisedb.com >>>>>>>>> The Enterprise PostgreSQL Company >>>>>>>>> >>>>>>>>> On Wed, Jul 6, 2016 at 5:30 PM, Harshal Dhumal < >>>>>>>>> harshal.dhumal@enterprisedb.com> wrote: >>>>>>>>> >>>>>>>>>> Hi, >>>>>>>>>> >>>>>>>>>> PFA patch for issue RM1260. >>>>>>>>>> >>>>>>>>>> Changes: Issue wasn't related to foreign table but was due the >>>>>>>>>> Select2 control. Now I have improved select2 control to handle null value >>>>>>>>>> in multi-select mode. Initial it was returning "null" instead it should >>>>>>>>>> return [] (empty array). >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> -- >>>>>>>>>> *Harshal Dhumal* >>>>>>>>>> *Software Engineer* >>>>>>>>>> >>>>>>>>>> EnterpriseDB India: http://www.enterprisedb.com >>>>>>>>>> The Enterprise PostgreSQL Company >>>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> -- >>>>>>>> Sent via pgadmin-hackers mailing list ( >>>>>>>> pgadmin-hackers@postgresql.org) >>>>>>>> To make changes to your subscription: >>>>>>>> http://www.postgresql.org/mailpref/pgadmin-hackers >>>>>>>> >>>>>>>> >>>>>>> >>>>>> >>>>> >>>>> >>>>> -- >>>>> Dave Page >>>>> Blog: http://pgsnake.blogspot.com >>>>> Twitter: @pgsnake >>>>> >>>>> EnterpriseDB UK: http://www.enterprisedb.com >>>>> The Enterprise PostgreSQL Company >>>>> >>>> >>>> >>> >> > --001a113dbc2a0368aa05389e8a16 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi,

PFA updated patch for RM1260 (V4).

=
Fixed create and delete operations for foreign table.


--=C2=A0
Harshal Dhumal
Software Engineer

EnterpriseDB India:=C2=A0http://www.enterprisedb.com
The Enterprise PostgreSQL Company

On Wed, Jul 27, 2016 at 6:53 PM, Ashesh Vash= i <ashesh.vashi@enterprisedb.com> wrote:
Hi Harshal,

= During testing, I found that create, and delete operation on foreign table = is not working.
Foreign table node uses, it's own version of = Select2 Control, which should have used maximum functionalities from the or= iginal NodeAjaxOptionsControl for consistency reason.
Hence - I h= ave made the changes.

Can you please take a look a= t the create, and delete operations, and submit combined patch for all thos= e problems?

--

Thanks & R= egards,

Ashesh Vashi
EnterpriseDB INDIA: <= /span>Enterprise = PostgreSQL Company

<= br>

<= a href=3D"http://www.linkedin.com/in/asheshvashi" target=3D"_blank">http= ://www.linkedin.com/in/asheshvashi


On Wed, Jul 27= , 2016 at 3:54 PM, Harshal Dhumal <harshal.dhumal@enterprise= db.com> wrote:
and patch file

--=C2=A0
Harshal Dhumal
Software Engineer

EnterpriseDB India:=C2=A0http://www.enterprisedb.com
The Enterprise PostgreSQL Company

On Wed, Jul 27, 2016 at 3:4= 9 PM, Harshal Dhumal <harshal.dhumal@enterprisedb.com>= ; wrote:
Hi,

PFA updated patch for RM1260.

In = addition to RM1260 issue I have added following changes in this patch.
<= /div>1] datamodel.js: Added option check against undefined.
2] for= eign key: fixed first empty option issue.

--=C2=A0
Harshal Dhumal
Software Engineer

Enterpr= iseDB India:=C2=A0http://www.enterpr= isedb.com
The Enterprise PostgreSQL C= ompany

On Thu, Jul 7, 2016 at 5:08= PM, Ashesh Vashi <ashesh.vashi@enterprisedb.com> wrote:
Sure - I will d= o.

--

Thanks & Regards,

Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Company

<= br>

<= a href=3D"http://www.linkedin.com/in/asheshvashi" target=3D"_blank">http= ://www.linkedin.com/in/asheshvashi


On Thu, Jul 7, 2016 at 2:33= PM, Dave Page <dpage@pgadmin.org> wrote:
Ashesh, can you review/commit please?
=
Thanks.

=
On Thu, Jul 7, 2016 at 7:50 AM, Harshal Dhumal <= span dir=3D"ltr"><harshal.dhumal@enterprisedb.com> wrote:
Hi,

By mista= ke I deleted a line which was not supposed to be deleted, and that line of = code was initialization of select2.

=
--=C2=A0
Hars= hal Dhumal
Software Engineer

EnterpriseDB= India:=C2=A0http://www.enterprisedb= .com
The Enterprise PostgreSQL Comp= any
<= /div>

On Thu, Jul 7, 2016 at 12:1= 3 PM, Ashesh Vashi <ashesh.vashi@enterprisedb.com> wrote:
Hi Harshal,
Can you please explain - what was missing in the last patc= h?

--

Thanks & Regards,

Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Company

<= br>

<= a href=3D"http://www.linkedin.com/in/asheshvashi" target=3D"_blank">http= ://www.linkedin.com/in/asheshvashi


On Thu, Jul 7, 2016 at 12:12 PM, H= arshal Dhumal <harshal.dhumal@enterprisedb.com> wrote:
Hi,

PFA updated patch for issue RM1260
=

=
--=C2=A0
Harshal Dhumal
Software Enginee= r

EnterpriseDB India:=C2=A0http://www.enterprisedb.com
T= he Enterprise PostgreSQL Company

On Thu, Jul 7, 2016 at 12:04 PM= , Harshal Dhumal <harshal.dhumal@enterprisedb.com> wrote:
Hi,
Plea= se ignore this patch as this has some minor issue. I'll sent updated on= e.

<= div>
--=C2=A0
Harshal Dhumal
Soft= ware Engineer

EnterpriseDB India:=C2=A0http://www.enterprisedb.com
The Enterprise PostgreSQL Company

On Wed, Jul 6, 2016 at 5:30= PM, Harshal Dhumal <harshal.dhumal@enterprisedb.com>= wrote:
Hi,

PFA patch for issue RM1260.

Changes: Issue w= asn't related to foreign table but was due the Select2 control. Now I h= ave improved select2 control to handle null value in multi-select mode. Ini= tial it was returning "null" instead it should return [] (empty a= rray).


--=C2=A0
Harshal Dhumal
=
Software Engineer

EnterpriseDB India:=C2=A0http://www.enterprisedb.com
The Enterprise PostgreSQL Company




--
Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgadmin-hackers=






<= font color=3D"#888888">--
Dave = Page
Blog: htt= p://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: <= a href=3D"http://www.enterprisedb.com" target=3D"_blank">http://www.enterpr= isedb.com
The Enterprise PostgreSQL Company





--001a113dbc2a0368aa05389e8a16-- --001a113dbc2a0368b005389e8a18 Content-Type: text/x-patch; charset=US-ASCII; name="RM1260_V4.patch" Content-Disposition: attachment; filename="RM1260_V4.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ir4yu1v21 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvX19p bml0X18ucHkKaW5kZXggMjY2NWI2Mi4uOTgxODJmYyAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvX19pbml0X18ucHkKKysr IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvX19pbml0X18ucHkK QEAgLTY2OCw3ICs2NjgsOCBAQCBBTkQgcmVsa2luZCAhPSAnYycpKSIiIgog ICAgICAgICAgICAgaWYgbm90IHN0YXR1czoKICAgICAgICAgICAgICAgICBy ZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPXJlcykKIAot ICAgICAgICAgICAgZm9pZCwgc2NpZCA9IHJlc1sncm93cyddWzBdCisgICAg ICAgICAgICBmb2lkID0gcmVzWydyb3dzJ11bMF1bJ29pZCddCisgICAgICAg ICAgICBzY2lkID0gcmVzWydyb3dzJ11bMF1bJ3NjaWQnXQogCiAgICAgICAg ICAgICByZXR1cm4ganNvbmlmeSgKICAgICAgICAgICAgICAgICBub2RlPXNl bGYuYmx1ZXByaW50LmdlbmVyYXRlX2Jyb3dzZXJfbm9kZSgKQEAgLTcxOCw3 ICs3MTksOCBAQCBBTkQgcmVsa2luZCAhPSAnYycpKSIiIgogICAgICAgICAg ICAgICAgICAgICApCiAgICAgICAgICAgICAgICAgKQogCi0gICAgICAgICAg ICBuYW1lLCBiYXNlbnNwID0gcmVzWydyb3dzJ11bMF0KKyAgICAgICAgICAg IG5hbWUgPSAgcmVzWydyb3dzJ11bMF1bJ25hbWUnXQorICAgICAgICAgICAg YmFzZW5zcCA9IHJlc1sncm93cyddWzBdWydiYXNlbnNwJ10KIAogICAgICAg ICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKCIvIi5qb2luKFtzZWxmLnRl bXBsYXRlX3BhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICdkZWxldGUuc3FsJ10pLApAQCAtMTEwMywxMyArMTEw NSw2IEBAIEFORCByZWxraW5kICE9ICdjJykpIiIiCiAgICAgICAgIGlmIGNv bHMgYW5kICdyb3dzJyBpbiBjb2xzOgogICAgICAgICAgICAgZGF0YVsnY29s dW1ucyddID0gY29sc1sncm93cyddCiAKLSAgICAgICAgZGF0YVsnc3RyY29s dW1uJ10gPSAnJwotICAgICAgICBzdHJfY29scyA9IFtdCi0gICAgICAgIGlm ICdjb2x1bW5zJyBpbiBkYXRhOgotICAgICAgICAgICAgZm9yIGMgaW4gZGF0 YVsnY29sdW1ucyddOgotICAgICAgICAgICAgICAgIHN0cl9jb2xzLmFwcGVu ZChjWydzdHJjb2x1bW4nXSkKLSAgICAgICAgICAgIGRhdGFbJ3N0cmNvbHVt biddID0gJywgJy5qb2luKHN0cl9jb2xzKQotCiAgICAgICAgICMgR2V0IElu aGVyaXRlZCB0YWJsZSBuYW1lcyBmcm9tIHRoZWlyIE9JRAogICAgICAgICBp ZiBpbmhlcml0czoKICAgICAgICAgICAgIGlmICdpbmhlcml0cycgaW4gZGF0 YSBhbmQgZGF0YVsnaW5oZXJpdHMnXToKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL2ZvcmVpZ25fdGFibGVzL3RlbXBsYXRlcy9mb3JlaWduX3RhYmxl cy9qcy9mb3JlaWduX3RhYmxlcy5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVp Z25fdGFibGVzL3RlbXBsYXRlcy9mb3JlaWduX3RhYmxlcy9qcy9mb3JlaWdu X3RhYmxlcy5qcwppbmRleCBhNGI1YTI3Li4yMzBiNmMyIDEwMDY0NAotLS0g YS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9k YXRhYmFzZXMvc2NoZW1hcy9mb3JlaWduX3RhYmxlcy90ZW1wbGF0ZXMvZm9y ZWlnbl90YWJsZXMvanMvZm9yZWlnbl90YWJsZXMuanMKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVpZ25fdGFi bGVzL2pzL2ZvcmVpZ25fdGFibGVzLmpzCkBAIC0yNDEsMjIgKzI0MSw2IEBA IGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRtaW4sIHBnQnJvd3NlciwgYWxlcnRp ZnkpIHsKICAgICB0b0pTT046IEJhY2tib25lLk1vZGVsLnByb3RvdHlwZS50 b0pTT04KICAgfSk7CiAKLSAgdmFyIGZvcm1hdE5vZGUgPSBmdW5jdGlvbihv cHQpIHsKLSAgICBpZiAoIW9wdC5pZCkgewotICAgICAgcmV0dXJuIG9wdC50 ZXh0OwotICAgIH0KLQotICAgIHZhciBvcHRpbWFnZSA9ICQob3B0LmVsZW1l bnQpLmRhdGEoJ2ltYWdlJyk7Ci0KLSAgICBpZighb3B0aW1hZ2UpewotICAg ICAgcmV0dXJuIG9wdC50ZXh0OwotICAgIH0gZWxzZSB7Ci0gICAgICByZXR1 cm4gJCgKLSAgICAgICAgICAnPHNwYW4+PHNwYW4gY2xhc3M9IndjVGFiSWNv biAnICsgb3B0aW1hZ2UgKyAnIi8+JyArIG9wdC50ZXh0ICsgJzwvc3Bhbj4n Ci0gICAgICAgICAgKTsKLSAgICB9Ci0gIH07Ci0KIAogICAvKiBOb2RlQWph eE9wdGlvbnNNdWx0aXBsZUNvbnRyb2wgaXMgZm9yIG11bHRpcGxlIHNlbGVj dGlvbiBvZiBDb21ib2JveC4KICAgKiAgVGhpcyBjb250cm9sIGlzIHVzZWQg dG8gc2VsZWN0IE11bHRpcGxlIFBhcmVudCBUYWJsZXMgdG8gYmUgaW5oZXJp dGVkLgpAQCAtMjY0LDgzICsyNDgsNyBAQCBmdW5jdGlvbigkLCBfLCBTLCBw Z0FkbWluLCBwZ0Jyb3dzZXIsIGFsZXJ0aWZ5KSB7CiAgICogIFRvIHBvcHVs YXRlcyB0aGUgY29sdW1uLCBpdCBjYWxscyB0aGUgc2VydmVyIGFuZCBmZXRj aCB0aGUgY29sdW1ucyBkYXRhCiAgICogIGZvciB0aGUgc2VsZWN0ZWQgdGFi bGUuCiAgICovCi0KLSAgdmFyIE5vZGVBamF4T3B0aW9uc011bHRpcGxlQ29u dHJvbCA9IEJhY2tmb3JtLk5vZGVBamF4T3B0aW9uc011bHRpcGxlQ29udHJv bCA9IEJhY2tmb3JtLk5vZGVBamF4T3B0aW9uc0NvbnRyb2wuZXh0ZW5kKHsK LSAgICB0ZW1wbGF0ZTogXy50ZW1wbGF0ZShbCi0gICAgICAnPGxhYmVsIGNs YXNzPSI8JT1CYWNrZm9ybS5jb250cm9sTGFiZWxDbGFzc05hbWUlPiI+PCU9 bGFiZWwlPjwvbGFiZWw+JywKLSAgICAgICc8ZGl2IGNsYXNzPSI8JT1CYWNr Zm9ybS5jb250cm9sc0NsYXNzTmFtZSU+IDwlPWV4dHJhQ2xhc3Nlcy5qb2lu KFwnIFwnKSU+Ij4nLAotICAgICAgJyAgPHNlbGVjdCBjbGFzcz0icGdhZG1p bi1ub2RlLXNlbGVjdCBmb3JtLWNvbnRyb2wiIG5hbWU9IjwlPW5hbWUlPiIg c3R5bGU9IndpZHRoOjEwMCU7IiB2YWx1ZT08JS12YWx1ZSU+IDwlPWRpc2Fi bGVkID8gImRpc2FibGVkIiA6ICIiJT4gPCU9cmVxdWlyZWQgPyAicmVxdWly ZWQiIDogIiIlPiA+JywKLSAgICAgICcgIDwvc2VsZWN0PicsCi0gICAgICAn PC9kaXY+J10uam9pbigiXG4iKSksCi0gICAgZGVmYXVsdHM6IF8uZXh0ZW5k KAotICAgICAge30sIEJhY2tmb3JtLk5vZGVBamF4T3B0aW9uc0NvbnRyb2wu cHJvdG90eXBlLmRlZmF1bHRzLAotICAgICAgewotICAgICAgICBzZWxlY3Qy OiB7Ci0gICAgICAgICAgYWxsb3dDbGVhcjogdHJ1ZSwKLSAgICAgICAgICBw bGFjZWhvbGRlcjogJ1NlbGVjdCBmcm9tIHRoZSBsaXN0JywKLSAgICAgICAg ICB3aWR0aDogJ3N0eWxlJywKLSAgICAgICAgICB0ZW1wbGF0ZVJlc3VsdDog Zm9ybWF0Tm9kZSwKLSAgICAgICAgICB0ZW1wbGF0ZVNlbGVjdGlvbjogZm9y bWF0Tm9kZQotICAgICAgICB9Ci0gICAgICB9KSwKLSAgICByZW5kZXI6IGZ1 bmN0aW9uKCkgewotICAgICAgdmFyIGZpZWxkID0gXy5kZWZhdWx0cyh0aGlz LmZpZWxkLnRvSlNPTigpLCB0aGlzLmRlZmF1bHRzKSwKLSAgICAgICAgYXR0 cmlidXRlcyA9IHRoaXMubW9kZWwudG9KU09OKCksCi0gICAgICAgIGF0dHJB cnIgPSBmaWVsZC5uYW1lLnNwbGl0KCcuJyksCi0gICAgICAgIG5hbWUgPSBh dHRyQXJyLnNoaWZ0KCksCi0gICAgICAgIHBhdGggPSBhdHRyQXJyLmpvaW4o Jy4nKSwKLSAgICAgICAgcmF3VmFsdWUgPSB0aGlzLmtleVBhdGhBY2Nlc3Nv cihhdHRyaWJ1dGVzW25hbWVdLCBwYXRoKSwKLSAgICAgICAgZGF0YSA9IF8u ZXh0ZW5kKGZpZWxkLCB7Ci0gICAgICAgICAgcmF3VmFsdWU6IHJhd1ZhbHVl LAotICAgICAgICAgIHZhbHVlOiB0aGlzLmZvcm1hdHRlci5mcm9tUmF3KHJh d1ZhbHVlLCB0aGlzLm1vZGVsKSwKLSAgICAgICAgICBhdHRyaWJ1dGVzOiBh dHRyaWJ1dGVzLAotICAgICAgICAgIGZvcm1hdHRlcjogdGhpcy5mb3JtYXR0 ZXIKLSAgICAgICAgfSksCi0gICAgICAgIGV2YWxGID0gZnVuY3Rpb24oZiwg ZCwgbSkgewotICAgICAgICAgIHJldHVybiAoXy5pc0Z1bmN0aW9uKGYpID8g ISFmLmFwcGx5KGQsIFttXSkgOiAhIWYpOwotICAgICAgICB9OwotCi0gICAg ICAvLyBFdmFsdWF0ZSB0aGUgZGlzYWJsZWQsIHZpc2libGUsIGFuZCByZXF1 aXJlZCBvcHRpb24KLSAgICAgIF8uZXh0ZW5kKGRhdGEsIHsKLSAgICAgICAg ZGlzYWJsZWQ6IGV2YWxGKGRhdGEuZGlzYWJsZWQsIGRhdGEsIHRoaXMubW9k ZWwpLAotICAgICAgICB2aXNpYmxlOiAgZXZhbEYoZGF0YS52aXNpYmxlLCBk YXRhLCB0aGlzLm1vZGVsKSwKLSAgICAgICAgcmVxdWlyZWQ6IGV2YWxGKGRh dGEucmVxdWlyZWQsIGRhdGEsIHRoaXMubW9kZWwpCi0gICAgICB9KTsKLQot ICAgICAgaWYgKGZpZWxkLm5vZGVfaW5mby5zZXJ2ZXIudmVyc2lvbiA8IGZp ZWxkLm1pbl92ZXJzaW9uKSB7Ci0gICAgICAgIGZpZWxkLnZlcnNpb25fY29t cGF0aWJsZSA9IGZhbHNlCi0gICAgICAgIHJldHVybiB0aGlzOwotICAgICAg fQotICAgICAgZWxzZSB7Ci0gICAgICAgIC8vIEV2YWx1YXRpb24gdGhlIG9w dGlvbnMKLSAgICAgICAgaWYgKF8uaXNGdW5jdGlvbihkYXRhLm9wdGlvbnMp KSB7Ci0gICAgICAgIHRyeSB7Ci0gICAgICAgICAgZGF0YS5vcHRpb25zID0g ZGF0YS5vcHRpb25zLmFwcGx5KHRoaXMpCi0gICAgICAgIH0gY2F0Y2goZSkg ewotICAgICAgICAgIC8vIERvIG5vdGhpbmcKLSAgICAgICAgICBkYXRhLm9w dGlvbnMgPSBbXQotICAgICAgICAgIHRoaXMubW9kZWwudHJpZ2dlcigncGdh ZG1pbi12aWV3OnRyYW5zZm9ybTplcnJvcicsIHNlbGYubW9kZWwsIHNlbGYu ZmllbGQsIGUpOwotICAgICAgICB9Ci0gICAgICAgIH0KLQotICAgICAgICAv LyBDbGVhbiB1cCBmaXJzdAotICAgICAgICB0aGlzLiRlbC5yZW1vdmVDbGFz cyhCYWNrZm9ybS5oaWRkZW5DbGFzc25hbWUpOwotICAgICAgICB0aGlzLiRl bC5odG1sKHRoaXMudGVtcGxhdGUoZGF0YSkpLmFkZENsYXNzKGZpZWxkLm5h bWUpOwotCi0gICAgICAgIGlmICghZGF0YS52aXNpYmxlKSB7Ci0gICAgICAg IHRoaXMuJGVsLmFkZENsYXNzKEJhY2tmb3JtLmhpZGRlbkNsYXNzbmFtZSk7 Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgIHZhciBvcHRzID0gXy5leHRl bmQoCi0gICAgICAgICAge30sIHRoaXMuZGVmYXVsdHMuc2VsZWN0MiwgZGF0 YS5zZWxlY3QyLAotICAgICAgICAgIHsKLSAgICAgICAgICAgICdkYXRhJzog ZGF0YS5vcHRpb25zCi0gICAgICAgICAgfSk7Ci0gICAgICAgIHRoaXMuJGVs LmZpbmQoInNlbGVjdCIpLnNlbGVjdDIob3B0cykudmFsKGRhdGEucmF3VmFs dWUpLnRyaWdnZXIoImNoYW5nZSIpOwotICAgICAgICB0aGlzLnVwZGF0ZUlu dmFsaWQoKTsKLSAgICAgICAgfQotICAgICAgfQotICAgICAgcmV0dXJuIHRo aXM7Ci0gICAgfSwKKyAgdmFyIE5vZGVBamF4T3B0aW9uc011bHRpcGxlQ29u dHJvbCA9IEJhY2tmb3JtLk5vZGVBamF4T3B0aW9uc0NvbnRyb2wuZXh0ZW5k KHsKICAgICBvbkNoYW5nZTogZnVuY3Rpb24oZSkgewogICAgICAgdmFyIG1v ZGVsID0gdGhpcy5tb2RlbCwKICAgICAgICAgICAkZWwgPSAkKGUudGFyZ2V0 KSwKQEAgLTM3MCw3ICsyNzgsNyBAQCBmdW5jdGlvbigkLCBfLCBTLCBwZ0Fk bWluLCBwZ0Jyb3dzZXIsIGFsZXJ0aWZ5KSB7CiAKICAgICAgIC8vIFJlbW92 ZSBDb2x1bW5zIGlmIGluaGVyaXQgb3B0aW9uIGlzIGRlc2VsZWN0ZWQgZnJv bSB0aGUgY29tYm9ib3gKICAgICAgIGlmKF8uc2l6ZSh2YWx1ZSkgPCBfLnNp emUoaW5oZXJpdHMpKSB7Ci0gICAgICAgIHZhciBkaWYgPSAgXy5kaWZmZXJl bmNlKGluaGVyaXRzLCBKU09OLnBhcnNlKHZhbHVlKSk7CisgICAgICAgIHZh ciBkaWYgPSAgXy5kaWZmZXJlbmNlKGluaGVyaXRzLCB2YWx1ZSk7CiAgICAg ICAgIHZhciBybXZfY29sdW1ucyA9IGNvbHVtbnMud2hlcmUoe2luaGVyaXRl ZGlkOiBwYXJzZUludChkaWZbMF0pfSk7CiAgICAgICAgIGNvbHVtbnMucmVt b3ZlKHJtdl9jb2x1bW5zKTsKICAgICAgIH0KQEAgLTYwMCw3ICs1MDgsNiBA QCBmdW5jdGlvbigkLCBfLCBTLCBwZ0FkbWluLCBwZ0Jyb3dzZXIsIGFsZXJ0 aWZ5KSB7CiAgICAgICAgICAgYmFzZW5zcDogdW5kZWZpbmVkLAogICAgICAg ICAgIGRlc2NyaXB0aW9uOiB1bmRlZmluZWQsCiAgICAgICAgICAgZnRzcnZu YW1lOiB1bmRlZmluZWQsCi0gICAgICAgICAgc3RyY29sdW1uOiB1bmRlZmlu ZWQsCiAgICAgICAgICAgc3RyZnRvcHRpb25zOiB1bmRlZmluZWQsCiAgICAg ICAgICAgaW5oZXJpdHM6IFtdLAogICAgICAgICAgIGNvbHVtbnM6IFtdLApA QCAtNjMyLDcgKzUzOSw3IEBAIGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRtaW4s IHBnQnJvd3NlciwgYWxlcnRpZnkpIHsKICAgICAgICAgICB0eXBlOiAndGV4 dCcsIGdyb3VwOiAnRGVmaW5pdGlvbicsIHVybDogJ2dldF9mb3JlaWduX3Nl cnZlcnMnLCBkaXNhYmxlZDogZnVuY3Rpb24obSkgeyByZXR1cm4gIW0uaXNO ZXcoKTsgfQogICAgICAgICB9LHsKICAgICAgICAgICBpZDogJ2luaGVyaXRz JywgbGFiZWw6J3t7IF8oJ0luaGVyaXRzJykgfX0nLCBncm91cDogJ0RlZmlu aXRpb24nLAotICAgICAgICAgIHR5cGU6ICdhcnJheScsIG1pbl92ZXJzaW9u OiA5MDUwMCwgY29udHJvbDogJ25vZGUtYWpheC1vcHRpb25zLW11bHRpcGxl JywKKyAgICAgICAgICB0eXBlOiAnYXJyYXknLCBtaW5fdmVyc2lvbjogOTA1 MDAsIGNvbnRyb2w6IE5vZGVBamF4T3B0aW9uc011bHRpcGxlQ29udHJvbCwK ICAgICAgICAgICB1cmw6ICdnZXRfdGFibGVzJywgc2VsZWN0Mjoge211bHRp cGxlOiB0cnVlfSwKICAgICAgICAgICAnY2FjaGVfbGV2ZWwnOiAnZGF0YWJh c2UnLAogICAgICAgICAgIHRyYW5zZm9ybTogZnVuY3Rpb24oZCwgc2VsZil7 CkBAIC02NDYsOSArNTUzLDYgQEAgZnVuY3Rpb24oJCwgXywgUywgcGdBZG1p biwgcGdCcm93c2VyLCBhbGVydGlmeSkgewogICAgICAgICAgICAgcmV0dXJu IGQ7CiAgICAgICAgICAgfQogICAgICAgICB9LHsKLSAgICAgICAgICBpZDog J3N0cmNvbHVtbicsIGxhYmVsOid7eyBfKCdDb2x1bW5zJykgfX0nLCBjZWxs OiAnc3RyaW5nJywgZ3JvdXA6ICdEZWZpbml0aW9uJywKLSAgICAgICAgICB0 eXBlOiAndGV4dCcsIG1pbl92ZXJzaW9uOiA5MDUwMCwgbW9kZTogWydwcm9w ZXJ0aWVzJ10KLSAgICAgICAgfSx7CiAgICAgICAgICAgaWQ6ICdjb2x1bW5z JywgbGFiZWw6J3t7IF8oJ0NvbHVtbnMnKSB9fScsIGNlbGw6ICdzdHJpbmcn LAogICAgICAgICAgIHR5cGU6ICdjb2xsZWN0aW9uJywgZ3JvdXA6ICdDb2x1 bW5zJywgdmlzaWJsZTogZmFsc2UsIG1vZGU6IFsnZWRpdCcsICdjcmVhdGUn XSwKICAgICAgICAgICBtb2RlbDogQ29sdW1uc01vZGVsLCBjYW5BZGQ6IHRy dWUsIGNhbkRlbGV0ZTogdHJ1ZSwgY2FuRWRpdDogdHJ1ZSwKZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3RlbXBsYXRlcy9m b3JlaWduX3RhYmxlcy9zcWwvOS4xX3BsdXMvZ2V0X2NvbHVtbnMuc3FsIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVp Z25fdGFibGVzL3NxbC85LjFfcGx1cy9nZXRfY29sdW1ucy5zcWwKaW5kZXgg NGJmNWUxNy4uMDczM2EzYyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv Zm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVzL3NxbC85 LjFfcGx1cy9nZXRfY29sdW1ucy5zcWwKKysrIGIvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv Zm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVzL3NxbC85 LjFfcGx1cy9nZXRfY29sdW1ucy5zcWwKQEAgLTEsMTMgKzEsNyBAQAogU0VM RUNUCiAgICAgYXR0bmFtZSwgYXR0bmRpbXMsIGF0dHR5cG1vZCwgZm9ybWF0 X3R5cGUodC5vaWQsTlVMTCkgQVMgZGF0YXR5cGUsCiAgICAgZm9ybWF0X3R5 cGUodC5vaWQsIGF0dC5hdHR0eXBtb2QpIEFTIGZ1bGx0eXBlLCBhdHRub3Ru dWxsLCBhdHRudW0sCi0gICAgKFNFTEVDVCBDT1VOVCgxKSBmcm9tIHBnX3R5 cGUgdDIgV0hFUkUgdDIudHlwbmFtZT10LnR5cG5hbWUpID4gMSBBUyBpc2R1 cCwKLSAgICAoCi0gICAgICAgIGF0dG5hbWUgfHwgJyAnIHx8IGZvcm1hdF90 eXBlKHQub2lkLCBhdHQuYXR0dHlwbW9kKSB8fCAnICcgfHwKLSAgICAgICAg KENBU0UgV0hFTiBhdHRub3RudWxsPSd0cnVlJwotICAgICAgICBUSEVOICdO T1QgTlVMTCcgRUxTRSAnTlVMTCcKLSAgICAgICAgRU5EKQotICAgICkgYXMg c3RyY29sdW1uCisgICAgKFNFTEVDVCBDT1VOVCgxKSBmcm9tIHBnX3R5cGUg dDIgV0hFUkUgdDIudHlwbmFtZT10LnR5cG5hbWUpID4gMSBBUyBpc2R1cAog RlJPTQogICAgIHBnX2F0dHJpYnV0ZSBhdHQKIEpPSU4KZGlmZiAtLWdpdCBh L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3RlbXBsYXRlcy9mb3Jl aWduX3RhYmxlcy9zcWwvOS4yX3BsdXMvZ2V0X2NvbHVtbnMuc3FsIGIvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVpZ25f dGFibGVzL3NxbC85LjJfcGx1cy9nZXRfY29sdW1ucy5zcWwKaW5kZXggNDI3 MDA1OC4uYWI1ZWU3NSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZm9y ZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVzL3NxbC85LjJf cGx1cy9nZXRfY29sdW1ucy5zcWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZm9y ZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVzL3NxbC85LjJf cGx1cy9nZXRfY29sdW1ucy5zcWwKQEAgLTQsMjUgKzQsNyBAQCBTRUxFQ1QK ICAgICBDQVNFIFdIRU4gbGVuZ3RoKGNuLm5zcG5hbWUpID4gMCBBTkQgbGVu Z3RoKGNsLmNvbGxuYW1lKSA+IDAgVEhFTgogICAgIGNvbmNhdChjbi5uc3Bu YW1lLCAnLiInLCBjbC5jb2xsbmFtZSwnIicpIEVMU0UgJycgRU5EIEFTIGNv bGxuYW1lLAogICAgIChTRUxFQ1QgQ09VTlQoMSkgZnJvbSBwZ190eXBlIHQy IFdIRVJFIHQyLnR5cG5hbWU9dC50eXBuYW1lKSA+IDEgQVMgaXNkdXAsCi0g ICAgcGdfY2F0YWxvZy5wZ19nZXRfZXhwcihkZWYuYWRiaW4sIGRlZi5hZHJl bGlkKSBBUyB0eXBkZWZhdWx0LAotICAgICgKLSAgICAgICAgYXR0bmFtZSB8 fCAnICcgfHwgZm9ybWF0X3R5cGUodC5vaWQsIGF0dC5hdHR0eXBtb2QpIHx8 ICcgJyB8fAotICAgICAgICAoCi0gICAgICAgICAgICBDQVNFIFdIRU4gYXJy YXlfbGVuZ3RoKGF0dGZkd29wdGlvbnMsIDEpPjAKLSAgICAgICAgICAgIFRI RU4gY29uY2F0KCdPUFRJT05TICgnLCBhcnJheV90b19zdHJpbmcoYXR0ZmR3 b3B0aW9ucywgJywgJyksICcpJykgRUxTRSAnJwotICAgICAgICAgICAgRU5E Ci0gICAgICAgICkgfHwgJyAnIHx8Ci0gICAgICAgICgKLSAgICAgICAgICAg IENBU0UgV0hFTiBhdHRub3RudWxsPSd0cnVlJwotICAgICAgICAgICAgVEhF TiAnTk9UIE5VTEwnIEVMU0UgJ05VTEwnCi0gICAgICAgICAgICBFTkQKLSAg ICAgICAgKSB8fCAnICcgfHwKLSAgICAgICAgKAotICAgICAgICAgICAgQ0FT RSBXSEVOIHBnX2NhdGFsb2cucGdfZ2V0X2V4cHIoZGVmLmFkYmluLCBkZWYu YWRyZWxpZCk8PicnCi0gICAgICAgICAgICBUSEVOICdERUZBVUxUICcgfHwg cGdfY2F0YWxvZy5wZ19nZXRfZXhwcihkZWYuYWRiaW4sIGRlZi5hZHJlbGlk KQotICAgICAgICAgICAgRUxTRSAnJyBFTkQKLSAgICAgICAgKQotICAgICkg YXMgc3RyY29sdW1uCisgICAgcGdfY2F0YWxvZy5wZ19nZXRfZXhwcihkZWYu YWRiaW4sIGRlZi5hZHJlbGlkKSBBUyB0eXBkZWZhdWx0CiBGUk9NCiAgICAg cGdfYXR0cmlidXRlIGF0dAogSk9JTgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj aGVtYXMvZm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVz L3NxbC85LjVfcGx1cy9nZXRfY29sdW1ucy5zcWwgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy9mb3JlaWduX3RhYmxlcy90ZW1wbGF0ZXMvZm9yZWlnbl90YWJsZXMvc3Fs LzkuNV9wbHVzL2dldF9jb2x1bW5zLnNxbAppbmRleCA2NGQ2ZDEzLi4zNDE3 MjA4IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWduX3RhYmxl cy90ZW1wbGF0ZXMvZm9yZWlnbl90YWJsZXMvc3FsLzkuNV9wbHVzL2dldF9j b2x1bW5zLnNxbAorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWduX3RhYmxl cy90ZW1wbGF0ZXMvZm9yZWlnbl90YWJsZXMvc3FsLzkuNV9wbHVzL2dldF9j b2x1bW5zLnNxbApAQCAtMjAsMjUgKzIwLDYgQEAgU0VMRUNUIElOSC5pbmhl cml0ZWRmcm9tLCBJTkguaW5oZXJpdGVkaWQsIGF0dC5hdHRvcHRpb25zLCBh dHRmZHdvcHRpb25zLAogICAgIGNvbmNhdChjbi5uc3BuYW1lLCAnLiInLCBj bC5jb2xsbmFtZSwnIicpCiAgICAgRUxTRSAnJyBFTkQgQVMgY29sbG5hbWUs CiAgICAgcGdfY2F0YWxvZy5wZ19nZXRfZXhwcihkZWYuYWRiaW4sIGRlZi5h ZHJlbGlkKSBBUyB0eXBkZWZhdWx0LAotICAgICgKLSAgICAgICAgYXR0LmF0 dG5hbWUgfHwgJyAnIHx8IGZvcm1hdF90eXBlKHQub2lkLCBhdHQuYXR0dHlw bW9kKSB8fCAnICcgfHwKLSAgICAgICAgKAotICAgICAgICAgICAgQ0FTRSBX SEVOIGFycmF5X2xlbmd0aChhdHRmZHdvcHRpb25zLCAxKT4wCi0gICAgICAg ICAgICBUSEVOIGNvbmNhdCgnT1BUSU9OUyAoJywgYXJyYXlfdG9fc3RyaW5n KGF0dGZkd29wdGlvbnMsICcsICcpLCAnKScpIEVMU0UgJycKLSAgICAgICAg ICAgIEVORAotICAgICAgICApIHx8ICcgJyB8fAotICAgICAgICAoCi0gICAg ICAgICAgICBDQVNFIFdIRU4gYXR0bm90bnVsbD0ndHJ1ZScKLSAgICAgICAg ICAgIFRIRU4gJ05PVCBOVUxMJyBFTFNFICdOVUxMJwotICAgICAgICAgICAg RU5ECi0gICAgICAgICkgfHwgJyAnIHx8Ci0gICAgICAgICgKLSAgICAgICAg ICAgIENBU0UgV0hFTiBwZ19jYXRhbG9nLnBnX2dldF9leHByKGRlZi5hZGJp biwgZGVmLmFkcmVsaWQpPD4nJwotICAgICAgICAgICAgVEhFTiAnREVGQVVM VCAnIHx8IHBnX2NhdGFsb2cucGdfZ2V0X2V4cHIoZGVmLmFkYmluLCBkZWYu YWRyZWxpZCkKLSAgICAgICAgICAgIEVMU0UgJycgRU5ECi0gICAgICAgICkK LSAgICApIGFzIHN0cmNvbHVtbiwKLQogICAgIChTRUxFQ1QgQ09VTlQoMSkg ZnJvbSBwZ190eXBlIHQyIFdIRVJFIHQyLnR5cG5hbWU9dC50eXBuYW1lKSA+ IDEgQVMgaXNkdXAKIEZST00KICAgICBwZ19hdHRyaWJ1dGUgYXR0CmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWduX3RhYmxlcy90ZW1wbGF0 ZXMvZm9yZWlnbl90YWJsZXMvc3FsLzkuNV9wbHVzL2dldF90YWJsZXMuc3Fs IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2Zv cmVpZ25fdGFibGVzL3NxbC85LjVfcGx1cy9nZXRfdGFibGVzLnNxbAppbmRl eCA4MzQ0NWEyLi4zOGY5Y2U0IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy9mb3JlaWduX3RhYmxlcy90ZW1wbGF0ZXMvZm9yZWlnbl90YWJsZXMvc3Fs LzkuNV9wbHVzL2dldF90YWJsZXMuc3FsCisrKyBiL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L2ZvcmVpZ25fdGFibGVzL3RlbXBsYXRlcy9mb3JlaWduX3RhYmxlcy9zcWwv OS41X3BsdXMvZ2V0X3RhYmxlcy5zcWwKQEAgLTksNyArOSw3IEBAIFdIRVJF CiAKIHslIGVsc2UgJX0KIFNFTEVDVAotICAgIGMub2lkIEFTIGlkLCBxdW90 ZV9pZGVudChuLm5zcG5hbWUpIHx8ICcuJyB8fCBxdW90ZV9pZGVudChjLnJl bG5hbWUpIGFzIHRleHQKKyAgICBjLm9pZCBBUyB2YWx1ZSwgcXVvdGVfaWRl bnQobi5uc3BuYW1lKSB8fCAnLicgfHwgcXVvdGVfaWRlbnQoYy5yZWxuYW1l KSBhcyBsYWJlbAogRlJPTQogICAgIHBnX2NsYXNzIGMsIHBnX25hbWVzcGFj ZSBuCiBXSEVSRQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVz L2NvbnN0cmFpbnRzL2ZvcmVpZ25fa2V5L3RlbXBsYXRlcy9mb3JlaWduX2tl eS9qcy9mb3JlaWduX2tleS5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9j b25zdHJhaW50cy9mb3JlaWduX2tleS90ZW1wbGF0ZXMvZm9yZWlnbl9rZXkv anMvZm9yZWlnbl9rZXkuanMKaW5kZXggM2ZmYTZlZi4uZDdjOTQ3ZiAxMDA2 NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2Zv cmVpZ25fa2V5L3RlbXBsYXRlcy9mb3JlaWduX2tleS9qcy9mb3JlaWduX2tl eS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMv Zm9yZWlnbl9rZXkvdGVtcGxhdGVzL2ZvcmVpZ25fa2V5L2pzL2ZvcmVpZ25f a2V5LmpzCkBAIC0yMSw2ICsyMSw3IEBAIGZ1bmN0aW9uKCQsIF8sIFMsIHBn QWRtaW4sIHBnQnJvd3NlciwgQWxlcnRpZnkpIHsKICAgICAgIGhlYWRlclNl bGVjdENvbnRyb2xUZW1wbGF0ZSA9ICBfLnRlbXBsYXRlKFsKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICc8ZGl2IGNsYXNzPSI8JT1CYWNrZm9y bS5jb250cm9sc0NsYXNzTmFtZSU+IDwlPWV4dHJhQ2xhc3Nlcy5qb2luKFwn IFwnKSU+Ij4nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyAg PHNlbGVjdCBjbGFzcz0icGdhZG1pbi1ub2RlLXNlbGVjdCBmb3JtLWNvbnRy b2wiIG5hbWU9IjwlPW5hbWUlPiIgc3R5bGU9IndpZHRoOjEwMCU7IiB2YWx1 ZT0iPCUtdmFsdWUlPiIgPCU9ZGlzYWJsZWQgPyAiZGlzYWJsZWQiIDogIiIl PiA8JT1yZXF1aXJlZCA/ICJyZXF1aXJlZCIgOiAiIiU+ID4nLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJyAgICA8JT1zZWxlY3QyLmZpcnN0 X2VtcHR5ID8gIiA8b3B0aW9uPjwvb3B0aW9uPiIgOiAiIiU+JywKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICcgICAgPCUgZm9yICh2YXIgaT0w OyBpIDwgb3B0aW9ucy5sZW5ndGg7IGkrKykgeyAlPicsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnICAgIDwlIHZhciBvcHRpb24gPSBvcHRp b25zW2ldOyAlPicsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn ICAgIDxvcHRpb24gPCUgaWYgKG9wdGlvbi5pbWFnZSkgeyAlPiBkYXRhLWlt YWdlPTwlPSBvcHRpb24uaW1hZ2UgJT4gPCUgfSAlPiB2YWx1ZT08JT0gZm9y bWF0dGVyLmZyb21SYXcob3B0aW9uLnZhbHVlKSAlPiA8JT1vcHRpb24udmFs dWUgPT09IHJhd1ZhbHVlID8gInNlbGVjdGVkPVwnc2VsZWN0ZWRcJyIgOiAi IiAlPj48JS1vcHRpb24ubGFiZWwlPjwvb3B0aW9uPicsCkBAIC0xMzQsOCAr MTM1LDkgQEAgZnVuY3Rpb24oJCwgXywgUywgcGdBZG1pbiwgcGdCcm93c2Vy LCBBbGVydGlmeSkgewogICAgICAgICAgIH0pLAogICAgICAgICAgIHNlbGVj dDI6IHsKICAgICAgICAgICAgIGFsbG93Q2xlYXI6IGZhbHNlLCB3aWR0aDog J3N0eWxlJywKLSAgICAgICAgICAgIHBsYWNlaG9sZGVyOiAnU2VsZWN0IGNv bHVtbicKLSAgICAgICAgICB9LCBmaXJzdF9lbXB0eTogIV8uaXNVbmRlZmlu ZWQoc2VsZi5tb2RlbC5nZXQoJ29pZCcpKSwKKyAgICAgICAgICAgIHBsYWNl aG9sZGVyOiAne3sgXygnU2VsZWN0IGNvbHVtbicpIH19JywKKyAgICAgICAg ICAgIGZpcnN0X2VtcHR5OiAhXy5pc1VuZGVmaW5lZChzZWxmLm1vZGVsLmdl dCgnb2lkJykpCisgICAgICAgICAgfSwKICAgICAgICAgICB2ZXJzaW9uX2Nv bXBhdGlibGU6IHNlbGYuZmllbGQuZ2V0KCd2ZXJzaW9uX2NvbXBhdGlibGUn KSwKICAgICAgICAgICBkaXNhYmxlZDogZnVuY3Rpb24obSkgewogICAgICAg ICAgICAgcmV0dXJuICFfLmlzVW5kZWZpbmVkKHNlbGYubW9kZWwuZ2V0KCdv aWQnKSk7CkBAIC0yMzQsMTAgKzIzNiwxMSBAQCBmdW5jdGlvbigkLCBfLCBT LCBwZ0FkbWluLCBwZ0Jyb3dzZXIsIEFsZXJ0aWZ5KSB7CiAgICAgICAgICAg ICAgIEJhY2tmb3JtLlNlbGVjdDJDb250cm9sLnByb3RvdHlwZS5yZW5kZXIu YXBwbHkodGhpcywgYXJndW1lbnRzKTsKICAgICAgICAgICAgICAgcmV0dXJu IHRoaXM7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgfSksIHVybDogJ2dl dF9jb2x1bW5zJywgZmlyc3RfZW1wdHk6IHRydWUsCisgICAgICAgICAgfSks IHVybDogJ2dldF9jb2x1bW5zJywKICAgICAgICAgICBzZWxlY3QyOiB7Cisg ICAgICAgICAgICBhbGxvd0NsZWFyOiBmYWxzZSwKICAgICAgICAgICAgIHdp ZHRoOiAic3R5bGUiLAotICAgICAgICAgICAgcGxhY2Vob2xkZXI6ICdTZWxl Y3QgY29sdW1uJywKKyAgICAgICAgICAgIHBsYWNlaG9sZGVyOiAne3sgXygn U2VsZWN0IGNvbHVtbicpIH19JywKICAgICAgICAgICAgIHRlbXBsYXRlUmVz dWx0OiBmb3JtYXROb2RlLAogICAgICAgICAgICAgdGVtcGxhdGVTZWxlY3Rp b246IGZvcm1hdE5vZGUKICAgICAgICAgICB9LApkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvZGF0YW1vZGVsLmpzIGIvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvZGF0YW1vZGVsLmpzCmluZGV4 IDhjYjcwMzQuLjdiMzc5Y2UgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc3RhdGljL2pzL2RhdGFtb2RlbC5qcworKysgYi93ZWIvcGdhZG1p bi9icm93c2VyL3N0YXRpYy9qcy9kYXRhbW9kZWwuanMKQEAgLTEyNCw3ICsx MjQsNyBAQCBmdW5jdGlvbihfLCBwZ0FkbWluLCAkLCBCYWNrYm9uZSkgewog ICAgICAgICB2YXIgc2VsZiA9IHRoaXM7CiAgICAgICAgIHNlbGYuX3ByZXZp b3VzX2tleV92YWx1ZXMgPSB7fTsKIAotICAgICAgICBpZiAoJ29uX3NlcnZl cicgaW4gb3B0aW9ucyAmJiBvcHRpb25zLm9uX3NlcnZlcikgeworICAgICAg ICBpZiAoIV8uaXNVbmRlZmluZWQob3B0aW9ucykgJiYgJ29uX3NlcnZlcicg aW4gb3B0aW9ucyAmJiBvcHRpb25zLm9uX3NlcnZlcikgewogICAgICAgICAg IHNlbGYub25fc2VydmVyID0gdHJ1ZTsKICAgICAgICAgfQogCmRpZmYgLS1n aXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2Zvcm0ucGdhZG1pbi5q cyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWluLmpz CmluZGV4IDI1MzBkYjkuLmUyN2VhMmQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWluLmpzCisrKyBiL3dlYi9w Z2FkbWluL3N0YXRpYy9qcy9iYWNrZm9ybS5wZ2FkbWluLmpzCkBAIC0xODA0 LDcgKzE4MDQsMTEgQEAKICAgICAgIGlmIChfLmlzQXJyYXkoZm9ybWF0dGVk RGF0YSkpIHsKICAgICAgICAgcmV0dXJuIF8ubWFwKGZvcm1hdHRlZERhdGEs IGRlY29kZVVSSUNvbXBvbmVudCk7CiAgICAgICB9IGVsc2UgewotICAgICAg ICByZXR1cm4gZGVjb2RlVVJJQ29tcG9uZW50KGZvcm1hdHRlZERhdGEpOwor ICAgICAgICBpZighXy5pc051bGwoZm9ybWF0dGVkRGF0YSkgJiYgIV8uaXNV bmRlZmluZWQoZm9ybWF0dGVkRGF0YSkpIHsKKyAgICAgICAgICByZXR1cm4g ZGVjb2RlVVJJQ29tcG9uZW50KGZvcm1hdHRlZERhdGEpOworICAgICAgICB9 IGVsc2UgeworICAgICAgICAgIHJldHVybiBudWxsOworICAgICAgICB9CiAg ICAgICB9CiAgICAgfQogICB9KTsKQEAgLTE5MTUsOSArMTkxOSwxNSBAQAog ICAgICAgcmV0dXJuIHRoaXM7CiAgICAgfSwKICAgICBnZXRWYWx1ZUZyb21E T006IGZ1bmN0aW9uKCkgewotICAgICAgcmV0dXJuIEJhY2tmb3JtLlNlbGVj dENvbnRyb2wucHJvdG90eXBlLmdldFZhbHVlRnJvbURPTS5hcHBseSgKLSAg ICAgICAgdGhpcywgYXJndW1lbnRzCi0gICAgICApOworICAgICAgdmFyIHZh bCA9IEJhY2tmb3JtLlNlbGVjdENvbnRyb2wucHJvdG90eXBlLmdldFZhbHVl RnJvbURPTS5hcHBseSgKKyAgICAgICAgICAgICAgICAgIHRoaXMsIGFyZ3Vt ZW50cworICAgICAgICAgICAgICAgICksCisgICAgICAgIHNlbGVjdDJPcHRz ID0gXy5leHRlbmQoe30sIHRoaXMuZmllbGQuZ2V0KCJzZWxlY3QyIikgfHwg dGhpcy5kZWZhdWx0cy5zZWxlY3QyKTsKKworICAgICAgaWYgKHNlbGVjdDJP cHRzLm11bHRpcGxlICYmIHZhbCA9PSBudWxsKSB7CisgICAgICAgIHJldHVy biBbXTsKKyAgICAgIH0KKyAgICAgIHJldHVybiB2YWw7CiAgICAgfQogICB9 KTsKIAo= --001a113dbc2a0368b005389e8a18 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 --001a113dbc2a0368b005389e8a18--