pgAdmin 4 commit: Prevent the filter dialog CodeMirror from overflowing

2018-01-31 Thread Dave Page
Prevent the filter dialog CodeMirror from overflowing onto the button bar of 
the dialog. Fixes #3067

Branch
--
master

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

Modified Files
--
web/pgadmin/tools/datagrid/static/js/datagrid.js  | 5 +++--
web/pgadmin/tools/datagrid/templates/datagrid/filter.html | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)



Re: [pgAdmin4][RM#3067] To fix codemirror scroll alignment

2018-01-31 Thread Dave Page
Thanks, applied.

On Tue, Jan 30, 2018 at 11:24 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch to fix the issue where CodeMirror text overlaps in data view
> filter dialog.
>
> --
> 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


Re: RM2815: Relogin to pgAdmin from sqleditor/datadrid if session exprires

2018-01-31 Thread Dave Page
Hi

Can you rebase this please? It doesn't apply.

On Wed, Jan 31, 2018 at 6:42 AM, Harshal Dhumal <
harshal.dhu...@enterprisedb.com> wrote:

> Hi Dave,
>
> Please find updated patch for RM2815
>
> issues fixed in updated patch
>
> 1. Warn user before executing query if connection was reset.
> 2. Improved warning dialog.
> 3. Do not show multiple dialogs while recovering from expired session or
> connect reset.
> 4. User should not be clicking multiple times on execute button to execute
> query if
> connect was lost or user session was expired.
>
>
> [image: Inline image 1]
>
>
> --
> *Harshal Dhumal*
> *Sr. Software Engineer*
>
> EnterpriseDB India: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
> On Mon, Jan 15, 2018 at 11:09 PM, Dave Page  wrote:
>
>> Hi
>>
>> On Mon, Jan 15, 2018 at 10:54 AM, Harshal Dhumal
>>  wrote:
>> >
>> > Hi Dave,
>> >
>> > Please find rebased patch.
>> >
>> > Also I have made changes to existing code about showing connection
>> status in query tool to make this work.
>>
>>
>> I ran the feature tests a couple of times, and in both cases got the
>> following error:
>>
>> ==
>> ERROR: runTest (pgadmin.feature_tests.view_da
>> ta_dml_queries.CheckForViewDataTest)
>> Validate Insert, Update operations in View/Edit data with given test data
>> --
>> Traceback (most recent call last):
>>   File "/Users/dpage/git/pgadmin4/web/pgadmin/feature_tests/view_
>> data_dml_queries.py",
>> line 115, in runTest
>> self._verify_row_data(True)
>>   File "/Users/dpage/git/pgadmin4/web/pgadmin/feature_tests/view_
>> data_dml_queries.py",
>> line 289, in _verify_row_data
>> self.page.find_by_id("btn-flash").click()
>>   File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packa
>> ges/selenium/webdriver/remote/webelement.py",
>> line 80, in click
>> self._execute(Command.CLICK_ELEMENT)
>>   File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packa
>> ges/selenium/webdriver/remote/webelement.py",
>> line 501, in _execute
>> return self._parent.execute(command, params)
>>   File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packa
>> ges/selenium/webdriver/remote/webdriver.py",
>> line 308, in execute
>> self.error_handler.check_response(response)
>>   File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packa
>> ges/selenium/webdriver/remote/errorhandler.py",
>> line 194, in check_response
>> raise exception_class(message, screen, stacktrace)
>> WebDriverException: Message: unknown error: Element > id="btn-flash" type="button" class="btn btn-default" style="width:
>> 40px;" title="Execute/Refresh (F5)">... is not clickable at
>> point (514, 20). Other element would receive the click: > class="ajs-modal" tabindex="0">...
>>   (Session info: chrome=63.0.3239.132)
>>   (Driver info: chromedriver=2.35.528157
>> (4429ca2590d6988c0745c24c8858745aaaec01ef),platform=Mac OS X 10.12.6
>> x86_64)
>>
>> I've attached a screenshot from the test run.
>>
>> Thanks, Dave
>>
>> --
>> 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


pgAdmin 4 commit: PEP8 fixes for the utils module. Fixes #3076

2018-01-31 Thread Dave Page
PEP8 fixes for the utils module. Fixes #3076

Branch
--
master

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

Modified Files
--
web/pgadmin/utils/__init__.py  |   4 +-
web/pgadmin/utils/ajax.py  |  16 +-
web/pgadmin/utils/driver/abstract.py   |  21 +-
web/pgadmin/utils/driver/psycopg2/__init__.py  | 292 +++--
.../utils/driver/psycopg2/generate_keywords.py |   3 +-
web/pgadmin/utils/driver/psycopg2/keywords.py  | 472 ++---
web/pgadmin/utils/driver/psycopg2/typecast.py  |  53 ++-
web/pgadmin/utils/driver/registry.py   |   6 +-
web/pgadmin/utils/html.py  |   2 +-
web/pgadmin/utils/javascript/javascript_bundler.py |   6 +-
.../javascript/tests/test_javascript_bundler.py|  26 +-
web/pgadmin/utils/menu.py  |   8 +-
web/pgadmin/utils/paths.py |  11 +-
web/pgadmin/utils/preferences.py   |  16 +-
web/pgadmin/utils/route.py |   9 +-
web/pgadmin/utils/session.py   |  29 +-
web/pgadmin/utils/sqlautocomplete/autocomplete.py  | 242 +++
web/pgadmin/utils/sqlautocomplete/completion.py|   7 +-
web/pgadmin/utils/sqlautocomplete/counter.py   |  17 +-
.../utils/sqlautocomplete/function_metadata.py |  23 +-
web/pgadmin/utils/sqlautocomplete/parseutils.py|  67 +--
.../utils/tests/test_versioned_template_loader.py  | 189 ++---
web/pgadmin/utils/versioned_template_loader.py |  17 +-
23 files changed, 1075 insertions(+), 461 deletions(-)



Re: [pgAdmin4][RM#3076] Fix PEP-8 issues in Utility module

2018-01-31 Thread Dave Page
Thanks, applied.

On Wed, Jan 31, 2018 at 10:24 AM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch to fix PEP-8 issues in Utility module's python code.
>
> To verify the changes,
> 1) activate virtual environemt
> 2) Navigate to ../web directory and run following
> pycodestyle --config=.pycodestyle ./pgadmin/utils/
>
>
> --
> 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


