Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bom4t-0001ie-FM for pgadmin-hackers@arkaria.postgresql.org; Tue, 27 Sep 2016 06:41:19 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bom4t-0007Dr-1q for pgadmin-hackers@arkaria.postgresql.org; Tue, 27 Sep 2016 06:41:19 +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 1bom4f-0006xr-D1 for pgadmin-hackers@postgresql.org; Tue, 27 Sep 2016 06:41:05 +0000 Received: from mail-qk0-x233.google.com ([2607:f8b0:400d:c09::233]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bom4c-000382-0L for pgadmin-hackers@postgresql.org; Tue, 27 Sep 2016 06:41:04 +0000 Received: by mail-qk0-x233.google.com with SMTP id g67so4863052qkd.0 for ; Mon, 26 Sep 2016 23:41:01 -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=5nPJqk5Xbp1EajWnyd7UKskQtD/qyPFvvrRbRmx4TSM=; b=vCef8D/0Izmce2JgHg7ISV1/ZUKqbmCM5+BacWMrCkOFF9jw/EXSN/rOZY1TO1JFub z2m848/G10mlikDeDzbA9F4dPHp5uFni5tdYvm7OJo0c4o24iAKIkYK/ASr4boMMOEva /fd309QTbbKZuyVOcdVSeZN/e7MtxtsN6D/lNalYmjgVOSe88kShbnkLKMYRxSZL/iXy oPDJYaB6CTj5QwS5AuSTUxw8B5WbDzaOZVFCC3gsxyI9mpqFNAoEEYjG5IWkGjo8oQSu RR8SRgBDMAB+sH5UqoSFsr1m6D2kjUfRbSDWONZ8hEfLCY06x3QKTwMauhnuqbOYoiXz ljbw== 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=5nPJqk5Xbp1EajWnyd7UKskQtD/qyPFvvrRbRmx4TSM=; b=jcOKJox1xqlA4w7LdS1t8Zvg5Z5czas7/zNBpfDtMxF4OfRoqbMeOVpIFVvceUQez5 +kVqGP2cupb93kxf3gwJefHiUvD+UsIC1P9/cppC1ulW9zF2QjAvuKP8E/LjICXHHMsu V2qbl/mVyu+b/cpmyLAH5afnCEoMBTvvnqJljpr5yHLThxmlV/0bAoaHjOMsP4+zaJrn aDsOPapOLWmcB6ZSJF7r7V61vpdarSCziwLn90EN79SltfHajQ+JM6D9gW8roNYHDbZk xFABoIs37CePnRj8ThIDQu7gjCCVqf673vCItb9/9w1xGh/3vfM6mbLxOJtx3B2FBgI7 O8gA== X-Gm-Message-State: AA6/9RmfMDWm7YMMyK1SMOgZOD4Qg9wKarCXsvzuwQimNhZn7NSYspDN5cjOwVtO4igXgKLfY9zWwYWW2RIBgosN X-Received: by 10.55.88.199 with SMTP id m190mr27575134qkb.78.1474958460630; Mon, 26 Sep 2016 23:41:00 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.129.194 with HTTP; Mon, 26 Sep 2016 23:40:40 -0700 (PDT) In-Reply-To: References: From: Murtuza Zabuawala Date: Tue, 27 Sep 2016 12:10:40 +0530 Message-ID: Subject: Re: PATCH: To fix the issue in Debugger module (pgAdmin4) To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary=001a114e507e1ae7e0053d778708 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 --001a114e507e1ae7e0053d778708 Content-Type: multipart/alternative; boundary=001a114e507e1ae7dd053d778706 --001a114e507e1ae7dd053d778706 Content-Type: text/plain; charset=UTF-8 Hi Dave, PFA updated patch to fix mentioned issue as well as incremental msgs updates in Messages Tab. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Mon, Sep 26, 2016 at 6:24 PM, Dave Page wrote: > On Mon, Sep 26, 2016 at 1:28 PM, Murtuza Zabuawala > wrote: > > Hi Dave, > > > > PFA updated patch to fix `
` tag display. > > Please clear cache & try again with this updated patch. > > OK, that fixes the display issue. Regarding the error message, on this > execution I noticed the following exception: > > 2016-09-26 13:52:48,181: INFO werkzeug: 127.0.0.1 - - [26/Sep/2016 > 13:52:48] "GET /debugger/poll_end_execution_result/3629301/ HTTP/1.1" > 500 - > Traceback (most recent call last): > File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site- > packages/flask/app.py", > line 2000, in __call__ > return self.wsgi_app(environ, start_response) > File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site- > packages/flask/app.py", > line 1991, in wsgi_app > response = self.make_response(self.handle_exception(e)) > File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site- > packages/flask/app.py", > line 1567, in handle_exception > reraise(exc_type, exc_value, tb) > File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site- > packages/flask/app.py", > line 1988, in wsgi_app > response = self.full_dispatch_request() > File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site- > packages/flask/app.py", > line 1641, in full_dispatch_request > rv = self.handle_user_exception(e) > File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site- > packages/flask/app.py", > line 1544, in handle_user_exception > reraise(exc_type, exc_value, tb) > File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site- > packages/flask/app.py", > line 1639, in full_dispatch_request > rv = self.dispatch_request() > File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site- > packages/flask/app.py", > line 1625, in dispatch_request > return self.view_functions[rule.endpoint](**req.view_args) > File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site- > packages/flask_login.py", > line 792, in decorated_view > return func(*args, **kwargs) > File "/Users/dpage/git/pgadmin4/web/pgadmin/tools/debugger/__init__.py", > line 1365, in poll_end_execution_result > statusmsg = "
".join(additional_msgs) + "
" + statusmsg > TypeError: cannot concatenate 'str' and 'NoneType' objects > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --001a114e507e1ae7dd053d778706 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Dave,

PFA updated patch to fix menti= oned issue as well as incremental msgs updates in Messages Tab.
<= br>


=
--
Regards,
= Murtuza Zabuawala
EnterpriseDB:=C2=A0http://www.enterprisedb.com
The Enterprise PostgreSQL Compa= ny

On Mon, Sep 26, 2016 at 6:24 PM, Dave Page <= span dir=3D"ltr"><dpage@pgadmin.org> wrote:
= On Mon, Sep 26, 2016 at 1:28 PM, Murtuza Zabuawala
<murtuza.zabuawala= @enterprisedb.com> wrote:
> Hi Dave,
>
> PFA updated patch to fix `<br>` tag display.
> Please clear cache & try again with this updated patch.

OK, that fixes the display issue. Regarding the error message, on this
execution I noticed the following exception:

2016-09-26 13:52:48,181: INFO werkzeug: 127.0.0.1 - - [26/Sep/2016
13:52:48] "GET /debugger/poll_end_execution_result/3629301/ HTTP/= 1.1"
500 -
Traceback (most recent call last):
=C2=A0 File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/sit= e-packages/flask/app.py",
line 2000, in __call__
=C2=A0 =C2=A0 return self.wsgi_app(environ, start_response)
=C2=A0 File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/sit= e-packages/flask/app.py",
line 1991, in wsgi_app
=C2=A0 =C2=A0 response =3D self.make_response(self.handle_exception(e)= )
=C2=A0 File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/sit= e-packages/flask/app.py",
line 1567, in handle_exception
=C2=A0 =C2=A0 reraise(exc_type, exc_value, tb)
=C2=A0 File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/sit= e-packages/flask/app.py",
line 1988, in wsgi_app
=C2=A0 =C2=A0 response =3D self.full_dispatch_request()
=C2=A0 File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/sit= e-packages/flask/app.py",
line 1641, in full_dispatch_request
=C2=A0 =C2=A0 rv =3D self.handle_user_exception(e)
=C2=A0 File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/sit= e-packages/flask/app.py",
line 1544, in handle_user_exception
=C2=A0 =C2=A0 reraise(exc_type, exc_value, tb)
=C2=A0 File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/sit= e-packages/flask/app.py",
line 1639, in full_dispatch_request
=C2=A0 =C2=A0 rv =3D self.dispatch_request()
=C2=A0 File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/sit= e-packages/flask/app.py",
line 1625, in dispatch_request
=C2=A0 =C2=A0 return self.view_functions[rule.endpoint](**req.view_arg= s)
=C2=A0 File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/sit= e-packages/flask_login.py",
line 792, in decorated_view
=C2=A0 =C2=A0 return func(*args, **kwargs)
=C2=A0 File "/Users/dpage/git/pgadmin4/web/pgadmin/tools/debugger= /__init__.py",
line 1365, in poll_end_execution_result
=C2=A0 =C2=A0 statusmsg =3D "<br>".join(additional_msgs) + = "<br>" + statusmsg
TypeError: cannot concatenate 'str' and 'NoneType' objects<= br>

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

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

--001a114e507e1ae7dd053d778706-- --001a114e507e1ae7e0053d778708 Content-Type: application/octet-stream; name="RM_1227_v2.patch" Content-Disposition: attachment; filename="RM_1227_v2.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_itl464lp0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RlYnVnZ2VyL19faW5p dF9fLnB5IGIvd2ViL3BnYWRtaW4vdG9vbHMvZGVidWdnZXIvX19pbml0X18u cHkKaW5kZXggZjdkMGU3Yi4uNjU0M2IxMyAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vdG9vbHMvZGVidWdnZXIvX19pbml0X18ucHkKKysrIGIvd2ViL3Bn YWRtaW4vdG9vbHMvZGVidWdnZXIvX19pbml0X18ucHkKQEAgLTEzNDMsOCAr MTM0MywxNiBAQCBkZWYgcG9sbF9lbmRfZXhlY3V0aW9uX3Jlc3VsdCh0cmFu c19pZCk6CiAgICAgaWYgY29ubi5jb25uZWN0ZWQoKToKICAgICAgICAgc3Rh dHVzbXNnID0gY29ubi5zdGF0dXNfbWVzc2FnZSgpCiAgICAgICAgIHN0YXR1 cywgcmVzdWx0LCBjb2xfaW5mbyA9IGNvbm4ucG9sbCgpCi0gICAgICAgIGlm IHN0YXR1cyA9PSBBU1lOQ19PSyBhbmQgc2Vzc2lvblsnZnVuY3Rpb25EYXRh J11bc3RyKHRyYW5zX2lkKV1bJ2xhbmd1YWdlJ10gPT0gJ2VkYnNwbCc6Cisg ICAgICAgIGlmIHN0YXR1cyA9PSBBU1lOQ19PSyBhbmQgXAorICAgICAgICAg ICAgICAgIG5vdCBzZXNzaW9uWydmdW5jdGlvbkRhdGEnXVtzdHIodHJhbnNf aWQpXVsnaXNfZnVuYyddIGFuZCBcCisgICAgICAgICAgICAgICAgc2Vzc2lv blsnZnVuY3Rpb25EYXRhJ11bc3RyKHRyYW5zX2lkKV1bJ2xhbmd1YWdlJ10g PT0gJ2VkYnNwbCc6CiAgICAgICAgICAgICBzdGF0dXMgPSAnU3VjY2VzcycK KyAgICAgICAgICAgIGFkZGl0aW9uYWxfbXNncyA9IGNvbm4ubWVzc2FnZXMo KQorICAgICAgICAgICAgaWYgbGVuKGFkZGl0aW9uYWxfbXNncykgPiAwOgor ICAgICAgICAgICAgICAgIGlmIHN0YXR1c21zZyBhbmQgc3RhdHVzbXNnID09 ICdTRUxFQ1QgMSc6CisgICAgICAgICAgICAgICAgICAgIHN0YXR1c21zZyA9 ICcnCisgICAgICAgICAgICAgICAgc3RhdHVzbXNnID0gIjxicj4iLmpvaW4o YWRkaXRpb25hbF9tc2dzKSArICI8YnI+IiArIHN0YXR1c21zZyBpZiBzdGF0 dXNtc2cgaXMgbm90IE5vbmUgZWxzZSAnJworCiAgICAgICAgICAgICByZXR1 cm4gbWFrZV9qc29uX3Jlc3BvbnNlKHN1Y2Nlc3M9MSwgaW5mbz1nZXR0ZXh0 KCJFeGVjdXRpb24gQ29tcGxldGVkLiIpLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkYXRhPXsnc3RhdHVzJzogc3RhdHVzLCAn c3RhdHVzX21lc3NhZ2UnOiBzdGF0dXNtc2d9KQogICAgICAgICBpZiByZXN1 bHQ6CkBAIC0xMzU0LDYgKzEzNjIsMTIgQEAgZGVmIHBvbGxfZW5kX2V4ZWN1 dGlvbl9yZXN1bHQodHJhbnNfaWQpOgogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZGF0YT17J3N0YXR1cyc6IHN0YXR1cywg J3N0YXR1c19tZXNzYWdlJzogcmVzdWx0fSkKICAgICAgICAgICAgIGVsc2U6 CiAgICAgICAgICAgICAgICAgc3RhdHVzID0gJ1N1Y2Nlc3MnCisgICAgICAg ICAgICAgICAgYWRkaXRpb25hbF9tc2dzID0gY29ubi5tZXNzYWdlcygpCisg ICAgICAgICAgICAgICAgaWYgbGVuKGFkZGl0aW9uYWxfbXNncykgPiAwOgor ICAgICAgICAgICAgICAgICAgICBpZiBzdGF0dXNtc2cgYW5kIHN0YXR1c21z ZyA9PSAnU0VMRUNUIDEnOgorICAgICAgICAgICAgICAgICAgICAgICAgc3Rh dHVzbXNnID0gJycKKyAgICAgICAgICAgICAgICAgICAgc3RhdHVzbXNnID0g Ijxicj4iLmpvaW4oYWRkaXRpb25hbF9tc2dzKSArICI8YnI+IiArIHN0YXR1 c21zZyBpZiBzdGF0dXNtc2cgaXMgbm90IE5vbmUgZWxzZSAnJworCiAgICAg ICAgICAgICAgICAgY29sdW1ucyA9IFtdCiAgICAgICAgICAgICAgICAgIyBD aGVjayBjb2x1bW4gaW5mbyBpcyBhdmFpbGFibGUgb3Igbm90CiAgICAgICAg ICAgICAgICAgaWYgY29sX2luZm8gaXMgbm90IE5vbmUgYW5kIGxlbihjb2xf aW5mbykgPiAwOgpAQCAtMTM2OSw2ICsxMzgzLDEyIEBAIGRlZiBwb2xsX2Vu ZF9leGVjdXRpb25fcmVzdWx0KHRyYW5zX2lkKToKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdjb2xfaW5mbyc6 IGNvbHVtbnMsICdzdGF0dXNfbWVzc2FnZSc6IHN0YXR1c21zZ30pCiAgICAg ICAgIGVsc2U6CiAgICAgICAgICAgICBzdGF0dXMgPSAnQnVzeScKKyAgICAg ICAgICAgIGFkZGl0aW9uYWxfbXNncyA9IGNvbm4ubWVzc2FnZXMoKQorICAg ICAgICAgICAgaWYgbGVuKGFkZGl0aW9uYWxfbXNncykgPiAwOgorICAgICAg ICAgICAgICAgIGlmIHN0YXR1c21zZyBhbmQgc3RhdHVzbXNnID09ICdTRUxF Q1QgMSc6CisgICAgICAgICAgICAgICAgICAgIHN0YXR1c21zZyA9ICcnCisg ICAgICAgICAgICAgICAgc3RhdHVzbXNnID0gIjxicj4iLmpvaW4oYWRkaXRp b25hbF9tc2dzKSArICI8YnI+IiArIHN0YXR1c21zZyBpZiBzdGF0dXNtc2cg aXMgbm90IE5vbmUgZWxzZSAnJworICAgICAgICAgICAgcmV0dXJuIG1ha2Vf anNvbl9yZXNwb25zZShkYXRhPXsnc3RhdHVzJzogc3RhdHVzLCAncmVzdWx0 JzogcmVzdWx0LCAnc3RhdHVzX21lc3NhZ2UnOiBzdGF0dXNtc2d9KQogICAg IGVsc2U6CiAgICAgICAgIHN0YXR1cyA9ICdOb3RDb25uZWN0ZWQnCiAgICAg ICAgIHJlc3VsdCA9IGdldHRleHQoJ05vdCBjb25uZWN0ZWQgdG8gc2VydmVy IG9yIGNvbm5lY3Rpb24gd2l0aCB0aGUgc2VydmVyIGhhcyBiZWVuIGNsb3Nl ZC4nKQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvZGVidWdnZXIv dGVtcGxhdGVzL2RlYnVnZ2VyL2pzL2RpcmVjdC5qcyBiL3dlYi9wZ2FkbWlu L3Rvb2xzL2RlYnVnZ2VyL3RlbXBsYXRlcy9kZWJ1Z2dlci9qcy9kaXJlY3Qu anMKaW5kZXggNDUyNjE3Yi4uYmFiZDAwYyAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vdG9vbHMvZGVidWdnZXIvdGVtcGxhdGVzL2RlYnVnZ2VyL2pzL2Rp cmVjdC5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9kZWJ1Z2dlci90ZW1w bGF0ZXMvZGVidWdnZXIvanMvZGlyZWN0LmpzCkBAIC0zOTIsNiArMzkyLDcg QEAgZGVmaW5lKAogICAgICAgICAgIHVybDogYmFzZVVybCwKICAgICAgICAg ICBtZXRob2Q6ICdHRVQnLAogICAgICAgICAgIHN1Y2Nlc3M6IGZ1bmN0aW9u KHJlcykgeworICAgICAgICAgICAgdmFyIG9sZF9tc2dzPScnLCBuZXdfbXNn cz0nJzsKICAgICAgICAgICAgIGlmIChyZXMuZGF0YS5zdGF0dXMgPT09ICdT dWNjZXNzJykgewogICAgICAgICAgICAgICBpZihyZXMuZGF0YS5yZXN1bHQg PT0gdW5kZWZpbmVkICkgewogICAgICAgICAgICAgICAgIC8qCkBAIC00MTEs NyArNDEyLDE1IEBAIGRlZmluZSgKICAgICAgICAgICAgICAgICApOwogCiAg ICAgICAgICAgICAgICAgLy8gVXBkYXRlIHRoZSBtZXNzYWdlIHRhYiBvZiB0 aGUgZGVidWdnZXIKLSAgICAgICAgICAgICAgICBwZ1Rvb2xzLkRpcmVjdERl YnVnLmRibXNNZXNzYWdlcy4kZWxlbS50ZXh0KHJlcy5kYXRhLnN0YXR1c19t ZXNzYWdlKTsKKyAgICAgICAgICAgICAgICBpZiAocmVzLmRhdGEuc3RhdHVz X21lc3NhZ2UpIHsKKyAgICAgICAgICAgICAgICAgIG9sZF9tc2dzID0gcGdU b29scy5EaXJlY3REZWJ1Zy5tZXNzYWdlc19wYW5lbC4kY29udGFpbmVyLmZp bmQoJy5tZXNzYWdlcycpLmh0bWwoKTsKKyAgICAgICAgICAgICAgICAgIGlm KG9sZF9tc2dzKSB7CisgICAgICAgICAgICAgICAgICAgICAgbmV3X21zZ3Mg PSAob2xkX21zZ3MgKyAnXG4nICsgcmVzLmRhdGEuc3RhdHVzX21lc3NhZ2Up LnJlcGxhY2UoLyg/OlxyXG58XHJ8XG4pL2csICc8YnIgLz4nKTsKKyAgICAg ICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAgICAg bmV3X21zZ3MgPSByZXMuZGF0YS5zdGF0dXNfbWVzc2FnZTsKKyAgICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgIHBnVG9vbHMuRGlyZWN0 RGVidWcubWVzc2FnZXNfcGFuZWwuJGNvbnRhaW5lci5maW5kKCcubWVzc2Fn ZXMnKS5odG1sKG5ld19tc2dzKTsKKyAgICAgICAgICAgICAgICB9CiAKICAg ICAgICAgICAgICAgICAvLyBFeGVjdXRpb24gY29tcGxldGVkIHNvIGRpc2Fi bGUgdGhlIGJ1dHRvbnMgb3RoZXIgdGhhbiAiQ29udGludWUvU3RhcnQiIGJ1 dHRvbiBiZWNhdXNlIHVzZXIgY2FuIHN0aWxsCiAgICAgICAgICAgICAgICAg Ly8gc3RhcnQgdGhlIHNhbWUgZXhlY3V0aW9uIGFnYWluLgpAQCAtNDM5LDcg KzQ0OCwxNSBAQCBkZWZpbmUoCiAgICAgICAgICAgICAgICAgICApOwogCiAg ICAgICAgICAgICAgICAgICAvLyBVcGRhdGUgdGhlIG1lc3NhZ2UgdGFiIG9m IHRoZSBkZWJ1Z2dlcgotICAgICAgICAgICAgICAgICAgcGdUb29scy5EaXJl Y3REZWJ1Zy5tZXNzYWdlc19wYW5lbC4kY29udGFpbmVyLmZpbmQoJy5tZXNz YWdlcycpLnRleHQocmVzLmRhdGEuc3RhdHVzX21lc3NhZ2UpOworICAgICAg ICAgICAgICAgICAgaWYgKHJlcy5kYXRhLnN0YXR1c19tZXNzYWdlKSB7Cisg ICAgICAgICAgICAgICAgICAgIG9sZF9tc2dzID0gcGdUb29scy5EaXJlY3RE ZWJ1Zy5tZXNzYWdlc19wYW5lbC4kY29udGFpbmVyLmZpbmQoJy5tZXNzYWdl cycpLmh0bWwoKTsKKyAgICAgICAgICAgICAgICAgICAgaWYob2xkX21zZ3Mp IHsKKyAgICAgICAgICAgICAgICAgICAgICBuZXdfbXNncyA9IChvbGRfbXNn cyArICdcbicgKyByZXMuZGF0YS5zdGF0dXNfbWVzc2FnZSkucmVwbGFjZSgv KD86XHJcbnxccnxcbikvZywgJzxiciAvPicpOworICAgICAgICAgICAgICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICAgIG5ld19tc2dz ID0gcmVzLmRhdGEuc3RhdHVzX21lc3NhZ2U7CisgICAgICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICAgICAgcGdUb29scy5EaXJlY3REZWJ1 Zy5tZXNzYWdlc19wYW5lbC4kY29udGFpbmVyLmZpbmQoJy5tZXNzYWdlcycp Lmh0bWwobmV3X21zZ3MpOworICAgICAgICAgICAgICAgICAgfQogCiAgICAg ICAgICAgICAgICAgICAvLyBFeGVjdXRpb24gY29tcGxldGVkIHNvIGRpc2Fi bGUgdGhlIGJ1dHRvbnMgb3RoZXIgdGhhbiAiQ29udGludWUvU3RhcnQiIGJ1 dHRvbiBiZWNhdXNlIHVzZXIgY2FuIHN0aWxsCiAgICAgICAgICAgICAgICAg ICAvLyBzdGFydCB0aGUgc2FtZSBleGVjdXRpb24gYWdhaW4uCkBAIC00NTQs NiArNDcxLDE2IEBAIGRlZmluZSgKICAgICAgICAgICAgIGVsc2UgaWYgKHJl cy5kYXRhLnN0YXR1cyA9PT0gJ0J1c3knKSB7CiAgICAgICAgICAgICAgIC8v IElmIHN0YXR1cyBpcyBCdXN5IHRoZW4gcG9sbCB0aGUgcmVzdWx0IGJ5IHJl Y3Vyc2l2ZSBjYWxsIHRvIHRoZSBwb2xsIGZ1bmN0aW9uCiAgICAgICAgICAg ICAgIC8vc2VsZi5wb2xsX2VuZF9leGVjdXRpb25fcmVzdWx0KHRyYW5zX2lk KTsKKyAgICAgICAgICAgICAgLy8gVXBkYXRlIHRoZSBtZXNzYWdlIHRhYiBv ZiB0aGUgZGVidWdnZXIKKyAgICAgICAgICAgICAgaWYocmVzLmRhdGEuc3Rh dHVzX21lc3NhZ2UpIHsKKyAgICAgICAgICAgICAgICBvbGRfbXNncyA9IHBn VG9vbHMuRGlyZWN0RGVidWcubWVzc2FnZXNfcGFuZWwuJGNvbnRhaW5lci5m aW5kKCcubWVzc2FnZXMnKS5odG1sKCk7CisgICAgICAgICAgICAgICAgaWYo b2xkX21zZ3MpIHsKKyAgICAgICAgICAgICAgICAgIG5ld19tc2dzID0gKG9s ZF9tc2dzICsgJ1xuJyArIHJlcy5kYXRhLnN0YXR1c19tZXNzYWdlKS5yZXBs YWNlKC8oPzpcclxufFxyfFxuKS9nLCAnPGJyIC8+Jyk7CisgICAgICAgICAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgIG5ld19tc2dzID0g cmVzLmRhdGEuc3RhdHVzX21lc3NhZ2U7CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgIHBnVG9vbHMuRGlyZWN0RGVidWcubWVzc2FnZXNf cGFuZWwuJGNvbnRhaW5lci5maW5kKCcubWVzc2FnZXMnKS5odG1sKG5ld19t c2dzKTsKKyAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAg ICAgICAgZWxzZSBpZiAocmVzLmRhdGEuc3RhdHVzID09PSAnTm90Q29ubmVj dGVkJykgewogICAgICAgICAgICAgICBBbGVydGlmeS5hbGVydCgKQEAgLTQ3 Myw3ICs1MDAsMTYgQEAgZGVmaW5lKAogICAgICAgICAgICAgICAgIGZ1bmN0 aW9uKCkgeyB9CiAgICAgICAgICAgICAgICk7CiAKLSAgICAgICAgICAgICAg cGdUb29scy5EaXJlY3REZWJ1Zy5tZXNzYWdlc19wYW5lbC4kY29udGFpbmVy LmZpbmQoJy5tZXNzYWdlcycpLnRleHQocmVzLmRhdGEuc3RhdHVzX21lc3Nh Z2UpOworICAgICAgICAgICAgICBpZiAocmVzLmRhdGEuc3RhdHVzX21lc3Nh Z2UpIHsKKyAgICAgICAgICAgICAgICBvbGRfbXNncyA9IHBnVG9vbHMuRGly ZWN0RGVidWcubWVzc2FnZXNfcGFuZWwuJGNvbnRhaW5lci5maW5kKCcubWVz c2FnZXMnKS5odG1sKCk7CisgICAgICAgICAgICAgICAgaWYob2xkX21zZ3Mp IHsKKyAgICAgICAgICAgICAgICAgIG5ld19tc2dzID0gKG9sZF9tc2dzICsg J1xuJyArIHJlcy5kYXRhLnN0YXR1c19tZXNzYWdlKS5yZXBsYWNlKC8oPzpc clxufFxyfFxuKS9nLCAnPGJyIC8+Jyk7CisgICAgICAgICAgICAgICAgfSBl bHNlIHsKKyAgICAgICAgICAgICAgICAgIG5ld19tc2dzID0gcmVzLmRhdGEu c3RhdHVzX21lc3NhZ2U7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgIHBnVG9vbHMuRGlyZWN0RGVidWcubWVzc2FnZXNfcGFuZWwuJGNv bnRhaW5lci5maW5kKCcubWVzc2FnZXMnKS5odG1sKG5ld19tc2dzKTsKKyAg ICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAgIHBnVG9vbHMuRGlyZWN0 RGVidWcubWVzc2FnZXNfcGFuZWwuZm9jdXMoKTsKIAogICAgICAgICAgICAg ICAvLyBFeGVjdXRpb24gY29tcGxldGVkIHNvIGRpc2FibGUgdGhlIGJ1dHRv bnMgb3RoZXIgdGhhbiAiQ29udGludWUvU3RhcnQiIGJ1dHRvbiBiZWNhdXNl IHVzZXIgY2FuIHN0aWxsCg== --001a114e507e1ae7e0053d778708 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 --001a114e507e1ae7e0053d778708--