Re: Fix for debugger issue with EPAS package procedures/functions INOUT params #RM3191
Hi,
Please find the attached updated patch which handles the already saved
debug logs into SQLite database.
Thanks,
Khushboo
On Wed, Aug 29, 2018 at 11:08 AM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:
> Hi Harshal,
>
> On Tue, Aug 28, 2018 at 6:23 PM, Harshal Dhumal <
> harshal.dhu...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Please find attached patch to fix below debugger issues.
>>
>> 1. Allow debugging of EPAS package procedures/functions with INOUT params.
>>
> This is not working in case of OUT parameters. Please refer the attached
> screen shots.
>
>> 2. Add Support for indirect debugging for EPAS package
>> procedures/functions.
>> 3. Allow debugging with NULL param values.
>>
>>
>> Thanks,
>>
>> Thanks,
> Khushboo
>
>> --
>> *Harshal Dhumal*
>> *Sr. Software Engineer*
>>
>> EnterpriseDB India: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>
diff --git a/web/migrations/versions/ca00ec32581b_.py b/web/migrations/versions/ca00ec32581b_.py
new file mode 100644
index 000..2208235
--- /dev/null
+++ b/web/migrations/versions/ca00ec32581b_.py
@@ -0,0 +1,34 @@
+##
+#
+# pgAdmin 4 - PostgreSQL Tools
+#
+# Copyright (C) 2013 - 2018, The pgAdmin Development Team
+# This software is released under the PostgreSQL Licence
+#
+##
+"""
+Deleting old debug logs
+
+Revision ID: ca00ec32581b
+Revises: aa86fb60b73d
+Create Date: 2018-08-29 15:33:57.855491
+
+"""
+
+from pgadmin.model import db
+
+# revision identifiers, used by Alembic.
+revision = 'ca00ec32581b'
+down_revision = 'aa86fb60b73d'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+db.engine.execute(
+'DELETE FROM debugger_function_arguments'
+)
+
+
+def downgrade():
+pass
diff --git a/web/pgadmin/model/__init__.py b/web/pgadmin/model/__init__.py
index f740337..d3b0c54 100644
--- a/web/pgadmin/model/__init__.py
+++ b/web/pgadmin/model/__init__.py
@@ -29,7 +29,7 @@ from flask_sqlalchemy import SQLAlchemy
#
##
-SCHEMA_VERSION = 18
+SCHEMA_VERSION = 19
##
#
diff --git a/web/pgadmin/tools/debugger/static/js/debugger.js b/web/pgadmin/tools/debugger/static/js/debugger.js
index 39caca7..848737c 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger.js
@@ -354,6 +354,24 @@ define([
'func_id': debuggerUtils.getProcedureId(treeInfo),
}
);
+ } else if (d._type == 'edbfunc') {
+// Get the existing function parameters available from sqlite database
+baseUrl = url_for('debugger.initialize_target_for_function', {
+ 'debug_type': 'indirect',
+ 'sid': treeInfo.server._id,
+ 'did': treeInfo.database._id,
+ 'scid': treeInfo.schema._id,
+ 'func_id': treeInfo.edbfunc._id,
+});
+ } else if (d._type == 'edbproc') {
+// Get the existing function parameters available from sqlite database
+baseUrl = url_for('debugger.initialize_target_for_function', {
+ 'debug_type': 'indirect',
+ 'sid': treeInfo.server._id,
+ 'did': treeInfo.database._id,
+ 'scid': treeInfo.schema._id,
+ 'func_id': treeInfo.edbproc._id,
+});
} else if (d._type == 'trigger_function') {
baseUrl = url_for(
'debugger.initialize_target_for_function', {
@@ -449,7 +467,8 @@ define([
i = item || t.selected(),
d = i && i.length == 1 ? t.itemData(i) : undefined,
node = d && pgBrowser.Nodes[d._type],
-self = this;
+self = this,
+is_edb_proc = d._type == 'edbproc';
if (!d)
return;
@@ -465,7 +484,7 @@ define([
// Open Alertify the dialog to take the input arguments from user if function having input arguments
if (res.data[0]['require_input']) {
- get_function_arguments(res.data[0], 0);
+ get_function_arguments(res.data[0], 0, is_edb_proc);
} else {
// Initialize the target and create asynchronous connection and unique transaction ID
// If there is no arguments to the functions then we should not ask for for function arguments and
diff --git a/web/pgadmin/tools/debugger/static/js/debugger_ui.js b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
index 6f6fad5..38f6869 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger_ui.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
@@ -120,14 +120,17 @@ define([
}
};
- var res = function(args, restart_debug) {
+ var res = function(debug_info, restart_debug, is_edb_proc) {
if (!Alertify.debuggerInputArgsDialog) {
Alertify.dialog('debuggerInputArgsDialog', function factory() {
pgAdmin 4 commit: When building the Windows installer, copy system Pyth
When building the Windows installer, copy system Python packages before installing dependencies to ensure we don't end up with older versions than intended. Fixes #3579 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=b7ad95907a92236f9652713ca00cec792ee3cb6a Author: Maxim Zakharov Modified Files -- Make.bat | 6 +++--- docs/en_US/release_notes_3_3.rst | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)
pgAdmin 4 commit: Fixed debugger execution issues:
Fixed debugger execution issues: 1. Allow debugging of EPAS package procedures/functions with INOUT params. 2. Add support for indirect debugging for EPAS package procedures/functions. 3. Allow debugging with NULL param values. 4. Remove saved debug arguments. Fixes #3191 Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=208ee4da8c19a81b5907b436e2eb16a72591234e Author: Harshal Dhumal Modified Files -- docs/en_US/release_notes_3_3.rst | 1 + web/migrations/versions/ca00ec32581b_.py | 34 + web/pgadmin/model/__init__.py | 2 +- web/pgadmin/tools/debugger/static/js/debugger.js | 23 ++- .../tools/debugger/static/js/debugger_ui.js| 167 - .../debugger/sql/get_function_debug_info.sql | 5 - 6 files changed, 150 insertions(+), 82 deletions(-)
Re: Fix for debugger issue with EPAS package procedures/functions INOUT params #RM3191
Thanks patch applied. On Wed, Aug 29, 2018 at 3:42 PM, Khushboo Vashi < khushboo.va...@enterprisedb.com> wrote: > Hi, > > Please find the attached updated patch which handles the already saved > debug logs into SQLite database. > > Thanks, > Khushboo > > On Wed, Aug 29, 2018 at 11:08 AM, Khushboo Vashi < > khushboo.va...@enterprisedb.com> wrote: > >> Hi Harshal, >> >> On Tue, Aug 28, 2018 at 6:23 PM, Harshal Dhumal < >> harshal.dhu...@enterprisedb.com> wrote: >> >>> Hi, >>> >>> Please find attached patch to fix below debugger issues. >>> >>> 1. Allow debugging of EPAS package procedures/functions with INOUT >>> params. >>> >> This is not working in case of OUT parameters. Please refer the attached >> screen shots. >> >>> 2. Add Support for indirect debugging for EPAS package >>> procedures/functions. >>> 3. Allow debugging with NULL param values. >>> >>> >>> Thanks, >>> >>> Thanks, >> Khushboo >> >>> -- >>> *Harshal Dhumal* >>> *Sr. Software Engineer* >>> >>> EnterpriseDB India: http://www.enterprisedb.com >>> The Enterprise PostgreSQL Company >>> >> >> > -- *Akshay Joshi* *Sr. Software Architect * *Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
pgAdmin 4 commit: Fix auto scrolling issue in debugger on step in and s
Fix auto scrolling issue in debugger on step in and step out. Fixes #3554. Branch -- master Details --- https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=283a69a21a6b232677b7c1365b2d17a0f436ac3b Author: Aditya Toshniwal Modified Files -- docs/en_US/release_notes_3_3.rst | 1 + web/pgadmin/static/bundle/codemirror.js| 5 +- web/pgadmin/static/css/bootstrap.overrides.css | 9 +- .../js/codemirror/extension/centre_on_line.js | 7 ++ .../tools/debugger/static/js/debugger_ui.js| 3 +- web/pgadmin/tools/debugger/static/js/direct.js | 95 ++ 6 files changed, 65 insertions(+), 55 deletions(-)
Re: [pgAdmin4][RM3554] Debugger scroll issue for long procedures
Thanks patch applied. On Wed, Aug 29, 2018 at 11:38 AM, Aditya Toshniwal < aditya.toshni...@enterprisedb.com> wrote: > Hi, > > Attached is the updated patch. Fixed linter issues. > > On Wed, Aug 29, 2018 at 11:26 AM Khushboo Vashi < > khushboo.va...@enterprisedb.com> wrote: > >> Hi Aditya, >> >> yarn run bundle gives errors. >> >> yarn run v0.27.5 >> $ yarn run linter && yarn run webpacker >> >> /home/khushboo/Projects/pgadmin4/web/pgadmin/static/bundle/codemirror.js >> 20:28 error Strings must use singlequote quotes >> 22:53 error Strings must use singlequote quotes >> >> Thanks, >> Khushboo >> >> On Wed, Aug 29, 2018 at 11:10 AM, Aditya Toshniwal > enterprisedb.com> wrote: >> >>> Hi Hackers, >>> >>> Attached is the latest patch and will have the following changes: >>> 1) Debugger scrolling issues fixed. Now debugger will scroll to active >>> line and keep the active line in the centre of the editor. >>> 2) Changes to avoid reloading same proc/function again in case of a >>> recursive call. >>> 3) Found one bug where changing the preferences of Debugger to open in >>> new tab was not working. Debugger opened in same tab. This is fixed. >>> >>> Kindly review. >>> >>> On Mon, Aug 27, 2018 at 7:32 PM Aditya Toshniwal >> enterprisedb.com> wrote: >>> Hi Hackers, Attached is the updated patch which also includes code changes to avoid reloading same proc/function again in case of a recursive call. On Mon, Aug 27, 2018 at 6:44 PM Aditya Toshniwal >>> enterprisedb.com> wrote: > Hi Hackers, > > Please hold on with the patch. As discussed and found by Ashesh Vashi, > if we the function called recursively then it is loading the > debugger with source code again which can be avoided and will improve > performance if the function is large. > Will send the updated patch along with the required changes. Thank you > Ashesh. > > On Mon, Aug 27, 2018 at 6:16 PM Aditya Toshniwal enterprisedb.com> wrote: > >> Hi Hackers, >> >> Attached is the patch to make debugger scroll automatically to >> current active line and scroll along with StepIn/StepOut. Previously, we >> had to manually scroll. >> >> Kindly review. >> >> -- >> Thanks and Regards, >> Aditya Toshniwal >> Software Engineer | EnterpriseDB Software Solutions | Pune >> "Don't Complain about Heat, Plant a tree" >> > > > -- > Thanks and Regards, > Aditya Toshniwal > Software Engineer | EnterpriseDB Software Solutions | Pune > "Don't Complain about Heat, Plant a tree" > -- Thanks and Regards, Aditya Toshniwal Software Engineer | EnterpriseDB Software Solutions | Pune "Don't Complain about Heat, Plant a tree" >>> >>> >>> -- >>> Thanks and Regards, >>> Aditya Toshniwal >>> Software Engineer | EnterpriseDB Software Solutions | Pune >>> "Don't Complain about Heat, Plant a tree" >>> >> >> > > -- > Thanks and Regards, > Aditya Toshniwal > Software Engineer | EnterpriseDB Software Solutions | Pune > "Don't Complain about Heat, Plant a tree" > -- *Akshay Joshi* *Sr. Software Architect * *Phone: +91 20-3058-9517Mobile: +91 976-788-8246*
