Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSOoR-0007AT-IB for pgadmin-hackers@arkaria.postgresql.org; Wed, 27 Jul 2016 13:23:51 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bSOoQ-0002SS-CE for pgadmin-hackers@arkaria.postgresql.org; Wed, 27 Jul 2016 13:23:50 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1bSOoC-0002EZ-Hf for pgadmin-hackers@postgresql.org; Wed, 27 Jul 2016 13:23:36 +0000 Received: from mail-io0-x231.google.com ([2607:f8b0:4001:c06::231]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bSOo9-0001nh-AK for pgadmin-hackers@postgresql.org; Wed, 27 Jul 2016 13:23:35 +0000 Received: by mail-io0-x231.google.com with SMTP id m101so69809746ioi.2 for ; Wed, 27 Jul 2016 06:23:32 -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=sbk+c8Gu5JdtQKzfCjSZnxHVQc9Oc0ps6QJosP2Sn0s=; b=uiqV4+ndxp/RZDNBHGvSF/Xw8qRyq8jP0BaAxUxt+ssHuM0m0FXuozBk9/9M7Efj6x L4SQUdbBGX+/P/prlPkHHy05bFfgo3PFUyRI2dGZMI4wO6xzZuWznYulwGEBWkLOUV+L QYx/eTdjHSfDGceeyK7jrHIcgyM3y12YNLEmFngN/dq3TICAE6n46nT+PerG1iUdHtWg mQLzTI/r4na5KqWxG35/DwKGUzcL8+BtdZpOeAC8kOAZqq8n9bUIccCKQR+osTqQIGHN PYx2HyXak7Oe1y1XxwhZBN/V37YwcdrZOg13vnWhmPCtxoJJGktUit8avcUzzZnuIxLh RVKw== 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=sbk+c8Gu5JdtQKzfCjSZnxHVQc9Oc0ps6QJosP2Sn0s=; b=Slb9AOlz2iW2Kb6CvxmryEIFYneuJ1tovE1O2CYSFpFt6E5TM96Xc/45PE2Xe/MWbL c+ETVScLHbje5ez6JCg/9pc1B7kq+wwwz8q5d/VpiwDLeTEiHDOCdbxxrkpS7RUrI5Zb OWXqmG+YT0jZvLeYc3tWXM6FBfXRoGZ6s21qG4Ef1eQ6x5M20PBpTo2ctT1FRBjYdce7 2WYAWIgvF5QlHZnJoYX/yOSFOt8y8ldIlOJgC8oz583+v5vx3XawihYY2jZP91urQXSm sKUVmxl+XE0FInpE8IaKIeHmU6t0MysqKlHqaMzIhkCqR7YSnT/BBEEe6sr1mrJ7pIks fv4w== X-Gm-Message-State: AEkoouvsZsgSz4BxTQ9Exi2wA4lW0ugvIqD0Ve9xr6tXOWRe3NZmeGvCBa9PqjMYuWfISMBDBmihSoVqktzY1nnA X-Received: by 10.107.37.198 with SMTP id l189mr28138934iol.117.1469625812221; Wed, 27 Jul 2016 06:23:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.6.76 with HTTP; Wed, 27 Jul 2016 06:23:12 -0700 (PDT) In-Reply-To: References: From: Ashesh Vashi Date: Wed, 27 Jul 2016 18:53:12 +0530 Message-ID: Subject: Re: patch for issue RM1260 [pgAdmin4] To: Harshal Dhumal Cc: Dave Page , pgadmin-hackers Content-Type: multipart/mixed; boundary=001a1140d93c7dbf4505389decd2 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 --001a1140d93c7dbf4505389decd2 Content-Type: multipart/alternative; boundary=001a1140d93c7dbf3f05389decd0 --001a1140d93c7dbf3f05389decd0 Content-Type: text/plain; charset=UTF-8 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 >>>> >>> >>> >> > --001a1140d93c7dbf3f05389decd0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Harshal,

During testing, I found tha= t create, and delete operation on foreign table is not working.
F= oreign table node uses, it's own version of Select2 Control, which shou= ld have used maximum functionalities from the original NodeAjaxOptionsContr= ol for consistency reason.
Hence - I have made the changes.
=

Can you please take a look at the create, and delete op= erations, and submit combined patch for all those problems?

--=

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 Wed, Jul 27, 2016 at 3:54 PM, Harshal Dhu= mal <harshal.dhumal@enterprisedb.com> wrote:
and patch file
<= div class=3D"gmail_extra">
=
--=C2=A0
Harshal Dhumal
Softwar= e Engineer

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

On Wed, Jul 27= , 2016 at 3:49 PM, Harshal Dhumal <harshal.dhumal@enterprise= db.com> wrote:
Hi,

PFA updated patch for RM1260.
=
In addition to RM1260 issue I have added following changes in thi= s patch.
1] datamodel.js: Added option check against undefined.
2] foreign key: fixed first empty option issue.

