Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bn2ve-00072G-2F for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Sep 2016 12:16:38 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.84_2) (envelope-from ) id 1bn2vd-00067r-Dj for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Sep 2016 12:16:37 +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 1bn2vc-000677-3E for pgadmin-hackers@postgresql.org; Thu, 22 Sep 2016 12:16:36 +0000 Received: from mail-qk0-x22b.google.com ([2607:f8b0:400d:c09::22b]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.84_2) (envelope-from ) id 1bn2vY-0003iI-9P for pgadmin-hackers@postgresql.org; Thu, 22 Sep 2016 12:16:35 +0000 Received: by mail-qk0-x22b.google.com with SMTP id n185so73741496qke.1 for ; Thu, 22 Sep 2016 05:16:31 -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=7u0JCFFgehXRTI1xdIodgd0hOxcF0fCCxcAPJguaEBw=; b=MeFjgBNSAX8F+S+pCCxIBa0pNSpPQQ2WWKg52mJ3qUEiPkubL4vWOC5t7OwDeJfgfB CEeaJ17WRDD1XqBJZO0hv+ed3i+Ev8FNP0aXdMst2FbNxX4sh36zWGmnRrC73/auRwm/ R9cX+IeumeahDvxBK/ZuEhaE2bZQGWQJm7Pv8RedRnC6XMqo0Hkf1GIFIUMbCrgZnJyU lXlQNxAWjikdaNMPx1gVlnw92EsPX7GX9tjup98br9FMnnInKNIDbelowuZQR3ohG/u6 i9Cv7P+UKg3jabfb9xglP5Mm22vdHYEfjD4SHNPGP9bg0ZCDYxJuXeUNQo3QTII3roNR d8Tw== 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=7u0JCFFgehXRTI1xdIodgd0hOxcF0fCCxcAPJguaEBw=; b=WR05nzIWmDQ179kJgb8rEXw8BL2R/SRqFFyxdZjAkuLkOG9wXADJ4c/CMHBr9gLB9b M7mtbLLny7MTC7Qlf5o8fuEZUFL69yvXIGmwFqL5vmt5nL56rWs/KMVerENS7+Klmmud S8uDaUq8bjfCNbuaBLWDFWghNANu/qQyp5Rt6WdRvRrPHd+gCSPnYmBAqZFQblNapAz/ GKr7zbW3QS89N2j/BDj339nbwhJkUAkAoP7a2/pt//R+1uL4odVzixwh1XyjXu+2C5vs y5FqZRdmlCpy9U5aaW94TeMuM4ZEmx0OQLslOfDZxXra2S3O4xkk0Pwy19gONeYP4ijC nd/w== X-Gm-Message-State: AA6/9RnH7tDyhiY4QA3qyTQZErl7sm9ZIuxrhB+zq/5uGbfv5YoirSMgdeZhPoiEUOK3+jRNxapw1rky8m0Gzj5j X-Received: by 10.55.147.199 with SMTP id v190mr1512819qkd.192.1474546590035; Thu, 22 Sep 2016 05:16:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.129.194 with HTTP; Thu, 22 Sep 2016 05:16:09 -0700 (PDT) In-Reply-To: References: From: Murtuza Zabuawala Date: Thu, 22 Sep 2016 17:46:09 +0530 Message-ID: Subject: Re: PATCH: To fix the issue with stats table in PG9.6 (pgAdmin4) To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary=94eb2c08b31ab59020053d17a174 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 --94eb2c08b31ab59020053d17a174 Content-Type: multipart/alternative; boundary=94eb2c08b31ab5901a053d17a172 --94eb2c08b31ab5901a053d17a172 Content-Type: text/plain; charset=UTF-8 Hi Dave, PFA updated patch. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Thu, Sep 22, 2016 at 5:33 PM, Dave Page wrote: > Can you rebase this please? > > (pgadmin4)piranha:web dpage$ git apply ~/Downloads/RM_1719.patch > error: patch failed: web/pgadmin/browser/server_ > groups/servers/__init__.py:662 > error: web/pgadmin/browser/server_groups/servers/__init__.py: patch > does not apply > > On Thu, Sep 22, 2016 at 8:20 AM, Murtuza Zabuawala > wrote: > > Hi, > > > > PFA patch to fix the issue where pgAdmin4 was throwing error when user > > clicks on Statistics tab when using PG9.6. > > RM#1719 > > > > Issue: > > The column `waiting` has been removed from `pg_stat_activity` View > instead > > two new columns has been added `wait_event` and `wait_event_type`. > > > > -- > > Regards, > > Murtuza Zabuawala > > EnterpriseDB: 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 > --94eb2c08b31ab5901a053d17a172 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Dave,

PFA updated patch.
<= br>
--<= div>Regards,
Murtuza Zabuawala
EnterpriseDB:=C2= =A0http://www.enterprisedb.com=
The Enterprise PostgreSQL Company

On Thu, Sep 22, 2016 at 5:33 PM, Dave Page <= span dir=3D"ltr"><dpage@pgadmin.org> wrote:
= Can you rebase this please?

(pgadmin4)piranha:web dpage$ git apply ~/Downloads/RM_1719.patch
error: patch failed: web/pgadmin/browser/server_groups/servers/__init_= _.py:662
error: web/pgadmin/browser/server_groups/servers/__init__.py: patch
does not apply

On Thu, Sep 22, 2016 at 8:20 AM, Murtuza Zabuawala
<murtuza.zabuawala= @enterprisedb.com> wrote:
> Hi,
>
> PFA patch to fix the issue where pgAdmin4 was throwing error when user=
> clicks on Statistics tab when using PG9.6.
> RM#1719
>
> Issue:
> The column `waiting` has been removed from `pg_stat_activity` View ins= tead
> two new columns has been added `wait_event` and `wait_event_type`.
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: 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/pgadm= in-hackers
>



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

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

--94eb2c08b31ab5901a053d17a172-- --94eb2c08b31ab59020053d17a174 Content-Type: text/x-patch; charset=US-ASCII; name="RM_1719_v2.patch" Content-Disposition: attachment; filename="RM_1719_v2.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iteay3lz0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkKaW5kZXggNjExZDcw MS4uMzU0OTRhMiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18u cHkKQEAgLTY1Niw2ICs2NTYsMTYgQEAgY2xhc3MgU2VydmVyTm9kZShQR0No aWxkTm9kZVZpZXcpOgogICAgIGRlZiBtb2RpZmllZF9zcWwoc2VsZiwgZ2lk LCBzaWQpOgogICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKGRh dGE9JycpCiAKKyAgICBkZWYgZ2V0X3RlbXBsYXRlX2RpcmVjdG9yeShzZWxm LCB2ZXJzaW9uKToKKyAgICAgICAgIiIiIFRoaXMgZnVuY3Rpb24gd2lsbCBj aGVjayBhbmQgcmV0dXJuIHRlbXBsYXRlIGRpcmVjdG9yeQorICAgICAgICBi YXNlZCBvbiBwb3N0Z3JlcyB2ZXJpb24iIiIKKyAgICAgICAgaWYgdmVyc2lv biA+PSA5MDYwMDoKKyAgICAgICAgICAgIHJldHVybiAnOS42X3BsdXMnCisg ICAgICAgIGVsaWYgdmVyc2lvbiA+PSA5MDIwMDoKKyAgICAgICAgICAgIHJl dHVybiAnOS4yX3BsdXMnCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBy ZXR1cm4gJzkuMV9wbHVzJworCiAgICAgZGVmIHN0YXRpc3RpY3Moc2VsZiwg Z2lkLCBzaWQpOgogICAgICAgICBtYW5hZ2VyID0gZ2V0X2RyaXZlcihQR19E RUZBVUxUX0RSSVZFUikuY29ubmVjdGlvbl9tYW5hZ2VyKHNpZCkKICAgICAg ICAgY29ubiA9IG1hbmFnZXIuY29ubmVjdGlvbigpCkBAIC02NjUsNyArNjc1 LDcgQEAgY2xhc3MgU2VydmVyTm9kZShQR0NoaWxkTm9kZVZpZXcpOgogICAg ICAgICAgICAgICAgIHJlbmRlcl90ZW1wbGF0ZSgKICAgICAgICAgICAgICAg ICAgICAgIi8iLmpvaW4oWwogICAgICAgICAgICAgICAgICAgICAgICAgJ3Nl cnZlcnMvc3FsJywKLSAgICAgICAgICAgICAgICAgICAgICAgICc5LjJfcGx1 cycgaWYgbWFuYWdlci52ZXJzaW9uID49IDkwMjAwIGVsc2UgJzkuMV9wbHVz JywKKyAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuZ2V0X3RlbXBsYXRl X2RpcmVjdG9yeShtYW5hZ2VyLnZlcnNpb24pLAogICAgICAgICAgICAgICAg ICAgICAgICAgJ3N0YXRzLnNxbCcKICAgICAgICAgICAgICAgICAgICAgXSks CiAgICAgICAgICAgICAgICAgICAgIGNvbm49Y29ubiwgXz1nZXR0ZXh0CkBA IC0xMDQwLDcgKzEwNTAsNyBAQCBjbGFzcyBTZXJ2ZXJOb2RlKFBHQ2hpbGRO b2RlVmlldyk6CiAKICAgICAgICAgICAgIFNRTCA9IHJlbmRlcl90ZW1wbGF0 ZSgiLyIuam9pbihbCiAgICAgICAgICAgICAgICAgJ3NlcnZlcnMvc3FsJywK LSAgICAgICAgICAgICAgICAnOS4yX3BsdXMnIGlmIG1hbmFnZXIudmVyc2lv biA+PSA5MDIwMCBlbHNlICc5LjFfcGx1cycsCisgICAgICAgICAgICAgICAg c2VsZi5nZXRfdGVtcGxhdGVfZGlyZWN0b3J5KG1hbmFnZXIudmVyc2lvbiks CiAgICAgICAgICAgICAgICAgJ2NoYW5nZV9wYXNzd29yZC5zcWwnCiAgICAg ICAgICAgICBdKSwKICAgICAgICAgICAgICAgICBjb25uPWNvbm4sIF89Z2V0 dGV4dCwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL3RlbXBsYXRlcy9zZXJ2ZXJzL3NxbC85LjZfcGx1 cy9jaGFuZ2VfcGFzc3dvcmQuc3FsIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMvc3FsLzku Nl9wbHVzL2NoYW5nZV9wYXNzd29yZC5zcWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uZGNmMGVjMQotLS0gL2Rldi9udWxsCisrKyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3Rl bXBsYXRlcy9zZXJ2ZXJzL3NxbC85LjZfcGx1cy9jaGFuZ2VfcGFzc3dvcmQu c3FsCkBAIC0wLDAgKzEsMiBAQAoreyMgQ2hhbmdlIGRhdGFiYXNlIHNlcnZl ciBwYXNzd29yZCAjfQorQUxURVIgVVNFUiB7e2Nvbm58cXRJZGVudCh1c2Vy KX19IFdJVEggRU5DUllQVEVEIFBBU1NXT1JEIHt7ZW5jcnlwdGVkX3Bhc3N3 b3JkfHF0TGl0ZXJhbH19OwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGVtcGxhdGVzL3NlcnZlcnMv c3FsLzkuNl9wbHVzL3N0YXRzLnNxbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RlbXBsYXRlcy9zZXJ2ZXJzL3NxbC85 LjZfcGx1cy9zdGF0cy5zcWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMC4uYTFkYmMzNwotLS0gL2Rldi9udWxsCisrKyBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RlbXBsYXRlcy9z ZXJ2ZXJzL3NxbC85LjZfcGx1cy9zdGF0cy5zcWwKQEAgLTAsMCArMSw1MSBA QAorU0VMRUNUCisgICAgcGlkIEFTICJQSUQiLAorICAgIHVzZW5hbWUgQVMg e3sgY29ubnxxdElkZW50KF8oJ1VzZXInKSkgfX0sCisgICAgZGF0bmFtZSBB UyB7eyBjb25ufHF0SWRlbnQoXygnRGF0YWJhc2UnKSkgfX0sCisgICAgYmFj a2VuZF9zdGFydCBBUyB7eyBjb25ufHF0SWRlbnQoXygnQmFja2VuZCBzdGFy dCcpKSB9fSwKKyAgICBDQVNFCisgICAgV0hFTiBjbGllbnRfaG9zdG5hbWUg SVMgTk9UIE5VTEwgQU5EIGNsaWVudF9ob3N0bmFtZSAhPSAnJyBUSEVOCisg ICAgICAgIGNsaWVudF9ob3N0bmFtZSB8fCAnOicgfHwgY2xpZW50X3BvcnQK KyAgICBXSEVOIGNsaWVudF9hZGRyIElTIE5PVCBOVUxMIEFORCBjbGllbnRf YWRkcjo6dGV4dCAhPSAnJyBUSEVOCisgICAgICAgIGNsaWVudF9hZGRyIHx8 ICc6JyB8fCBjbGllbnRfcG9ydAorICAgIFdIRU4gY2xpZW50X3BvcnQgPSAt MSBUSEVOCisgICAgICAgICdsb2NhbCBwaXBlJworICAgIEVMU0UKKyAgICAg ICAgJ2xvY2FsaG9zdDonIHx8IGNsaWVudF9wb3J0CisgICAgRU5EIEFTIHt7 IGNvbm58cXRJZGVudChfKCdDbGllbnQnKSkgfX0sCisgICAgYXBwbGljYXRp b25fbmFtZSBBUyB7eyBjb25ufHF0SWRlbnQoXygnQXBwbGljYXRpb24nKSkg fX0sCisgICAgd2FpdF9ldmVudF90eXBlIEFTIHt7IGNvbm58cXRJZGVudChf KCdXYWl0IGV2ZW50IHR5cGUnKSkgfX0sCisgICAgd2FpdF9ldmVudCBBUyB7 eyBjb25ufHF0SWRlbnQoXygnV2FpdCBldmVudCBuYW1lJykpIH19LAorICAg IHF1ZXJ5IEFTIHt7IGNvbm58cXRJZGVudChfKCdRdWVyeScpKSB9fSwKKyAg ICBxdWVyeV9zdGFydCBBUyB7eyBjb25ufHF0SWRlbnQoXygnUXVlcnkgc3Rh cnQnKSkgfX0sCisgICAgeGFjdF9zdGFydCBBUyB7eyBjb25ufHF0SWRlbnQo XygnWGFjdCBzdGFydCcpKSB9fQorRlJPTQorICAgIHBnX3N0YXRfYWN0aXZp dHkgc2EKK1dIRVJFCisgICAgKFNFTEVDVCByLnJvbHN1cGVyIE9SIHIub2lk ID0gc2EudXNlc3lzaWQgIEZST00gcGdfcm9sZXMgciBXSEVSRSByLnJvbG5h bWUgPSBjdXJyZW50X3VzZXIpCitVTklPTgorU0VMRUNUCisgICAgcGlkIEFT ICJQSUQiLAorICAgIHVzZW5hbWUgQVMge3sgY29ubnxxdElkZW50KF8oJ1Vz ZXInKSkgfX0sCisgICAgJycgQVMge3sgY29ubnxxdElkZW50KF8oJ0RhdGFi YXNlJykpIH19LAorICAgIGJhY2tlbmRfc3RhcnQgQVMge3sgY29ubnxxdElk ZW50KF8oJ0JhY2tlbmQgc3RhcnQnKSkgfX0sCisgICAgQ0FTRQorICAgIFdI RU4gY2xpZW50X2hvc3RuYW1lIElTIE5PVCBOVUxMIEFORCBjbGllbnRfaG9z dG5hbWUgIT0gJycgVEhFTgorICAgICAgICBjbGllbnRfaG9zdG5hbWUgfHwg JzonIHx8IGNsaWVudF9wb3J0CisgICAgV0hFTiBjbGllbnRfYWRkciBJUyBO T1QgTlVMTCBBTkQgY2xpZW50X2FkZHI6OnRleHQgIT0gJycgVEhFTgorICAg ICAgICBjbGllbnRfYWRkciB8fCAnOicgfHwgY2xpZW50X3BvcnQKKyAgICBX SEVOIGNsaWVudF9wb3J0ID0gLTEgVEhFTgorICAgICAgICAnbG9jYWwgcGlw ZScKKyAgICBFTFNFCisgICAgICAgICdsb2NhbGhvc3Q6JyB8fCBjbGllbnRf cG9ydAorICAgIEVORCBBUyB7eyBjb25ufHF0SWRlbnQoXygnQ2xpZW50Jykp IH19LAorICAgIHt7IF8oJ1N0cmVhbWluZyBSZXBsaWNhdGlvbicpfHF0TGl0 ZXJhbCB9fSBBUyB7eyBjb25ufHF0SWRlbnQoXygnQXBwbGljYXRpb24nKSkg fX0sCisgICAgbnVsbCBBUyB7eyBjb25ufHF0SWRlbnQoXygnV2FpdCBldmVu dCB0eXBlJykpIH19LAorICAgIG51bGwgQVMge3sgY29ubnxxdElkZW50KF8o J1dhaXQgZXZlbnQgbmFtZScpKSB9fSwKKyAgICBzdGF0ZSB8fCAnIFtzeW5j IChzdGF0ZTogJyB8fCBDT0FMRVNDRShzeW5jX3N0YXRlLCAnJykgfHwgJywg cHJpb3JpdHk6ICcgfHwgc3luY19wcmlvcml0eTo6dGV4dCB8fCAnKV0gKCcg fHwgc2VudF9sb2NhdGlvbiB8fCAnIHNlbnQsICcgfHwgd3JpdGVfbG9jYXRp b24gfHwgJyB3cml0dGVuLCAnIHx8IGZsdXNoX2xvY2F0aW9uIHx8ICcgZmx1 c2hlZCwgJyB8fCByZXBsYXlfbG9jYXRpb24gfHwgJyBhcHBsaWVkKScgQVMg e3sgY29ubnxxdElkZW50KF8oJ1F1ZXJ5JykpIH19LAorICAgIG51bGwgQVMg e3sgY29ubnxxdElkZW50KF8oJ1F1ZXJ5IHN0YXJ0JykpIH19LAorICAgIG51 bGwgQVMge3sgY29ubnxxdElkZW50KF8oJ1hhY3Qgc3RhcnQnKSkgfX0KK0ZS T00KKyAgICBwZ19zdGF0X3JlcGxpY2F0aW9uIHNhCitXSEVSRQorICAgIChT RUxFQ1Qgci5yb2xzdXBlciBPUiByLm9pZCA9IHNhLnVzZXN5c2lkICBGUk9N IHBnX3JvbGVzIHIgV0hFUkUgci5yb2xuYW1lID0gY3VycmVudF91c2VyKQo= --94eb2c08b31ab59020053d17a174 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 --94eb2c08b31ab59020053d17a174--