Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d93Jq-0000qA-0r for pgadmin-hackers@arkaria.postgresql.org; Fri, 12 May 2017 05:40:50 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1d93Jp-00075S-AV for pgadmin-hackers@arkaria.postgresql.org; Fri, 12 May 2017 05:40:49 +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 1d93JZ-0006gf-0l for pgadmin-hackers@postgresql.org; Fri, 12 May 2017 05:40:33 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1d93JR-0003FM-3S for pgadmin-hackers@postgresql.org; Fri, 12 May 2017 05:40:31 +0000 Received: by mail-wm0-x22e.google.com with SMTP id u65so8973227wmu.1 for ; Thu, 11 May 2017 22:40:24 -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=9Du0oMPOtF0w6VUcqJ1chYRoldwwoDi5hzLC0WVR8Bo=; b=xc2X5CpEiC8VGRXJ+hXGJsh3rAxO8vwh9HlA9iAMlaAH4+U1dbIvfdnGFr2E7AzpGR R4l41C+dEW5eBpi5qwo2RIUbi+Q3WcB8F77KAMFdLQ9x8lB2ycdxOYh1TuNtmXye099K +tIdxyNkluBWhp4mxk6sreMRl5bMwBzgOHUh3uuksOGEefu33C1k7CEFUfFvN3tWRVBV nyQvoVOCuZZ95MX6iBPfYuAg1rqzSv4wKhkaRy1VTE7wQitNvYKM+UubfWE29ZGY+oob ncdHSHdi6u+qucO9y+ZjJ5310il4LAPGG0dhrnBDEYw2+8npfoRgiq3B+bpUkerdTa5Z 833A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=9Du0oMPOtF0w6VUcqJ1chYRoldwwoDi5hzLC0WVR8Bo=; b=e/lY4Ogi6XIKRyM9Hb/zBccLF8GA7l0B5vAuQNjzMJwLex7Ym6wNCuyX03i8i5MNFp GIbWyPWYe1JZmKPgkCqrvwxzgNB+yEkcs+FgZcphP+5TPrDhV1gFiqrDYsyLHmrLzypN Lld6eqz1qGnI0JCwHhPnUjkZd7az8rr8mNzictlCxAU3HT4/Tvg3tBQLM25UtmvJgoev AACQXtXjAwLm7kMWALVLhyQsu6Y1ldAmVihmN3K3LLkrreTzZ655MGml/xr14wL3lhEw S+S+P7HHvMtcINeUHm3qtGkzLmVuNtHKY6bQhJRP07vXUbfBfA+x/KRuDKpI4vidmFq/ MO4w== X-Gm-Message-State: AODbwcAYfCsID6NIupvQzBSNqOcr0nZdwjVKtNDR8J6e2CrTGoOzvGp3 zStPKXaqRI8GsLG8B0azcBAZ2+9FpiaT X-Received: by 10.28.144.15 with SMTP id s15mr1219037wmd.137.1494567623214; Thu, 11 May 2017 22:40:23 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.19.138 with HTTP; Thu, 11 May 2017 22:39:52 -0700 (PDT) In-Reply-To: References: From: Surinder Kumar Date: Fri, 12 May 2017 11:09:52 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch][RM2257]: Query tool - Insert row doesn't use default values To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="001a1145ba4446b88f054f4d247e" 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 --001a1145ba4446b88f054f4d247e Content-Type: multipart/alternative; boundary="001a1145ba4446b888054f4d247c" --001a1145ba4446b888054f4d247c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi Dave, Please find updated patch On Thu, May 11, 2017 at 2:29 PM, Dave Page wrote: > Ooops, managed to hit send too soon. > > ... it leads to failed updates such as: > > 2017-05-11 09:55:47,570: SQL pgadmin: Execute (void) for server #1 - > CONN:2096775 (Query-id: 4540472): > UPDATE public.defaults SET > data_default_no_nulls =3D 'asas' WHERE > ; > 2017-05-11 09:55:47,577: ERROR pgadmin: > Failed to execute query (execute_void) for the server #1 - CONN:2096775 > (Query-id: 4540472): > Error Message:ERROR: syntax error at or near ";" > LINE 3: ; > =E2=80=8BThe new rows added is kept disabled untill grid is not refreshed. > > > On Thu, May 11, 2017 at 9:58 AM, Dave Page wrote: > >> Hi >> >> There seems to be couple of bugs in this; >> >> - When creating a new row with my test table, if I click in the id >> column, don't change anything, then click in another column, the ID colu= mn >> value changes from [default] to [null], making it impossible to save that >> row with the default value. In this case I would expect it to stay at >> [default] unless I explicitly entered a value. >> > =E2=80=8BFixed.=E2=80=8B > >> - When I add a new row, but leave the id as [default], the row is saved, >> but the [default] marker changes from gray to black (but only in the id >> column. >> > =E2=80=8BI forgot to add 'grey_color' class for numeric type fields. Now = added.=E2=80=8B > >> - I'm able to edit a freshly added row immediately after saving but >> before refreshing. This shouldn't be allowed if we don't know what the >> primary key value is, as it leads to failed updates such as: >> >> >> On Wed, May 10, 2017 at 9:52 AM, Surinder Kumar < >> surinder.kumar@enterprisedb.com> wrote: >> >>> Hi Dave, >>> >>> Please find attached patch for RM only. >>> >>> *Changes:* >>> >>> - All formatters now handles both [null] and [default] values >>> >>> - the cell values are validated on server side as in pgAdmin3. >>> >>> - added light grey color for cells with [null] and [default] >>> placeholders. >>> >>> On Wed, May 10, 2017 at 2:12 PM, Dave Page wrote: >>> >>>> >>>> >>>> On Wed, May 10, 2017 at 9:39 AM, Surinder Kumar < >>>> surinder.kumar@enterprisedb.com> wrote: >>>> >>>>> Hi Dave, >>>>> >>>>> On Wed, May 10, 2017 at 2:06 PM, Dave Page wrote: >>>>> >>>>>> Any chance we can get this wrapped up today Surinder? >>>>>> >>>>> =E2=80=8BI have fixed RM case, I am currently writing its feature tes= t cases >>>>> which is taking some time. >>>>> Should I send patch for RM case only?=E2=80=8B I will try to complete= test >>>>> cases by today eod. >>>>> >>>> >>>> Yes please. >>>> >>>> Thanks! >>>> >>>> -- >>>> Dave Page >>>> Blog: http://pgsnake.blogspot.com >>>> Twitter: @pgsnake >>>> >>>> EnterpriseDB UK: http://www.enterprisedb.com >>>> The Enterprise PostgreSQL Company >>>> >>> >>> >> >> >> -- >> Dave Page >> Blog: http://pgsnake.blogspot.com >> Twitter: @pgsnake >> >> EnterpriseDB UK: http://www.enterprisedb.com >> The Enterprise PostgreSQL Company >> > > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --001a1145ba4446b888054f4d247c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi = Dave,

Please find updated= patch

On Th= u, May 11, 2017 at 2:29 PM, Dave Page <dpage@pgadmin.org> wr= ote:
Ooops, managed to h= it send too soon.

... it leads to failed updates such as= :

2017-05-11 09:55:47,570: SQL= pgadmin: Execute (void) for server #1 - CONN:= 2096775 (Query-id: 4540472):
UPDATE public.defaults SET
data_default_no_nulls =3D 'asas' WHERE
;
2017-= 05-11 09:55:47,577: ERROR pgadmin:
Failed to execute query (execute_void) for the server #1 - C= ONN:2096775
(Query-id: 4540472):
Error Message:ERROR: = =C2=A0syntax error at or near ";"
LINE 3: ;
=
= =E2=80=8BThe new rows added is kept disabled untill grid is not refreshed.<= /div>

<= div class=3D"HOEnZb">

On Thu, May 11, 2017 at 9:58 AM, Dave Page <dpage@p= gadmin.org> wrote:
Hi

There seems to be couple of bugs in this;=C2= =A0

- When creating a new row with my test table, = if I click in the id column, don't change anything, then click in anoth= er column, the ID column value changes from [default] to [null], making it = impossible to save that row with the default value. In this case I would ex= pect it to stay at [default] unless I explicitly entered a value.
=E2=80=8BFixed.=E2=80=8B

- When I add a new row, but leave the id as [= default], the row is saved, but the [default] marker changes from gray to b= lack (but only in the id column.
=
= =E2=80=8BI forgot to add 'grey_color' class for numeric type fields= . Now added.=E2=80=8B

- I&#= 39;m able to edit a freshly added row immediately after saving but before r= efreshing. This shouldn't be allowed if we don't know what the prim= ary key value is, as it leads to failed updates such as:


= On Wed, May 10, 2017 at 9:52 AM, Surinder Kumar <surinder.ku= mar@enterprisedb.com> wrote:
Hi Dave,

Please fi= nd attached patch for RM only.

Changes:

=C2=A0- All formatters now=C2=A0handles bot= h [null] and [default] values

=C2=A0- the cell values are validated on server side as in pgAdmin3.<= /div>

=C2=A0- added light grey color for cells with [null] and [default] placeh= olders.

On Wed, May 10, 2017= at 2:12 PM, Dave Page <dpage@pgadmin.org> wrote:

On Wed, May 10, 2017 at 9:39 AM, Surinder= Kumar <surinder.kumar@enterprisedb.com> = wrote:
Hi Dave,

On Wed, May 10, 2017 at 2:06 PM, Dave Page <= dpage@pgadmin.org> wrote:
<= div dir=3D"ltr">Any chance we can get this wrapped up today Surinder?
=
=E2=80=8BI have fixed RM= case, I am currently writing its feature test cases which is taking some t= ime.
Should I send patch for RM case on= ly?=E2=80=8B I will try to complete test cases by today eod.

Yes please.
=

Thanks!

--
Dave PageBlog: http://pgs= nake.blogspot.com
Twitter: @pgsnake

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




--
=
Dave Page
Blog: http://pgsnake.blogspot.com
Twi= tter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise Pos= tgreSQL Company



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

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

--001a1145ba4446b888054f4d247c-- --001a1145ba4446b88f054f4d247e Content-Type: application/octet-stream; name="RM_2257_v4.patch" Content-Disposition: attachment; filename="RM_2257_v4.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j2lexqum0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMv Y29sdW1uL3NxbC85LjJfcGx1cy9ub2Rlcy5zcWwgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy90YWJsZXMvdGVtcGxhdGVzL2NvbHVtbi9zcWwvOS4yX3BsdXMvbm9kZXMu c3FsCmluZGV4IDc1OWU2NTcuLmYzMzUzZDYgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9zY2hlbWFzL3RhYmxlcy90ZW1wbGF0ZXMvY29sdW1uL3NxbC85LjJfcGx1 cy9ub2Rlcy5zcWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RlbXBs YXRlcy9jb2x1bW4vc3FsLzkuMl9wbHVzL25vZGVzLnNxbApAQCAtMSw0ICsx LDUgQEAKLVNFTEVDVCBhdHQuYXR0bmFtZSBhcyBuYW1lLCBhdHQuYXR0bnVt IGFzIE9JRCwgZm9ybWF0X3R5cGUodHkub2lkLE5VTEwpIEFTIGRhdGF0eXBl CitTRUxFQ1QgYXR0LmF0dG5hbWUgYXMgbmFtZSwgYXR0LmF0dG51bSBhcyBP SUQsIGZvcm1hdF90eXBlKHR5Lm9pZCxOVUxMKSBBUyBkYXRhdHlwZSwKK2F0 dC5hdHRub3RudWxsIGFzIG5vdF9udWxsLCBhdHQuYXR0aGFzZGVmIGFzIGhh c19kZWZhdWx0X3ZhbAogRlJPTSBwZ19hdHRyaWJ1dGUgYXR0CiAgIEpPSU4g cGdfdHlwZSB0eSBPTiB0eS5vaWQ9YXR0dHlwaWQKICAgSk9JTiBwZ19uYW1l c3BhY2UgdG4gT04gdG4ub2lkPXR5LnR5cG5hbWVzcGFjZQpkaWZmIC0tZ2l0 IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RlbXBsYXRlcy9jb2x1bW4vc3Fs L2RlZmF1bHQvbm9kZXMuc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3Rl bXBsYXRlcy9jb2x1bW4vc3FsL2RlZmF1bHQvbm9kZXMuc3FsCmluZGV4IDc1 MzZhOWMuLjRmMWRlMmEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3Rh Ymxlcy90ZW1wbGF0ZXMvY29sdW1uL3NxbC9kZWZhdWx0L25vZGVzLnNxbAor KysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvdGVtcGxhdGVzL2NvbHVtbi9z cWwvZGVmYXVsdC9ub2Rlcy5zcWwKQEAgLTEsNCArMSw1IEBACi1TRUxFQ1Qg YXR0LmF0dG5hbWUgYXMgbmFtZSwgYXR0LmF0dG51bSBhcyBPSUQsIGZvcm1h dF90eXBlKHR5Lm9pZCxOVUxMKSBBUyBkYXRhdHlwZQorU0VMRUNUIGF0dC5h dHRuYW1lIGFzIG5hbWUsIGF0dC5hdHRudW0gYXMgT0lELCBmb3JtYXRfdHlw ZSh0eS5vaWQsTlVMTCkgQVMgZGF0YXR5cGUsCithdHQuYXR0bm90bnVsbCBh cyBub3RfbnVsbCwgYXR0LmF0dGhhc2RlZiBhcyBoYXNfZGVmYXVsdF92YWwK IEZST00gcGdfYXR0cmlidXRlIGF0dAogICAgIEpPSU4gcGdfdHlwZSB0eSBP TiB0eS5vaWQ9YXR0dHlwaWQKICAgICBKT0lOIHBnX25hbWVzcGFjZSB0biBP TiB0bi5vaWQ9dHkudHlwbmFtZXNwYWNlCmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi9zdGF0aWMvY3NzL3BnYWRtaW4uY3NzIGIvd2ViL3BnYWRtaW4vc3Rh dGljL2Nzcy9wZ2FkbWluLmNzcwppbmRleCA2NTA4ZmViLi4xYTJkNDQzIDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvY3NzL3BnYWRtaW4uY3Nz CisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9jc3MvcGdhZG1pbi5jc3MKQEAg LTc4MCw0ICs3ODAsNyBAQCBsZ2ctZWwtY29udGFpbmVyW2VsPW1kXSAucGct ZWwtbGctOCwKIH0KIC51c2VyLWxhbmd1YWdlIHNlbGVjdHsKICAgaGVpZ2h0 OiAyNXB4ICFpbXBvcnRhbnQ7Cit9CisuZ3JleV9jb2xvciB7CisgIGNvbG9y OiAjOTk5OTk5OwogfQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlm ZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zbGlja2dyaWQvc2xp Y2sucGdhZG1pbi5lZGl0b3JzLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pz L3NsaWNrZ3JpZC9zbGljay5wZ2FkbWluLmVkaXRvcnMuanMKaW5kZXggY2Rm YmE0ZC4uZmFhZDczMSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGlj L2pzL3NsaWNrZ3JpZC9zbGljay5wZ2FkbWluLmVkaXRvcnMuanMKKysrIGIv d2ViL3BnYWRtaW4vc3RhdGljL2pzL3NsaWNrZ3JpZC9zbGljay5wZ2FkbWlu LmVkaXRvcnMuanMKQEAgLTExMCw3ICsxMTAsMTIgQEAKIAogICAgIC8vIFdo ZW4gdGV4dCBlZGl0b3Igb3BlbnMKICAgICB0aGlzLmxvYWRWYWx1ZSA9IGZ1 bmN0aW9uIChpdGVtKSB7Ci0gICAgICBpZiAoaXRlbVthcmdzLmNvbHVtbi5w b3NdID09PSAiIikgeworICAgICAgdmFyIGNvbCA9IGFyZ3MuY29sdW1uOwor CisgICAgICBpZiAoXy5pc1VuZGVmaW5lZChpdGVtW2FyZ3MuY29sdW1uLnBv c10pICYmIGNvbC5oYXNfZGVmYXVsdF92YWwpIHsKKyAgICAgICAgJGlucHV0 LnZhbCgiIik7CisgICAgICB9CisgICAgICBlbHNlIGlmIChpdGVtW2FyZ3Mu Y29sdW1uLnBvc10gPT09ICIiKSB7CiAgICAgICAgICRpbnB1dC52YWwoIicn Iik7CiAgICAgICB9CiAgICAgICBlbHNlIHsKQEAgLTE0NSw3ICsxNTAsMTQg QEAKICAgICB9OwogCiAgICAgdGhpcy5pc1ZhbHVlQ2hhbmdlZCA9IGZ1bmN0 aW9uICgpIHsKLSAgICAgIHJldHVybiAoISgkaW5wdXQudmFsKCkgPT0gIiIg JiYgZGVmYXVsdFZhbHVlID09IG51bGwpKSAmJiAoJGlucHV0LnZhbCgpICE9 IGRlZmF1bHRWYWx1ZSk7CisgICAgICAvLyBVc2UgXy5pc051bGwodmFsdWUp IGZvciBjb21wYXJpc29uIGZvciBudWxsIGluc3RlYWQgb2YKKyAgICAgIC8v IGRlZmF1bHRWYWx1ZSA9PSBudWxsLCBiZWNhdXNlIGl0IHJldHVybnMgdHJ1 ZSBmb3IgdW5kZWZpbmVkIHZhbHVlLgorICAgICAgaWYgKCRpbnB1dC52YWwo KSA9PSAiIiAmJiBfLmlzVW5kZWZpbmVkKGRlZmF1bHRWYWx1ZSkpIHsKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgfSBlbHNlIHsKKyAgICAgICAg cmV0dXJuICghKCRpbnB1dC52YWwoKSA9PSAiIiAmJiBfLmlzTnVsbChkZWZh dWx0VmFsdWUpKSkgJiYKKyAgICAgICAgICAgICAgICgkaW5wdXQudmFsKCkg IT0gZGVmYXVsdFZhbHVlKTsKKyAgICAgIH0KICAgICB9OwogCiAgICAgdGhp cy52YWxpZGF0ZSA9IGZ1bmN0aW9uICgpIHsKQEAgLTI1Myw3ICsyNjUsNyBA QAogCiAgICAgdGhpcy5sb2FkVmFsdWUgPSBmdW5jdGlvbiAoaXRlbSkgewog ICAgICAgdmFyIGRhdGEgPSBkZWZhdWx0VmFsdWUgPSBpdGVtW2FyZ3MuY29s dW1uLnBvc107Ci0gICAgICBpZiAodHlwZW9mIGRhdGEgPT09ICJvYmplY3Qi ICYmICFBcnJheS5pc0FycmF5KGRhdGEpKSB7CisgICAgICBpZiAoZGF0YSAm JiB0eXBlb2YgZGF0YSA9PT0gIm9iamVjdCIgJiYgIUFycmF5LmlzQXJyYXko ZGF0YSkpIHsKICAgICAgICAgZGF0YSA9IEpTT04uc3RyaW5naWZ5KGRhdGEp OwogICAgICAgfSBlbHNlIGlmIChBcnJheS5pc0FycmF5KGRhdGEpKSB7CiAg ICAgICAgIHZhciB0ZW1wID0gW107CkBAIC0yODIsNyArMjk0LDExIEBACiAg ICAgfTsKIAogICAgIHRoaXMuaXNWYWx1ZUNoYW5nZWQgPSBmdW5jdGlvbiAo KSB7Ci0gICAgICByZXR1cm4gKCEoJGlucHV0LnZhbCgpID09ICIiICYmIGRl ZmF1bHRWYWx1ZSA9PSBudWxsKSkgJiYgKCRpbnB1dC52YWwoKSAhPSBkZWZh dWx0VmFsdWUpOworICAgICAgaWYgKCRpbnB1dC52YWwoKSA9PSAiIiAmJiBf LmlzVW5kZWZpbmVkKGRlZmF1bHRWYWx1ZSkpIHsKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgfSBlbHNlIHsKKyAgICAgICAgcmV0dXJuICghKCRp bnB1dC52YWwoKSA9PSAiIiAmJiBfLmlzTnVsbChkZWZhdWx0VmFsdWUpKSkg JiYgKCRpbnB1dC52YWwoKSAhPSBkZWZhdWx0VmFsdWUpOworICAgICAgfQog ICAgIH07CiAKICAgICB0aGlzLnZhbGlkYXRlID0gZnVuY3Rpb24gKCkgewpA QCAtNDk4LDYgKzUxNCwxMiBAQAogICAgIH07CiAKICAgICB0aGlzLnZhbGlk YXRlID0gZnVuY3Rpb24gKCkgeworICAgICAgaWYgKGFyZ3MuY29sdW1uLnZh bGlkYXRvcikgeworICAgICAgICB2YXIgdmFsaWRhdGlvblJlc3VsdHMgPSBh cmdzLmNvbHVtbi52YWxpZGF0b3IodGhpcy5zZXJpYWxpemVWYWx1ZSgpKTsK KyAgICAgICAgaWYgKCF2YWxpZGF0aW9uUmVzdWx0cy52YWxpZCkgeworICAg ICAgICAgIHJldHVybiB2YWxpZGF0aW9uUmVzdWx0czsKKyAgICAgICAgfQor ICAgICAgfQogICAgICAgcmV0dXJuIHsKICAgICAgICAgdmFsaWQ6IHRydWUs CiAgICAgICAgIG1zZzogbnVsbApAQCAtODM3LDcgKzg1OSwxNCBAQAogICAg IH07CiAKICAgICB0aGlzLmlzVmFsdWVDaGFuZ2VkID0gZnVuY3Rpb24gKCkg ewotICAgICAgcmV0dXJuICghKCRpbnB1dC52YWwoKSA9PSAiIiAmJiBkZWZh dWx0VmFsdWUgPT0gbnVsbCkpICYmICgkaW5wdXQudmFsKCkgIT0gZGVmYXVs dFZhbHVlKTsKKyAgICAgIGlmICgkaW5wdXQudmFsKCkgPT0gIiIgJiYgXy5p c1VuZGVmaW5lZChkZWZhdWx0VmFsdWUpKSB7CisgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgIH0gZWxzZSBpZiAoJGlucHV0LnZhbCgpID09ICIiICYm IGRlZmF1bHRWYWx1ZSA9PSAiIikgeworICAgICAgICByZXR1cm4gdHJ1ZTsK KyAgICAgIH0gZWxzZSB7CisgICAgICAgIHJldHVybiAoISgkaW5wdXQudmFs KCkgPT0gIiIgJiYgXy5pc051bGwoZGVmYXVsdFZhbHVlICkpKSAmJgorICAg ICAgICAoJGlucHV0LnZhbCgpICE9IGRlZmF1bHRWYWx1ZSk7CisgICAgICB9 CiAgICAgfTsKIAogICAgIHRoaXMudmFsaWRhdGUgPSBmdW5jdGlvbiAoKSB7 CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc2xpY2tncmlk L3NsaWNrLnBnYWRtaW4uZm9ybWF0dGVycy5qcyBiL3dlYi9wZ2FkbWluL3N0 YXRpYy9qcy9zbGlja2dyaWQvc2xpY2sucGdhZG1pbi5mb3JtYXR0ZXJzLmpz CmluZGV4IDI5MGJkZGQuLjY0MmZjMmYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL3N0YXRpYy9qcy9zbGlja2dyaWQvc2xpY2sucGdhZG1pbi5mb3JtYXR0 ZXJzLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zbGlja2dyaWQv c2xpY2sucGdhZG1pbi5mb3JtYXR0ZXJzLmpzCkBAIC0xOSw4ICsxOSwxNSBA QAogICB9KTsKIAogICBmdW5jdGlvbiBKc29uRm9ybWF0dGVyKHJvdywgY2Vs bCwgdmFsdWUsIGNvbHVtbkRlZiwgZGF0YUNvbnRleHQpIHsKLSAgICBpZiAo dmFsdWUgPT0gbnVsbCB8fCB2YWx1ZSA9PT0gIiIpIHsKLSAgICAgIHJldHVy biAiIjsKKyAgICAvLyBJZiBjb2x1bW4gaGFzIGRlZmF1bHQgdmFsdWUsIHNl dCBwbGFjZWhvbGRlcgorICAgIGlmIChfLmlzVW5kZWZpbmVkKHZhbHVlKSAm JiBjb2x1bW5EZWYuaGFzX2RlZmF1bHRfdmFsKSB7CisgICAgICByZXR1cm4g IjxzcGFuIGNsYXNzPSdwdWxsLWxlZnQgZ3JleV9jb2xvcic+W2RlZmF1bHRd PC9zcGFuPiI7CisgICAgfQorICAgIGVsc2UgaWYgKAorICAgICAgKF8uaXNV bmRlZmluZWQodmFsdWUpICYmIGNvbHVtbkRlZi5ub3RfbnVsbCkgfHwKKyAg ICAgIChfLmlzVW5kZWZpbmVkKHZhbHVlKSB8fCB2YWx1ZSA9PT0gbnVsbCkK KyAgICApIHsKKyAgICAgIHJldHVybiAiPHNwYW4gY2xhc3M9J3B1bGwtbGVm dCBncmV5X2NvbG9yJz5bbnVsbF08L3NwYW4+IjsKICAgICB9IGVsc2Ugewog ICAgICAgLy8gU3RyaW5naWZ5IG9ubHkgaWYgaXQncyBqc29uIG9iamVjdAog ICAgICAgaWYgKHR5cGVvZiB2YWx1ZSA9PT0gIm9iamVjdCIgJiYgIUFycmF5 LmlzQXJyYXkodmFsdWUpKSB7CkBAIC00MiwxMSArNDksMTUgQEAKICAgfQog CiAgIGZ1bmN0aW9uIE51bWJlcnNGb3JtYXR0ZXIocm93LCBjZWxsLCB2YWx1 ZSwgY29sdW1uRGVmLCBkYXRhQ29udGV4dCkgewotICAgIGlmIChfLmlzVW5k ZWZpbmVkKHZhbHVlKSB8fCB2YWx1ZSA9PT0gbnVsbCkgewotICAgICAgcmV0 dXJuICI8c3BhbiBjbGFzcz0ncHVsbC1yaWdodCc+W251bGxdPC9zcGFuPiI7 CisgICAgLy8gSWYgY29sdW1uIGhhcyBkZWZhdWx0IHZhbHVlLCBzZXQgcGxh Y2Vob2xkZXIKKyAgICBpZiAoXy5pc1VuZGVmaW5lZCh2YWx1ZSkgJiYgY29s dW1uRGVmLmhhc19kZWZhdWx0X3ZhbCkgeworICAgICAgcmV0dXJuICI8c3Bh biBjbGFzcz0ncHVsbC1yaWdodCBncmV5X2NvbG9yJz5bZGVmYXVsdF08L3Nw YW4+IjsKICAgICB9Ci0gICAgZWxzZSBpZiAodmFsdWUgPT09ICIiKSB7Ci0g ICAgICByZXR1cm4gJyc7CisgICAgZWxzZSBpZiAoCisgICAgICAoXy5pc1Vu ZGVmaW5lZCh2YWx1ZSkgfHwgdmFsdWUgPT09IG51bGwgfHwgdmFsdWUgPT09 ICIiKSB8fAorICAgICAgKF8uaXNVbmRlZmluZWQodmFsdWUpICYmIGNvbHVt bkRlZi5ub3RfbnVsbCkKKyAgICApIHsKKyAgICAgIHJldHVybiAiPHNwYW4g Y2xhc3M9J3B1bGwtcmlnaHQgZ3JleV9jb2xvcic+W251bGxdPC9zcGFuPiI7 CiAgICAgfQogICAgIGVsc2UgewogICAgICAgcmV0dXJuICI8c3BhbiBzdHls ZT0nZmxvYXQ6cmlnaHQnPiIgKyBfLmVzY2FwZSh2YWx1ZSkgKyAiPC9zcGFu PiI7CkBAIC01NywxNyArNjgsMzAgQEAKICAgICAvKiBDaGVja2JveCBoYXMg MyBzdGF0ZXMKICAgICAgKiAxKSBjaGVja2VkPXRydWUKICAgICAgKiAyKSB1 bmNoZWNrZWQ9ZmFsc2UKLSAgICAgKiAzKSBpbmRldGVybWluYXRlPW51bGwv JycKKyAgICAgKiAzKSBpbmRldGVybWluYXRlPW51bGwKICAgICAgKi8KLSAg ICBpZiAodmFsdWUgPT0gbnVsbCB8fCB2YWx1ZSA9PT0gIiIpIHsKLSAgICAg IHJldHVybiAiPHNwYW4gY2xhc3M9J3B1bGwtbGVmdCc+W251bGxdPC9zcGFu PiI7CisgICAgaWYgKF8uaXNVbmRlZmluZWQodmFsdWUpICYmIGNvbHVtbkRl Zi5oYXNfZGVmYXVsdF92YWwpIHsKKyAgICAgIHJldHVybiAiPHNwYW4gY2xh c3M9J3B1bGwtbGVmdCBncmV5X2NvbG9yJz5bZGVmYXVsdF08L3NwYW4+IjsK KyAgICB9CisgICAgZWxzZSBpZiAoCisgICAgICAoXy5pc1VuZGVmaW5lZCh2 YWx1ZSkgJiYgY29sdW1uRGVmLm5vdF9udWxsKSB8fAorICAgICAgKHZhbHVl ID09IG51bGwgfHwgdmFsdWUgPT09ICIiKQorICAgICkgeworICAgICAgcmV0 dXJuICI8c3BhbiBjbGFzcz0ncHVsbC1sZWZ0IGdyZXlfY29sb3InPltudWxs XTwvc3Bhbj4iOwogICAgIH0KICAgICByZXR1cm4gdmFsdWUgPyAidHJ1ZSIg OiAiZmFsc2UiOwogICB9CiAKICAgZnVuY3Rpb24gVGV4dEZvcm1hdHRlcihy b3csIGNlbGwsIHZhbHVlLCBjb2x1bW5EZWYsIGRhdGFDb250ZXh0KSB7Ci0g ICAgaWYgKF8uaXNVbmRlZmluZWQodmFsdWUpIHx8IHZhbHVlID09PSBudWxs KSB7Ci0gICAgICByZXR1cm4gIjxzcGFuIGNsYXNzPSdwdWxsLWxlZnQnPltu dWxsXTwvc3Bhbj4iOworICAgIC8vIElmIGNvbHVtbiBoYXMgZGVmYXVsdCB2 YWx1ZSwgc2V0IHBsYWNlaG9sZGVyCisgICAgaWYgKF8uaXNVbmRlZmluZWQo dmFsdWUpICYmIGNvbHVtbkRlZi5oYXNfZGVmYXVsdF92YWwpIHsKKyAgICAg ICAgcmV0dXJuICI8c3BhbiBjbGFzcz0ncHVsbC1sZWZ0IGdyZXlfY29sb3In PltkZWZhdWx0XTwvc3Bhbj4iOworICAgIH0KKyAgICBlbHNlIGlmICgKKyAg ICAgIChfLmlzVW5kZWZpbmVkKHZhbHVlKSAmJiBjb2x1bW5EZWYubm90X251 bGwpIHx8CisgICAgICAoXy5pc1VuZGVmaW5lZCh2YWx1ZSkgfHwgXy5pc051 bGwodmFsdWUpKQorICAgICkgeworICAgICAgcmV0dXJuICI8c3BhbiBjbGFz cz0ncHVsbC1sZWZ0IGdyZXlfY29sb3InPltudWxsXTwvc3Bhbj4iOwogICAg IH0KICAgICBlbHNlIHsKICAgICAgIHJldHVybiBfLmVzY2FwZSh2YWx1ZSk7 CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvX19p bml0X18ucHkgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvX19pbml0 X18ucHkKaW5kZXggZDExNDk4OC4uZjc0NjZkOCAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL19faW5pdF9fLnB5CisrKyBiL3dl Yi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2luaXRfXy5weQpAQCAtNDQw LDggKzQ0MCwyMyBAQCBkZWYgZ2V0X2NvbHVtbnModHJhbnNfaWQpOgogICAg IGNvbHVtbnMgPSBkaWN0KCkKICAgICBjb2x1bW5zX2luZm8gPSBOb25lCiAg ICAgcHJpbWFyeV9rZXlzID0gTm9uZQorICAgIHJzZXQgPSBOb25lCiAgICAg c3RhdHVzLCBlcnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwgc2Vzc2lvbl9v YmogPSBjaGVja190cmFuc2FjdGlvbl9zdGF0dXModHJhbnNfaWQpCiAgICAg aWYgc3RhdHVzIGFuZCBjb25uIGlzIG5vdCBOb25lIGFuZCBzZXNzaW9uX29i aiBpcyBub3QgTm9uZToKKworICAgICAgICB2ZXIgPSBjb25uLm1hbmFnZXIu dmVyc2lvbgorICAgICAgICAjIEdldCB0aGUgdGVtcGxhdGUgcGF0aCBmb3Ig dGhlIGNvbHVtbgorICAgICAgICB0ZW1wbGF0ZV9wYXRoID0gJ2NvbHVtbi9z cWwvI3swfSMnLmZvcm1hdCh2ZXIpCisgICAgICAgIGNvbW1hbmRfb2JqID0g cGlja2xlLmxvYWRzKHNlc3Npb25fb2JqWydjb21tYW5kX29iaiddKQorICAg ICAgICBpZiBoYXNhdHRyKGNvbW1hbmRfb2JqLCAnb2JqX2lkJyk6CisgICAg ICAgICAgICBTUUwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3RlbXBs YXRlX3BhdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICdub2Rlcy5zcWwnXSksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdGlkPWNvbW1hbmRfb2JqLm9ial9pZCkKKyAgICAg ICAgICAgICMgcm93cyB3aXRoIGF0dHJpYnV0ZSBub3RfbnVsbAorICAgICAg ICAgICAgc3RhdHVzLCByc2V0ID0gY29ubi5leGVjdXRlXzJkYXJyYXkoU1FM KQorICAgICAgICAgICAgaWYgbm90IHN0YXR1czoKKyAgICAgICAgICAgICAg ICByZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPXJzZXQp CisKICAgICAgICAgIyBDaGVjayBQSyBjb2x1bW4gaW5mbyBpcyBhdmFpbGFi bGUgb3Igbm90CiAgICAgICAgIGlmICdwcmltYXJ5X2tleXMnIGluIHNlc3Np b25fb2JqOgogICAgICAgICAgICAgcHJpbWFyeV9rZXlzID0gc2Vzc2lvbl9v YmpbJ3ByaW1hcnlfa2V5cyddCkBAIC00NDksMTAgKzQ2NCwxNyBAQCBkZWYg Z2V0X2NvbHVtbnModHJhbnNfaWQpOgogICAgICAgICAjIEZldGNoIGNvbHVt biBpbmZvcm1hdGlvbgogICAgICAgICBjb2x1bW5zX2luZm8gPSBjb25uLmdl dF9jb2x1bW5faW5mbygpCiAgICAgICAgIGlmIGNvbHVtbnNfaW5mbyBpcyBu b3QgTm9uZToKLSAgICAgICAgICAgIGZvciBjb2wgaW4gY29sdW1uc19pbmZv OgorICAgICAgICAgICAgZm9yIGtleSwgY29sIGluIGVudW1lcmF0ZShjb2x1 bW5zX2luZm8pOgogICAgICAgICAgICAgICAgIGNvbF90eXBlID0gZGljdCgp CiAgICAgICAgICAgICAgICAgY29sX3R5cGVbJ3R5cGVfY29kZSddID0gY29s Wyd0eXBlX2NvZGUnXQogICAgICAgICAgICAgICAgIGNvbF90eXBlWyd0eXBl X25hbWUnXSA9IE5vbmUKKyAgICAgICAgICAgICAgICBpZiByc2V0OgorICAg ICAgICAgICAgICAgICAgICBjb2xfdHlwZVsnbm90X251bGwnXSA9IGNvbFsn bm90X251bGwnXSA9IFwKKyAgICAgICAgICAgICAgICAgICAgICAgIHJzZXRb J3Jvd3MnXVtrZXldWydub3RfbnVsbCddCisKKyAgICAgICAgICAgICAgICAg ICAgY29sX3R5cGVbJ2hhc19kZWZhdWx0X3ZhbCddID0gY29sWydoYXNfZGVm YXVsdF92YWwnXSA9IFwKKyAgICAgICAgICAgICAgICAgICAgICAgIHJzZXRb J3Jvd3MnXVtrZXldWydoYXNfZGVmYXVsdF92YWwnXQorCiAgICAgICAgICAg ICAgICAgY29sdW1uc1tjb2xbJ25hbWUnXV0gPSBjb2xfdHlwZQogCiAgICAg ICAgICMgQXMgd2UgY2hhbmdlZCB0aGUgdHJhbnNhY3Rpb24gb2JqZWN0IHdl IG5lZWQgdG8KQEAgLTYwMiw2ICs2MjQsNyBAQCBkZWYgc2F2ZSh0cmFuc19p ZCk6CiAgICAgc3RhdHVzLCBlcnJvcl9tc2csIGNvbm4sIHRyYW5zX29iaiwg c2Vzc2lvbl9vYmogPSBjaGVja190cmFuc2FjdGlvbl9zdGF0dXModHJhbnNf aWQpCiAgICAgaWYgc3RhdHVzIGFuZCBjb25uIGlzIG5vdCBOb25lIFwKICAg ICAgICAgICAgIGFuZCB0cmFuc19vYmogaXMgbm90IE5vbmUgYW5kIHNlc3Np b25fb2JqIGlzIG5vdCBOb25lOgorICAgICAgICBzZXRhdHRyKHRyYW5zX29i aiwgJ2NvbHVtbnNfaW5mbycsIHNlc3Npb25fb2JqWydjb2x1bW5zX2luZm8n XSkKIAogICAgICAgICAjIElmIHRoZXJlIGlzIG5vIHByaW1hcnkga2V5IGZv dW5kIHRoZW4gcmV0dXJuIGZyb20gdGhlIGZ1bmN0aW9uLgogICAgICAgICBp ZiBsZW4oc2Vzc2lvbl9vYmpbJ3ByaW1hcnlfa2V5cyddKSA8PSAwIG9yIGxl bihjaGFuZ2VkX2RhdGEpIDw9IDA6CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1p bi90b29scy9zcWxlZGl0b3IvY29tbWFuZC5weSBiL3dlYi9wZ2FkbWluL3Rv b2xzL3NxbGVkaXRvci9jb21tYW5kLnB5CmluZGV4IDE3OTUxNTUuLjk2MDE0 NjcgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9j b21tYW5kLnB5CisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9j b21tYW5kLnB5CkBAIC00NDIsNiArNDQyLDI1IEBAIGNsYXNzIFRhYmxlQ29t bWFuZChHcmlkQ29tbWFuZCk6CiAKICAgICAgICAgICAgICAgICAjIEZvciBu ZXdseSBhZGRlZCByb3dzCiAgICAgICAgICAgICAgICAgaWYgb2ZfdHlwZSA9 PSAnYWRkZWQnOgorCisgICAgICAgICAgICAgICAgICAgICMgV2hlbiBuZXcg cm93cyBhcmUgYWRkZWQsIG9ubHkgY2hhbmdlZCBjb2x1bW5zIGRhdGEgaXMK KyAgICAgICAgICAgICAgICAgICAgIyBzZW50IGZyb20gY2xpZW50IHNpZGUu IEJ1dCBpZiBjb2x1bW4gaXMgbm90X251bGwgYW5kIGhhcworICAgICAgICAg ICAgICAgICAgICAjIG5vX2RlZmF1bHRfdmFsdWUsIHNldCBjb2x1bW4gdG8g YmxhbmssIGluc3RlYWQKKyAgICAgICAgICAgICAgICAgICAgIyBvZiBub3Qg bnVsbCB3aGljaCBpcyBzZXQgYnkgZGVmYXVsdC4KKyAgICAgICAgICAgICAg ICAgICAgY29sdW1uX2RhdGEgPSB7fQorICAgICAgICAgICAgICAgICAgICBj b2x1bW5fdHlwZSA9IHt9CisgICAgICAgICAgICAgICAgICAgIHBrX25hbWVz LCBwcmltYXJ5X2tleXMgPSBzZWxmLmdldF9wcmltYXJ5X2tleXMoKQorCisg ICAgICAgICAgICAgICAgICAgIGZvciBlYWNoX2NvbCBpbiBzZWxmLmNvbHVt bnNfaW5mbzoKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICgKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzZWxmLmNvbHVtbnNfaW5mb1tlYWNo X2NvbF1bJ25vdF9udWxsJ10gYW5kCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbm90IHNlbGYuY29sdW1uc19pbmZvW2VhY2hfY29sXVsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2hhc19kZWZhdWx0X3ZhbCdd CisgICAgICAgICAgICAgICAgICAgICAgICApOgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbHVtbl9kYXRhW2VhY2hfY29sXSA9IE5vbmUKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb2x1bW5fdHlwZVtlYWNoX2Nv bF0gPVwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5j b2x1bW5zX2luZm9bZWFjaF9jb2xdWyd0eXBlX25hbWUnXQorCiAgICAgICAg ICAgICAgICAgICAgIGZvciBlYWNoX3JvdyBpbiBjaGFuZ2VkX2RhdGFbb2Zf dHlwZV06CiAgICAgICAgICAgICAgICAgICAgICAgICBkYXRhID0gY2hhbmdl ZF9kYXRhW29mX3R5cGVdW2VhY2hfcm93XVsnZGF0YSddCiAgICAgICAgICAg ICAgICAgICAgICAgICAjIFJlbW92ZSBvdXIgdW5pcXVlIHRyYWNraW5nIGtl eQpAQCAtNDUwLDEyICs0NjksMTkgQEAgY2xhc3MgVGFibGVDb21tYW5kKEdy aWRDb21tYW5kKToKICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFfdHlw ZSA9IHNldF9jb2x1bW5fbmFtZXMoY2hhbmdlZF9kYXRhW29mX3R5cGVdW2Vh Y2hfcm93XVsnZGF0YV90eXBlJ10pCiAgICAgICAgICAgICAgICAgICAgICAg ICBsaXN0X29mX3Jvd2lkLmFwcGVuZChkYXRhLmdldCgnX190ZW1wX1BLJykp CiAKKyAgICAgICAgICAgICAgICAgICAgICAgICMgVXBkYXRlIGNvbHVtbnMg dmFsdWUgYW5kIGRhdGEgdHlwZQorICAgICAgICAgICAgICAgICAgICAgICAg IyB3aXRoIGNvbHVtbnMgaGF2aW5nIG5vdF9udWxsPUZhbHNlIGFuZCBoYXMK KyAgICAgICAgICAgICAgICAgICAgICAgICMgbm8gZGVmYXVsdCB2YWx1ZQor ICAgICAgICAgICAgICAgICAgICAgICAgY29sdW1uX2RhdGEudXBkYXRlKGRh dGEpCisgICAgICAgICAgICAgICAgICAgICAgICBjb2x1bW5fdHlwZS51cGRh dGUoZGF0YV90eXBlKQorCiAgICAgICAgICAgICAgICAgICAgICAgICBzcWwg PSByZW5kZXJfdGVtcGxhdGUoIi8iLmpvaW4oW3NlbGYuc3FsX3BhdGgsICdp bnNlcnQuc3FsJ10pLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRhdGFfdG9fYmVfc2F2ZWQ9ZGF0YSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkYXRh X3RvX2JlX3NhdmVkPWNvbHVtbl9kYXRhLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByaW1hcnlfa2V5cz1Ob25l LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG9iamVjdF9uYW1lPXNlbGYub2JqZWN0X25hbWUsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnNwX25hbWU9 c2VsZi5uc3BfbmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkYXRhX3R5cGU9ZGF0YV90eXBlKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFf dHlwZT1jb2x1bW5fdHlwZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwa19uYW1lcz1wa19uYW1lcykKICAgICAg ICAgICAgICAgICAgICAgICAgIGxpc3Rfb2Zfc3FsLmFwcGVuZChzcWwpCiAK ICAgICAgICAgICAgICAgICAjIEZvciB1cGRhdGVkIHJvd3MKZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvY3NzL3Nx bGVkaXRvci5jc3MgYi93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3Rh dGljL2Nzcy9zcWxlZGl0b3IuY3NzCmluZGV4IDU3NGVmNTMuLjFkNTcyY2Eg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0 aWMvY3NzL3NxbGVkaXRvci5jc3MKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMv c3FsZWRpdG9yL3N0YXRpYy9jc3Mvc3FsZWRpdG9yLmNzcwpAQCAtNDIwLDYg KzQyMCwxMCBAQCBpbnB1dC5lZGl0b3ItY2hlY2tib3g6Zm9jdXMgewogICBi YWNrZ3JvdW5kOiAjZTQ2YjZiOwogfQogCisuZ3JpZC1jYW52YXMgLmRpc2Fi bGVkX3JvdyB7CisgIGJhY2tncm91bmQ6ICNjMWMxYzE7Cit9CisKIC8qIGNv bG9yIHRoZSBmaXJzdCBjb2x1bW4gKi8KIC5zciAuc2M6Zmlyc3QtY2hpbGQg ewogICAgIGJhY2tncm91bmQtY29sb3I6ICMyYzc2YjQ7CkBAIC00NDUsNCAr NDQ5LDQgQEAgaW5wdXQuZWRpdG9yLWNoZWNrYm94OmZvY3VzIHsKIAogLnNy LnVpLXdpZGdldC1jb250ZW50IHsKICAgYm9yZGVyLXRvcDogMXB4IHNvbGlk IHNpbHZlcjsKLX0KK30KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRp ZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3IvdGVtcGxh dGVzL3NxbGVkaXRvci9qcy9zcWxlZGl0b3IuanMgYi93ZWIvcGdhZG1pbi90 b29scy9zcWxlZGl0b3IvdGVtcGxhdGVzL3NxbGVkaXRvci9qcy9zcWxlZGl0 b3IuanMKaW5kZXggMjA2MmFhMi4uYmE5ZGQ0MyAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vdG9vbHMvc3FsZWRpdG9yL3RlbXBsYXRlcy9zcWxlZGl0b3Iv anMvc3FsZWRpdG9yLmpzCisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVk aXRvci90ZW1wbGF0ZXMvc3FsZWRpdG9yL2pzL3NxbGVkaXRvci5qcwpAQCAt NTU3LDcgKzU1Nyw5IEBAIGRlZmluZSgKICAgICAgICAgICAgICAgaWQ6IGMu bmFtZSwKICAgICAgICAgICAgICAgcG9zOiBjLnBvcywKICAgICAgICAgICAg ICAgZmllbGQ6IGMubmFtZSwKLSAgICAgICAgICAgICAgbmFtZTogYy5sYWJl bAorICAgICAgICAgICAgICBuYW1lOiBjLmxhYmVsLAorICAgICAgICAgICAg ICBub3RfbnVsbDogYy5ub3RfbnVsbCwKKyAgICAgICAgICAgICAgaGFzX2Rl ZmF1bHRfdmFsOiBjLmhhc19kZWZhdWx0X3ZhbAogICAgICAgICAgICAgfTsK IAogICAgICAgICAgICAgLy8gR2V0IHRoZSBjb2x1bW5zIHdpZHRoIGJhc2Vk IG9uIGRhdGEgdHlwZQpAQCAtNjI1LDYgKzYyNywxMiBAQCBkZWZpbmUoCiAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgICB9Cisg ICAgICAgICAgLy8gRGlzYWJsZSByb3dzIGhhdmluZyBkZWZhdWx0IHZhbHVl cworICAgICAgICAgIGlmICghXy5pc1VuZGVmaW5lZChzZWxmLmhhbmRsZXIu cm93c190b19kaXNhYmxlKSAmJgorICAgICAgICAgICAgXy5pbmRleE9mKHNl bGYuaGFuZGxlci5yb3dzX3RvX2Rpc2FibGUsIGkpICE9PSAtMQorICAgICAg ICAgICkgeworICAgICAgICAgICAgY3NzQ2xhc3MgKz0gJyBkaXNhYmxlZF9y b3cnOworICAgICAgICAgIH0KICAgICAgICAgICByZXR1cm4geydjc3NDbGFz c2VzJzogY3NzQ2xhc3N9OwogICAgICAgICB9CiAKQEAgLTcwMiw2ICs3MTAs MTQgQEAgZGVmaW5lKAogICAgICAgICAvLyBUaGlzIHdpbGwgYmUgdXNlZCB0 byBjb2xsZWN0IHByaW1hcnkga2V5IGZvciB0aGF0IHJvdwogICAgICAgICBn cmlkLm9uQmVmb3JlRWRpdENlbGwuc3Vic2NyaWJlKGZ1bmN0aW9uIChlLCBh cmdzKSB7CiAgICAgICAgICAgICB2YXIgYmVmb3JlX2RhdGEgPSBhcmdzLml0 ZW07CisKKyAgICAgICAgICAgIC8vIElmIG5ld2x5IGFkZGVkIHJvdyBpcyBz YXZlZCBidXQgZ3JpZCBpcyBub3QgcmVmcmVzaGVkLAorICAgICAgICAgICAg Ly8gdGhlbiBkaXNhYmxlIGNlbGwgZWRpdGluZyBmb3IgdGhhdCByb3cKKyAg ICAgICAgICAgIGlmKHNlbGYuaGFuZGxlci5yb3dzX3RvX2Rpc2FibGUgJiYK KyAgICAgICAgICAgICAgXy5jb250YWlucyhzZWxmLmhhbmRsZXIucm93c190 b19kaXNhYmxlLCBhcmdzLnJvdykpIHsKKyAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBpZihzZWxm LmhhbmRsZXIuY2FuX2VkaXQgJiYgYmVmb3JlX2RhdGEgJiYgJ19fdGVtcF9Q SycgaW4gYmVmb3JlX2RhdGEpIHsKICAgICAgICAgICAgICAgdmFyIF9wayA9 IGJlZm9yZV9kYXRhLl9fdGVtcF9QSywKICAgICAgICAgICAgICAgICBfa2V5 cyA9IHNlbGYuaGFuZGxlci5wcmltYXJ5X2tleXMsCkBAIC0xNjI5LDYgKzE2 NDUsOCBAQCBkZWZpbmUoCiAgICAgICAgICAgc2VsZi5xdWVyeV9zdGFydF90 aW1lID0gbmV3IERhdGUoKTsKICAgICAgICAgICBzZWxmLnJvd3NfYWZmZWN0 ZWQgPSAwOwogICAgICAgICAgIHNlbGYuX2luaXRfcG9sbGluZ19mbGFncygp OworICAgICAgICAgIC8vIGtlZXAgdHJhY2sgb2YgbmV3bHkgYWRkZWQgcm93 cworICAgICAgICAgIHNlbGYucm93c190b19kaXNhYmxlID0gbmV3IEFycmF5 KCk7CiAKICAgICAgICAgICBzZWxmLnRyaWdnZXIoCiAgICAgICAgICAgICAn cGdhZG1pbi1zcWxlZGl0b3I6bG9hZGluZy1pY29uOnNob3cnLApAQCAtMjA3 Nyw3ICsyMDk1LDkgQEAgZGVmaW5lKAogICAgICAgICAgICAgICAgICAgICAn bGFiZWwnOiBjb2x1bW5fbGFiZWwsCiAgICAgICAgICAgICAgICAgICAgICdj ZWxsJzogY29sX2NlbGwsCiAgICAgICAgICAgICAgICAgICAgICdjYW5fZWRp dCc6IHNlbGYuY2FuX2VkaXQsCi0gICAgICAgICAgICAgICAgICAgICd0eXBl JzogdHlwZQorICAgICAgICAgICAgICAgICAgICAndHlwZSc6IHR5cGUsCisg ICAgICAgICAgICAgICAgICAgICdub3RfbnVsbCc6IGMubm90X251bGwsCisg ICAgICAgICAgICAgICAgICAgICdoYXNfZGVmYXVsdF92YWwnOiBjLmhhc19k ZWZhdWx0X3ZhbAogICAgICAgICAgICAgICAgICAgfTsKICAgICAgICAgICAg ICAgICAgIGNvbHVtbnMucHVzaChjb2wpOwogICAgICAgICAgICAgICAgIH0p OwpAQCAtMjMyMCw2ICsyMzQwLDEwIEBAIGRlZmluZSgKICAgICAgICAgICAg ICAgICAgICAgICBncmlkLnNldFNlbGVjdGVkUm93cyhbXSk7CiAgICAgICAg ICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgICAgICAgICAvLyBBZGQg bGFzdCByb3cobmV3IHJvdykgdG8ga2VlcCB0cmFjayBvZiBpdAorICAgICAg ICAgICAgICAgICAgICBpZiAoaXNfYWRkZWQpIHsKKyAgICAgICAgICAgICAg ICAgICAgICBzZWxmLnJvd3NfdG9fZGlzYWJsZS5wdXNoKGdyaWQuZ2V0RGF0 YUxlbmd0aCgpLTEpOworICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAgICAgICAgIC8vIFJlc2V0IGRhdGEgc3RvcmUKICAgICAgICAgICAg ICAgICAgICAgc2VsZi5kYXRhX3N0b3JlID0gewogICAgICAgICAgICAgICAg ICAgICAgICdhZGRlZCc6IHt9LAo= --001a1145ba4446b88f054f4d247e 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 --001a1145ba4446b88f054f4d247e--