Re: Next release

2018-02-19 Thread Dave Page
On Thu, Feb 15, 2018 at 2:26 PM, Robert Eckhardt 
wrote:

> Apologies if this has been discussed and I missed it.
>
> When is the 3.0 release planned?
>

I was planning it to be in a week or two, however I'm currently dealing
with a family emergency so it's likely to be March now.

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

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


Re: Proposal for changes in official Docker image

2018-02-19 Thread Dave Page
Hi

On Sun, Feb 18, 2018 at 5:41 PM, Максим Кольцов  wrote:

> Hi!
>
> I accidentially sent this email to pgsql-hackers yesterday, sorry!
>
> First of all, thanks for the great app :)
>
> I started using PgAdmin with docker image (dpage/pgadmin4) a few weeks
> ago, however I thought that it had some issues, so I decided to make
> my own image. Some of the advantages:
>
> - Use alpine linux instead of centos to greatly reduce image size
> (170MB vs 560MB)
> - Use lightweight pure-python HTTP server waitress instead of heavy
> apache/mod_wsgi
> - Use python 3.6
>
> You can test the image at https://hub.docker.com/r/maksbotan/pgadmin4/
> Readme contains more detailed explanation and usage instructions.
>
> The Dockerfile is hosted at github: https://github.com/maksbotan/
> pgadmin4_docker
>
> If you find my work useful, I'd love to make a contribution with these
> scripts, after some discussion with pgadmin developers and further
> improvements.
>

Please feel free to submit patches to the existing code. I have no
objection to the any of the alternate design decisions you've made (in
principal), except for the intentional lack of SSL support.

Thanks, Dave.

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

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


pgAdmin 4 commit: Fix target name

2018-02-19 Thread Dave Page
Fix target name

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=d5aeb8a69166067187b622f4487d0be612a32576

Modified Files
--
README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)



Build failed in Jenkins: pgadmin4-master-python26 #607

2018-02-19 Thread pgAdmin 4 Jenkins
See 


Changes:

[Dave Page] Fix target name

--
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url git://git.postgresql.org/git/pgadmin4.git # 
 > timeout=10
Cleaning workspace
 > git rev-parse --verify HEAD # timeout=10
Resetting working tree
 > git reset --hard # timeout=10
 > git clean -fdx # timeout=10
Fetching upstream changes from git://git.postgresql.org/git/pgadmin4.git
 > git --version # timeout=10
 > git fetch --tags --progress git://git.postgresql.org/git/pgadmin4.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse origin/master^{commit} # timeout=10
Checking out Revision d5aeb8a69166067187b622f4487d0be612a32576 (origin/master)
Commit message: "Fix target name"
 > git config core.sparsecheckout # timeout=10
 > git checkout -f d5aeb8a69166067187b622f4487d0be612a32576
 > git rev-list 9c382e4d23aa66cf4ff18e25835c14a1c5fe3a9c # timeout=10
[EnvInject] - Executing scripts and injecting environment variables after the 
SCM step.
[EnvInject] - Injecting as environment variables the properties content 
PYTHON_VERSION=2.6

[EnvInject] - Variables injected successfully.
[pgadmin4-master-python26] $ /bin/sh -xe /tmp/jenkins124083007669043445.sh
+ 
EXECUTING: Create pgAdmin config

EXECUTING: Python tests

Creating Python 2.6 virtual environment...

New python executable in 

Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/local/python-2.6/bin/python
DEPRECATION: Python 2.6 is no longer supported by the Python core team, please 
upgrade your Python. A future version of pip will drop support for Python 2.6
Collecting wheel==0.29.0
  Using cached wheel-0.29.0-py2.py3-none-any.whl
Collecting argparse; python_version == "2.6" (from wheel==0.29.0)
  Using cached argparse-1.4.0-py2.py3-none-any.whl
Installing collected packages: argparse, wheel
Successfully installed argparse-1.4.0 wheel-0.29.0
DEPRECATION: Python 2.6 is no longer supported by the Python core team, please 
upgrade your Python. A future version of pip will drop support for Python 2.6
Ignoring Flask-HTMLmin: markers 'python_version >= "2.7"' don't match your 
environment
Collecting Babel==2.3.4 (from -r requirements.txt (line 4))
  Using cached Babel-2.3.4-py2.py3-none-any.whl
Collecting beautifulsoup4==4.4.1 (from -r requirements.txt (line 5))
  Using cached beautifulsoup4-4.4.1-py2-none-any.whl
Collecting blinker==1.3 (from -r requirements.txt (line 6))
Collecting click==6.6 (from -r requirements.txt (line 7))
  Using cached click-6.6-py2.py3-none-any.whl
Collecting extras==0.0.3 (from -r requirements.txt (line 8))
Collecting fixtures==2.0.0 (from -r requirements.txt (line 9))
  Using cached fixtures-2.0.0-py2.py3-none-any.whl
Collecting Flask==0.11.1 (from -r requirements.txt (line 10))
  Using cached Flask-0.11.1-py2.py3-none-any.whl
Collecting Flask-Babel==0.11.1 (from -r requirements.txt (line 11))
Collecting Flask-Gravatar==0.4.2 (from -r requirements.txt (line 12))
  Using cached Flask_Gravatar-0.4.2-py2.py3-none-any.whl
Collecting Flask-Login==0.3.2 (from -r requirements.txt (line 14))
Collecting Flask-Mail==0.9.1 (from -r requirements.txt (line 15))
Collecting Flask-Migrate==2.0.3 (from -r requirements.txt (line 16))
Collecting Flask-Principal==0.4.0 (from -r requirements.txt (line 17))
Collecting Flask-Security==1.7.5 (from -r requirements.txt (line 18))
Collecting Flask-SQLAlchemy==2.1 (from -r requirements.txt (line 19))
Collecting Flask-WTF==0.12 (from -r requirements.txt (line 20))
  Using cached Flask_WTF-0.12-py2-none-any.whl
Collecting html5lib==1.0b3 (from -r requirements.txt (line 21))
Collecting importlib==1.0.3 (from -r requirements.txt (line 22))
Collecting itsdangerous==0.24 (from -r requirements.txt (line 23))
Collecting Jinja2==2.7.3 (from -r requirements.txt (line 24))
Collecting linecache2==1.0.0 (from -r requirements.txt (line 25))
  Using cached linecache2-1.0.0-py2.py3-none-any.whl
Collecting MarkupSafe==0.23 (from -r requirements.txt (line 26))
Collecting ordereddict (from -r requirements.txt (line 27))
:318:
 SNIMissingWarning: An HTTPS request has been made, but the SNI (Subject Name 
Indication) extension 

pgAdmin 4 commit: Fix Python 2.6 support.

2018-02-19 Thread Dave Page
Fix Python 2.6 support.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=1a958a39514d1f839e382950105333ac2462c195
Author: Murtuza Zabuawala 

Modified Files
--
pkg/pip/setup_pip.py | 6 --
requirements.txt | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)



Re: Build failed in Jenkins: pgadmin4-master-python26 #602

2018-02-19 Thread Dave Page
On Mon, Feb 12, 2018 at 6:30 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi Dave,
>
> On Fri, Feb 9, 2018 at 8:40 PM, Dave Page  wrote:
>
>> Hi,
>>
>> Doesn't this need to include 2.7 in the test that'll install the newer
>> version of psycopg2? e.g.
>>
>> psycopg2>=2.7.3.2; python_version >= '2.7'
>>
> Sorry for the typo.
>
>
>> psycopg2==2.7.3.2; python_version < '2.7'
>>
>> Also, I think the change as written breaks the wheel generation (see the
>> comment at the top of requirements.txt). Changes are required
>> inpkg/pip/setup_pip.py aren't they?
>>
>>
> If we use the latest version of pip then we can also use psycopg2 binary
> package which will save us from compiling the
> psycopg2
> ​​
> source on client.
> http://initd.org/psycopg/docs/install.html#binary-install-from-pypi
>
> I have attached both patches,
> Please review
> ​ & check which one suites to our need., I've tested both patches and its
> working fine.
> ​
>

Thanks - I've committed the source fix for now, but... what do folks think
about using source in requirements.txt (for developers and official
packages, to ensure compiler compatibility etc), and the binary package in
the wheel?

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

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


pgAdmin 4 commit: Fix creation of tables and columns in GPDB. Fixes #30

2018-02-19 Thread Dave Page
Fix creation of tables and columns in GPDB. Fixes #3099

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=15862e903a75433df7e6746ecaa89248cbe97d95
Author: Joao Pedro De Almeida Pereira 

