Re: RM3694-If database is already connected and click on database then connect database should not displayed in Menu

2020-05-04 Thread Satish V
Hi Khushboo,

As we discussed, the database disconnection error message is ignored as it
is getting displayed as expected. Variable name , info_already_connected,
is changed to already_connected. Run all the test cases except the feature
test. Number of test case failures before and after the patch remain the
same.

Thanks,
Sathish V

On Mon, May 4, 2020 at 12:04 AM Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi Satish,
>
> On Thu, Apr 30, 2020 at 8:29 PM Satish V 
> wrote:
>
>> Hi Khushboo,
>>
>> In the attached patch,
>> Fixed pep8 and made use of 'gettext' inside "database.js" file...
>> Regarding *res.info ='Database already connected', **we
>> are appending the database name and server name in front of 'res.info
>> ' string in the very next line. So using this 'Database
>> already connected' text directly inside alertify will stop it from showing
>> the info pertaining to the server and database. -* no changes are done
>> about res.info.
>>
>> The database disconnection error comes without a database name. To
> reproduce this issue, perform the steps in this RM and then try to
> disconnect the database.
> Also, please give the proper variable name as we discussed.
>
> Thanks,
> Khushboo
>
> Thanks
>
>> Sathish
>>
>> On Thu, Apr 30, 2020 at 7:40 AM Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>> Hi Satish,
>>>
>>> Some minor comments:
>>>
>>> - Fix PEP8 issues.
>>> - Use gettext in database.js file for the info message.
>>> - No need to assign text value in res object (res.info = 'Database
>>> already connected.'), use this text directly in Alertify.info.
>>>
>>> Thanks,
>>> Khushboo
>>>
>>>
>>>
>>>
>>>
>>> On Thu, Apr 30, 2020 at 1:59 PM Satish V 
>>> wrote:
>>>
 Hi,

 I made the changes to the code such that conn.connect() will happen
 only when there is no prior connection exist. In short, connection via
 context menu will not trigger this conn.connect().
 In the client side code, instead of error alert, info alert is used to
 inform the user.

 Kindly review the patch and suggest the changes if required.

 Thanks,
 Sathish V

 On Thu, Apr 30, 2020 at 2:43 AM Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

>
>
> On Thu, Apr 30, 2020 at 12:04 PM Aditya Toshniwal <
> aditya.toshni...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> On Thu, Apr 30, 2020 at 11:55 AM Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>>
>>>
>>> On Thu, Apr 30, 2020 at 10:55 AM Aditya Toshniwal <
>>> aditya.toshni...@enterprisedb.com> wrote:
>>>
 Hi,

 On Thu, Apr 30, 2020 at 10:48 AM Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

>
>
> On Thu, Apr 30, 2020 at 10:14 AM Aditya Toshniwal <
> aditya.toshni...@enterprisedb.com> wrote:
>
>> Hi,
>>
>>
>> On Thu, Apr 30, 2020 at 9:41 AM Satish V <
>> satis...@enterprisedb.com> wrote:
>>
>>> Hi Kushboo,
>>>
>>> Thanks for the update. I will check the same and make
>>> appropriate changes.
>>>
>>> Thanks,
>>> Sathish
>>>
>>> On Thu, Apr 30, 2020 at 9:20 AM Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>
 Hi Satish,

 As per the RM, the fix is supposed to be at the front-end but
 it seems difficult at the moment as on the selection of the 
 database, we
 connect it and at the same time the context menu is being called.
 As you have tried to fix at the backend, some of the review
 comments are below.

 1.  If the database is already connected, no need to call
 conn.connect again.


 info_already_connected = conn.connected()

 status, errmsg = conn.connect()

 I've noticed conn.connected() is misleading sometimes. Let's
>> say if the PG server is stopped and no query is fired from pgadmin 
>> after
>> that, then conn.connected() will still give True. It is updated
>> only when a query is fired to the PG server. I would suggest let it 
>> connect
>> again as there is no harm and this function is very important. We 
>> don't
>> want to mess it up for the sake of a message.
>>
> It's true that conn.connected() is misleading but we already get
> the connection before checking conn.connected() with conn =
> manager.connection(did=did, auto_reconnect=True).
> So, if the database server is stopped, it will throw the error.
>
 I just checked the manager.connection function, and it is not
 connecting or checkin

pgAdmin 4 commit: Ensure that file browse home button should point to /

2020-05-04 Thread Akshay Joshi
Ensure that file browse home button should point to /Users/akshayjoshi rather 
than /. Fixes #4279

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=cc2e3ece7ae412254408a45104a2f0fbeef55647
Author: Yogesh Jain 

Modified Files
--
docs/en_US/release_notes_4_22.rst  |  1 +
web/pgadmin/misc/file_manager/__init__.py  |  8 
web/pgadmin/misc/file_manager/static/js/utility.js | 18 +++---
.../templates/file_manager/js/file_manager_config.json |  3 ++-
4 files changed, 18 insertions(+), 12 deletions(-)



pgAdmin 4 commit: Ensure that the dependencies tab shows correct inform

2020-05-04 Thread Akshay Joshi
Ensure that the dependencies tab shows correct information for Synonyms. Fixes 
#5422

Branch
--
master

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

Modified Files
--
docs/en_US/release_notes.rst |  1 +
docs/en_US/release_notes_4_22.rst| 20 
.../servers/databases/schemas/synonyms/__init__.py   |  8 ++--
3 files changed, 23 insertions(+), 6 deletions(-)



pgAdmin 4 commit: Gracefully informed the user that the database is alr

2020-05-04 Thread Akshay Joshi
Gracefully informed the user that the database is already connected when they 
click on 'Connect Database...'. Fixes #3694

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=d61b8eb1b39f2256a196827d5152f6ac520bb13d
Author: Satish V 

Modified Files
--
docs/en_US/release_notes_4_22.rst  |  1 +
.../server_groups/servers/databases/__init__.py| 49 --
.../servers/databases/static/js/database.js| 11 +++--
3 files changed, 35 insertions(+), 26 deletions(-)



pgAdmin 4 commit: Add Reverse Engineered and Modified SQL tests for Col

2020-05-04 Thread Akshay Joshi
Add Reverse Engineered and Modified SQL tests for Column and Type.

Branch
--
master

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

Modified Files
--
.../columns/tests/10_plus/alter_column_char.msql   | 15 +
.../tests/10_plus/alter_column_drop_identity.msql  |  2 +
.../alter_column_drop_identity_by_default.msql |  2 +
.../tests/10_plus/alter_column_identity.msql   |  7 +++
.../10_plus/alter_column_identity_by_default.msql  |  8 +++
.../columns/tests/10_plus/alter_column_int.msql|  9 +++
.../tests/10_plus/alter_column_numeric.msql|  9 +++
.../tests/10_plus/alter_column_remove_length.msql  |  2 +
.../columns/tests/10_plus/create_column_char.msql  |  5 ++
.../columns/tests/10_plus/create_column_int.msql   |  5 ++
.../tests/10_plus/create_column_int_identity.msql  |  5 ++
.../create_column_int_identity_by_default.msql |  5 ++
.../tests/10_plus/create_column_numeric.msql   |  9 +++
.../schemas/tables/columns/tests/10_plus/test.json | 52 
.../columns/tests/12_plus/alter_column_char.msql   | 15 +
.../tests/12_plus/alter_column_drop_identity.msql  |  2 +
.../alter_column_drop_identity_by_default.msql |  2 +
.../tests/12_plus/alter_column_generated.msql  |  7 +++
...ter_column_generated_with_existing_columns.msql |  7 +++
.../tests/12_plus/alter_column_identity.msql   |  7 +++
.../12_plus/alter_column_identity_by_default.msql  |  8 +++
.../columns/tests/12_plus/alter_column_int.msql|  9 +++
.../tests/12_plus/alter_column_numeric.msql|  9 +++
.../tests/12_plus/alter_column_remove_length.msql  |  2 +
.../columns/tests/12_plus/create_column_char.msql  |  5 ++
.../columns/tests/12_plus/create_column_int.msql   |  5 ++
.../tests/12_plus/create_column_int_generated.msql |  5 ++
...column_int_generated_with_existing_columns.msql |  5 ++
.../tests/12_plus/create_column_int_identity.msql  |  5 ++
.../create_column_int_identity_by_default.msql |  5 ++
.../tests/12_plus/create_column_numeric.msql   |  9 +++
.../schemas/tables/columns/tests/12_plus/test.json | 70 --
.../columns/tests/default/alter_column_char.msql   | 15 +
.../columns/tests/default/alter_column_int.msql|  9 +++
.../tests/default/alter_column_numeric.msql|  9 +++
.../tests/default/alter_column_remove_length.msql  |  2 +
.../columns/tests/default/create_column_char.msql  |  5 ++
.../columns/tests/default/create_column_int.msql   |  5 ++
.../tests/default/create_column_numeric.msql   |  9 +++
.../schemas/tables/columns/tests/default/test.json | 28 ++---
.../alter_composite_type_acl_description.msql  |  4 ++
.../default/alter_composite_type_add_member.msql   |  2 +
.../alter_composite_type_remove_member.msql|  2 +
.../default/alter_enum_type_acl_description.msql   |  4 ++
.../types/tests/default/alter_enum_type_label.msql |  2 +
.../default/alter_range_type_acl_description.msql  |  4 ++
.../default/alter_shell_type_acl_description.msql  |  2 +
.../types/tests/default/create_composite_type.msql |  6 ++
.../types/tests/default/create_enum_type.msql  |  2 +
.../types/tests/default/create_range_type.msql |  4 ++
.../types/tests/default/create_shell_type.msql |  1 +
.../schemas/types/tests/default/tests.json | 44 ++
52 files changed, 423 insertions(+), 48 deletions(-)



pgAdmin 4 commit: Fixed an issue where select2 hover is inconsistent fo

2020-05-04 Thread Akshay Joshi
Fixed an issue where select2 hover is inconsistent for the SSL field in create 
server dialog. Fixes #5469

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=5fe7813f9fc43bb3e8ff1ccf9f272c8861de0026
Author: Ganesh Jaybhay 

Modified Files
--
docs/en_US/release_notes_4_22.rst | 3 ++-
web/pgadmin/browser/server_groups/servers/static/js/server.js | 6 +-
2 files changed, 7 insertions(+), 2 deletions(-)



Re: [pgAdmin4][Patch] - RM 5422 - Synonym Dependencies tab shows incorrect data

2020-05-04 Thread Akshay Joshi
Thanks, patch applied.

On Wed, Apr 29, 2020 at 1:29 PM Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi Navnath,
>
> On Wed, Apr 29, 2020 at 12:16 PM navnath gadakh <
> navnath.gad...@enterprisedb.com> wrote:
>
>> Hi Khushboo,
>>
>>  Patch looks good to me except there are no API test cases written for
>> dependents and dependencies.
>>
>> Thanks for the review.
> We don't have API test cases for dependents and dependencies for none of
> the objects.
> If the team agrees, I will create a separate RM for that.
>
> Thanks,
> Khushboo
>
>> Thanks!
>>
>> On Wed, Apr 29, 2020 at 10:40 AM navnath gadakh <
>> navnath.gad...@enterprisedb.com> wrote:
>>
>>> Hi ,
>>>
>>>  I'm reviewing this task.
>>>
>>> On Wed, Apr 29, 2020 at 9:36 AM Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>
 Hi,

 Please find the attached patch to fix the RM 5422 - Synonym
 Dependencies tab shows incorrect data.

 Thanks,
 Khushboo

>>>
>>>
>>> --
>>> Regards,
>>> Navnath Gadakh
>>>
>>
>>
>> --
>> Regards,
>> Navnath Gadakh
>>
>

-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


Re: [pgAdmin][RM4279] : Issue with File Browser Home button

2020-05-04 Thread Akshay Joshi
Thanks, patch applied.

On Wed, Apr 29, 2020 at 5:26 PM Yogesh Jain 
wrote:

> Hi all,
>
> Here is an updated patch as per the review comments mentioned above.
>
> Please review the updated patch.
> PFA.
>


-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


Re: [pgAdmin4] RESQL tests for Column & Type nodes

2020-05-04 Thread Akshay Joshi
Thanks, patch applied.

On Thu, Apr 30, 2020 at 11:11 AM navnath gadakh <
navnath.gad...@enterprisedb.com> wrote:

> Hi Murtuza,
>
>  Patch looks good to me.
>
> Thanks!
>
> On Wed, Apr 29, 2020 at 2:38 PM navnath gadakh <
> navnath.gad...@enterprisedb.com> wrote:
>
>> I will review and test it.
>>
>> On Wed, Apr 29, 2020 at 2:27 PM Murtuza Zabuawala <
>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> PFA patch to add RESQL tests for Column and Type nodes.
>>>
>>>
>>> --
>>> Regards,
>>> Murtuza Zabuawala
>>> EnterpriseDB: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>>
>>
>> --
>> Regards,
>> Navnath Gadakh
>>
>
>
> --
> Regards,
> Navnath Gadakh
>


-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


Re: RM3694-If database is already connected and click on database then connect database should not displayed in Menu

2020-05-04 Thread Akshay Joshi
Thanks, patch applied.

On Mon, May 4, 2020 at 12:47 PM Satish V  wrote:

> Hi Khushboo,
>
> As we discussed, the database disconnection error message is ignored as it
> is getting displayed as expected. Variable name , info_already_connected,
> is changed to already_connected. Run all the test cases except the feature
> test. Number of test case failures before and after the patch remain the
> same.
>
> Thanks,
> Sathish V
>
> On Mon, May 4, 2020 at 12:04 AM Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi Satish,
>>
>> On Thu, Apr 30, 2020 at 8:29 PM Satish V 
>> wrote:
>>
>>> Hi Khushboo,
>>>
>>> In the attached patch,
>>> Fixed pep8 and made use of 'gettext' inside "database.js" file...
>>> Regarding *res.info ='Database already connected', **we
>>> are appending the database name and server name in front of 'res.info
>>> ' string in the very next line. So using this 'Database
>>> already connected' text directly inside alertify will stop it from showing
>>> the info pertaining to the server and database. -* no changes are done
>>> about res.info.
>>>
>>> The database disconnection error comes without a database name. To
>> reproduce this issue, perform the steps in this RM and then try to
>> disconnect the database.
>> Also, please give the proper variable name as we discussed.
>>
>> Thanks,
>> Khushboo
>>
>> Thanks
>>
>>> Sathish
>>>
>>> On Thu, Apr 30, 2020 at 7:40 AM Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>
 Hi Satish,

 Some minor comments:

 - Fix PEP8 issues.
 - Use gettext in database.js file for the info message.
 - No need to assign text value in res object (res.info = 'Database
 already connected.'), use this text directly in Alertify.info.

 Thanks,
 Khushboo





 On Thu, Apr 30, 2020 at 1:59 PM Satish V 
 wrote:

> Hi,
>
> I made the changes to the code such that conn.connect() will happen
> only when there is no prior connection exist. In short, connection via
> context menu will not trigger this conn.connect().
> In the client side code, instead of error alert, info alert is used to
> inform the user.
>
> Kindly review the patch and suggest the changes if required.
>
> Thanks,
> Sathish V
>
> On Thu, Apr 30, 2020 at 2:43 AM Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>>
>>
>> On Thu, Apr 30, 2020 at 12:04 PM Aditya Toshniwal <
>> aditya.toshni...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> On Thu, Apr 30, 2020 at 11:55 AM Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>


 On Thu, Apr 30, 2020 at 10:55 AM Aditya Toshniwal <
 aditya.toshni...@enterprisedb.com> wrote:

> Hi,
>
> On Thu, Apr 30, 2020 at 10:48 AM Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>>
>>
>> On Thu, Apr 30, 2020 at 10:14 AM Aditya Toshniwal <
>> aditya.toshni...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>>
>>> On Thu, Apr 30, 2020 at 9:41 AM Satish V <
>>> satis...@enterprisedb.com> wrote:
>>>
 Hi Kushboo,

 Thanks for the update. I will check the same and make
 appropriate changes.

 Thanks,
 Sathish

 On Thu, Apr 30, 2020 at 9:20 AM Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

> Hi Satish,
>
> As per the RM, the fix is supposed to be at the front-end but
> it seems difficult at the moment as on the selection of the 
> database, we
> connect it and at the same time the context menu is being called.
> As you have tried to fix at the backend, some of the review
> comments are below.
>
> 1.  If the database is already connected, no need to call
> conn.connect again.
>
>
> info_already_connected = conn.connected()
>
> status, errmsg = conn.connect()
>
> I've noticed conn.connected() is misleading sometimes. Let's
>>> say if the PG server is stopped and no query is fired from pgadmin 
>>> after
>>> that, then conn.connected() will still give True. It is updated
>>> only when a query is fired to the PG server. I would suggest let it 
>>> connect
>>> again as there is no harm and this function is very important. We 
>>> don't
>>> want to mess it up for the sake of a message.
>>>
>> It's true that conn.connected() is misleading but we already get
>> the connection before checking conn.connected() with conn =
>>

Re: [pgAdmin][5469] SSL mode dropdown hover in create server dialog is not consistent with other select2

2020-05-04 Thread Akshay Joshi
Thanks, patch applied.

On Mon, May 4, 2020 at 11:01 AM Ganesh Jaybhay <
ganesh.jayb...@enterprisedb.com> wrote:

> Hi Hackers,
>
> Please find the attached minor patch to fix the issue with select2 hover
> consistency for SSL mode field(SSL tab) in create server dialog.
>
> Please review.
>
> Regards,
> Ganesh Jaybhay
>


-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


pgAdmin 4 commit: Correct ipv4 "all interfaces" address in the containe

2020-05-04 Thread Dave Page
Correct ipv4 "all interfaces" address in the container docs, per Frank Limpert. 
Fixes #5466

Branch
--
master

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

Modified Files
--
docs/en_US/container_deployment.rst | 2 +-
docs/en_US/release_notes_4_22.rst   | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)



Re: Cleanup runtime qmake code

2020-05-04 Thread Akshay Joshi
Hi Dave

Patch looks good to me except one small change in the README file that is
PGADMIN_PYTHON_PATH is mentioned but it should be PGADMIN_PYTHON_DIR

On Fri, May 1, 2020 at 8:29 PM Dave Page  wrote:

> The attached patch tidies up the qmake code for configuring the runtime
> build so that it's consistent on all platforms, and simply requires that
> the PGADMIN_PYTHON_DIR environment variable points to the Python
> installation to be used.
>
> Please review, but don't commit, as this change will probably break some
> of the Jenkins jobs. I'll commit and fix them when the patch has passed
> review.
>
> (Sidenote: this is part of a larger tidy up/standardisation of the build
> scripts).
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>


-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


pgAdmin 4 commit: Cleanup Python detection in the runtime project file.

2020-05-04 Thread Dave Page
Cleanup Python detection in the runtime project file. Fixes #5444

Branch
--
master

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

Modified Files
--
Make.bat  |   2 +-
README|  66 
docs/en_US/release_notes_4_22.rst |   1 +
pkg/linux/build-functions.sh  |   4 +-
pkg/mac/build.sh  |   6 +-
runtime/pgAdmin4.pro  | 153 +-
6 files changed, 127 insertions(+), 105 deletions(-)



Re: [pgAdmin 4 - Housekeeping #5255] Implement Selenium Grid using multi-threading & solenoid using current test framework

2020-05-04 Thread Akshay Joshi
Hi Yogesh

The patch is not applied to the master branch. Can you please rebase and
send the patch again.

On Fri, May 1, 2020 at 12:28 PM Yogesh Mahajan <
yogesh.maha...@enterprisedb.com> wrote:

> Hi,
>
> Please find updated patch modified according to review comments -
> Patch implements below things -
> 1.Enable the current framework to provide option to execute Feature tests
> in parallel  on selenium grid set up.
>- Addition of new switch to start parallel features tests.
>- New parameters with respect to selenoid in test_config.json.in
>- Addition of new script to check solenoid updates.
>
>
>
> Thanks,
> Yogesh Mahajan
> QA - Team
> EnterpriseDB Corporation
>
> Phone: +91-9741705709
>
>
> On Tue, Apr 21, 2020 at 1:18 PM Shubham Agarwal <
> shubham.agar...@enterprisedb.com> wrote:
>
>> Hi Yogesh,
>> Below are the review comments-
>>
>> 1. runtests.py
>> a. The exception traceback logic at line number 653 in runtests.py
>> is not correct since it is particular to the thread
>> but there is much more code in that block which can throw some exception.
>> b. line number 447 -> The drop_database function will only try to drop
>> the database with the name which is newly created
>> at 431 line number, its probability is 1% instead of this you can write a
>> logic so that it will drop all the database which starts with name
>> ‘acceptance_test_db'.
>>   c. line 584 - Why we are including resql test case execution in GUI
>> execution logic.
>> d. Change the function name run_test as script name is also
>> runtests.py
>>
>> 2. test_utils.py
>> a. Remove the headless chrome code from get_remote_webdriver() in
>> test_utils.py since we are using solenoid and it is not required anymore.
>> b. Create separate functions to instantiate the firefox driver and
>> chrome driver logic since the same code is used in multiple files.
>> c. launch_url_in_browser() -> you can simplify the definition of the
>> function like:
>> retry = 60
>> *while *retry > 0:
>> try:
>> driver.get(url)
>> except WebDriverException:
>>  retry -= 1
>> 3. Execution logs are not printing as per the logic some time, I ran the
>> suite for two servers and attached are the execution logs.
>> 4. Readme -
>> Please provide the Valid selenoid URL to be provided in the
>> test_config.json, with all the steps mentioned in the readme it is not
>> clear.
>> Revisit the readme and write the missing steps.
>> 5. copy_selected_query_results_feature_tests.py-
>> Create the function to avoid duplicate code. The code for pasting the
>> values is repeating 8 times in the test code.
>> 6. Provide the valid docstring in newly introduced functions and also
>> valid comments while calling it. for ex.- _update_preference() function is
>> introduced in pg_utilities_backup_restrore_test.py but from the function
>> name, it is not clear what preferences are going to update in it.
>> 7. test_index_constraint_add test case is failing due to the latest
>> change, please merge and update this test case
>>
>> On Thu, Apr 16, 2020 at 2:41 PM navnath gadakh <
>> navnath.gad...@enterprisedb.com> wrote:
>>
>>> Hi,
>>> I think I am not the right person to review this patch now as I already
>>> reviewed this code offline in the last week. I know the approached Yogesh
>>> has followed, also given some review comments on it.
>>> Someone else please review it.
>>>
>>> Thanks!
>>>
>>> On Mon, Apr 13, 2020 at 2:49 PM Akshay Joshi <
>>> akshay.jo...@enterprisedb.com> wrote:
>>>
 Hi Navnath

 Can you please review it?

 On Mon, Apr 13, 2020 at 2:40 PM Yogesh Mahajan <
 yogesh.maha...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch for running *features tests* using
> solenoid(selenium grid + docker).
> KIndly review.
> To sun feature tests in parallel, required prerequisites can be
> checked in '~/web/regression/README' file.
> Also detailed instructions are added in the same file.
> After applying the patch, any existing process for execution of
> API/Features tests remains the same.
>
>
> Thanks,
> Yogesh Mahajan
> QA - Team
> EnterpriseDB Corporation
>
> Phone: +91-9741705709
>


 --
 *Thanks & Regards*
 *Akshay Joshi*

 *Sr. Software Architect*
 *EnterpriseDB Software India Private Limited*
 *Mobile: +91 976-788-8246*

>>>
>>>
>>> --
>>> Regards,
>>> Navnath Gadakh
>>>
>>
>>
>> --
>> Thanks & Regards,
>> Shubham Agarwal
>> EnterpriseDB Corporation
>>
>> The Postgres Database Company
>>
>

-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


Re: Cleanup runtime qmake code

2020-05-04 Thread Dave Page
Hi

On Mon, May 4, 2020 at 10:03 AM Akshay Joshi 
wrote:

> Hi Dave
>
> Patch looks good to me except one small change in the README file that is
> PGADMIN_PYTHON_PATH is mentioned but it should be PGADMIN_PYTHON_DIR
>

I kept mixing those up :-(

I've committed the patch, and made a couple of changes to Jenkins jobs
where I thought necessary. Hopefully nothing breaks too much!

Thanks!


>
> On Fri, May 1, 2020 at 8:29 PM Dave Page  wrote:
>
>> The attached patch tidies up the qmake code for configuring the runtime
>> build so that it's consistent on all platforms, and simply requires that
>> the PGADMIN_PYTHON_DIR environment variable points to the Python
>> installation to be used.
>>
>> Please review, but don't commit, as this change will probably break some
>> of the Jenkins jobs. I'll commit and fix them when the patch has passed
>> review.
>>
>> (Sidenote: this is part of a larger tidy up/standardisation of the build
>> scripts).
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
>
> *Sr. Software Architect*
> *EnterpriseDB Software India Private Limited*
> *Mobile: +91 976-788-8246*
>


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

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


Re: Patch to remove Python 2.7 support in the macOS Appbundle

2020-05-04 Thread Dave Page
Here's a rebased version.

On Mon, May 4, 2020 at 7:33 AM Akshay Joshi 
wrote:

> Hi Dave
>
> On Fri, May 1, 2020 at 5:21 PM Dave Page  wrote:
>
>> Akshay, are you happy with this patch?
>>
>
>The patch is not applied to the latest code.
>
>>
>> On Mon, Apr 27, 2020 at 3:30 PM Dave Page  wrote:
>>
>>>
>>>
>>> On Mon, Apr 27, 2020 at 3:28 PM Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>
 Hi,

 The code looks good to me. The package building was tested by Neel and
 we found that the venv was built with Python 3+ but the runtime was built
 against Python 2.7.
 As per Dave, Neel may have not used a venv of the correct version as it
 is working fine on Dav'e system. So, we can commit the patch.

>>>
>>> Yeah, that's not ideal, but the same problem exists today. I need to
>>> spend some time figuring out how to make that more robust.
>>>
>>> --
>>> 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
>>
>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
>
> *Sr. Software Architect*
> *EnterpriseDB Software India Private Limited*
> *Mobile: +91 976-788-8246*
>


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

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


Remove_support_for_building_against_Python_2_7_and_the_system_Python_installation_on_macOS_v2.patch
Description: Binary data


pgAdmin 4 commit: Raise an exception under Python < 3.4 for WSGI mode.

2020-05-04 Thread Akshay Joshi
Raise an exception under Python < 3.4 for WSGI mode.

refs #5443

Branch
--
master

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

Modified Files
--
web/pgAdmin4.wsgi | 4 
1 file changed, 4 insertions(+)



Re: Patch to remove Python 2.7 support in the macOS Appbundle

2020-05-04 Thread Akshay Joshi
Hi Dave

Patch looks good to me except the below line gets commented by mistake (if
i am not wrong)

# ./complete-bundle.sh "${BUILDROOT}/${APP_BUNDLE_NAME}" || { echo
complete-bundle.sh failed; exit 1; }


On Mon, May 4, 2020 at 3:02 PM Dave Page  wrote:

> Here's a rebased version.
>
> On Mon, May 4, 2020 at 7:33 AM Akshay Joshi 
> wrote:
>
>> Hi Dave
>>
>> On Fri, May 1, 2020 at 5:21 PM Dave Page  wrote:
>>
>>> Akshay, are you happy with this patch?
>>>
>>
>>The patch is not applied to the latest code.
>>
>>>
>>> On Mon, Apr 27, 2020 at 3:30 PM Dave Page  wrote:
>>>


 On Mon, Apr 27, 2020 at 3:28 PM Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> The code looks good to me. The package building was tested by Neel and
> we found that the venv was built with Python 3+ but the runtime was built
> against Python 2.7.
> As per Dave, Neel may have not used a venv of the correct version as
> it is working fine on Dav'e system. So, we can commit the patch.
>

 Yeah, that's not ideal, but the same problem exists today. I need to
 spend some time figuring out how to make that more robust.

 --
 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
>>>
>>
>>
>> --
>> *Thanks & Regards*
>> *Akshay Joshi*
>>
>> *Sr. Software Architect*
>> *EnterpriseDB Software India Private Limited*
>> *Mobile: +91 976-788-8246*
>>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>


-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


pgAdmin 4 commit: Remove support for building the macOS appbundle with

2020-05-04 Thread Dave Page
Remove support for building the macOS appbundle with Python 2.7. Refs #5443

Branch
--
master

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

Modified Files
--
pkg/mac/build.sh | 52 
1 file changed, 12 insertions(+), 40 deletions(-)



pgAdmin 4 commit: Remove support for Python 2. Fixes #5443

2020-05-04 Thread Dave Page
Remove support for Python 2. Fixes #5443

Branch
--
master

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

Modified Files
--
docs/en_US/release_notes_4_22.rst   |  1 +
web/pgadmin/utils/driver/psycopg2/server_manager.py | 13 ++---
2 files changed, 3 insertions(+), 11 deletions(-)



pgAdmin 4 commit: Fixed post-login redirect location when running in se

2020-05-04 Thread Dave Page
Fixed post-login redirect location when running in server mode under a 
non-default root. Fixes #5473

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=370094274c8cfe98c4744e99b00236263a4c4db5
Author: Aditya Toshniwal 

Modified Files
--
docs/en_US/release_notes_4_22.rst| 1 +
web/pgadmin/authenticate/__init__.py | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)



pgAdmin 4 commit: Refactor pgAdmin4.py so it can be imported and is a l

2020-05-04 Thread Dave Page
Refactor pgAdmin4.py so it can be imported and is a lot more readable. Fixes 
#5455

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=059f1e38cc94b3c8e2659a8751afbd220393b0ef
Author: Aditya Toshniwal 

Modified Files
--
docs/en_US/release_notes_4_22.rst |   1 +
pkg/pip/setup_pip.py  |   2 +-
web/pgAdmin4.py   | 144 +++---
3 files changed, 74 insertions(+), 73 deletions(-)



Re: Patch to remove Python 2.7 support in the macOS Appbundle

2020-05-04 Thread Dave Page
Thanks, applied.

On Mon, May 4, 2020 at 10:59 AM Akshay Joshi 
wrote:

> Hi Dave
>
> Patch looks good to me except the below line gets commented by mistake (if
> i am not wrong)
>
> # ./complete-bundle.sh "${BUILDROOT}/${APP_BUNDLE_NAME}" || { echo 
> complete-bundle.sh failed; exit 1; }
>
>
> On Mon, May 4, 2020 at 3:02 PM Dave Page  wrote:
>
>> Here's a rebased version.
>>
>> On Mon, May 4, 2020 at 7:33 AM Akshay Joshi <
>> akshay.jo...@enterprisedb.com> wrote:
>>
>>> Hi Dave
>>>
>>> On Fri, May 1, 2020 at 5:21 PM Dave Page  wrote:
>>>
 Akshay, are you happy with this patch?

>>>
>>>The patch is not applied to the latest code.
>>>

 On Mon, Apr 27, 2020 at 3:30 PM Dave Page  wrote:

>
>
> On Mon, Apr 27, 2020 at 3:28 PM Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> The code looks good to me. The package building was tested by Neel
>> and we found that the venv was built with Python 3+ but the runtime was
>> built against Python 2.7.
>> As per Dave, Neel may have not used a venv of the correct version as
>> it is working fine on Dav'e system. So, we can commit the patch.
>>
>
> Yeah, that's not ideal, but the same problem exists today. I need to
> spend some time figuring out how to make that more robust.
>
> --
> 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

>>>
>>>
>>> --
>>> *Thanks & Regards*
>>> *Akshay Joshi*
>>>
>>> *Sr. Software Architect*
>>> *EnterpriseDB Software India Private Limited*
>>> *Mobile: +91 976-788-8246*
>>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
>
> *Sr. Software Architect*
> *EnterpriseDB Software India Private Limited*
> *Mobile: +91 976-788-8246*
>


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

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