pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix function signature generation. Fixes #1683

pull/3/head
Surinder Kumar 2016-09-12 15:20:46 +01:00 committed by Dave Page
parent ffc58b74d2
commit f2ed6fa4dd
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
View File

@ -906,34 +906,34 @@ class FunctionView(PGChildNodeView, DataTypeReader):
resp_data = self._fetch_properties(gid, sid, did, scid, fnid) resp_data = self._fetch_properties(gid, sid, did, scid, fnid)
# Fetch the function definition. # Fetch the function definition.
args = u'' args = u''
args_without_name = u'' args_without_name = []
cnt = 1 cnt = 1
args_list = [] args_list = []
if 'arguments' in resp_data and len(resp_data['arguments']) > 0: if 'arguments' in resp_data and len(resp_data['arguments']) > 0:
args_list = resp_data['arguments'] args_list = resp_data['arguments']
resp_data['args'] = resp_data['arguments'] resp_data['args'] = resp_data['arguments']
for a in args_list: for a in args_list:
if (('argmode' in a and a['argmode'] != 'OUT' and if (('argmode' in a and a['argmode'] != 'OUT' and
a['argmode'] is not None a['argmode'] is not None
) or 'argmode' not in a): ) or 'argmode' not in a):
if 'argmode' in a: if 'argmode' in a:
args += a['argmode'] + " " args += a['argmode'] + " "
args_without_name += a['argmode'] + " "
if 'argname' in a and a['argname'] != '' \ if 'argname' in a and a['argname'] != '' \
and a['argname'] is not None: and a['argname'] is not None:
args += self.qtIdent( args += self.qtIdent(
self.conn, a['argname']) + " " self.conn, a['argname']) + " "
if 'argtype' in a: if 'argtype' in a:
args += a['argtype'] args += a['argtype']
args_without_name += a['argtype'] args_without_name.append(a['argtype'])
if cnt < len(args_list): if cnt < len(args_list):
args += ', ' args += ', '
args_without_name += ', '
cnt += 1 cnt += 1
resp_data['func_args'] = args.strip(' ') resp_data['func_args'] = args.strip(' ')
resp_data['func_args_without'] = args_without_name.strip(' ')
resp_data['func_args_without'] = ', '.join(args_without_name)
if self.node_type == 'procedure': if self.node_type == 'procedure':
object_type = 'procedure' object_type = 'procedure'
@ -1158,7 +1158,7 @@ class FunctionView(PGChildNodeView, DataTypeReader):
data['acl'] = parse_priv_to_db(data['acl'], ["X"]) data['acl'] = parse_priv_to_db(data['acl'], ["X"])
args = u'' args = u''
args_without_name = u'' args_without_name = []
cnt = 1 cnt = 1
args_list = [] args_list = []
if 'arguments' in data and len(data['arguments']) > 0: if 'arguments' in data and len(data['arguments']) > 0:
@ -1171,28 +1171,26 @@ class FunctionView(PGChildNodeView, DataTypeReader):
) or 'argmode' not in a): ) or 'argmode' not in a):
if 'argmode' in a: if 'argmode' in a:
args += a['argmode'] + " " args += a['argmode'] + " "
args_without_name += a['argmode'] + " "
if 'argname' in a and a['argname'] != '' \ if 'argname' in a and a['argname'] != '' \
and a['argname'] is not None: and a['argname'] is not None:
args += self.qtIdent( args += self.qtIdent(
self.conn, a['argname']) + " " self.conn, a['argname']) + " "
if 'argtype' in a: if 'argtype' in a:
args += a['argtype'] args += a['argtype']
args_without_name += a['argtype'] args_without_name.append(a['argtype'])
if cnt < len(args_list): if cnt < len(args_list):
args += ', ' args += ', '
args_without_name += ', '
cnt += 1 cnt += 1
data['func_args'] = args.strip(' ') data['func_args'] = args.strip(' ')
data['func_args_without'] = args_without_name.strip(' ')
data['func_args_without'] = ', '.join(args_without_name)
# Create mode # Create mode
SQL = render_template("/".join([self.sql_template_path, SQL = render_template("/".join([self.sql_template_path,
'create.sql']), 'create.sql']),
data=data, is_sql=is_sql) data=data, is_sql=is_sql)
return True, SQL.strip('\n') return True, SQL.strip('\n')
def _fetch_properties(self, gid, sid, did, scid, fnid=None): def _fetch_properties(self, gid, sid, did, scid, fnid=None):
""" """
Return Function Properties which will be used in properties, Return Function Properties which will be used in properties,