--=C2= =A0
Harshal Dhumal
Software Engineer

EnterpriseDB India:=C2=A0ht= tp://www.enterprisedb.com
The Enterpr= ise PostgreSQL Company
=

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




--001a1140d93c7dbf3f05389decd0-- --001a1140d93c7dbf4505389decd2 Content-Type: application/octet-stream; name="RM1260_v2.patch" Content-Disposition: attachment; filename="RM1260_v2.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_ir4x8zo41 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3Rl bXBsYXRlcy9mb3JlaWduX3RhYmxlcy9qcy9mb3JlaWduX3RhYmxlcy5qcyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3RlbXBsYXRlcy9mb3Jl aWduX3RhYmxlcy9qcy9mb3JlaWduX3RhYmxlcy5qcwppbmRleCBhNGI1YTI3 Li5kMzlkMmQ0IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWdu X3RhYmxlcy90ZW1wbGF0ZXMvZm9yZWlnbl90YWJsZXMvanMvZm9yZWlnbl90 YWJsZXMuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMv dGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVzL2pzL2ZvcmVpZ25fdGFibGVzLmpz CkBAIC0yNDEsMjIgKzI0MSw2IEBAIGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRt aW4sIHBnQnJvd3NlciwgYWxlcnRpZnkpIHsKICAgICB0b0pTT046IEJhY2ti b25lLk1vZGVsLnByb3RvdHlwZS50b0pTT04KICAgfSk7CiAKLSAgdmFyIGZv cm1hdE5vZGUgPSBmdW5jdGlvbihvcHQpIHsKLSAgICBpZiAoIW9wdC5pZCkg ewotICAgICAgcmV0dXJuIG9wdC50ZXh0OwotICAgIH0KLQotICAgIHZhciBv cHRpbWFnZSA9ICQob3B0LmVsZW1lbnQpLmRhdGEoJ2ltYWdlJyk7Ci0KLSAg ICBpZighb3B0aW1hZ2UpewotICAgICAgcmV0dXJuIG9wdC50ZXh0OwotICAg IH0gZWxzZSB7Ci0gICAgICByZXR1cm4gJCgKLSAgICAgICAgICAnPHNwYW4+ PHNwYW4gY2xhc3M9IndjVGFiSWNvbiAnICsgb3B0aW1hZ2UgKyAnIi8+JyAr IG9wdC50ZXh0ICsgJzwvc3Bhbj4nCi0gICAgICAgICAgKTsKLSAgICB9Ci0g IH07Ci0KIAogICAvKiBOb2RlQWpheE9wdGlvbnNNdWx0aXBsZUNvbnRyb2wg aXMgZm9yIG11bHRpcGxlIHNlbGVjdGlvbiBvZiBDb21ib2JveC4KICAgKiAg VGhpcyBjb250cm9sIGlzIHVzZWQgdG8gc2VsZWN0IE11bHRpcGxlIFBhcmVu dCBUYWJsZXMgdG8gYmUgaW5oZXJpdGVkLgpAQCAtMjY0LDgzICsyNDgsNyBA QCBmdW5jdGlvbigkLCBfLCBTLCBwZ0FkbWluLCBwZ0Jyb3dzZXIsIGFsZXJ0 aWZ5KSB7CiAgICogIFRvIHBvcHVsYXRlcyB0aGUgY29sdW1uLCBpdCBjYWxs cyB0aGUgc2VydmVyIGFuZCBmZXRjaCB0aGUgY29sdW1ucyBkYXRhCiAgICog IGZvciB0aGUgc2VsZWN0ZWQgdGFibGUuCiAgICovCi0KLSAgdmFyIE5vZGVB amF4T3B0aW9uc011bHRpcGxlQ29udHJvbCA9IEJhY2tmb3JtLk5vZGVBamF4 T3B0aW9uc011bHRpcGxlQ29udHJvbCA9IEJhY2tmb3JtLk5vZGVBamF4T3B0 aW9uc0NvbnRyb2wuZXh0ZW5kKHsKLSAgICB0ZW1wbGF0ZTogXy50ZW1wbGF0 ZShbCi0gICAgICAnPGxhYmVsIGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9s TGFiZWxDbGFzc05hbWUlPiI+PCU9bGFiZWwlPjwvbGFiZWw+JywKLSAgICAg ICc8ZGl2IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sc0NsYXNzTmFtZSU+ IDwlPWV4dHJhQ2xhc3Nlcy5qb2luKFwnIFwnKSU+Ij4nLAotICAgICAgJyAg PHNlbGVjdCBjbGFzcz0icGdhZG1pbi1ub2RlLXNlbGVjdCBmb3JtLWNvbnRy b2wiIG5hbWU9IjwlPW5hbWUlPiIgc3R5bGU9IndpZHRoOjEwMCU7IiB2YWx1 ZT08JS12YWx1ZSU+IDwlPWRpc2FibGVkID8gImRpc2FibGVkIiA6ICIiJT4g PCU9cmVxdWlyZWQgPyAicmVxdWlyZWQiIDogIiIlPiA+JywKLSAgICAgICcg IDwvc2VsZWN0PicsCi0gICAgICAnPC9kaXY+J10uam9pbigiXG4iKSksCi0g ICAgZGVmYXVsdHM6IF8uZXh0ZW5kKAotICAgICAge30sIEJhY2tmb3JtLk5v ZGVBamF4T3B0aW9uc0NvbnRyb2wucHJvdG90eXBlLmRlZmF1bHRzLAotICAg ICAgewotICAgICAgICBzZWxlY3QyOiB7Ci0gICAgICAgICAgYWxsb3dDbGVh cjogdHJ1ZSwKLSAgICAgICAgICBwbGFjZWhvbGRlcjogJ1NlbGVjdCBmcm9t IHRoZSBsaXN0JywKLSAgICAgICAgICB3aWR0aDogJ3N0eWxlJywKLSAgICAg ICAgICB0ZW1wbGF0ZVJlc3VsdDogZm9ybWF0Tm9kZSwKLSAgICAgICAgICB0 ZW1wbGF0ZVNlbGVjdGlvbjogZm9ybWF0Tm9kZQotICAgICAgICB9Ci0gICAg ICB9KSwKLSAgICByZW5kZXI6IGZ1bmN0aW9uKCkgewotICAgICAgdmFyIGZp ZWxkID0gXy5kZWZhdWx0cyh0aGlzLmZpZWxkLnRvSlNPTigpLCB0aGlzLmRl ZmF1bHRzKSwKLSAgICAgICAgYXR0cmlidXRlcyA9IHRoaXMubW9kZWwudG9K U09OKCksCi0gICAgICAgIGF0dHJBcnIgPSBmaWVsZC5uYW1lLnNwbGl0KCcu JyksCi0gICAgICAgIG5hbWUgPSBhdHRyQXJyLnNoaWZ0KCksCi0gICAgICAg IHBhdGggPSBhdHRyQXJyLmpvaW4oJy4nKSwKLSAgICAgICAgcmF3VmFsdWUg PSB0aGlzLmtleVBhdGhBY2Nlc3NvcihhdHRyaWJ1dGVzW25hbWVdLCBwYXRo KSwKLSAgICAgICAgZGF0YSA9IF8uZXh0ZW5kKGZpZWxkLCB7Ci0gICAgICAg ICAgcmF3VmFsdWU6IHJhd1ZhbHVlLAotICAgICAgICAgIHZhbHVlOiB0aGlz LmZvcm1hdHRlci5mcm9tUmF3KHJhd1ZhbHVlLCB0aGlzLm1vZGVsKSwKLSAg ICAgICAgICBhdHRyaWJ1dGVzOiBhdHRyaWJ1dGVzLAotICAgICAgICAgIGZv cm1hdHRlcjogdGhpcy5mb3JtYXR0ZXIKLSAgICAgICAgfSksCi0gICAgICAg IGV2YWxGID0gZnVuY3Rpb24oZiwgZCwgbSkgewotICAgICAgICAgIHJldHVy biAoXy5pc0Z1bmN0aW9uKGYpID8gISFmLmFwcGx5KGQsIFttXSkgOiAhIWYp OwotICAgICAgICB9OwotCi0gICAgICAvLyBFdmFsdWF0ZSB0aGUgZGlzYWJs ZWQsIHZpc2libGUsIGFuZCByZXF1aXJlZCBvcHRpb24KLSAgICAgIF8uZXh0 ZW5kKGRhdGEsIHsKLSAgICAgICAgZGlzYWJsZWQ6IGV2YWxGKGRhdGEuZGlz YWJsZWQsIGRhdGEsIHRoaXMubW9kZWwpLAotICAgICAgICB2aXNpYmxlOiAg ZXZhbEYoZGF0YS52aXNpYmxlLCBkYXRhLCB0aGlzLm1vZGVsKSwKLSAgICAg ICAgcmVxdWlyZWQ6IGV2YWxGKGRhdGEucmVxdWlyZWQsIGRhdGEsIHRoaXMu bW9kZWwpCi0gICAgICB9KTsKLQotICAgICAgaWYgKGZpZWxkLm5vZGVfaW5m by5zZXJ2ZXIudmVyc2lvbiA8IGZpZWxkLm1pbl92ZXJzaW9uKSB7Ci0gICAg ICAgIGZpZWxkLnZlcnNpb25fY29tcGF0aWJsZSA9IGZhbHNlCi0gICAgICAg IHJldHVybiB0aGlzOwotICAgICAgfQotICAgICAgZWxzZSB7Ci0gICAgICAg IC8vIEV2YWx1YXRpb24gdGhlIG9wdGlvbnMKLSAgICAgICAgaWYgKF8uaXNG dW5jdGlvbihkYXRhLm9wdGlvbnMpKSB7Ci0gICAgICAgIHRyeSB7Ci0gICAg ICAgICAgZGF0YS5vcHRpb25zID0gZGF0YS5vcHRpb25zLmFwcGx5KHRoaXMp Ci0gICAgICAgIH0gY2F0Y2goZSkgewotICAgICAgICAgIC8vIERvIG5vdGhp bmcKLSAgICAgICAgICBkYXRhLm9wdGlvbnMgPSBbXQotICAgICAgICAgIHRo aXMubW9kZWwudHJpZ2dlcigncGdhZG1pbi12aWV3OnRyYW5zZm9ybTplcnJv cicsIHNlbGYubW9kZWwsIHNlbGYuZmllbGQsIGUpOwotICAgICAgICB9Ci0g ICAgICAgIH0KLQotICAgICAgICAvLyBDbGVhbiB1cCBmaXJzdAotICAgICAg ICB0aGlzLiRlbC5yZW1vdmVDbGFzcyhCYWNrZm9ybS5oaWRkZW5DbGFzc25h bWUpOwotICAgICAgICB0aGlzLiRlbC5odG1sKHRoaXMudGVtcGxhdGUoZGF0 YSkpLmFkZENsYXNzKGZpZWxkLm5hbWUpOwotCi0gICAgICAgIGlmICghZGF0 YS52aXNpYmxlKSB7Ci0gICAgICAgIHRoaXMuJGVsLmFkZENsYXNzKEJhY2tm b3JtLmhpZGRlbkNsYXNzbmFtZSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAg ICAgIHZhciBvcHRzID0gXy5leHRlbmQoCi0gICAgICAgICAge30sIHRoaXMu ZGVmYXVsdHMuc2VsZWN0MiwgZGF0YS5zZWxlY3QyLAotICAgICAgICAgIHsK LSAgICAgICAgICAgICdkYXRhJzogZGF0YS5vcHRpb25zCi0gICAgICAgICAg fSk7Ci0gICAgICAgIHRoaXMuJGVsLmZpbmQoInNlbGVjdCIpLnNlbGVjdDIo b3B0cykudmFsKGRhdGEucmF3VmFsdWUpLnRyaWdnZXIoImNoYW5nZSIpOwot ICAgICAgICB0aGlzLnVwZGF0ZUludmFsaWQoKTsKLSAgICAgICAgfQotICAg ICAgfQotICAgICAgcmV0dXJuIHRoaXM7Ci0gICAgfSwKKyAgdmFyIE5vZGVB amF4T3B0aW9uc011bHRpcGxlQ29udHJvbCA9IEJhY2tmb3JtLk5vZGVBamF4 T3B0aW9uc0NvbnRyb2wuZXh0ZW5kKHsKICAgICBvbkNoYW5nZTogZnVuY3Rp b24oZSkgewogICAgICAgdmFyIG1vZGVsID0gdGhpcy5tb2RlbCwKICAgICAg ICAgICAkZWwgPSAkKGUudGFyZ2V0KSwKQEAgLTM3MCw3ICsyNzgsNyBAQCBm dW5jdGlvbigkLCBfLCBTLCBwZ0FkbWluLCBwZ0Jyb3dzZXIsIGFsZXJ0aWZ5 KSB7CiAKICAgICAgIC8vIFJlbW92ZSBDb2x1bW5zIGlmIGluaGVyaXQgb3B0 aW9uIGlzIGRlc2VsZWN0ZWQgZnJvbSB0aGUgY29tYm9ib3gKICAgICAgIGlm KF8uc2l6ZSh2YWx1ZSkgPCBfLnNpemUoaW5oZXJpdHMpKSB7Ci0gICAgICAg IHZhciBkaWYgPSAgXy5kaWZmZXJlbmNlKGluaGVyaXRzLCBKU09OLnBhcnNl KHZhbHVlKSk7CisgICAgICAgIHZhciBkaWYgPSAgXy5kaWZmZXJlbmNlKGlu aGVyaXRzLCB2YWx1ZSk7CiAgICAgICAgIHZhciBybXZfY29sdW1ucyA9IGNv bHVtbnMud2hlcmUoe2luaGVyaXRlZGlkOiBwYXJzZUludChkaWZbMF0pfSk7 CiAgICAgICAgIGNvbHVtbnMucmVtb3ZlKHJtdl9jb2x1bW5zKTsKICAgICAg IH0KQEAgLTYzMiw3ICs1NDAsNyBAQCBmdW5jdGlvbigkLCBfLCBTLCBwZ0Fk bWluLCBwZ0Jyb3dzZXIsIGFsZXJ0aWZ5KSB7CiAgICAgICAgICAgdHlwZTog J3RleHQnLCBncm91cDogJ0RlZmluaXRpb24nLCB1cmw6ICdnZXRfZm9yZWln bl9zZXJ2ZXJzJywgZGlzYWJsZWQ6IGZ1bmN0aW9uKG0pIHsgcmV0dXJuICFt LmlzTmV3KCk7IH0KICAgICAgICAgfSx7CiAgICAgICAgICAgaWQ6ICdpbmhl cml0cycsIGxhYmVsOid7eyBfKCdJbmhlcml0cycpIH19JywgZ3JvdXA6ICdE ZWZpbml0aW9uJywKLSAgICAgICAgICB0eXBlOiAnYXJyYXknLCBtaW5fdmVy c2lvbjogOTA1MDAsIGNvbnRyb2w6ICdub2RlLWFqYXgtb3B0aW9ucy1tdWx0 aXBsZScsCisgICAgICAgICAgdHlwZTogJ2FycmF5JywgbWluX3ZlcnNpb246 IDkwNTAwLCBjb250cm9sOiBOb2RlQWpheE9wdGlvbnNNdWx0aXBsZUNvbnRy b2wsCiAgICAgICAgICAgdXJsOiAnZ2V0X3RhYmxlcycsIHNlbGVjdDI6IHtt dWx0aXBsZTogdHJ1ZX0sCiAgICAgICAgICAgJ2NhY2hlX2xldmVsJzogJ2Rh dGFiYXNlJywKICAgICAgICAgICB0cmFuc2Zvcm06IGZ1bmN0aW9uKGQsIHNl bGYpewpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZm9yZWlnbl90YWJs ZXMvdGVtcGxhdGVzL2ZvcmVpZ25fdGFibGVzL3NxbC85LjVfcGx1cy9nZXRf dGFibGVzLnNxbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL3Rl bXBsYXRlcy9mb3JlaWduX3RhYmxlcy9zcWwvOS41X3BsdXMvZ2V0X3RhYmxl cy5zcWwKaW5kZXggODM0NDVhMi4uMWJiNTAxZSAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvZm9yZWlnbl90YWJsZXMvdGVtcGxhdGVzL2ZvcmVpZ25f dGFibGVzL3NxbC85LjVfcGx1cy9nZXRfdGFibGVzLnNxbAorKysgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy9mb3JlaWduX3RhYmxlcy90ZW1wbGF0ZXMvZm9yZWlnbl90 YWJsZXMvc3FsLzkuNV9wbHVzL2dldF90YWJsZXMuc3FsCkBAIC05LDcgKzks NyBAQCBXSEVSRQogCiB7JSBlbHNlICV9CiBTRUxFQ1QKLSAgICBjLm9pZCBB UyBpZCwgcXVvdGVfaWRlbnQobi5uc3BuYW1lKSB8fCAnLicgfHwgcXVvdGVf aWRlbnQoYy5yZWxuYW1lKSBhcyB0ZXh0CisgICAgYy5vaWQgQVMgdmFsdWUs IHF1b3RlX2lkZW50KG4ubnNwbmFtZSkgfHwgJy4nIHx8IHF1b3RlX2lkZW50 KGMucmVsbmFtZSkgYXMgbGFiZWwKIEZST00KICAgICBwZ19jbGFzcyBjLCBw Z19uYW1lc3BhY2UgbgogV0hFUkUKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL3RhYmxlcy9jb25zdHJhaW50cy9mb3JlaWduX2tleS90ZW1wbGF0ZXMv Zm9yZWlnbl9rZXkvanMvZm9yZWlnbl9rZXkuanMgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy90YWJsZXMvY29uc3RyYWludHMvZm9yZWlnbl9rZXkvdGVtcGxhdGVzL2Zv cmVpZ25fa2V5L2pzL2ZvcmVpZ25fa2V5LmpzCmluZGV4IDNmZmE2ZWYuLmQ3 Yzk0N2YgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25z dHJhaW50cy9mb3JlaWduX2tleS90ZW1wbGF0ZXMvZm9yZWlnbl9rZXkvanMv Zm9yZWlnbl9rZXkuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2Nv bnN0cmFpbnRzL2ZvcmVpZ25fa2V5L3RlbXBsYXRlcy9mb3JlaWduX2tleS9q cy9mb3JlaWduX2tleS5qcwpAQCAtMjEsNiArMjEsNyBAQCBmdW5jdGlvbigk LCBfLCBTLCBwZ0FkbWluLCBwZ0Jyb3dzZXIsIEFsZXJ0aWZ5KSB7CiAgICAg ICBoZWFkZXJTZWxlY3RDb250cm9sVGVtcGxhdGUgPSAgXy50ZW1wbGF0ZShb CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnPGRpdiBjbGFzcz0i PCU9QmFja2Zvcm0uY29udHJvbHNDbGFzc05hbWUlPiA8JT1leHRyYUNsYXNz ZXMuam9pbihcJyBcJyklPiI+JywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICcgIDxzZWxlY3QgY2xhc3M9InBnYWRtaW4tbm9kZS1zZWxlY3Qg Zm9ybS1jb250cm9sIiBuYW1lPSI8JT1uYW1lJT4iIHN0eWxlPSJ3aWR0aDox MDAlOyIgdmFsdWU9IjwlLXZhbHVlJT4iIDwlPWRpc2FibGVkID8gImRpc2Fi bGVkIiA6ICIiJT4gPCU9cmVxdWlyZWQgPyAicmVxdWlyZWQiIDogIiIlPiA+ JywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICcgICAgPCU9c2Vs ZWN0Mi5maXJzdF9lbXB0eSA/ICIgPG9wdGlvbj48L29wdGlvbj4iIDogIiIl PicsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnICAgIDwlIGZv ciAodmFyIGk9MDsgaSA8IG9wdGlvbnMubGVuZ3RoOyBpKyspIHsgJT4nLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyAgICA8JSB2YXIgb3B0 aW9uID0gb3B0aW9uc1tpXTsgJT4nLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJyAgICA8b3B0aW9uIDwlIGlmIChvcHRpb24uaW1hZ2UpIHsg JT4gZGF0YS1pbWFnZT08JT0gb3B0aW9uLmltYWdlICU+IDwlIH0gJT4gdmFs dWU9PCU9IGZvcm1hdHRlci5mcm9tUmF3KG9wdGlvbi52YWx1ZSkgJT4gPCU9 b3B0aW9uLnZhbHVlID09PSByYXdWYWx1ZSA/ICJzZWxlY3RlZD1cJ3NlbGVj dGVkXCciIDogIiIgJT4+PCUtb3B0aW9uLmxhYmVsJT48L29wdGlvbj4nLApA QCAtMTM0LDggKzEzNSw5IEBAIGZ1bmN0aW9uKCQsIF8sIFMsIHBnQWRtaW4s IHBnQnJvd3NlciwgQWxlcnRpZnkpIHsKICAgICAgICAgICB9KSwKICAgICAg ICAgICBzZWxlY3QyOiB7CiAgICAgICAgICAgICBhbGxvd0NsZWFyOiBmYWxz ZSwgd2lkdGg6ICdzdHlsZScsCi0gICAgICAgICAgICBwbGFjZWhvbGRlcjog J1NlbGVjdCBjb2x1bW4nCi0gICAgICAgICAgfSwgZmlyc3RfZW1wdHk6ICFf LmlzVW5kZWZpbmVkKHNlbGYubW9kZWwuZ2V0KCdvaWQnKSksCisgICAgICAg ICAgICBwbGFjZWhvbGRlcjogJ3t7IF8oJ1NlbGVjdCBjb2x1bW4nKSB9fScs CisgICAgICAgICAgICBmaXJzdF9lbXB0eTogIV8uaXNVbmRlZmluZWQoc2Vs Zi5tb2RlbC5nZXQoJ29pZCcpKQorICAgICAgICAgIH0sCiAgICAgICAgICAg dmVyc2lvbl9jb21wYXRpYmxlOiBzZWxmLmZpZWxkLmdldCgndmVyc2lvbl9j b21wYXRpYmxlJyksCiAgICAgICAgICAgZGlzYWJsZWQ6IGZ1bmN0aW9uKG0p IHsKICAgICAgICAgICAgIHJldHVybiAhXy5pc1VuZGVmaW5lZChzZWxmLm1v ZGVsLmdldCgnb2lkJykpOwpAQCAtMjM0LDEwICsyMzYsMTEgQEAgZnVuY3Rp b24oJCwgXywgUywgcGdBZG1pbiwgcGdCcm93c2VyLCBBbGVydGlmeSkgewog ICAgICAgICAgICAgICBCYWNrZm9ybS5TZWxlY3QyQ29udHJvbC5wcm90b3R5 cGUucmVuZGVyLmFwcGx5KHRoaXMsIGFyZ3VtZW50cyk7CiAgICAgICAgICAg ICAgIHJldHVybiB0aGlzOwogICAgICAgICAgICAgfQotICAgICAgICAgIH0p LCB1cmw6ICdnZXRfY29sdW1ucycsIGZpcnN0X2VtcHR5OiB0cnVlLAorICAg ICAgICAgIH0pLCB1cmw6ICdnZXRfY29sdW1ucycsCiAgICAgICAgICAgc2Vs ZWN0MjogeworICAgICAgICAgICAgYWxsb3dDbGVhcjogZmFsc2UsCiAgICAg ICAgICAgICB3aWR0aDogInN0eWxlIiwKLSAgICAgICAgICAgIHBsYWNlaG9s ZGVyOiAnU2VsZWN0IGNvbHVtbicsCisgICAgICAgICAgICBwbGFjZWhvbGRl cjogJ3t7IF8oJ1NlbGVjdCBjb2x1bW4nKSB9fScsCiAgICAgICAgICAgICB0 ZW1wbGF0ZVJlc3VsdDogZm9ybWF0Tm9kZSwKICAgICAgICAgICAgIHRlbXBs YXRlU2VsZWN0aW9uOiBmb3JtYXROb2RlCiAgICAgICAgICAgfSwKZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL2RhdGFtb2Rl bC5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL2RhdGFtb2Rl bC5qcwppbmRleCA4Y2I3MDM0Li43YjM3OWNlIDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9kYXRhbW9kZWwuanMKKysrIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvZGF0YW1vZGVsLmpzCkBA IC0xMjQsNyArMTI0LDcgQEAgZnVuY3Rpb24oXywgcGdBZG1pbiwgJCwgQmFj a2JvbmUpIHsKICAgICAgICAgdmFyIHNlbGYgPSB0aGlzOwogICAgICAgICBz ZWxmLl9wcmV2aW91c19rZXlfdmFsdWVzID0ge307CiAKLSAgICAgICAgaWYg KCdvbl9zZXJ2ZXInIGluIG9wdGlvbnMgJiYgb3B0aW9ucy5vbl9zZXJ2ZXIp IHsKKyAgICAgICAgaWYgKCFfLmlzVW5kZWZpbmVkKG9wdGlvbnMpICYmICdv bl9zZXJ2ZXInIGluIG9wdGlvbnMgJiYgb3B0aW9ucy5vbl9zZXJ2ZXIpIHsK ICAgICAgICAgICBzZWxmLm9uX3NlcnZlciA9IHRydWU7CiAgICAgICAgIH0K IApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2JhY2tmb3Jt LnBnYWRtaW4uanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2Zvcm0u cGdhZG1pbi5qcwppbmRleCAyNTMwZGI5Li5lMjdlYTJkIDEwMDY0NAotLS0g YS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2Zvcm0ucGdhZG1pbi5qcwor KysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2Zvcm0ucGdhZG1pbi5q cwpAQCAtMTgwNCw3ICsxODA0LDExIEBACiAgICAgICBpZiAoXy5pc0FycmF5 KGZvcm1hdHRlZERhdGEpKSB7CiAgICAgICAgIHJldHVybiBfLm1hcChmb3Jt YXR0ZWREYXRhLCBkZWNvZGVVUklDb21wb25lbnQpOwogICAgICAgfSBlbHNl IHsKLSAgICAgICAgcmV0dXJuIGRlY29kZVVSSUNvbXBvbmVudChmb3JtYXR0 ZWREYXRhKTsKKyAgICAgICAgaWYoIV8uaXNOdWxsKGZvcm1hdHRlZERhdGEp ICYmICFfLmlzVW5kZWZpbmVkKGZvcm1hdHRlZERhdGEpKSB7CisgICAgICAg ICAgcmV0dXJuIGRlY29kZVVSSUNvbXBvbmVudChmb3JtYXR0ZWREYXRhKTsK KyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICByZXR1cm4gbnVsbDsKKyAg ICAgICAgfQogICAgICAgfQogICAgIH0KICAgfSk7CkBAIC0xOTE1LDkgKzE5 MTksMTUgQEAKICAgICAgIHJldHVybiB0aGlzOwogICAgIH0sCiAgICAgZ2V0 VmFsdWVGcm9tRE9NOiBmdW5jdGlvbigpIHsKLSAgICAgIHJldHVybiBCYWNr Zm9ybS5TZWxlY3RDb250cm9sLnByb3RvdHlwZS5nZXRWYWx1ZUZyb21ET00u YXBwbHkoCi0gICAgICAgIHRoaXMsIGFyZ3VtZW50cwotICAgICAgKTsKKyAg ICAgIHZhciB2YWwgPSBCYWNrZm9ybS5TZWxlY3RDb250cm9sLnByb3RvdHlw ZS5nZXRWYWx1ZUZyb21ET00uYXBwbHkoCisgICAgICAgICAgICAgICAgICB0 aGlzLCBhcmd1bWVudHMKKyAgICAgICAgICAgICAgICApLAorICAgICAgICBz ZWxlY3QyT3B0cyA9IF8uZXh0ZW5kKHt9LCB0aGlzLmZpZWxkLmdldCgic2Vs ZWN0MiIpIHx8IHRoaXMuZGVmYXVsdHMuc2VsZWN0Mik7CisKKyAgICAgIGlm IChzZWxlY3QyT3B0cy5tdWx0aXBsZSAmJiB2YWwgPT0gbnVsbCkgeworICAg ICAgICByZXR1cm4gW107CisgICAgICB9CisgICAgICByZXR1cm4gdmFsOwog ICAgIH0KICAgfSk7CiAK --001a1140d93c7dbf4505389decd2 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 --001a1140d93c7dbf4505389decd2--