Modified Files
--
web/karma.conf.js  |   1 +
.../databases/schemas/collations/__init__.py   |   7 +-
.../collation/sql/gpdb_5.0_plus/get_collations.sql |   6 +
.../servers/databases/schemas/domains/__init__.py  |   7 +-
.../domains/sql/gpdb_5.0_plus/get_collations.sql   |   6 +
.../databases/schemas/foreign_tables/__init__.py   |   7 +-
.../sql/gpdb_5.0_plus/get_collations.sql   |   6 +
.../servers/databases/schemas/tables/__init__.py   |   2 +-
.../databases/schemas/tables/indexes/__init__.py   |   7 +-
.../schemas/tables/static/js/show_advanced_tab.js  |  23 
.../databases/schemas/tables/static/js/table.js|  33 +++---
.../column/sql/gpdb_5.0_plus/get_collations.sql|   6 +
.../index/sql/gpdb_5.0_plus/get_collations.sql |   6 +
.../templates/table/sql/gpdb_5.0_plus/create.sql   |   3 +
.../schemas/tables/tests/test_template_create.py   | 122 +
.../datatype/sql/gpdb_5.0_plus/get_types.sql   |  10 +-
.../type/sql/gpdb_5.0_plus/get_collations.sql  |   6 +
web/pgadmin/utils/compile_template_name.py |   6 +-
.../schemas/tables/show_advanced_tab_spec.js   |  64 +++
web/webpack.shim.js|   1 +
20 files changed, 304 insertions(+), 25 deletions(-)



Re: [pgadmin4][patch] #3099 GPDB: Creating table and creating column in table fails

2018-02-19 Thread Dave Page
Thanks, patch applied.

On Fri, Feb 9, 2018 at 10:49 PM, Joao De Almeida Pereira <
jdealmeidapere...@pivotal.io> wrote:

> Hi Hackers,
>
> Attached is the patch that correct the creation of tables and columns.
>
> Also started using in a more widespread way the `compile_template_path`
> function  to have the logic in a single place.
> Hides the Advanced Tab on table creation for GreenPlum Databases
> Correctly retrieves the collate of the GrenPlum Database in multiples
> places that use it
> Correct the SQL generation for table creation when a primary keys are
> present
>
> Thanks
> Joao
>



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

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


pgAdmin 4 commit: Un-vendorise React, now that it contains bug fixes we

2018-02-19 Thread Dave Page
Un-vendorise React, now that it contains bug fixes we need.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=0677ad254adc9f4adde5b45626c8491212647bad
Author: Joao Pedro De Almeida Pereira 

Modified Files
--
web/karma.conf.js  | 4 +-
web/package.json   |14 +-
web/pgadmin/static/vendor/react-dom/LICENSE|31 -
web/pgadmin/static/vendor/react-dom/PATENTS|33 -
web/pgadmin/static/vendor/react-dom/README.md  |54 -
.../vendor/react-dom/dist/react-dom-server.js  | 16224 
.../vendor/react-dom/dist/react-dom-server.min.js  | 1 -
.../static/vendor/react-dom/dist/react-dom.js  | 18266 ---
.../static/vendor/react-dom/dist/react-dom.min.js  | 1 -
web/pgadmin/static/vendor/react-dom/index.js   | 3 -
.../vendor/react-dom/lib/ARIADOMPropertyConfig.js  |73 -
.../static/vendor/react-dom/lib/AutoFocusUtils.js  |23 -
.../vendor/react-dom/lib/BeforeInputEventPlugin.js |   384 -
.../static/vendor/react-dom/lib/CSSProperty.js |   147 -
.../vendor/react-dom/lib/CSSPropertyOperations.js  |   208 -
.../static/vendor/react-dom/lib/CallbackQueue.js   |   118 -
.../vendor/react-dom/lib/ChangeEventPlugin.js  |   320 -
.../vendor/react-dom/lib/DOMChildrenOperations.js  |   224 -
.../static/vendor/react-dom/lib/DOMLazyTree.js |   117 -
.../static/vendor/react-dom/lib/DOMNamespaces.js   |19 -
.../static/vendor/react-dom/lib/DOMProperty.js |   209 -
.../vendor/react-dom/lib/DOMPropertyOperations.js  |   236 -
web/pgadmin/static/vendor/react-dom/lib/Danger.js  |47 -
.../react-dom/lib/DefaultEventPluginOrder.js   |25 -
.../vendor/react-dom/lib/EnterLeaveEventPlugin.js  |99 -
.../static/vendor/react-dom/lib/EventConstants.js  |91 -
.../static/vendor/react-dom/lib/EventPluginHub.js  |   277 -
.../vendor/react-dom/lib/EventPluginRegistry.js|   254 -
.../vendor/react-dom/lib/EventPluginUtils.js   |   225 -
.../vendor/react-dom/lib/EventPropagators.js   |   133 -
.../react-dom/lib/FallbackCompositionState.js  |94 -
.../vendor/react-dom/lib/HTMLDOMPropertyConfig.js  |   211 -
.../static/vendor/react-dom/lib/KeyEscapeUtils.js  |58 -
.../vendor/react-dom/lib/LinkedValueUtils.js   |   134 -
.../vendor/react-dom/lib/PluginModuleType.js   |12 -
.../static/vendor/react-dom/lib/PooledClass.js |   111 -
.../react-dom/lib/ReactBrowserEventEmitter.js  |   327 -
.../static/vendor/react-dom/lib/ReactChildFiber.js |   243 -
.../vendor/react-dom/lib/ReactChildReconciler.js   |   153 -
.../lib/ReactComponentBrowserEnvironment.js|29 -
.../react-dom/lib/ReactComponentEnvironment.js |45 -
.../react-dom/lib/ReactComponentTreeTestUtils.js   |86 -
.../react-dom/lib/ReactCompositeComponent.js   |   901 -
.../static/vendor/react-dom/lib/ReactCoroutine.js  |80 -
.../static/vendor/react-dom/lib/ReactDOM.js|   110 -
.../vendor/react-dom/lib/ReactDOMComponent.js  |  1000 -
.../vendor/react-dom/lib/ReactDOMComponentFlags.js |17 -
.../vendor/react-dom/lib/ReactDOMComponentTree.js  |   194 -
.../vendor/react-dom/lib/ReactDOMContainerInfo.js  |32 -
.../vendor/react-dom/lib/ReactDOMEmptyComponent.js |59 -
.../vendor/react-dom/lib/ReactDOMFeatureFlags.js   |18 -
.../static/vendor/react-dom/lib/ReactDOMFiber.js   |97 -
.../vendor/react-dom/lib/ReactDOMIDOperations.js   |33 -
.../static/vendor/react-dom/lib/ReactDOMInput.js   |   277 -
.../react-dom/lib/ReactDOMInvalidARIAHook.js   |92 -
.../lib/ReactDOMNullInputValuePropHook.js  |42 -
.../static/vendor/react-dom/lib/ReactDOMOption.js  |   122 -
.../static/vendor/react-dom/lib/ReactDOMSelect.js  |   199 -
.../vendor/react-dom/lib/ReactDOMSelection.js  |   211 -
.../static/vendor/react-dom/lib/ReactDOMServer.js  |25 -
.../vendor/react-dom/lib/ReactDOMServerUMDEntry.js |15 -
.../vendor/react-dom/lib/ReactDOMTextComponent.js  |   163 -
.../vendor/react-dom/lib/ReactDOMTextarea.js   |   159 -
.../vendor/react-dom/lib/ReactDOMTreeTraversal.js  |   135 -
.../vendor/react-dom/lib/ReactDOMUMDEntry.js   |33 -
.../react-dom/lib/ReactDOMUnknownPropertyHook.js   |   111 -
.../static/vendor/react-dom/lib/ReactDebugTool.js  |   360 -
.../react-dom/lib/ReactDefaultBatchingStrategy.js  |67 -
.../vendor/react-dom/lib/ReactDefaultInjection.js  |85 -
.../vendor/react-dom/lib/ReactElementSymbol.js |19 -
.../vendor/react-dom/lib/ReactEmptyComponent.js|29 -
.../static/vendor/react-dom/lib/ReactErrorUtils.js |76 -
.../vendor/react-dom/lib/ReactEventEmitterMixin.js |32 -
.../vendor/react-dom/lib/ReactEventListener.js |   154 -
.../vendor/react-dom/lib/ReactFeatureFlags.js  |21 -
.../static/vendor/react-dom/lib/ReactFiber.js  |   190 -
.../vendor/react-dom/lib/ReactFiberBeginWork.js|  

Re: [pgadmin4][patch] Unvendorize react #3098

2018-02-19 Thread Dave Page
Thanks, patch applied.

