Обсуждение: Query Tool JS Minimal Refactoring

Hi hackers,

Please find attached a patch with minimal refactoring of:

web/pgadmin/tools/sqleditor/static/js/sqleditor.js

This includes merging 2 redundant functions into one and renaming some functions to have more expressive and consistent names.

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/

Hi Yosry

Jasmine tests are failing, can you please fix those and resend the patch. 

On Fri, Aug 16, 2019 at 11:23 PM Yosry Muhammad <yosrym93@gmail.com> wrote:

Hi hackers,

Please find attached a patch with minimal refactoring of:

web/pgadmin/tools/sqleditor/static/js/sqleditor.js

This includes merging 2 redundant functions into one and renaming some functions to have more expressive and consistent names.

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

Akshay Joshi

Sr. Software Architect

EnterpriseDB Software India Private Limited

Mobile: +91 976-788-8246

Jasmine tests passed on my machine, I will take another look once I have access to my machine.

On Mon, Aug 19, 2019, 7:57 AM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:

Hi Yosry

Jasmine tests are failing, can you please fix those and resend the patch. 

On Fri, Aug 16, 2019 at 11:23 PM Yosry Muhammad <yosrym93@gmail.com> wrote:

Hi hackers,

Please find attached a patch with minimal refactoring of:

web/pgadmin/tools/sqleditor/static/js/sqleditor.js

This includes merging 2 redundant functions into one and renaming some functions to have more expressive and consistent names.

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

Akshay Joshi

Sr. Software Architect

EnterpriseDB Software India Private Limited

Mobile: +91 976-788-8246

Please find an updated patch attached.

On Mon, Aug 19, 2019 at 9:54 AM Yosry Muhammad <yosrym93@gmail.com> wrote:

Jasmine tests passed on my machine, I will take another look once I have access to my machine.

On Mon, Aug 19, 2019, 7:57 AM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:

Hi Yosry

Jasmine tests are failing, can you please fix those and resend the patch. 

On Fri, Aug 16, 2019 at 11:23 PM Yosry Muhammad <yosrym93@gmail.com> wrote:

Hi hackers,

Please find attached a patch with minimal refactoring of:

web/pgadmin/tools/sqleditor/static/js/sqleditor.js

This includes merging 2 redundant functions into one and renaming some functions to have more expressive and consistent names.

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

Akshay Joshi

Sr. Software Architect

EnterpriseDB Software India Private Limited

Mobile: +91 976-788-8246

--

Yosry Muhammad Yosry

Computer Engineering student,

The Faculty of Engineering,

Cairo University (2021).

Class representative of CMP 2021.

https://www.linkedin.com/in/yosrym93/

Hi Yosry,

This breaks the reconnect for query tool. Open a query tool, execute some query and then restart the python server. Go to the query tool and click execute. It will show a warning, on continuing it should connect again. It throws exception in browser console:

Uncaught TypeError: Cannot read property 'apply' of undefined
    at Object.eval (VM69935 sqleditor.js:1769)
    at Object.callback (alertify.js:3347)
    at triggerCallback (alertify.js:1220)
    at Object.buttonsClickHandler (alertify.js:1241)
    at HTMLDivElement.eval (alertify.js:299)

On Thu, Aug 22, 2019 at 11:44 PM Yosry Muhammad <yosrym93@gmail.com> wrote:

Please find an updated patch attached.

On Mon, Aug 19, 2019 at 9:54 AM Yosry Muhammad <yosrym93@gmail.com> wrote:

Jasmine tests passed on my machine, I will take another look once I have access to my machine.

On Mon, Aug 19, 2019, 7:57 AM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:

Hi Yosry

Jasmine tests are failing, can you please fix those and resend the patch. 

On Fri, Aug 16, 2019 at 11:23 PM Yosry Muhammad <yosrym93@gmail.com> wrote:

Hi hackers,

Please find attached a patch with minimal refactoring of:

web/pgadmin/tools/sqleditor/static/js/sqleditor.js

This includes merging 2 redundant functions into one and renaming some functions to have more expressive and consistent names.

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

Akshay Joshi

Sr. Software Architect

EnterpriseDB Software India Private Limited

Mobile: +91 976-788-8246

--

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"

Please find an updated patch attached.