Re: RM2815: Relogin to pgAdmin from sqleditor/datadrid if session exprires

2018-01-31 Thread Dave Page
Sorry - I think we broke it again. It looks simple to fix, but I'm about to
board a flight so can you update again please?

Thanks.

On Wed, Jan 31, 2018 at 11:17 AM, Harshal Dhumal <
harshal.dhu...@enterprisedb.com> wrote:

> Hi,
>
> On Wed, Jan 31, 2018 at 3:47 PM, Dave Page  wrote:
>
>> Hi
>>
>> Can you rebase this please? It doesn't apply.
>>
> Please find attached updated patch.
>
>
>
>>
>> On Wed, Jan 31, 2018 at 6:42 AM, Harshal Dhumal <
>> harshal.dhu...@enterprisedb.com> wrote:
>>
>>> Hi Dave,
>>>
>>> Please find updated patch for RM2815
>>>
>>> issues fixed in updated patch
>>>
>>> 1. Warn user before executing query if connection was reset.
>>> 2. Improved warning dialog.
>>> 3. Do not show multiple dialogs while recovering from expired session or
>>> connect reset.
>>> 4. User should not be clicking multiple times on execute button to
>>> execute query if
>>> connect was lost or user session was expired.
>>>
>>>
>>> [image: Inline image 1]
>>>
>>>
>>> --
>>> *Harshal Dhumal*
>>> *Sr. Software Engineer*
>>>
>>> EnterpriseDB India: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>> On Mon, Jan 15, 2018 at 11:09 PM, Dave Page  wrote:
>>>
 Hi

 On Mon, Jan 15, 2018 at 10:54 AM, Harshal Dhumal
  wrote:
 >
 > Hi Dave,
 >
 > Please find rebased patch.
 >
 > Also I have made changes to existing code about showing connection
 status in query tool to make this work.


 I ran the feature tests a couple of times, and in both cases got the
 following error:

 ==
 ERROR: runTest (pgadmin.feature_tests.view_da
 ta_dml_queries.CheckForViewDataTest)
 Validate Insert, Update operations in View/Edit data with given test
 data
 --
 Traceback (most recent call last):
   File "/Users/dpage/git/pgadmin4/web/pgadmin/feature_tests/view_da
 ta_dml_queries.py",
 line 115, in runTest
 self._verify_row_data(True)
   File "/Users/dpage/git/pgadmin4/web/pgadmin/feature_tests/view_da
 ta_dml_queries.py",
 line 289, in _verify_row_data
 self.page.find_by_id("btn-flash").click()
   File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packa
 ges/selenium/webdriver/remote/webelement.py",
 line 80, in click
 self._execute(Command.CLICK_ELEMENT)
   File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packa
 ges/selenium/webdriver/remote/webelement.py",
 line 501, in _execute
 return self._parent.execute(command, params)
   File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packa
 ges/selenium/webdriver/remote/webdriver.py",
 line 308, in execute
 self.error_handler.check_response(response)
   File "/Users/dpage/.virtualenvs/pgadmin4/lib/python2.7/site-packa
 ges/selenium/webdriver/remote/errorhandler.py",
 line 194, in check_response
 raise exception_class(message, screen, stacktrace)
 WebDriverException: Message: unknown error: Element >>> id="btn-flash" type="button" class="btn btn-default" style="width:
 40px;" title="Execute/Refresh (F5)">... is not clickable at
 point (514, 20). Other element would receive the click: >>> class="ajs-modal" tabindex="0">...
   (Session info: chrome=63.0.3239.132)
   (Driver info: chromedriver=2.35.528157
 (4429ca2590d6988c0745c24c8858745aaaec01ef),platform=Mac OS X 10.12.6
 x86_64)

 I've attached a screenshot from the test run.

 Thanks, Dave

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

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

>>>
>>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>


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

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