diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py index 8b2aa4654..a3c666aef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py @@ -698,8 +698,7 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare): return SQL.strip('\n'), data['name'] @check_precondition - def sql(self, gid, sid, did, scid, coid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, coid, **kwargs): """ This function will generates reverse engineered sql for collation object @@ -713,6 +712,9 @@ class CollationView(PGChildNodeView, SchemaDiffObjectCompare): diff_schema: Target Schema for schema diff json_resp: True then return json response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) + SQL = render_template("/".join([self.template_path, 'properties.sql']), scid=scid, coid=coid) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py index 7f7e24eb3..1e66f86d4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py @@ -690,8 +690,7 @@ AND relkind != 'c'))""" ) @check_precondition - def sql(self, gid, sid, did, scid, doid=None, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, doid=None, **kwargs): """ Returns the SQL for the Domain object. @@ -704,6 +703,8 @@ AND relkind != 'c'))""" diff_schema: Target Schema for schema diff json_resp: True then return json response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) SQL = render_template("/".join([self.template_path, 'properties.sql']), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py index b1b75a1e6..f60affadc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py @@ -818,8 +818,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, return internal_server_error(errormsg=str(e)) @check_precondition - def sql(self, gid, sid, did, scid, foid=None, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, foid=None, **kwargs): """ Returns the SQL for the Foreign Table object. @@ -832,6 +831,9 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, diff_schema: Target Schema for schema diff json_resp: True then return json response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) + status, data = self._fetch_properties(gid, sid, did, scid, foid, inherits=True) if not status: diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py index e319ad3ef..304666df4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py @@ -876,8 +876,7 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare): ) @check_precondition - def sql(self, gid, sid, did, scid, cfgid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, cfgid, **kwargs): """ This function will reverse generate sql for sql panel :param gid: group id @@ -888,6 +887,9 @@ class FtsConfigurationView(PGChildNodeView, SchemaDiffObjectCompare): :param diff_schema: Target Schema for schema diff :param json_resp: True then return json response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) + try: sql = render_template( "/".join([self.template_path, 'sql.sql']), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py index c3cff1b73..1814c3e4f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py @@ -773,8 +773,7 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare): ) @check_precondition - def sql(self, gid, sid, did, scid, dcid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, dcid, **kwargs): """ This function will reverse generate sql for sql panel :param gid: group id @@ -785,6 +784,8 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare): :param diff_schema: Target Schema for schema diff :param json_resp: True then return json response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) sql = render_template( "/".join([self.template_path, 'properties.sql']), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py index e01ad95d0..916babac6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py @@ -818,8 +818,7 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare): ) @check_precondition - def sql(self, gid, sid, did, scid, pid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, pid, **kwargs): """ This function will reverse generate sql for sql panel :param gid: group id @@ -830,6 +829,9 @@ class FtsParserView(PGChildNodeView, SchemaDiffObjectCompare): :param diff_schema: Target Schema for schema diff :param json_resp: True then return json response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) + try: sql = render_template( "/".join([self.template_path, 'sql.sql']), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py index acd316c47..e6eccb635 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py @@ -694,8 +694,7 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare): ) @check_precondition - def sql(self, gid, sid, did, scid, tid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, tid, **kwargs): """ This function will reverse generate sql for sql panel :param gid: group id @@ -706,6 +705,9 @@ class FtsTemplateView(PGChildNodeView, SchemaDiffObjectCompare): :param diff_schema: Target Schema for schema diff :param json_resp: True then return json response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) + sql = render_template( "/".join([self.template_path, 'sql.sql']), tid=tid, 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 d132e56ba..9739b9109 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 @@ -1011,8 +1011,7 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): resp_data['pronamespace']) @check_precondition - def sql(self, gid, sid, did, scid, fnid=None, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, fnid=None, **kwargs): """ Returns the SQL for the Function object. @@ -1023,6 +1022,9 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): scid: Schema Id fnid: Function Id """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) + resp_data = self._fetch_properties(gid, sid, did, scid, fnid) # Most probably this is due to error if not isinstance(resp_data, dict): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py index 9edac8e96..164075235 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py @@ -668,8 +668,7 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare): return sql, data['name'] if 'name' in data else old_data['name'] @check_precondition(action="sql") - def sql(self, gid, sid, did, scid, pkgid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, pkgid, **kwargs): """ This function will generate sql for sql panel @@ -682,6 +681,9 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare): diff_schema: Schema diff target schema name json_resp: json response or plain text response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) + try: sql = render_template( "/".join([self.template_path, 'properties.sql']), scid=scid, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py index f82a329f6..3f5201e6d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py @@ -689,8 +689,7 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): ) @check_precondition(action="sql") - def sql(self, gid, sid, did, scid, seid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, seid, **kwargs): """ This function will generate sql for sql panel @@ -703,6 +702,8 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): diff_schema: Schema diff target schema name json_resp: json response or plain text response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) sql = render_template( "/".join([self.template_path, 'properties.sql']), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py index 690e7745b..6de838e2b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py @@ -660,8 +660,7 @@ class SynonymView(PGChildNodeView, SchemaDiffObjectCompare): return SQL.strip('\n'), name @check_precondition - def sql(self, gid, sid, did, scid, syid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, syid, **kwargs): """ This function will generates reverse engineered sql for synonym object @@ -674,6 +673,9 @@ class SynonymView(PGChildNodeView, SchemaDiffObjectCompare): diff_schema: json_resp: """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) + SQL = render_template("/".join([self.template_path, 'properties.sql']), scid=scid, syid=syid) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py index ee4e47f59..bf8e55682 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/__init__.py @@ -541,7 +541,7 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, trid=None, only_sql=False): + def delete(self, gid, sid, did, scid, tid, **kwargs): """ This function will updates existing the compound trigger object @@ -553,6 +553,9 @@ class CompoundTriggerView(PGChildNodeView, SchemaDiffObjectCompare): tid: Table ID trid: Trigger ID """ + trid = kwargs.get('trid', None) + only_sql = kwargs.get('only_sql', False) + if trid is None: data = request.form if request.form else json.loads( request.data, encoding='utf-8' diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py index 0e081817a..21861ba22 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py @@ -645,8 +645,7 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, idx=None, - only_sql=False): + def delete(self, gid, sid, did, scid, tid, **kwargs): """ This function will updates existing the schema object @@ -658,6 +657,9 @@ class IndexesView(PGChildNodeView, SchemaDiffObjectCompare): tid: Table ID idx: Index ID """ + idx = kwargs.get('idx', None) + only_sql = kwargs.get('only_sql', False) + if idx is None: data = request.form if request.form else json.loads( request.data, encoding='utf-8' diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py index 6747d5f9a..4ef0c2e99 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py @@ -717,7 +717,7 @@ class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings, return internal_server_error(errormsg=str(e)) @BaseTableView.check_precondition - def delete(self, gid, sid, did, scid, tid, ptid=None, only_sql=False): + def delete(self, gid, sid, did, scid, tid, **kwargs): """ This function will delete the table object @@ -729,6 +729,9 @@ class PartitionsView(BaseTableView, DataTypeReader, VacuumSettings, tid: Table ID ptid: Partition Table ID """ + ptid = kwargs.get('ptid', None) + only_sql = kwargs.get('only_sql', False) + if ptid is None: data = request.form if request.form else json.loads( request.data, encoding='utf-8' diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py index 351b8877e..aceeaa2dd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py @@ -392,10 +392,13 @@ class RuleView(PGChildNodeView, SchemaDiffObjectCompare): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, rid=None, only_sql=False): + def delete(self, gid, sid, did, scid, tid, **kwargs): """ This function will drop a rule object """ + rid = kwargs.get('rid', None) + only_sql = kwargs.get('only_sql', False) + if rid is None: data = request.form if request.form else json.loads( request.data, encoding='utf-8' diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index dfc84b00f..3a0235813 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -575,7 +575,7 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare): return internal_server_error(errormsg=str(e)) @check_precondition - def delete(self, gid, sid, did, scid, tid, trid=None, only_sql=False): + def delete(self, gid, sid, did, scid, tid, **kwargs): """ This function will updates existing the trigger object @@ -587,6 +587,9 @@ class TriggerView(PGChildNodeView, SchemaDiffObjectCompare): tid: Table ID trid: Trigger ID """ + trid = kwargs.get('trid', None) + only_sql = kwargs.get('only_sql', False) + if trid is None: data = request.form if request.form else json.loads( request.data, encoding='utf-8' diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py index 392f7d063..212eca4e7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py @@ -1339,8 +1339,7 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): return SQL, data['name'] if 'name' in data else old_data['name'] @check_precondition - def sql(self, gid, sid, did, scid, tid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, tid, **kwargs): """ This function will generates reverse engineered sql for type object @@ -1353,6 +1352,9 @@ class TypeView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): diff_schema: Target Schema for schema diff json_resp: True then return json response """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) + SQL = render_template( "/".join([self.template_path, 'properties.sql']), 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 index 24bd26418..27f03f6a9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py @@ -1209,11 +1209,12 @@ class ViewNode(PGChildNodeView, VacuumSettings, SchemaDiffObjectCompare): return sql_data @check_precondition - def sql(self, gid, sid, did, scid, vid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, vid, **kwargs): """ This function will generate sql to render into the sql panel """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) display_comments = True @@ -1756,11 +1757,12 @@ class MViewNode(ViewNode, VacuumSettings): return SQL, data['name'] if 'name' in data else old_data['name'] @check_precondition - def sql(self, gid, sid, did, scid, vid, diff_schema=None, - json_resp=True): + def sql(self, gid, sid, did, scid, vid, **kwargs): """ This function will generate sql to render into the sql panel """ + diff_schema = kwargs.get('diff_schema', None) + json_resp = kwargs.get('json_resp', True) display_comments = True