On Fri, Aug 23, 2019 at 7:57 AM Aditya Toshniwal <aditya.toshniwal@enterprisedb.com> wrote:

Hi Yosry,

This breaks the reconnect for query tool. Open a query tool, execute some query and then restart the python server. Go to the query tool and click execute. It will show a warning, on continuing it should connect again. It throws exception in browser console:

Uncaught TypeError: Cannot read property 'apply' of undefined
    at Object.eval (VM69935 sqleditor.js:1769)
    at Object.callback (alertify.js:3347)
    at triggerCallback (alertify.js:1220)
    at Object.buttonsClickHandler (alertify.js:1241)
    at HTMLDivElement.eval (alertify.js:299)

On Thu, Aug 22, 2019 at 11:44 PM Yosry Muhammad <yosrym93@gmail.com> wrote:

Please find an updated patch attached.

On Mon, Aug 19, 2019 at 9:54 AM Yosry Muhammad <yosrym93@gmail.com> wrote:

Jasmine tests passed on my machine, I will take another look once I have access to my machine.

On Mon, Aug 19, 2019, 7:57 AM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:

Hi Yosry

Jasmine tests are failing, can you please fix those and resend the patch. 

On Fri, Aug 16, 2019 at 11:23 PM Yosry Muhammad <yosrym93@gmail.com> wrote:

Hi hackers,

Please find attached a patch with minimal refactoring of:

web/pgadmin/tools/sqleditor/static/js/sqleditor.js

This includes merging 2 redundant functions into one and renaming some functions to have more expressive and consistent names.

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

Akshay Joshi

Sr. Software Architect

EnterpriseDB Software India Private Limited

Mobile: +91 976-788-8246

--

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"

--

Yosry Muhammad Yosry

Computer Engineering student,

The Faculty of Engineering,

Cairo University (2021).

Class representative of CMP 2021.

https://www.linkedin.com/in/yosrym93/

Hi

On Fri, Aug 23, 2019 at 11:28 AM Aditya Toshniwal <aditya.toshniwal@enterprisedb.com> wrote:

Hi Yosry,

The v3 patch has changes like:

diff --git a/docs/en_US/release_notes_4_13.rst b/docs/en_US/release_notes_4_13.rst
index bc21dfeca..a0a3a38ef 100644
--- a/docs/en_US/release_notes_4_13.rst
+++ b/docs/en_US/release_notes_4_13.rst
@@ -22,5 +22,4 @@ Bug fixes
 | `Issue #2706 <https://redmine.postgresql.org/issues/2706>`_ -  Added ProjectSet icon for explain module.
 | `Issue #2828 <https://redmine.postgresql.org/issues/2828>`_ -  Added Gather Merge, Named Tuple Store Scan and Table Function Scan icon for explain module.
 | `Issue #4643 <https://redmine.postgresql.org/issues/4643>`_ -  Fix Truncate option deselect issue for compound triggers.
-| `Issue #4644 <https://redmine.postgresql.org/issues/4644>`_ -  Fix length and precision enable/disable issue when changing the data type for Domain node.
-| `Issue #4650 <https://redmine.postgresql.org/issues/4650>`_ -  Fix SQL tab issue for Views. It's a regression of compound triggers.
\ No newline at end of file
+| `Issue #4644 <https://redmine.postgresql.org/issues/4644>`_ -  Fix length and precision enable/disable issue when changing the data type for Domain node.
\ No newline at end of file
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

Looks like some other patch got mixed up.

Anyway, I've removed these changes and have attached the updated patch (v4) ready for commit. Everything looks good to me.

Like the editable columns patch, this one no longer applies.

Can we have a rebased version please?

Thanks! 

--

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

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

Thanks - I assume this is dependent on the updatable columns patch, as the JS tests fail if I apply it to the current GIT head?

On Fri, Aug 23, 2019 at 1:07 PM Yosry Muhammad <yosrym93@gmail.com> wrote:

Please find an updated patch attached.

On Fri, Aug 23, 2019 at 1:23 PM Dave Page <dpage@pgadmin.org> wrote:

Hi

On Fri, Aug 23, 2019 at 11:28 AM Aditya Toshniwal <aditya.toshniwal@enterprisedb.com> wrote:

