public inbox for [email protected]
help / color / mirror / Atom feed[pgAdmin][RM-6797]: SQL code displayed in second line for function, procedure and trigger function
2+ messages / 2 participants
[nested] [flat]
* [pgAdmin][RM-6797]: SQL code displayed in second line for function, procedure and trigger function
@ 2021-10-07 05:53 Nikhil Mohite <[email protected]>
0 siblings, 1 reply; 2+ messages in thread
From: Nikhil Mohite @ 2021-10-07 05:53 UTC (permalink / raw)
To: pgadmin-hackers
Hi Hackers,
Please find the attached patch for RM-6797:
<https://redmine.postgresql.org/issues/6797; SQL code displayed in second
line for function, procedure and trigger function
--
*Thanks & Regards,*
*Nikhil Mohite*
*Software Engineer.*
*EDB Postgres* <https://www.enterprisedb.com/;
*Mob.No: +91-7798364578.*
Attachments:
[application/octet-stream] RM-6797.patch (3.4K, 3-RM-6797.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
index 331fca29..cf34ab73 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
@@ -843,7 +843,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
# Get SQL to create Function
status, sql = self._get_sql(gid=gid, sid=sid, did=did, scid=scid,
- data=self.request)
+ data=self.request,
+ allow_code_formatting=False)
if not status:
return internal_server_error(errormsg=sql)
@@ -951,7 +952,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
"""
status, sql = self._get_sql(gid=gid, sid=sid, did=did, scid=scid,
- data=self.request, fnid=fnid)
+ data=self.request, fnid=fnid,
+ allow_code_formatting=False)
if not status:
return internal_server_error(errormsg=sql)
@@ -1372,7 +1374,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
data['merged_variables'].append(v)
def _get_sql_for_edit_mode(self, data, parallel_dict, all_ids_dict,
- vol_dict):
+ vol_dict, allow_code_formatting=True):
"""
This function is used to get the sql for edit mode.
:param data:
@@ -1453,7 +1455,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
else:
FunctionView._merge_variables(data)
- self.reformat_prosrc_code(data)
+ if allow_code_formatting:
+ self.reformat_prosrc_code(data)
sql = render_template(
"/".join([self.sql_template_path, self._UPDATE_SQL]),
@@ -1476,6 +1479,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
fnid = kwargs.get('fnid', None)
is_sql = kwargs.get('is_sql', False)
is_schema_diff = kwargs.get('is_schema_diff', False)
+ allow_code_formatting = kwargs.get('allow_code_formatting', True)
vol_dict = {'v': 'VOLATILE', 's': 'STABLE', 'i': 'IMMUTABLE'}
parallel_dict = {'u': 'UNSAFE', 's': 'SAFE', 'r': 'RESTRICTED'}
@@ -1500,7 +1504,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
'is_schema_diff': is_schema_diff,
}
status, errmsg, sql = self._get_sql_for_edit_mode(
- data, parallel_dict, all_ids_dict, vol_dict)
+ data, parallel_dict, all_ids_dict, vol_dict,
+ allow_code_formatting=allow_code_formatting)
if not status:
return False, errmsg
@@ -1524,7 +1529,8 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
data['func_args_without'] = ', '.join(args_without_name)
- self.reformat_prosrc_code(data)
+ if allow_code_formatting:
+ self.reformat_prosrc_code(data)
# Create mode
sql = render_template("/".join([self.sql_template_path,
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: [pgAdmin][RM-6797]: SQL code displayed in second line for function, procedure and trigger function
@ 2021-10-07 12:35 Akshay Joshi <[email protected]>
parent: Nikhil Mohite <[email protected]>
0 siblings, 0 replies; 2+ messages in thread
From: Akshay Joshi @ 2021-10-07 12:35 UTC (permalink / raw)
To: Nikhil Mohite <[email protected]>; +Cc: pgadmin-hackers
Thanks, the patch applied.
On Thu, Oct 7, 2021 at 11:23 AM Nikhil Mohite <
[email protected]> wrote:
> Hi Hackers,
>
> Please find the attached patch for RM-6797:
> <https://redmine.postgresql.org/issues/6797; SQL code displayed in second
> line for function, procedure and trigger function
>
>
> --
> *Thanks & Regards,*
> *Nikhil Mohite*
> *Software Engineer.*
> *EDB Postgres* <https://www.enterprisedb.com/;
> *Mob.No: +91-7798364578.*
>
--
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Principal Software Architect*
*EDB Postgres <http://edbpostgres.com>*
*Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~2021-10-07 12:35 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2021-10-07 05:53 [pgAdmin][RM-6797]: SQL code displayed in second line for function, procedure and trigger function Nikhil Mohite <[email protected]>
2021-10-07 12:35 ` Akshay Joshi <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox