Received: from malur.postgresql.org ([217.196.149.56])
	by arkaria.postgresql.org with esmtp (Exim 4.84_2)
	(envelope-from
 <pgadmin-hackers-owner+M26746=pgadmin-hackers-arka@postgresql.org>)
	id 1bn2iu-0006RR-U5
	for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Sep 2016 12:03:29 +0000
Received: from localhost ([127.0.0.1] helo=postgresql.org)
	by malur.postgresql.org with smtp (Exim 4.84_2)
	(envelope-from
 <pgadmin-hackers-owner+M26746=pgadmin-hackers-arka@postgresql.org>)
	id 1bn2iu-0001ZR-Fo
	for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Sep 2016 12:03:28 +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 <dpage@pgadmin.org>)
	id 1bn2ih-0001KO-AB
	for pgadmin-hackers@postgresql.org; Thu, 22 Sep 2016 12:03:15 +0000
Received: from mail-it0-x22b.google.com ([2607:f8b0:4001:c0b::22b])
	by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256)
	(Exim 4.84_2)
	(envelope-from <dpage@pgadmin.org>)
	id 1bn2ic-0003R0-9L
	for pgadmin-hackers@postgresql.org; Thu, 22 Sep 2016 12:03:14 +0000
Received: by mail-it0-x22b.google.com with SMTP id n143so78930500ita.1
        for <pgadmin-hackers@postgresql.org>;
 Thu, 22 Sep 2016 05:03:09 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=pgadmin-org.20150623.gappssmtp.com; s=20150623;
        h=mime-version:in-reply-to:references:from:date:message-id:subject:to
         :cc;
        bh=9fUzhFOg8cT0tLYb1keWruLPbi6vSPURl9iGLWBuCbo=;
        b=xcrPkOF7CUmJfQrqHwnZmBge7gEqtsZXupgSqTmKMpYkTuNewj3BIeR8Yo4KxwcvLu
         oE4B2PgFnPTPRxW19RKckxTGxccfevH08szeEpO5AgMPuT+GZSFp/cAbrahSpLx5U+uY
         8N9FFqPp82sDvvERo9DTkJDFyUgVasqGQx0lbBVnr7m2O2mO7q9Vdpwn1hiOMkJqxsFS
         HFcl56UiR72B29MCIJfe6CsTiuInX/VeITWHu32tfLe1P06Posm1hzqNsTKOzxoiIDz+
         Rm6m1X0S4M9v/IRojvFXZi/+0dniYobdosWAZEbpu6pWTVF8NBtojqXJxJ20kacATZGq
         M/VQ==
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=9fUzhFOg8cT0tLYb1keWruLPbi6vSPURl9iGLWBuCbo=;
        b=iG+ShF6HqRXm+QVVeTCRE09FkXZxUbodyACh0x9RCOFT4Wk/ehrdF4QIU8BzijsMPX
         tvH9Ha96PvjtHjjou2dUSfSzayTqgrjl5XJkOiPphNKZvVhE47CPv1rElsjW5Avzcf22
         hJu1r4c0kbqBaH0aCfq/0uu0rKO5riWfmetASxwkPab67ptpp6hbzM1DjV2Xrt9609Mj
         YKNNJtiElz5pQXEbHlijRS+mLAaxuXHcLGZKQa+1EsTFnkCHhETZHVewvNbNTVKT/lWT
         UG+WWDdluwJXIeZ7ntKAMFzTpPo5jjJBDDXIYRVOJn0pqeRFpDKJVRwRS/NuiqggfWqi
         L5dQ==
X-Gm-Message-State: 
 AE9vXwPmIPZaYAsGEgiA38/hXnvN9D5NKHsCNtWvU923fBjsR4YP0NBiaceE0PqE4vyftBl3sGG5UMrBxUwFHg==
X-Received: by 10.36.246.2 with SMTP id u2mr2144934ith.103.1474545788159; Thu,
 22 Sep 2016 05:03:08 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.64.1.203 with HTTP; Thu, 22 Sep 2016 05:03:07 -0700 (PDT)
In-Reply-To: 
 <CAKKotZSFj6Vzt3TSpVp4paidpuuWAJSB-mM4mh1NxRRXXNRxVw@mail.gmail.com>
References: 
 <CAKKotZSFj6Vzt3TSpVp4paidpuuWAJSB-mM4mh1NxRRXXNRxVw@mail.gmail.com>
From: Dave Page <dpage@pgadmin.org>
Date: Thu, 22 Sep 2016 13:03:07 +0100
Message-ID: 
 <CA+OCxox18EbGFG28smNYVzCR1ZY+8WFa3utP6L04HCn-GJDfSA@mail.gmail.com>
Subject: Re: PATCH: To fix the issue with stats table in
 PG9.6 (pgAdmin4)
To: Murtuza Zabuawala <murtuza.zabuawala@enterprisedb.com>
Cc: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: text/plain; charset=UTF-8
X-Pg-Spam-Score: -1.9 (-)
List-Archive: <http://archives.postgresql.org/pgadmin-hackers>
List-Help: <mailto:majordomo@postgresql.org?body=help>
List-ID: <pgadmin-hackers.postgresql.org>
List-Owner: <mailto:pgadmin-hackers-owner@postgresql.org>
List-Post: <mailto:pgadmin-hackers@postgresql.org>
List-Subscribe: <mailto:majordomo@postgresql.org?body=sub%20pgadmin-hackers>
List-Unsubscribe: 
 <mailto:majordomo@postgresql.org?body=unsub%20pgadmin-hackers>
X-Mailing-List: pgadmin-hackers
Precedence: bulk
Sender: pgadmin-hackers-owner@postgresql.org

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 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


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