Hi Yosry,

The v3 patch has changes like:

diff --git a/docs/en_US/release_notes_4_13.rst b/docs/en_US/release_notes_4_13.rst
index bc21dfeca..a0a3a38ef 100644
--- a/docs/en_US/release_notes_4_13.rst
+++ b/docs/en_US/release_notes_4_13.rst
@@ -22,5 +22,4 @@ Bug fixes
 | `Issue #2706 <https://redmine.postgresql.org/issues/2706>`_ -  Added ProjectSet icon for explain module.
 | `Issue #2828 <https://redmine.postgresql.org/issues/2828>`_ -  Added Gather Merge, Named Tuple Store Scan and Table Function Scan icon for explain module.
 | `Issue #4643 <https://redmine.postgresql.org/issues/4643>`_ -  Fix Truncate option deselect issue for compound triggers.
-| `Issue #4644 <https://redmine.postgresql.org/issues/4644>`_ -  Fix length and precision enable/disable issue when changing the data type for Domain node.
-| `Issue #4650 <https://redmine.postgresql.org/issues/4650>`_ -  Fix SQL tab issue for Views. It's a regression of compound triggers.
\ No newline at end of file
+| `Issue #4644 <https://redmine.postgresql.org/issues/4644>`_ -  Fix length and precision enable/disable issue when changing the data type for Domain node.
\ No newline at end of file
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

Looks like some other patch got mixed up.

Anyway, I've removed these changes and have attached the updated patch (v4) ready for commit. Everything looks good to me.

Like the editable columns patch, this one no longer applies.

Can we have a rebased version please?

Thanks! 

--

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

No it isn't. I just needed to update JS tests after the latest modification and merging with master. Please find an updated patch attached, sorry for the inconvenience.

On Fri, Aug 23, 2019 at 3:47 PM Dave Page <dpage@pgadmin.org> wrote:

Thanks - I assume this is dependent on the updatable columns patch, as the JS tests fail if I apply it to the current GIT head?

On Fri, Aug 23, 2019 at 1:07 PM Yosry Muhammad <yosrym93@gmail.com> wrote:

Please find an updated patch attached.

On Fri, Aug 23, 2019 at 1:23 PM Dave Page <dpage@pgadmin.org> wrote:

Hi

On Fri, Aug 23, 2019 at 11:28 AM Aditya Toshniwal <aditya.toshniwal@enterprisedb.com> wrote:

Hi Yosry,

The v3 patch has changes like:

diff --git a/docs/en_US/release_notes_4_13.rst b/docs/en_US/release_notes_4_13.rst
index bc21dfeca..a0a3a38ef 100644
--- a/docs/en_US/release_notes_4_13.rst
+++ b/docs/en_US/release_notes_4_13.rst
@@ -22,5 +22,4 @@ Bug fixes
 | `Issue #2706 <https://redmine.postgresql.org/issues/2706>`_ -  Added ProjectSet icon for explain module.
 | `Issue #2828 <https://redmine.postgresql.org/issues/2828>`_ -  Added Gather Merge, Named Tuple Store Scan and Table Function Scan icon for explain module.
 | `Issue #4643 <https://redmine.postgresql.org/issues/4643>`_ -  Fix Truncate option deselect issue for compound triggers.
-| `Issue #4644 <https://redmine.postgresql.org/issues/4644>`_ -  Fix length and precision enable/disable issue when changing the data type for Domain node.
-| `Issue #4650 <https://redmine.postgresql.org/issues/4650>`_ -  Fix SQL tab issue for Views. It's a regression of compound triggers.
\ No newline at end of file
+| `Issue #4644 <https://redmine.postgresql.org/issues/4644>`_ -  Fix length and precision enable/disable issue when changing the data type for Domain node.
\ No newline at end of file
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

Looks like some other patch got mixed up.

Anyway, I've removed these changes and have attached the updated patch (v4) ready for commit. Everything looks good to me.

Like the editable columns patch, this one no longer applies.

Can we have a rebased version please?

Thanks! 

--

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

--

Yosry Muhammad Yosry

Computer Engineering student,

The Faculty of Engineering,

Cairo University (2021).

Class representative of CMP 2021.

https://www.linkedin.com/in/yosrym93/