pgAdmin 4 commit: Allow a banner to be displayed on the login and other

2019-08-01 Thread Dave Page
Allow a banner to be displayed on the login and other related pages showing 
custom text. Fixes #4549

Branch
--
master

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

Modified Files
--
docs/en_US/release_notes_4_12.rst   |  1 +
web/config.py   |  7 +++
web/pgadmin/static/scss/_pgadmin.style.scss | 10 ++
web/pgadmin/templates/security/panel.html   |  5 +
4 files changed, 23 insertions(+)



Re: [RM#4546] Add RE-SQL tests for Column node

2019-08-01 Thread Akshay Joshi
Hi All

I'll review this patch and give my review comments.

On Wed, Jul 31, 2019 at 4:10 PM Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA patch to add RE-SQL tests for Column node.
>
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: 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: Ensure type names are properly encoded in the results

2019-08-01 Thread Dave Page
Ensure type names are properly encoded in the results grid. Fixes #4401

Branch
--
master

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

Modified Files
--
docs/en_US/release_notes_4_12.rst  |  1 +
.../xss_checks_panels_and_query_tool_test.py   |  9 -
web/pgadmin/tools/sqleditor/static/js/sqleditor.js |  5 ++-
web/regression/python_test_utils/test_utils.py | 38 ++
4 files changed, 51 insertions(+), 2 deletions(-)



pgAdmin 4 commit: PEP-8 fix.

2019-08-01 Thread Dave Page
PEP-8 fix.

Branch
--
master

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

Modified Files
--
web/pgadmin/feature_tests/xss_checks_panels_and_query_tool_test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)



pgAdmin 4 commit: Ensure the query tool will work with older versions o

2019-08-01 Thread Dave Page
Ensure the query tool will work with older versions of psycopg2 than we 
officially support, albeit without updateable resultsets. Fixes #4520

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=7b65507533ac1e505786d04378f709451fbddfdf
Author: Yosry Muhammad 

Modified Files
--
docs/en_US/query_tool.rst|  3 +++
docs/en_US/release_notes_4_12.rst|  1 +
web/pgadmin/feature_tests/query_tool_journey_test.py |  6 ++
web/pgadmin/tools/sqleditor/__init__.py  | 20 ++--
web/pgadmin/tools/sqleditor/command.py   |  8 
.../tests/test_is_query_resultset_updatable.py   | 16 +---
.../{ => utils}/tests/test_save_changed_data.py  | 20 
web/regression/python_test_utils/test_utils.py   |  5 +
8 files changed, 54 insertions(+), 25 deletions(-)



pgAdmin 4 commit: Ensure command tags are shown in the messages tab of

2019-08-01 Thread Dave Page
Ensure command tags are shown in the messages tab of the Query Tool. Fixes #4520

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=76e658ee129a49afc74152b57330cf2c2e653e2e
Author: Yosry Muhammad 

Modified Files
--
docs/en_US/release_notes_4_12.rst  |  3 ++-
web/pgadmin/tools/sqleditor/__init__.py| 23 +++---
.../tools/sqleditor/tests/test_view_data.py|  2 +-
.../utils/tests/test_save_changed_data.py  |  2 +-
4 files changed, 16 insertions(+), 14 deletions(-)



pgAdmin 4 commit: Ensure the Query Tool doesn't throw an error when vie

2019-08-01 Thread Dave Page
Ensure the Query Tool doesn't throw an error when viewing the contents of a 
table with no columns. Fixes #4492

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=97e39699ead1005a4a5ef8e986d980df8f743db9
Author: Yosry Muhammad 

Modified Files
--
docs/en_US/release_notes_4_12.rst  | 1 +
web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)



Re: pgAdmin 4 commit: Ensure command tags are shown in the messages tab of

2019-08-01 Thread Yosry Muhammad
I think this fixes #4525 not #4520.

On Thu, Aug 1, 2019, 9:29 AM Dave Page  wrote:

> Ensure command tags are shown in the messages tab of the Query Tool. Fixes
> #4520
>
> Branch
> --
> master
>
> Details
> ---
>
> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=76e658ee129a49afc74152b57330cf2c2e653e2e
> Author: Yosry Muhammad 
>
> Modified Files
> --
> docs/en_US/release_notes_4_12.rst  |  3 ++-
> web/pgadmin/tools/sqleditor/__init__.py| 23
> +++---
> .../tools/sqleditor/tests/test_view_data.py|  2 +-
> .../utils/tests/test_save_changed_data.py  |  2 +-
> 4 files changed, 16 insertions(+), 14 deletions(-)
>
>


Re: Query Tool Fix

2019-08-01 Thread Dave Page
Thanks, all applied.

On Wed, Jul 31, 2019 at 10:30 PM Yosry Muhammad  wrote:

> Please find separate patch files attached. I believe there isn't any
> dependency between the patches.
>
> #4525 and #4529 are duplicates - both are fixed by the patch.
>
> On Wed, Jul 31, 2019 at 3:49 PM Dave Page  wrote:
>
>> Hi
>>
>> On Wed, Jul 31, 2019 at 6:05 AM Aditya Toshniwal <
>> aditya.toshni...@enterprisedb.com> wrote:
>>
>>> Hi Yosry,
>>>
>>> The changes to fix 4520 are in python side. I would suggest if you can
>>> separate it out from this patch, so that we can ask the users(affected by
>>> 4520) to just replace the python files in their installed pgAdmin4. This
>>> fix will not be available till next release, but we can give the workaround
>>> files. Most users are unable to upgrade psycopg2 on their systems.
>>>
>>
>> Agreed. As a general rule, we try to keep to one fix per patch/commit as
>> it makes it much easier to understand changes, especially after some time.
>> Having a stated dependency between patches is fine if that's necessary.
>>
>> Can you split the changes up please?
>>
>> Thanks.
>>
>>
>>>
>>> On Tue, Jul 30, 2019 at 8:10 PM Yosry Muhammad 
>>> wrote:
>>>
 Hi,

 Please find attached a patch with the following bug fixes for the query
 tool:
 - View data not working correctly when the table/view does not contain
 any columns (#4492).
 - Query tool does not produce results when psycopg2 version is below
 2.8 (#4520).
 - Command tags and number of affected rows not shown in the query
 result messages (#4525 and #4529 - duplicates).

 Note that:
 #4524 and #4522 are feature requests for already existing features.

 Please review !
 Thanks


 --
 *Yosry Muhammad Yosry*

 Computer Engineering student,
 The Faculty of Engineering,
 Cairo University (2021).
 Class representative of CMP 2021.
 https://www.linkedin.com/in/yosrym93/

>>>
>>>
>>> --
>>> Thanks and Regards,
>>> Aditya Toshniwal
>>> Software Engineer | EnterpriseDB India | Pune
>>> "Don't Complain about Heat, Plant a TREE"
>>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>
> --
> *Yosry Muhammad Yosry*
>
> Computer Engineering student,
> The Faculty of Engineering,
> Cairo University (2021).
> Class representative of CMP 2021.
> https://www.linkedin.com/in/yosrym93/
>


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

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


pgAdmin 4 commit: Update wcDocker to allow the browser's context menu t

2019-08-01 Thread Dave Page
Update wcDocker to allow the browser's context menu to be used except in tab 
strips and panel headers. Fixes #4229
Update wcDocker to prevent window state loading creating blank dialogues. Fixes 
#4489

Branch
--
master

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

Modified Files
--
docs/en_US/release_notes_4_12.rst | 2 ++
web/package.json  | 2 +-
web/yarn.lock | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)



Re: [pgAdmin][RM4229] Missing "Copy" (and other edit menu items) from data panels

2019-08-01 Thread Dave Page
Thanks, applied.

On Thu, Aug 1, 2019 at 6:42 AM Aditya Toshniwal <
aditya.toshni...@enterprisedb.com> wrote:

> Hi Hackers,
>
> Kindly ignore the previous patch. Attached it the updated patch to move
> wcDocker to latest version.
> This will also solve #4489 - Empty modal window.
>
> On Thu, Aug 1, 2019 at 10:56 AM Aditya Toshniwal <
> aditya.toshni...@enterprisedb.com> wrote:
>
>> Hi Hackers,
>>
>> The pull request https://github.com/EnterpriseDB/wcDocker/pull/12 is
>> merged. This will limit the wcDocker context menu to frame/panel titles.
>> This pull request also changes the tab scroller icon from arrows to
>> chevron and fixing the position of the icons which are not centred
>> currently.
>>
>> Attached patch will update the version to accommodate the changes.
>> Please note, kindly commit "[pgAdmin][RM4489] Empty modal window" before
>> this and this patch is rebased on top of it.
>> "
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> Software Engineer | EnterpriseDB India | Pune
>> "Don't Complain about Heat, Plant a TREE"
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB India | Pune
> "Don't Complain about Heat, Plant a TREE"
>


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

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


Re: pgAdmin 4 commit: Ensure command tags are shown in the messages tab of

2019-08-01 Thread Dave Page
Sigh. Well I can't fix the commit message, but I have updated the correct
ticket.

Thanks.

On Thu, Aug 1, 2019 at 2:39 PM Yosry Muhammad  wrote:

> I think this fixes #4525 not #4520.
>
> On Thu, Aug 1, 2019, 9:29 AM Dave Page  wrote:
>
>> Ensure command tags are shown in the messages tab of the Query Tool.
>> Fixes #4520
>>
>> Branch
>> --
>> master
>>
>> Details
>> ---
>>
>> https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=76e658ee129a49afc74152b57330cf2c2e653e2e
>> Author: Yosry Muhammad 
>>
>> Modified Files
>> --
>> docs/en_US/release_notes_4_12.rst  |  3 ++-
>> web/pgadmin/tools/sqleditor/__init__.py| 23
>> +++---
>> .../tools/sqleditor/tests/test_view_data.py|  2 +-
>> .../utils/tests/test_save_changed_data.py  |  2 +-
>> 4 files changed, 16 insertions(+), 14 deletions(-)
>>
>>

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

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


Ensure View Data mode fetches next rows on scrolling through results when appropriate. Fixes #4536.

2019-08-01 Thread Yosry Muhammad
Hi all,

Please find a patch attached that:

Ensure View Data mode fetches next rows on scrolling through results when
appropriate. Fixes #4536.

Thanks.
-- 
*Yosry Muhammad Yosry*

Computer Engineering student,
The Faculty of Engineering,
Cairo University (2021).
Class representative of CMP 2021.
https://www.linkedin.com/in/yosrym93/
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 5f7fde7c..7f1e0241 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -716,8 +716,6 @@ define('tools.querytool', [
   self.handler.rows_to_disable = new Array();
   // Temporarily hold new rows added
   self.handler.temp_new_rows = new Array();
-  self.handler.has_more_rows = false;
-  self.handler.fetching_rows = false;
 
   // To store primary keys before they gets changed
   self.handler.primary_keys_data = {};
@@ -2247,8 +2245,8 @@ define('tools.querytool', [
 self.on('pgadmin-sqleditor:unindent_selected_code', self._unindent_selected_code, self);
   },
 
-  // This function checks if there is any dirty data in the grid before
-  // it executes the sql query
+  // Checks if there is any dirty data in the grid before
+  // it executes the sql query in View Data mode
   execute_data_query: function() {
 var self = this;
 
@@ -2277,7 +2275,7 @@ define('tools.querytool', [
 }
   },
 
-  // This function makes the ajax call to execute the sql query.
+  // This function makes the ajax call to execute the sql query in View Data mode
   _run_query: function() {
 var self = this,
   url = url_for('sqleditor.view_data_start', {
@@ -2288,6 +2286,9 @@ define('tools.querytool', [
 self.rows_affected = 0;
 self._init_polling_flags();
 
+self.has_more_rows = false;
+self.fetching_rows = false;
+
 self.trigger(
   'pgadmin-sqleditor:loading-icon:show',
   gettext('Running query...')
@@ -3665,8 +3666,8 @@ define('tools.querytool', [
 }
   },
 
-  // This function will fetch the sql query from the text box
-  // and execute the query.
+  // Checks if there is any dirty data in the grid before
+  // it executes the sql query in Query Tool mode
   execute: function(explain_prefix, shouldReconnect=false) {
 var self = this;
 
@@ -3695,6 +3696,7 @@ define('tools.querytool', [
 }
   },
 
+  // Executes sql query in the editor in Query Tool mode
   _execute_sql_query: function(explain_prefix, shouldReconnect) {
 var self = this, sql = '';
 


[pgAdmin][RM4552] Dragging the selected text in SQL editor throws console errors

2019-08-01 Thread Aditya Toshniwal
Hi Hackers,

Attached is the patch to fix the issue where dragging a selected text in
SQL editor throws console errors and does not move the text.

As an improvement, the patch also fixes a potential issue where importing
jquery.event.drag will override drag events and will break drag and drop
feature. Currently jquery.event.drag is not imported. Changes are made to
use vanilla addEventListener instead of jquery on() to attach drag related
events to avoid conflict.

Kindly review.

-- 
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB India | Pune
"Don't Complain about Heat, Plant a TREE"


RM4552.patch
Description: Binary data


Re: [RM#4546] Add RE-SQL tests for Column node

2019-08-01 Thread Akshay Joshi
Hi Murtuza

Following test cases are missing:

   - Primary Key column.
   - Variable options.
   - Precision and Collation.
   - Identity column with 'GENERATED AS BY DEFAULT'.
   - ALTER column with identity values like CYCLE, minimum, maximum etc..
   instead of updating comments in such test cases.
   - Generated expression should use existing columns if possible like
   (col1 * col2).

Apart from that can you please look into *RM #4500 *which seems minor
issue. Please send separate patch for both.

On Thu, Aug 1, 2019 at 5:36 PM Akshay Joshi 
wrote:

> Hi All
>
> I'll review this patch and give my review comments.
>
> On Wed, Jul 31, 2019 at 4:10 PM Murtuza Zabuawala <
> murtuza.zabuaw...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> PFA patch to add RE-SQL tests for Column node.
>>
>>
>> --
>> Regards,
>> Murtuza Zabuawala
>> EnterpriseDB: 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*
>


-- 
*Thanks & Regards*
*Akshay Joshi*

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


[Help] Modifying get_columns.sql template

2019-08-01 Thread Yosry Muhammad
Hi hackers!

I was wondering if modifying the query in: get_columns.sql @
pgadmin/tools/sqleditor/templates/sql/default/
to also SELECT attnum (attribute number) in addition to the already
SELECTed columns will break any code or tests?

I know this template is used in multiple places throughout the code and
tests and I don't completely understand all the parts it is used in.

Can someone guide in terms of whether or not this will break anything? If
so, what parts of the code do I need to update?

Thanks.