On Fri, Feb 9, 2018 at 5:56 PM, Joao De Almeida Pereira <
jdealmeidapere...@pivotal.io> wrote:

> Hello,
> Now that we moved away from the webkit and the pull request that was send
> to React was merged, we believe we are in a good place to move react back
> to it's own version.
>
> We reverted the vendorization and also updated react to version 16.2
>
>
> Thanks
> Joao
>



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

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


pgAdmin 4 commit: Show button shortcut keys in the debugger on tooltips

2018-02-19 Thread Dave Page
Show button shortcut keys in the debugger on tooltips.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=30868614ffd55a5b89c462473477bf68e181edf4
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/tools/debugger/templates/debugger/direct.html | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)



Re: [pgAdmin4][RM#2901] Make shortcuts configurable in Debugger

2018-02-19 Thread Dave Page
Thanks, applied.

On Mon, Feb 12, 2018 at 7:27 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi Dave,
>
> PFA patch to update button tooltip.
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>
> On Fri, Feb 9, 2018 at 6:14 PM, Dave Page  wrote:
>
>> Thanks, applied.
>>
>> Can you please send a followup patch to include the configured keys on
>> the button tooltips, like we do in the Query Tool?
>>
>>
>> On Thu, Feb 8, 2018 at 11:32 AM, Murtuza Zabuawala <
>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> PFA patch to make shortcut configurable in debugger module.
>>>
>>> --
>>> Regards,
>>> Murtuza Zabuawala
>>> EnterpriseDB: 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


Re: [pgadmin4][patch] Hides the tablespace node in ACI tree for GreenPlum

2018-02-19 Thread Dave Page
Hi

On Mon, Feb 12, 2018 at 6:30 PM, Joao De Almeida Pereira <
jdealmeidapere...@pivotal.io> wrote:

> Hi Hackers
>
> The attached patch implements the feature #3107 to hide the tablespaces on
> GreenPlum databases.
>

Did you accidentally include some keyboard shortcut test code in this
patch?


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

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


pgAdmin 4 commit: Fix PEP8 issues in various modules. Fixes #3121

2018-02-19 Thread Dave Page
Fix PEP8 issues in various modules. Fixes #3121

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=7301e30ff3a57b4380c2cf56f67c065f56eb229a
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/help/__init__.py   |  20 +-
web/pgadmin/model/__init__.py  |  48 ++--
web/pgadmin/preferences/__init__.py|  18 +-
web/pgadmin/redirects/__init__.py  |   5 +-
web/pgadmin/settings/__init__.py   |  24 +-
web/pgadmin/setup/db_upgrade.py|   8 +-
web/pgadmin/setup/user_info.py |   5 +-
web/regression/feature_utils/app_starter.py|   4 +-
web/regression/feature_utils/base_feature_test.py  |  32 ++-
web/regression/feature_utils/pgadmin_page.py   |  97 ---
.../python_test_utils/template_helper.py   |   4 +-
web/regression/python_test_utils/test_utils.py | 279 -
web/regression/runtests.py |  54 ++--
13 files changed, 369 insertions(+), 229 deletions(-)



Re: [pgAdmin4][RM#3121] Fix PEP-8 issues

2018-02-19 Thread Dave Page
Thanks, patch applied.

On Thu, Feb 15, 2018 at 4:15 PM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Thank you for reviewing Joao.
>
>
> On Thu, Feb 15, 2018 at 8:37 PM, Joao De Almeida Pereira <
> jdealmeidapere...@pivotal.io> wrote:
>
>> Hello Murtuza,
>> I just run this patch as you suggested(no errors reported) and also run
>> it through our CI pipeline and it look good
>>
>> Thanks
>> Joao
>>
>> On Wed, Feb 14, 2018 at 7:23 AM Murtuza Zabuawala <
>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> PFA patch to fix the PEP-8 issues,
>>>
>>> To verify changes goto '../web' directory and run,
>>> pycodestyle --config=.pycodestyle ./regression/
>>> pycodestyle --config=.pycodestyle ./pgadmin/setup/
>>> pycodestyle --config=.pycodestyle ./pgadmin/settings/
>>> pycodestyle --config=.pycodestyle ./pgadmin/redirects/
>>> pycodestyle --config=.pycodestyle ./pgadmin/preferences/
>>> pycodestyle --config=.pycodestyle ./pgadmin/model/
>>> pycodestyle --config=.pycodestyle ./pgadmin/help/
>>>
>>>
>>> --
>>> Regards,
>>> Murtuza Zabuawala
>>> EnterpriseDB: 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


pgAdmin 4 commit: Add a marker (/*pga4dash*/) to the dashboard queries

2018-02-19 Thread Dave Page
Add a marker (/*pga4dash*/) to the dashboard queries to allow them to be more 
easily filtered from server logs. Fixes #2950

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=4dc9fb146ab47a8fdff8b7db3ecf773690e5625f
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/dashboard/templates/dashboard/sql/10_plus/activity.sql | 1 +
web/pgadmin/dashboard/templates/dashboard/sql/9.6_plus/activity.sql| 1 +
web/pgadmin/dashboard/templates/dashboard/sql/default/activity.sql | 1 +
web/pgadmin/dashboard/templates/dashboard/sql/default/bio_stats.sql| 1 +
web/pgadmin/dashboard/templates/dashboard/sql/default/config.sql   | 3 ++-
web/pgadmin/dashboard/templates/dashboard/sql/default/locks.sql| 3 ++-
web/pgadmin/dashboard/templates/dashboard/sql/default/prepared.sql | 3 ++-
.../dashboard/templates/dashboard/sql/default/session_stats.sql| 3 ++-
web/pgadmin/dashboard/templates/dashboard/sql/default/ti_stats.sql | 3 ++-
web/pgadmin/dashboard/templates/dashboard/sql/default/to_stats.sql | 3 ++-
web/pgadmin/dashboard/templates/dashboard/sql/default/tps_stats.sql| 3 ++-
.../dashboard/templates/dashboard/sql/gpdb_5.0_plus/activity.sql   | 1 +
web/pgadmin/dashboard/templates/dashboard/sql/gpdb_5.0_plus/locks.sql  | 1 +
.../dashboard/templates/dashboard/sql/gpdb_5.0_plus/session_stats.sql  | 1 +
14 files changed, 21 insertions(+), 7 deletions(-)



Re: [pgAdmin4][RM#2950] Add marker to dashboard queries

2018-02-19 Thread Dave Page
Thanks, patch applied.

On Thu, Feb 15, 2018 at 4:23 PM, Joao De Almeida Pereira <
jdealmeidapere...@pivotal.io> wrote:

> Hello Murtuza,
> Looks like I missread the Issue then.
> In that case I think it might be the solution that we can implement.
> Unless anyone in the list as a different idea.
>
> Thanks
> Joao
>
> On Thu, Feb 15, 2018 at 11:12 AM Murtuza Zabuawala  enterprisedb.com> wrote:
>
>> Hi Joao,
>>
>> It was mainly intended for PostgreSQL database logs and not pgAdmin4 logs
>> :)
>>
>>
>> --
>> Regards,
>> Murtuza Zabuawala
>> EnterpriseDB: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>>
>> On Thu, Feb 15, 2018 at 8:03 PM, Joao De Almeida Pereira <
>> jdealmeidapere...@pivotal.io> wrote:
>>
>>> Hello Murtuza,
>>> I was looking into the Issue information and the solution that was
>>> provided there needs some polish. With the solution that was asked, the log
>>> will still be generated, but eventually will not show up in a log monitor,
>>> but nevertheless will be there.
>>>
>>> After some digging around the code I saw that we are using Logging Level
>>> 25 for all SQL queries what if we give 24 for the dashboard logs?
>>> Another option, that I didn't look into very much was the possibility of
>>> passing a logger into the execution functions or even somehow tag them so
>>> we can have more control over the logs that we generate. It would be nice
>>> if we could somehow ignore all the logs from the Dashboard. (
>>> http://flask.pocoo.org/docs/dev/logging/#other-libraries)
>>>
>>> What do you think about the suggestion?
>>>
>>> Thanks
>>> Joao
>>>
>>> On Thu, Feb 15, 2018 at 8:51 AM Murtuza Zabuawala >> enterprisedb.com> wrote:
>>>
 Hi,

 PFA patch to add marker in dashboard queries, it will allow to user to
 filter out those queries from database logs if required.

 --
 Regards,
 Murtuza Zabuawala
 EnterpriseDB: 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


Jenkins build is back to normal : pgadmin4-master-python26 #608

2018-02-19 Thread pgAdmin 4 Jenkins
See 





pgAdmin 4 commit: Ensure we can properly update rows with upper-case pr

2018-02-19 Thread Dave Page
Ensure we can properly update rows with upper-case primary key columns. Fixes 
#3105

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=96165044ae7abbd7bef04d181a42487f8f96c42c
Author: Murtuza Zabuawala 

Modified Files
--
web/pgadmin/feature_tests/view_data_dml_queries.py | 40 --
web/pgadmin/tools/sqleditor/__init__.py| 21 
web/pgadmin/tools/sqleditor/command.py |  6 ++--
.../templates/sqleditor/sql/default/select.sql |  4 +--
4 files changed, 40 insertions(+), 31 deletions(-)



Re: [pgAdmin4][RM#3105] Allow user to insert new row if PK is in capital letters

2018-02-19 Thread Dave Page
Thanks guys, patch applied.

On Fri, Feb 16, 2018 at 2:30 PM, Joao De Almeida Pereira <
jdealmeidapere...@pivotal.io> wrote:

> Hello Murtuza,
> I believe it is a bit too much to have a feature test for this. A unit
> test around the function in question could have sufficed, specially because
> we are not yet running them in Jenkins, but I think it is ok.
> So I review the patch, applied and run our CI and everything is green. So
> I believe this patch is good to be merged.
>
> Thanks
> Joao
>
> On Fri, Feb 16, 2018 at 5:28 AM Murtuza Zabuawala  enterprisedb.com> wrote:
>
>> Hi,
>>
>> PFA updated patch, which includes feature test to test the scenario going
>> forward.
>>
>> --
>> Regards,
>> Murtuza Zabuawala
>> EnterpriseDB: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>>
>> On Thu, Feb 15, 2018 at 7:53 PM, Murtuza Zabuawala > enterprisedb.com> wrote:
>>
>>> ​Sure, will do that.​
>>>
>>> --
>>> Regards,
>>> Murtuza Zabuawala
>>> EnterpriseDB: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>>
>>> On Thu, Feb 15, 2018 at 7:34 PM, Joao De Almeida Pereira <
>>> jdealmeidapere...@pivotal.io> wrote:
>>>
 Hello Murtuza,
 Just reviewed your patch, and it looks good.
 Do you think you can wrap some tests around this behavior to ensure it
 doesn't happen again in the future?

 Thanks
 Joao

 On Thu, Feb 15, 2018 at 8:34 AM Murtuza Zabuawala >>> enterprisedb.com> wrote:

> Hi,
>
> PFA patch to fix the issue user was not able to insert new row in the
> table via 'view data' if the PK is in capital letters.
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: 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


pgAdmin 4 commit: Add missing reverse-engineered SQL header and drop st

2018-02-19 Thread Dave Page
Add missing reverse-engineered SQL header and drop statement for sequences. 
Fixes #3081

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=c85e14dc2502c5eff9ee24824ed73cc0da2e1225
Author: Khushboo Vashi 

Modified Files
--
.../servers/databases/schemas/sequences/__init__.py   | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)



Re: [pgAdmin4][Patch]: RM 3081- Reverse engineered SQL for Sequences missing comment header and drop statement

2018-02-19 Thread Dave Page
Thanks, patch applied.

On Mon, Feb 19, 2018 at 6:21 AM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix RM #3081 : Reverse engineered SQL
> for Sequences missing comment header and drop statement
>
> Thanks,
> Khushboo
>



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

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


Re: [pgAdmin4][Patch]: RM #3066 - Create script doesn't add quotation marks to column names for the "add index" functions

2018-02-19 Thread Dave Page
Hi

On Mon, Feb 19, 2018 at 7:56 AM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix RM #3066 -  Create script doesn't
> add quotation marks to column names for the "add index" functions
>

This causes additional quoting on regular tables. Please see the generated
SQL for the index below:

-- Table: public."CamelCase"

-- DROP TABLE public."CamelCase";

CREATE TABLE public."CamelCase"
(
"ID" bigint NOT NULL DEFAULT nextval('"CamelCase_ID_seq"'::regclass),
"SomeColumn" text COLLATE pg_catalog."default",
b boolean,
CONSTRAINT "CamelCase_pkey" PRIMARY KEY ("ID")
)
WITH (
OIDS = FALSE
)
TABLESPACE pg_default;

ALTER TABLE public."CamelCase"
OWNER to postgres;

-- Index: MixedCase_IDX

-- DROP INDEX public."MixedCase_IDX";

CREATE INDEX "MixedCase_IDX"
ON public."CamelCase" USING btree
("""ID""")
TABLESPACE pg_default;


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

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


Re: [pgAdmin4][Patch]: RM #3066 - Create script doesn't add quotation marks to column names for the "add index" functions

2018-02-19 Thread Khushboo Vashi
On Mon, Feb 19, 2018 at 5:19 PM, Dave Page  wrote:

> Hi
>
> On Mon, Feb 19, 2018 at 7:56 AM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Please find the attached patch to fix RM #3066 -  Create script doesn't
>> add quotation marks to column names for the "add index" functions
>>
>
> This causes additional quoting on regular tables. Please see the generated
> SQL for the index below:
>
> Please find the attached updated patch.


> -- Table: public."CamelCase"
>
> -- DROP TABLE public."CamelCase";
>
> CREATE TABLE public."CamelCase"
> (
> "ID" bigint NOT NULL DEFAULT nextval('"CamelCase_ID_seq"'::regclass),
> "SomeColumn" text COLLATE pg_catalog."default",
> b boolean,
> CONSTRAINT "CamelCase_pkey" PRIMARY KEY ("ID")
> )
> WITH (
> OIDS = FALSE
> )
> TABLESPACE pg_default;
>
> ALTER TABLE public."CamelCase"
> OWNER to postgres;
>
> -- Index: MixedCase_IDX
>
> -- DROP INDEX public."MixedCase_IDX";
>
> CREATE INDEX "MixedCase_IDX"
> ON public."CamelCase" USING btree
> ("""ID""")
> TABLESPACE pg_default;
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
index 0ead9db..2c51f14 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py
@@ -776,7 +776,7 @@ class ViewNode(PGChildNodeView, VacuumSettings):
 
 # We need all data as collection for ColumnsModel
 cols_data = {
-'colname': row['attdef'].strip('"'),
+'colname': row['attdef'],
 'collspcname': row['collnspname'],
 'op_class': row['opcname'],
 }


pgAdmin 4 commit: Python 3 fix for the runtime.

2018-02-19 Thread Dave Page
Python 3 fix for the runtime.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=df667bff5316cecbd78b15d6561fdc2043c3b2a6

Modified Files
--
runtime/Server.cpp | 6 ++
1 file changed, 6 insertions(+)



Build failed in Jenkins: pgadmin4-master-python26 #610

2018-02-19 Thread pgAdmin 4 Jenkins
See 


Changes:

[Dave Page] Python 3 fix for the runtime.

--
[...truncated 501.08 KB...]
copying images... [ 31%] images/check_sql.png
copying images... [ 32%] images/main_properties_edit.png
copying images... [ 32%] images/foreign_key_definition.png
copying images... [ 32%] images/event_trigger_general.png
copying images... [ 33%] images/resource_group_general.png
copying images... [ 33%] images/cast_sql.png
copying images... [ 33%] images/query_output_messages.png
copying images... [ 34%] images/synonym_sql.png
copying images... [ 34%] images/collation_definition.png
copying images... [ 34%] images/fts_parser_definition.png
copying images... [ 35%] images/pgagent_steps.png
copying images... [ 35%] images/server_group.png
copying images... [ 35%] images/trigger_function_definition.png
copying images... [ 36%] images/main_properties_table.png
copying images... [ 36%] images/import_export_pw.png
copying images... [ 36%] images/role_sql.png
copying images... [ 37%] images/backup_process_watcher.png
copying images... [ 37%] images/foreign_table_constraints.png
copying images... [ 37%] images/type_security.png
copying images... [ 38%] images/fts_dictionary_sql.png
copying images... [ 38%] images/table_unique.png
copying images... [ 38%] images/column_general.png
copying images... [ 39%] images/fts_parser_general.png
copying images... [ 39%] images/procedure_arguments.png
copying images... [ 40%] images/query_toolbar.png
copying images... [ 40%] images/main_query_tool.png
copying images... [ 40%] images/exclusion_constraint_columns.png
copying images... [ 41%] images/procedure_general.png
copying images... [ 41%] images/event_trigger_security.png
copying images... [ 41%] images/preferences_paths_binary.png
copying images... [ 42%] images/primary_key_sql.png
copying images... [ 42%] images/foreign_server_definition.png
copying images... [ 42%] images/domain_constraint_sql.png
copying images... [ 43%] images/backup_globals_messages.png
copying images... [ 43%] images/domain_sql.png
copying images... [ 43%] images/backup_objects.png
copying images... [ 44%] images/pgagent_properties.png
copying images... [ 44%] images/query_execute_section.png
copying images... [ 44%] images/foreign_server_sql.png
copying images... [ 45%] images/debug_toolbar.png
copying images... [ 45%] images/query_tool_connection_status.png
copying images... [ 45%] images/preferences_browser_display.png
copying images... [ 46%] images/server_connection.png
copying images... [ 46%] images/server_ssl.png
copying images... [ 46%] images/backup_messages.png
copying images... [ 47%] images/debug_main.png
copying images... [ 47%] images/main_statistics.png
copying images... [ 47%] images/procedure_sql.png
copying images... [ 48%] images/role_security.png
copying images... [ 48%] images/pgagent_schedules.png
copying images... [ 48%] images/user_mapping_options.png
copying images... [ 49%] images/table_advanced.png
copying images... [ 49%] images/backup_sections.png
copying images... [ 49%] images/restore_messages.png
copying images... [ 50%] images/package_code.png
copying images... [ 50%] images/extension_general.png
copying images... [ 50%] images/maintenance.png
copying images... [ 51%] images/tablespace_definition.png
copying images... [ 51%] images/foreign_data_wrapper_general.png
copying images... [ 51%] images/column_definition.png
copying images... [ 52%] images/foreign_server_options.png
copying images... [ 52%] images/schema_security.png
copying images... [ 52%] images/type_external.png
copying images... [ 53%] images/materialized_view_sql.png
copying images... [ 53%] images/import_export_miscellaneous.png
copying images... [ 53%] images/ce_not_running.png
copying images... [ 54%] images/language_sql.png
copying images... [ 54%] images/import_export_options.png
copying images... [ 54%] images/primary_key_definition.png
copying images... [ 55%] images/function_parameters.png
copying images... [ 55%] images/rule_sql.png
copying images... [ 55%] images/ce_timeout.png
copying images... [ 56%] images/ce_error_hba.png
copying images... [ 56%] images/pgadmin_login.png
copying images... [ 56%] images/main_dashboard.png
copying images... [ 57%] images/backup_miscellaneous.png
copying images... [ 57%] images/import_export_columns.png
copying images... [ 57%] images/grant_wizard_step1.png
copying images... [ 58%] images/preferences_dashboard_graphs.png
copying images... [ 58%] images/preferences_sql_options.png
copying images... [ 58%] images/foreign_key_sql.png
copying images... [ 59%] images/tablespace_general.png
copying images... [ 59%] images/column_variables.png
copying images... [ 60%] images/resource_group_sql.png
copying images... [ 60%] images/ce_password_failed.png
copying images... [ 60%] images/foreign_table_general.png
copying images... [ 61%] images/restore_sections.png
copying images... [ 61%] images/rule

Build failed in Jenkins: pgadmin4-master-python34 #473

2018-02-19 Thread pgAdmin 4 Jenkins
See 


Changes:

[Dave Page] Python 3 fix for the runtime.

--
[...truncated 494.69 KB...]
copying images... [ 26%] images/maintenance_complete.png
copying images... [ 26%] images/procedure_parameters.png
copying images... [ 27%] images/fts_template_general.png
copying images... [ 27%] images/role_general.png
copying images... [ 27%] images/restore_sections.png
copying images... [ 28%] images/index_sql.png
copying images... [ 28%] images/foreign_server_security.png
copying images... [ 28%] images/debug_stack.png
copying images... [ 29%] images/fts_parser_sql.png
copying images... [ 29%] images/file_menu.png
copying images... [ 29%] images/foreign_data_wrapper_general.png
copying images... [ 30%] images/type_external.png
copying images... [ 30%] images/import_export_columns.png
copying images... [ 30%] images/tablespace_security.png
copying images... [ 31%] images/import_export_complete.png
copying images... [ 31%] images/preferences_storage_options.png
copying images... [ 31%] images/check_definition.png
copying images... [ 32%] images/preferences_paths_help.png
copying images... [ 32%] images/restore_messages.png
copying images... [ 32%] images/trigger_sql.png
copying images... [ 33%] images/preferences_misc_user_language.png
copying images... [ 33%] images/import_export_miscellaneous.png
copying images... [ 33%] images/backup_queries.png
copying images... [ 34%] images/fts_parser_general.png
copying images... [ 34%] images/cast_definition.png
copying images... [ 34%] images/function_definition.png
copying images... [ 35%] images/role_parameters.png
copying images... [ 35%] images/schema_security.png
copying images... [ 35%] images/backup_server_messages.png
copying images... [ 36%] images/preferences_sql_csv_output.png
copying images... [ 36%] images/debug_step_in.png
copying images... [ 36%] images/main_dashboard.png
copying images... [ 37%] images/sequence_definition.png
copying images... [ 37%] images/restore_general.png
copying images... [ 37%] images/cast_sql.png
copying images... [ 38%] images/schema_sql.png
copying images... [ 38%] images/query_tool_message.png
copying images... [ 38%] images/foreign_server_sql.png
copying images... [ 39%] images/password.png
copying images... [ 39%] images/restore_miscellaneous.png
copying images... [ 40%] images/fts_parser_definition.png
copying images... [ 40%] images/foreign_data_wrapper_security.png
copying images... [ 40%] images/domain_sql.png
copying images... [ 41%] images/pgagent_schedule_repeat.png
copying images... [ 41%] images/pgadmin_user.png
copying images... [ 41%] images/primary_key_sql.png
copying images... [ 42%] images/backup_disable.png
copying images... [ 42%] images/trigger_function_definition.png
copying images... [ 42%] images/restore_do_not_save.png
copying images... [ 43%] images/backup_server_process_watcher.png
copying images... [ 43%] images/table_general.png
copying images... [ 43%] images/type_sql.png
copying images... [ 44%] images/grant_wizard_step3.png
copying images... [ 44%] images/main_sql.png
copying images... [ 44%] images/materialized_view_security.png
copying images... [ 45%] images/connect_to_server.png
copying images... [ 45%] images/import_export_pw.png
copying images... [ 45%] images/unique_constraint_definition.png
copying images... [ 46%] images/pgagent_step_definition_code.png
copying images... [ 46%] images/pgagent_step_definition.png
copying images... [ 46%] images/view_security.png
copying images... [ 47%] images/table_security.png
copying images... [ 47%] images/query_output_history.png
copying images... [ 47%] images/database_sql.png
copying images... [ 48%] images/resource_group_sql.png
copying images... [ 48%] images/pgagent_properties.png
copying images... [ 48%] images/fts_dictionary_options.png
copying images... [ 49%] images/pgadmin_welcome.png
copying images... [ 49%] images/main_dependents.png
copying images... [ 49%] images/package_general.png
copying images... [ 50%] images/backup_miscellaneous.png
copying images... [ 50%] images/domain_constraints.png
copying images... [ 50%] images/function_options.png
copying images... [ 51%] images/server_ssl.png
copying images... [ 51%] images/function_security.png
copying images... [ 51%] images/database_parameters.png
copying images... [ 52%] images/language_general.png
copying images... [ 52%] images/type_shell.png
copying images... [ 52%] images/domain_definition.png
copying images... [ 53%] images/debug_main.png
copying images... [ 53%] images/check_sql.png
copying images... [ 53%] images/cast_general.png
copying images... [ 54%] images/type_composite.png
copying images... [ 54%] images/check_general.png
copying images... [ 54%] images/exclusion_constraint_columns.png
copying images... [ 55%] images/type_enumeration.png
copying images... [ 55%] images/restore_queries.png
copying images... [ 55%] images/table_constraints.png
cop

Build failed in Jenkins: pgadmin4-master-python36 #477

2018-02-19 Thread pgAdmin 4 Jenkins
See 


Changes:

[Dave Page] Python 3 fix for the runtime.

--
[...truncated 494.46 KB...]
copying images... [ 26%] images/foreign_data_wrapper_sql.png
copying images... [ 26%] images/foreign_key_general.png
copying images... [ 27%] images/foreign_key_definition.png
copying images... [ 27%] images/foreign_key_columns.png
copying images... [ 27%] images/foreign_key_action.png
copying images... [ 28%] images/foreign_key_sql.png
copying images... [ 28%] images/foreign_server_general.png
copying images... [ 28%] images/foreign_server_definition.png
copying images... [ 29%] images/foreign_server_options.png
copying images... [ 29%] images/foreign_server_security.png
copying images... [ 29%] images/foreign_server_sql.png
copying images... [ 30%] images/foreign_table_general.png
copying images... [ 30%] images/foreign_table_definition.png
copying images... [ 30%] images/foreign_table_columns.png
copying images... [ 31%] images/foreign_table_constraints.png
copying images... [ 31%] images/foreign_table_options.png
copying images... [ 31%] images/foreign_table_security.png
copying images... [ 32%] images/foreign_table_sql.png
copying images... [ 32%] images/fts_configuration_general.png
copying images... [ 32%] images/fts_configuration_definition.png
copying images... [ 33%] images/fts_configuration_tokens.png
copying images... [ 33%] images/fts_configuration_sql.png
copying images... [ 33%] images/fts_dictionary_general.png
copying images... [ 34%] images/fts_dictionary_definition.png
copying images... [ 34%] images/fts_dictionary_options.png
copying images... [ 34%] images/fts_dictionary_sql.png
copying images... [ 35%] images/fts_parser_general.png
copying images... [ 35%] images/fts_parser_definition.png
copying images... [ 35%] images/fts_parser_sql.png
copying images... [ 36%] images/fts_template_general.png
copying images... [ 36%] images/fts_template_definition.png
copying images... [ 36%] images/fts_template_sql.png
copying images... [ 37%] images/function_general.png
copying images... [ 37%] images/function_definition.png
copying images... [ 37%] images/function_options.png
copying images... [ 38%] images/function_arguments.png
copying images... [ 38%] images/function_parameters.png
copying images... [ 38%] images/function_security.png
copying images... [ 39%] images/function_sql.png
copying images... [ 39%] images/grant_wizard_step1.png
copying images... [ 40%] images/grant_wizard_step2.png
copying images... [ 40%] images/grant_wizard_step3.png
copying images... [ 40%] images/import_export_options.png
copying images... [ 41%] images/import_export_miscellaneous.png
copying images... [ 41%] images/import_export_columns.png
copying images... [ 41%] images/import_export_complete.png
copying images... [ 42%] images/import_export_pw.png
copying images... [ 42%] images/logo-right-128.png
copying images... [ 42%] images/index_general.png
copying images... [ 43%] images/index_definition.png
copying images... [ 43%] images/index_sql.png
copying images... [ 43%] images/language_general.png
copying images... [ 44%] images/language_definition.png
copying images... [ 44%] images/language_security.png
copying images... [ 44%] images/language_sql.png
copying images... [ 45%] images/maintenance.png
copying images... [ 45%] images/maintenance_complete.png
copying images... [ 45%] images/maintenance_pw.png
copying images... [ 46%] images/materialized_view_general.png
copying images... [ 46%] images/materialized_view_definition.png
copying images... [ 46%] images/materialized_view_storage.png
copying images... [ 47%] images/materialized_view_parameter.png
copying images... [ 47%] images/materialized_view_security.png
copying images... [ 47%] images/materialized_view_sql.png
copying images... [ 48%] images/move_objects_general.png
copying images... [ 48%] images/move_objects_sql.png
copying images... [ 48%] images/package_general.png
copying images... [ 49%] images/package_code.png
copying images... [ 49%] images/package_security.png
copying images... [ 49%] images/package_sql.png
copying images... [ 50%] images/pgadmin_login.png
copying images... [ 50%] images/pgadmin_login_recover.png
copying images... [ 50%] images/file_menu.png
copying images... [ 51%] images/object_menu.png
copying images... [ 51%] images/tool_menu.png
copying images... [ 51%] images/help_menu.png
copying images... [ 52%] images/main_dashboard.png
copying images... [ 52%] images/main_properties_table.png
copying images... [ 52%] images/main_properties_icons.png
copying images... [ 53%] images/main_properties_edit.png
copying images... [ 53%] images/main_sql.png
copying images... [ 53%] images/main_statistics.png
copying images... [ 54%] images/main_dependencies.png
copying images... [ 54%] images/main_dependents.png
copying images... [ 54%] images/main_query_tool.png
copying images... [ 55%] images/main_left_pane.png
copyin

Build failed in Jenkins: pgadmin4-master-python33 #480

2018-02-19 Thread pgAdmin 4 Jenkins
See 


Changes:

[Dave Page] Python 3 fix for the runtime.

--
[...truncated 493.63 KB...]
copying images... [ 25%] images/trigger_function_definition.png
copying images... [ 26%] images/function_options.png
copying images... [ 26%] images/cast_general.png
copying images... [ 26%] images/user_mapping_options.png
copying images... [ 27%] images/domain_security.png
copying images... [ 27%] images/function_parameters.png
copying images... [ 27%] images/primary_key_general.png
copying images... [ 28%] images/query_toolbar.png
copying images... [ 28%] images/trigger_definition.png
copying images... [ 28%] images/fts_template_definition.png
copying images... [ 29%] images/preferences_sql_options.png
copying images... [ 29%] images/foreign_key_definition.png
copying images... [ 29%] images/language_sql.png
copying images... [ 30%] images/domain_constraint_general.png
copying images... [ 30%] images/primary_key_definition.png
copying images... [ 30%] images/main_sql.png
copying images... [ 31%] images/package_code.png
copying images... [ 31%] images/debug_step_in.png
copying images... [ 31%] images/trigger_function_options.png
copying images... [ 32%] images/move_objects_general.png
copying images... [ 32%] images/trigger_code.png
copying images... [ 32%] images/preferences_browser_nodes.png
copying images... [ 33%] images/restore_sections.png
copying images... [ 33%] images/role_general.png
copying images... [ 33%] images/backup_server_general.png
copying images... [ 34%] images/foreign_table_definition.png
copying images... [ 34%] images/fts_configuration_general.png
copying images... [ 34%] images/foreign_server_security.png
copying images... [ 35%] images/preferences_debugger_display.png
copying images... [ 35%] images/debug_ic_step_in.png
copying images... [ 35%] images/event_trigger_general.png
copying images... [ 36%] images/import_export_options.png
copying images... [ 36%] images/debug_params.png
copying images... [ 36%] images/pgagent_general.png
copying images... [ 37%] images/trigger_function_parameters.png
copying images... [ 37%] images/pgagent_steps.png
copying images... [ 37%] images/check_sql.png
copying images... [ 38%] images/pgagent_schedule_repeat.png
copying images... [ 38%] images/function_security.png
copying images... [ 38%] images/pgagent_schedule_definition.png
copying images... [ 39%] images/trigger_sql.png
copying images... [ 39%] images/table_security.png
copying images... [ 40%] images/pgagent_properties.png
copying images... [ 40%] images/restore_miscellaneous.png
copying images... [ 40%] images/foreign_data_wrapper_general.png
copying images... [ 41%] images/collation_sql.png
copying images... [ 41%] images/pgadmin_login_recover.png
copying images... [ 41%] images/type_composite.png
copying images... [ 42%] images/restore_objects.png
copying images... [ 42%] images/query_output_history.png
copying images... [ 42%] images/foreign_key_columns.png
copying images... [ 43%] images/main_query_tool.png
copying images... [ 43%] images/type_shell.png
copying images... [ 43%] images/preferences_sql_csv_output.png
copying images... [ 44%] images/language_security.png
copying images... [ 44%] images/language_general.png
copying images... [ 44%] images/main_dependencies.png
copying images... [ 45%] images/function_arguments.png
copying images... [ 45%] images/check_definition.png
copying images... [ 45%] images/debug_stack.png
copying images... [ 46%] images/procedure_arguments.png
copying images... [ 46%] images/editgrid.png
copying images... [ 46%] images/fts_template_general.png
copying images... [ 47%] images/foreign_key_sql.png
copying images... [ 47%] images/tablespace_security.png
copying images... [ 47%] images/restore_process_watcher.png
copying images... [ 48%] images/event_trigger_definition.png
copying images... [ 48%] images/backup_server_messages.png
copying images... [ 48%] images/trigger_general.png
copying images... [ 49%] images/pgadmin_login.png
copying images... [ 49%] images/password.png
copying images... [ 49%] images/main_dashboard.png
copying images... [ 50%] images/extension_definition.png
copying images... [ 50%] images/trigger_function_general.png
copying images... [ 50%] images/foreign_key_general.png
copying images... [ 51%] images/exclusion_constraint_columns.png
copying images... [ 51%] images/query_execute_section.png
copying images... [ 51%] images/ce_error_hba.png
copying images... [ 52%] images/trigger_function_security.png
copying images... [ 52%] images/backup_general.png
copying images... [ 52%] images/pgagent_schedule_exceptions.png
copying images... [ 53%] images/preferences_browser_keyboard_shortcuts.png
copying images... [ 53%] images/column_sql.png
copying images... [ 53%] images/preferences_debugger_keyboard_shortcuts.png
copying images... [ 54%] images/debug_toolbar.png
copying images... [ 54%] images/function_general.pn

Build failed in Jenkins: pgadmin4-master-python27 #483

2018-02-19 Thread pgAdmin 4 Jenkins
See 


Changes:

[Dave Page] Python 3 fix for the runtime.

--
[...truncated 495.73 KB...]
copying images... [ 26%] images/table_foreign_key.png
copying images... [ 26%] images/table_general.png
copying images... [ 27%] images/maintenance_pw.png
copying images... [ 27%] images/package_sql.png
copying images... [ 27%] images/trigger_general.png
copying images... [ 28%] images/backup_disable.png
copying images... [ 28%] images/preferences_sql_results_grid.png
copying images... [ 28%] images/fts_template_general.png
copying images... [ 29%] images/database_sql.png
copying images... [ 29%] images/restore_process_watcher.png
copying images... [ 29%] images/materialized_view_security.png
copying images... [ 30%] images/synonym_general.png
copying images... [ 30%] images/foreign_server_security.png
copying images... [ 30%] images/trigger_function_sql.png
copying images... [ 31%] images/materialized_view_parameter.png
copying images... [ 31%] images/event_trigger_definition.png
copying images... [ 31%] images/check_sql.png
copying images... [ 32%] images/main_properties_edit.png
copying images... [ 32%] images/foreign_key_definition.png
copying images... [ 32%] images/event_trigger_general.png
copying images... [ 33%] images/resource_group_general.png
copying images... [ 33%] images/cast_sql.png
copying images... [ 33%] images/query_output_messages.png
copying images... [ 34%] images/synonym_sql.png
copying images... [ 34%] images/collation_definition.png
copying images... [ 34%] images/fts_parser_definition.png
copying images... [ 35%] images/pgagent_steps.png
copying images... [ 35%] images/server_group.png
copying images... [ 35%] images/trigger_function_definition.png
copying images... [ 36%] images/main_properties_table.png
copying images... [ 36%] images/import_export_pw.png
copying images... [ 36%] images/role_sql.png
copying images... [ 37%] images/backup_process_watcher.png
copying images... [ 37%] images/foreign_table_constraints.png
copying images... [ 37%] images/type_security.png
copying images... [ 38%] images/fts_dictionary_sql.png
copying images... [ 38%] images/table_unique.png
copying images... [ 38%] images/column_general.png
copying images... [ 39%] images/fts_parser_general.png
copying images... [ 39%] images/procedure_arguments.png
copying images... [ 40%] images/query_toolbar.png
copying images... [ 40%] images/main_query_tool.png
copying images... [ 40%] images/exclusion_constraint_columns.png
copying images... [ 41%] images/procedure_general.png
copying images... [ 41%] images/event_trigger_security.png
copying images... [ 41%] images/preferences_paths_binary.png
copying images... [ 42%] images/primary_key_sql.png
copying images... [ 42%] images/foreign_server_definition.png
copying images... [ 42%] images/domain_constraint_sql.png
copying images... [ 43%] images/backup_globals_messages.png
copying images... [ 43%] images/domain_sql.png
copying images... [ 43%] images/backup_objects.png
copying images... [ 44%] images/pgagent_properties.png
copying images... [ 44%] images/query_execute_section.png
copying images... [ 44%] images/foreign_server_sql.png
copying images... [ 45%] images/debug_toolbar.png
copying images... [ 45%] images/query_tool_connection_status.png
copying images... [ 45%] images/preferences_browser_display.png
copying images... [ 46%] images/server_connection.png
copying images... [ 46%] images/server_ssl.png
copying images... [ 46%] images/backup_messages.png
copying images... [ 47%] images/debug_main.png
copying images... [ 47%] images/main_statistics.png
copying images... [ 47%] images/procedure_sql.png
copying images... [ 48%] images/role_security.png
copying images... [ 48%] images/pgagent_schedules.png
copying images... [ 48%] images/user_mapping_options.png
copying images... [ 49%] images/table_advanced.png
copying images... [ 49%] images/backup_sections.png
copying images... [ 49%] images/restore_messages.png
copying images... [ 50%] images/package_code.png
copying images... [ 50%] images/extension_general.png
copying images... [ 50%] images/maintenance.png
copying images... [ 51%] images/tablespace_definition.png
copying images... [ 51%] images/foreign_data_wrapper_general.png
copying images... [ 51%] images/column_definition.png
copying images... [ 52%] images/foreign_server_options.png
copying images... [ 52%] images/schema_security.png
copying images... [ 52%] images/type_external.png
copying images... [ 53%] images/materialized_view_sql.png
copying images... [ 53%] images/import_export_miscellaneous.png
copying images... [ 53%] images/ce_not_running.png
copying images... [ 54%] images/language_sql.png
copying images... [ 54%] images/import_export_options.png
copying images... [ 54%] images/primary_key_definition.png
copying images... [ 55%] images/function_parameters.png
copying images... [ 55%] images/rule_sql.png
copying images.

pgAdmin 4 commit: Fix stupid thinko

2018-02-19 Thread Dave Page
Fix stupid thinko

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=8a56eb9cd01265cd81b44fa06ea45b7240a3991a

Modified Files
--
runtime/Server.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)



Build failed in Jenkins: pgadmin4-master-python35 #483

2018-02-19 Thread pgAdmin 4 Jenkins
See 


Changes:

[Dave Page] Python 3 fix for the runtime.

--
[...truncated 494.75 KB...]
copying images... [ 26%] images/foreign_key_action.png
copying images... [ 26%] images/server_group.png
copying images... [ 27%] images/extension_sql.png
copying images... [ 27%] images/role_privileges.png
copying images... [ 27%] images/collation_sql.png
copying images... [ 28%] images/fts_dictionary_options.png
copying images... [ 28%] images/extension_general.png
copying images... [ 28%] images/unique_constraint_general.png
copying images... [ 29%] images/fts_dictionary_general.png
copying images... [ 29%] images/foreign_table_columns.png
copying images... [ 29%] images/table_advanced.png
copying images... [ 30%] images/ce_password_failed.png
copying images... [ 30%] images/schema_default_privileges.png
copying images... [ 30%] images/import_export_complete.png
copying images... [ 31%] images/resource_group_general.png
copying images... [ 31%] images/backup_globals_general.png
copying images... [ 31%] images/synonym_general.png
copying images... [ 32%] images/fts_parser_definition.png
copying images... [ 32%] images/role_membership.png
copying images... [ 32%] images/move_objects_sql.png
copying images... [ 33%] images/main_statistics.png
copying images... [ 33%] images/pgagent_sql.png
copying images... [ 33%] images/tablespace_security.png
copying images... [ 34%] images/editgrid_toolbar.png
copying images... [ 34%] images/schema_security.png
copying images... [ 34%] images/fts_template_general.png
copying images... [ 35%] images/cast_definition.png
copying images... [ 35%] images/main_sql.png
copying images... [ 35%] images/backup_disable.png
copying images... [ 36%] images/foreign_server_options.png
copying images... [ 36%] images/preferences_misc_user_language.png
copying images... [ 36%] images/schema_general.png
copying images... [ 37%] images/logo-right-128.png
copying images... [ 37%] images/type_sql.png
copying images... [ 37%] images/package_security.png
copying images... [ 38%] images/table_constraints.png
copying images... [ 38%] images/pgagent_step_definition_code.png
copying images... [ 38%] images/backup_process_watcher.png
copying images... [ 39%] images/user_mapping_general.png
copying images... [ 39%] images/column_sql.png
copying images... [ 40%] images/materialized_view_sql.png
copying images... [ 40%] images/foreign_key_general.png
copying images... [ 40%] images/editgrid.png
copying images... [ 41%] images/language_definition.png
copying images... [ 41%] images/query_output_explain.png
copying images... [ 41%] images/type_shell.png
copying images... [ 42%] images/unique_constraint_definition.png
copying images... [ 42%] images/debug_main.png
copying images... [ 42%] images/server_advanced.png
copying images... [ 43%] images/trigger_general.png
copying images... [ 43%] images/preferences_browser_display.png
copying images... [ 43%] images/primary_key_definition.png
copying images... [ 44%] images/preferences_debugger_display.png
copying images... [ 44%] images/backup_objects.png
copying images... [ 44%] images/domain_security.png
copying images... [ 45%] images/table_unique.png
copying images... [ 45%] images/maintenance.png
copying images... [ 45%] images/pgadmin_login.png
copying images... [ 46%] images/language_sql.png
copying images... [ 46%] images/sequence_sql.png
copying images... [ 46%] images/foreign_table_definition.png
copying images... [ 47%] images/domain_constraints.png
copying images... [ 47%] images/database_definition.png
copying images... [ 47%] images/role_general.png
copying images... [ 48%] images/ce_error_hba.png
copying images... [ 48%] images/pgagent_schedule_exceptions.png
copying images... [ 48%] images/check_definition.png
copying images... [ 49%] images/trigger_function_definition.png
copying images... [ 49%] images/main_properties_table.png
copying images... [ 49%] images/table_exclude.png
copying images... [ 50%] images/procedure_security.png
copying images... [ 50%] images/pgadmin_login_recover.png
copying images... [ 50%] images/check_general.png
copying images... [ 51%] images/exclusion_constraint_definition.png
copying images... [ 51%] images/pgagent_properties.png
copying images... [ 51%] images/query_output_error.png
copying images... [ 52%] images/domain_constraint_sql.png
copying images... [ 52%] images/fts_configuration_general.png
copying images... [ 52%] images/foreign_key_columns.png
copying images... [ 53%] images/domain_sql.png
copying images... [ 53%] images/preferences_sql_display.png
copying images... [ 53%] images/tablespace_general.png
copying images... [ 54%] images/pgagent_general.png
copying images... [ 54%] images/foreign_table_security.png
copying images... [ 54%] images/pgagent_step_definition.png
copying images... [ 55%] images/table_foreign_key.png
copying images... [ 55%] images/grant_wizard_step1.png
copyi

Jenkins build is back to normal : pgadmin4-master-python26 #611

2018-02-19 Thread pgAdmin 4 Jenkins
See 





Jenkins build is back to normal : pgadmin4-master-python33 #481

2018-02-19 Thread pgAdmin 4 Jenkins
See 





Jenkins build is back to normal : pgadmin4-master-python36 #478

2018-02-19 Thread pgAdmin 4 Jenkins
See 





Jenkins build is back to normal : pgadmin4-master-python34 #474

2018-02-19 Thread pgAdmin 4 Jenkins
See 





Jenkins build is back to normal : pgadmin4-master-python27 #484

2018-02-19 Thread pgAdmin 4 Jenkins
See 





Jenkins build is back to normal : pgadmin4-master-python35 #484

2018-02-19 Thread pgAdmin 4 Jenkins
See 





RM3080 Fix for alignment issue in keyboard preferences

2018-02-19 Thread Harshal Dhumal
Hi,

Please find attached patch to fix alignment issue in keyboard preferences.

-- 
*Harshal Dhumal*
*Sr. Software Engineer*

EnterpriseDB India: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py
index 04065f5..1d0374a 100644
--- a/web/pgadmin/browser/__init__.py
+++ b/web/pgadmin/browser/__init__.py
@@ -214,10 +214,10 @@ class BrowserModule(PgAdminModule):
 category_label=gettext('Properties')
 )
 fields = [
-{'name': 'alt', 'type': 'checkbox', 'label': gettext('Alt / Option')},
+{'name': 'key', 'type': 'keyCode', 'label': gettext('Key')},
 {'name': 'shift', 'type': 'checkbox', 'label': gettext('Shift')},
 {'name': 'control', 'type': 'checkbox', 'label': gettext('Ctrl')},
-{'name': 'key', 'type': 'keyCode', 'label': gettext('Key')}
+{'name': 'alt', 'type': 'checkbox', 'label': gettext('Alt/Option')}
 ]
 
 self.preference.register(
diff --git a/web/pgadmin/tools/debugger/__init__.py b/web/pgadmin/tools/debugger/__init__.py
index e2703ee..305c152 100644
--- a/web/pgadmin/tools/debugger/__init__.py
+++ b/web/pgadmin/tools/debugger/__init__.py
@@ -84,25 +84,24 @@ class DebuggerModule(PgAdminModule):
 
 shortcut_fields = [
 {
-'name': 'alt',
-'type': 'checkbox',
-'label': gettext('Alt/Option')
+'name': 'key',
+'type': 'keyCode',
+'label': gettext('Key')
 },
 {
 'name': 'shift',
 'type': 'checkbox',
 'label': gettext('Shift')
 },
-
 {
 'name': 'control',
 'type': 'checkbox',
 'label': gettext('Ctrl')
 },
 {
-'name': 'key',
-'type': 'keyCode',
-'label': gettext('Key')
+'name': 'alt',
+'type': 'checkbox',
+'label': gettext('Alt/Option')
 }
 ]
 


RM2898 Keyboard navigation in dialog tabs (nav tabs)

2018-02-19 Thread Harshal Dhumal
Hi,

Please find attached patch to enable keyboard navigation in dialog.

To allow navigation from one tab pane (bootstrap tab pane) to another one
I have added two new shortcut preferences *Dialog tab previous *(
shift+control+[ ) and *Dialog tab next* ( shift+control+] ) for backward
and forward tab navigation.

Also all dialog controls (within same tab pane) can be navigated using TAB
key.


-- 
*Harshal Dhumal*
*Sr. Software Engineer*

EnterpriseDB India: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
diff --git a/docs/en_US/keyboard_shortcuts.rst b/docs/en_US/keyboard_shortcuts.rst
index 1142975..f7bf402 100644
--- a/docs/en_US/keyboard_shortcuts.rst
+++ b/docs/en_US/keyboard_shortcuts.rst
@@ -41,6 +41,21 @@ When using main browser window, the following keyboard shortcuts are available:
 | Alt+Shift+G   | Direct debugging   |
 +---++
 
+
+**Dialog tab shortcuts**
+
+When any dialog which has bootstrap tabs (nav tabs) below shortcuts are
+available to navigate within them:
+
++---++
+| Shortcut for all platform | Function   |
++===++
+| Control+Shift+[   | Dialog tab previous|
++---++
+| Control+Shift+]   | Dialog tab next|
++---++
+
+
 **SQL Editors**
 
 When using the syntax-highlighting SQL editors, the following shortcuts are available:
diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py
index 04065f5..1e74e96 100644
--- a/web/pgadmin/browser/__init__.py
+++ b/web/pgadmin/browser/__init__.py
@@ -430,6 +430,36 @@ class BrowserModule(PgAdminModule):
 fields=fields
 )
 
+self.preference.register(
+'keyboard_shortcuts',
+'dialog_tab_next',
+gettext('Dialog tab next'),
+'keyboardshortcut',
+{
+'alt': False,
+'shift': True,
+'control': True,
+'key': {'key_code': 93, 'char': ']'}
+},
+category_label=gettext('Keyboard shortcuts'),
+fields=fields
+)
+
+self.preference.register(
+'keyboard_shortcuts',
+'dialog_tab_previous',
+gettext('Dialog tab previous'),
+'keyboardshortcut',
+{
+'alt': False,
+'shift': True,
+'control': True,
+'key': {'key_code': 91, 'char': '['}
+},
+category_label=gettext('Keyboard shortcuts'),
+fields=fields
+)
+
 def get_exposed_url_endpoints(self):
 """
 Returns:
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index 13af4ea..e166293 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -1951,6 +1951,29 @@ define('pgadmin.browser', [
   brace_matching: pgBrowser.utils.braceMatching,
   indent_with_tabs: pgBrowser.utils.is_indent_with_tabs,
 },
+find_and_set_focus: function(container) {
+  setTimeout(function() {
+var first_el = container
+  .find('button.fa-plus:first');
+
+if (first_el.length == 0) {
+  first_el = container.find('.pgadmin-controls:first')
+  .find('input,.select2-selection,.CodeMirror-scroll');
+}
+
+// don't club textarea with input,select2,codemirror,
+// as it has least precedence.
+
+if (first_el.length == 0) {
+  first_el = container.find('.pgadmin-controls:first').find('textarea');
+}
+
+if(first_el.length > 0) {
+  first_el[0].focus();
+}
+
+  }, 500);
+},
 
   });
 
diff --git a/web/pgadmin/browser/static/js/keyboard.js b/web/pgadmin/browser/static/js/keyboard.js
index 95b77db..ea775d7 100644
--- a/web/pgadmin/browser/static/js/keyboard.js
+++ b/web/pgadmin/browser/static/js/keyboard.js
@@ -27,7 +27,9 @@ function(_, S, pgAdmin, $, Mousetrap) {
   'sub_menu_create': getShortcut(pgBrowser.get_preference('browser', 'sub_menu_create').value),
   'sub_menu_delete': getShortcut(pgBrowser.get_preference('browser', 'sub_menu_delete').value),
   'context_menu': getShortcut(pgBrowser.get_preference('browser', 'context_menu').value),
-  'direct_debugging': getShortcut(pgBrowser.get_preference('browser', 'direct_debugging').value)
+  'direct_debugging': getShortcut(pgBrowser.get_preference('browser'