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 bd7153c0e..8f6fefe2c 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 @@ -216,8 +216,10 @@ class DomainView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") - % arg) + "Could not find the required parameter (%s)." % + arg + ) + ) try: list_params = [] @@ -741,10 +743,10 @@ AND relkind != 'c'))""" SQL = render_template("/".join([self.template_path, 'create.sql']), data=data) - sql_header = u"""-- DOMAIN: {0} - --- DROP DOMAIN {0}; + sql_header = u"""-- DOMAIN: {0}.{1}\n\n""".format( + data['basensp'], data['name']) + sql_header += """-- DROP DOMAIN {0};\n """.format(self.qtIdent(self.conn, data['basensp'], data['name'])) SQL = sql_header + SQL diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_comment.sql index 132f6ba8a..3104390c1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_comment.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_default_expression.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_default_expression.sql index 6987a3381..7aa39a2fe 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_default_expression.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_default_expression.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_name.sql index fad3d0f4c..c2fa954e8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_name.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_name.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom2_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom2_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom2_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_null_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_null_type.sql index a8d6a3fac..4576c3828 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_null_type.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/alter_domain_null_type.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/create_domain.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/create_domain.sql index 246cbc1e3..4aaf01549 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/create_domain.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/create_domain.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/create_domain_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/create_domain_numeric.sql index 81d572e22..283d8fc67 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/create_domain_numeric.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/pg/default/create_domain_numeric.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_comment.sql index 4e430fc64..1766c0f43 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_comment.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_default_expression.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_default_expression.sql index d6df44a8d..fe5e0d1e8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_default_expression.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_default_expression.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_name.sql index dde706dae..e51287d77 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_name.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_name.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom2_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom2_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom2_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_null_type.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_null_type.sql index 3ac89e3df..15caa1280 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_null_type.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/alter_domain_null_type.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/create_domain.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/create_domain.sql index ba9c72f09..6f3b539d0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/create_domain.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/create_domain.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/create_domain_numeric.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/create_domain_numeric.sql index 2462f685e..75f3accc1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/create_domain_numeric.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/tests/ppas/default/create_domain_numeric.sql @@ -1,4 +1,4 @@ --- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#" +-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/# -- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#"; 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 fca3e200a..28b30164c 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 @@ -260,8 +260,10 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") - % arg) + "Could not find the required parameter (%s)." % + arg + ) + ) try: list_params = [] @@ -855,9 +857,10 @@ class ForeignTableView(PGChildNodeView, DataTypeReader, if not json_resp: return SQL.strip('\n') - sql_header = u"""-- FOREIGN TABLE: {0} + sql_header = u"""-- FOREIGN TABLE: {0}.{1}\n\n""".format( + data['basensp'], data['name']) --- DROP FOREIGN TABLE {0}; + sql_header += """-- DROP FOREIGN TABLE {0}; """.format(self.qtIdent(self.conn, data['basensp'], data['name'])) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_add_opts.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_add_opts.sql index a64ce6de3..4815bd723 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_add_opts.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_add_opts.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_add_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_add_priv.sql index 1ff7174fb..a0caec3ae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_add_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_add_priv.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_col_opts.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_col_opts.sql index 25bfb303d..38d54d29e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_col_opts.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_col_opts.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_comment_add_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_comment_add_columns.sql index 9a24215dc..0725bb2d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_comment_add_columns.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_comment_add_columns.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_remove_opts_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_remove_opts_priv.sql index f31160f4d..aeb1c8a48 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_remove_opts_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/alter_remove_opts_priv.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/create_foreign_table_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/create_foreign_table_with_all_options.sql index e4c99eb36..3ed0e662e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/create_foreign_table_with_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.2_plus/create_foreign_table_with_all_options.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_cons_opts.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_cons_opts.sql index 521633774..3b0ee44dd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_cons_opts.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_cons_opts.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_priv.sql index fd8246613..8526755e3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_priv.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_col_opts.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_col_opts.sql index d502489c2..28b17ffa8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_col_opts.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_col_opts.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_comment_add_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_comment_add_columns.sql index 9a24215dc..0725bb2d8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_comment_add_columns.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_comment_add_columns.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_remove_opts_priv_cons.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_remove_opts_priv_cons.sql index f31160f4d..aeb1c8a48 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_remove_opts_priv_cons.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_remove_opts_priv_cons.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/create_foreign_table_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/create_foreign_table_with_all_options.sql index a6e0d77e4..dd9e71ca2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/create_foreign_table_with_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/create_foreign_table_with_all_options.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_add_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_add_priv.sql index 9b627c7ee..03b77cd28 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_add_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_add_priv.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_column.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_column.sql index ed3d9afc5..fd121901c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_column.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_column.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_comment_add_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_comment_add_columns.sql index a1673ca99..4c0ce3e7f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_comment_add_columns.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_comment_add_columns.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_remove_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_remove_priv.sql index b1d111fb8..8e111cab5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_remove_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_remove_priv.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/create_foreign_table_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/create_foreign_table_with_all_options.sql index bc1905892..7ace11fb8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/create_foreign_table_with_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/create_foreign_table_with_all_options.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_cons_opts.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_cons_opts.sql index 465b166f2..c101ee890 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_cons_opts.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_cons_opts.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_priv.sql index ef90db2b2..3dc50a1fb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_priv.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_col_opts.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_col_opts.sql index 4dc283671..110f6d9a6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_col_opts.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_col_opts.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_comment_add_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_comment_add_columns.sql index 8af1663d8..690e5cfe2 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_comment_add_columns.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_comment_add_columns.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_remove_opts_priv_cons.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_remove_opts_priv_cons.sql index 2365a797f..2145493a3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_remove_opts_priv_cons.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_remove_opts_priv_cons.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/create_foreign_table_with_all_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/create_foreign_table_with_all_options.sql index 74e175ca4..8ef7c0851 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/create_foreign_table_with_all_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/create_foreign_table_with_all_options.sql @@ -1,4 +1,4 @@ --- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#" +-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/# -- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/sql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/sql.sql index dfabdee16..76ed60e9a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/sql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/sql.sql @@ -6,7 +6,7 @@ FROM ( SELECT E'-- Text Search CONFIGURATION: ' || quote_ident(nspname) || E'.' - || quote_ident(cfg.cfgname) || + || (cfg.cfgname) || E'\n\n-- DROP TEXT SEARCH CONFIGURATION ' || quote_ident(nspname) || E'.' || quote_ident(cfg.cfgname) || E'\n\nCREATE TEXT SEARCH CONFIGURATION ' || quote_ident(nspname) || @@ -73,4 +73,4 @@ FROM WHERE cfg.oid={{cfgid}}::OID ) e; -{% endif %} \ No newline at end of file +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/default/create_fts_conf.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/default/create_fts_conf.sql index bbcf47df4..4d76466ed 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/default/create_fts_conf.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/tests/default/create_fts_conf.sql @@ -1,4 +1,4 @@ --- Text Search CONFIGURATION: test."test_fts_conf_$%{}[]()&*^!@""'`\/#" +-- Text Search CONFIGURATION: test.test_fts_conf_$%{}[]()&*^!@"'`\/# -- DROP TEXT SEARCH CONFIGURATION test."test_fts_conf_$%{}[]()&*^!@""'`\/#" 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 a7eea04d7..6858ec8d6 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 @@ -431,7 +431,7 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare): status=410, success=0, errormsg=_( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter (%s)." % arg) ) # Fetch schema name from schema oid sql = render_template( @@ -834,10 +834,9 @@ class FtsDictionaryView(PGChildNodeView, SchemaDiffObjectCompare): data=res['rows'][0], conn=self.conn, is_displaying=True) - sql_header = u"""-- Text Search Dictionary: {0} - --- DROP TEXT SEARCH DICTIONARY {0}; - + sql_header = u"""-- Text Search Dictionary: {0}.{1}\n\n""".format( + res['rows'][0]['schema'], res['rows'][0]['name']) + sql_header += """-- DROP TEXT SEARCH DICTIONARY {0};\n """.format(self.qtIdent(self.conn, res['rows'][0]['schema'], res['rows'][0]['name'])) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/alter_fts_dictionary_delete_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/alter_fts_dictionary_delete_options.sql index 1ab7cce3b..32267eb2b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/alter_fts_dictionary_delete_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/alter_fts_dictionary_delete_options.sql @@ -1,4 +1,4 @@ --- Text Search Dictionary: public."Test Dictionary Edit#1" +-- Text Search Dictionary: public.Test Dictionary Edit#1 -- DROP TEXT SEARCH DICTIONARY public."Test Dictionary Edit#1"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/alter_fts_dictionary_options.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/alter_fts_dictionary_options.sql index 7a50ee8e6..bad3cc710 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/alter_fts_dictionary_options.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/alter_fts_dictionary_options.sql @@ -1,4 +1,4 @@ --- Text Search Dictionary: public."Test Dictionary Edit#1" +-- Text Search Dictionary: public.Test Dictionary Edit#1 -- DROP TEXT SEARCH DICTIONARY public."Test Dictionary Edit#1"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/create_fts_dictionary.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/create_fts_dictionary.sql index 38aadc539..332801600 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/create_fts_dictionary.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/tests/default/create_fts_dictionary.sql @@ -1,4 +1,4 @@ --- Text Search Dictionary: public."Dictionary1_$%{}[]()&*^!@""'`\/#" +-- Text Search Dictionary: public.Dictionary1_$%{}[]()&*^!@"'`\/# -- DROP TEXT SEARCH DICTIONARY public."Dictionary1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/sql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/sql.sql index 71bb9028a..8004b67ab 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/sql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/sql.sql @@ -5,7 +5,7 @@ SELECT FROM ( SELECT - E'-- Text Search Parser: ' || quote_ident(nspname) || E'.' || quote_ident(prs.prsname) || + E'-- Text Search Parser: ' || quote_ident(nspname) || E'.' || prs.prsname || E'\n\n-- DROP TEXT SEARCH PARSER ' || quote_ident(nspname) || E'.' || quote_ident(prs.prsname) || E'\n\nCREATE TEXT SEARCH PARSER ' || quote_ident(nspname) || E'.' || quote_ident(prs.prsname) || E' (\n' || E' START = ' || prs.prsstart || E',\n' || @@ -43,4 +43,4 @@ FROM WHERE prs.oid={{pid}}::OID ) as c; -{% endif %} \ No newline at end of file +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser.sql index a25278025..3dee6ce4b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/alter_fts_parser.sql @@ -1,4 +1,4 @@ --- Text Search Parser: public."test_fts_parser_updated_$%{}[]()&*^!@""'`\/#" +-- Text Search Parser: public.test_fts_parser_updated_$%{}[]()&*^!@"'`\/# -- DROP TEXT SEARCH PARSER public."test_fts_parser_updated_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser.sql index 47c6f6e90..0bc7cb047 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/tests/default/create_fts_parser.sql @@ -1,4 +1,4 @@ --- Text Search Parser: public."test_fts_parser_$%{}[]()&*^!@""'`\/#" +-- Text Search Parser: public.test_fts_parser_$%{}[]()&*^!@"'`\/# -- DROP TEXT SEARCH PARSER public."test_fts_parser_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/sql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/sql.sql index 54d72352d..787ad11ea 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/sql.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/sql.sql @@ -4,7 +4,7 @@ SELECT FROM ( SELECT - E'-- Text Search Template: ' || quote_ident(nspname) || E'.' || quote_ident(tmpl.tmplname) || + E'-- Text Search Template: ' || quote_ident(nspname) || E'.' || tmpl.tmplname || E'\n\n-- DROP TEXT SEARCH TEMPLATE ' || quote_ident(nspname) || E'.' || quote_ident(tmpl.tmplname) || E'\n\nCREATE TEXT SEARCH TEMPLATE ' || quote_ident(nspname) || E'.' || quote_ident(tmpl.tmplname) || E' (\n' || CASE @@ -38,4 +38,4 @@ FROM ) b ON (b.noid = tmpl.tmplnamespace) WHERE tmpl.oid={{tid}}::OID -) as c; \ No newline at end of file +) as c; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/alter_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/alter_comment.sql index d1c3a51a6..b2aca6142 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/alter_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/alter_comment.sql @@ -1,4 +1,4 @@ --- Text Search Template: test_fts_template."FTSTemp1_$%{}[]()&*^!@""'`\/#" +-- Text Search Template: test_fts_template.FTSTemp1_$%{}[]()&*^!@"'`\/# -- DROP TEXT SEARCH TEMPLATE test_fts_template."FTSTemp1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/alter_rename.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/alter_rename.sql index c56ddf7a6..60af7465a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/alter_rename.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/alter_rename.sql @@ -1,4 +1,4 @@ --- Text Search Template: test_fts_template."FTSTemp1_$%{}[]()&*^!@""'`\/#" +-- Text Search Template: test_fts_template.FTSTemp1_$%{}[]()&*^!@"'`\/# -- DROP TEXT SEARCH TEMPLATE test_fts_template."FTSTemp1_$%{}[]()&*^!@""'`\/#" diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/create.sql index 4515c8d23..1049113ae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/tests/default/create.sql @@ -1,4 +1,4 @@ --- Text Search Template: test_fts_template."FTSTemp_$%{}[]()&*^!@""'`\/#" +-- Text Search Template: test_fts_template.FTSTemp_$%{}[]()&*^!@"'`\/# -- DROP TEXT SEARCH TEMPLATE test_fts_template."FTSTemp_$%{}[]()&*^!@""'`\/#" 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 a57de1d1a..e12a0d238 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 @@ -277,8 +277,10 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): status=410, success=0, errormsg=gettext( - "Could not find the required parameter (%s).") - % arg) + "Could not find the required parameter (%s)." % + arg + ) + ) list_params = [] if request.method == 'GET': @@ -1078,16 +1080,14 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare): func_def=name_with_default_args, query_for="sql_panel") - sql_header = u"""-- {0}: {1}({2}) - --- DROP {0} {1}({2}); - -""".format(object_type.upper(), - self.qtIdent( - self.conn, - resp_data['pronamespace'], - resp_data['proname']), - resp_data['proargtypenames'].lstrip('(').rstrip(')')) + sql_header = u"""-- {0}: {1}.{2}({3})\n\n""".format( + object_type.upper(), resp_data['pronamespace'], + resp_data['proname'], + resp_data['proargtypenames'].lstrip('(').rstrip(')')) + sql_header += """-- DROP {0} {1}({2});\n\n""".format( + object_type.upper(), self.qtIdent( + self.conn, resp_data['pronamespace'], resp_data['proname']), + resp_data['proargtypenames'].lstrip('(').rstrip(')')) if not json_resp: return re.sub('\n{2,}', '\n\n', func_def) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_comment.sql index ff4a22ca8..9dd7e3e03 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_comment.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_1.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_1.sql index 52d625172..17b9502dd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_1.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_1.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_2.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_2.sql index 400eb87ad..d388f9479 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_2.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_2.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_3.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_3.sql index ec12709b1..c3ae2b164 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_3.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/alter_ptrig_set_3.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_event_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_event_trigger_full.sql index 332ff12be..020e6126f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_event_trigger_full.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_event_trigger_full.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger.sql index 27ebbb1f0..3758fe14e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger_full.sql index 77bbc1dfd..eaa6d3bdc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger_full.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/pg/default/create_plain_trigger_full.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_comment.sql index 670d92f6e..3e29facee 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_comment.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_1.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_1.sql index d8e799fd9..5c72bfff5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_1.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_1.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_2.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_2.sql index a1fd89a72..95a902c60 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_2.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_2.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_3.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_3.sql index 370d6aab8..cfbcac9ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_3.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/alter_ptrig_set_3.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_event_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_event_trigger_full.sql index 09ed2323c..86a8a3437 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_event_trigger_full.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_event_trigger_full.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger.sql index c06e1b6c3..8ba939ec8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger_full.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger_full.sql index f4aede0f1..211236227 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger_full.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/tests/ppas/default/create_plain_trigger_full.sql @@ -1,4 +1,4 @@ --- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"() +-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#() -- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"(); 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 b33a7699b..d4bebf963 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 @@ -381,7 +381,8 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): status=400, success=0, errormsg=_( - "Could not find the required parameter (%s).") % arg + "Could not find the required parameter (%s)." % arg + ) ) try: @@ -589,8 +590,9 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): status=400, success=0, errormsg=_( - "Could not find the required parameter (%s).") - % arg) + "Could not find the required parameter (%s)." % arg + ) + ) SQL, name = self.getSQL(gid, sid, did, data, scid, seid) # Most probably this is due to error if not isinstance(SQL, (str, unicode)): @@ -735,9 +737,10 @@ class SequenceView(PGChildNodeView, SchemaDiffObjectCompare): if not json_resp: return SQL - sql_header = u"""-- SEQUENCE: {0} + sql_header = u"""-- SEQUENCE: {0}.{1}\n\n""".format( + result['schema'], result['name']) --- DROP SEQUENCE {0}; + sql_header += """-- DROP SEQUENCE {0}; """.format(self.qtIdent(self.conn, result['schema'], result['name'])) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_neg_seq_props.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_neg_seq_props.sql index a01684e95..ce1a63de0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_neg_seq_props.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_neg_seq_props.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_comment.sql index abb620824..b98eb4871 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_comment.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_add.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_add.sql index bd25682b9..e59e2e6ba 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_add.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_add.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_remove.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_remove.sql index 71da83b5f..149ff907b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_remove.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_remove.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_update.sql index ba9e2a2a6..dc586e417 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_update.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props.sql index 9b29c67d9..8d0b3342e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_negative_sequence.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_negative_sequence.sql index ae9c101e3..7cd0881d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_negative_sequence.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_negative_sequence.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence.sql index 6d79f516b..b159ab9d3 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_neg_seq_props.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_neg_seq_props.sql index 8d61421c5..01424cf9a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_neg_seq_props.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_neg_seq_props.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_comment.sql index 536a4b905..cc47ed079 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_comment.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_comment.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_add.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_add.sql index 7a46a3556..59109e3f8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_add.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_add.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_remove.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_remove.sql index c9794c037..46efc7e64 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_remove.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_remove.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_update.sql index a414c8db6..b6dc5eefa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_update.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props.sql index 3c5f254a6..e8eb6f40f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_negative_sequence.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_negative_sequence.sql index 23615e8a9..6ad4989c5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_negative_sequence.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_negative_sequence.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence.sql index 25aa799a2..611226a14 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence.sql @@ -1,4 +1,4 @@ --- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#" +-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/# -- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py index 65755fad2..928046fba 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py @@ -453,8 +453,8 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): column_utils.type_formatter(c['cltype']) if json_resp: - sql_header = u"-- Table: {0}\n\n-- ".format( - self.qtIdent(self.conn, data['schema'], data['name'])) + sql_header = u"-- Table: {0}.{1}\n\n-- ".format( + data['schema'], data['name']) sql_header += render_template("/".join([self.table_template_path, 'delete.sql']), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/create.sql index 877ba2596..89b200d39 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/create.sql @@ -1,6 +1,6 @@ {# ===================== Create new view ===================== #} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/create.sql index 877ba2596..89b200d39 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/create.sql @@ -1,6 +1,6 @@ {# ===================== Create new view ===================== #} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/create.sql index 877ba2596..89b200d39 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/create.sql @@ -1,6 +1,6 @@ {# ===================== Create new view ===================== #} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP MATERIALIZED VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/create.sql index 5720b1406..1f5a923da 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/create.sql @@ -1,6 +1,6 @@ {#============================Create new view=========================#} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/create.sql index 3e04ea1d2..461168703 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/create.sql @@ -1,6 +1,6 @@ {#============================Create new view=========================#} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/create.sql index e5068b256..dac7b12c0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/create.sql @@ -1,6 +1,6 @@ {#============================Create new view=========================#} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/create.sql index 3d8ae374c..ba3c810bd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/create.sql @@ -1,6 +1,6 @@ {#============================Create new view=========================#} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/create.sql index 5720b1406..1f5a923da 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/create.sql @@ -1,6 +1,6 @@ {#============================Create new view=========================#} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/create.sql index e5068b256..dac7b12c0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/create.sql @@ -1,6 +1,6 @@ {#============================Create new view=========================#} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/create.sql index e5068b256..dac7b12c0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/create.sql @@ -1,6 +1,6 @@ {#============================Create new view=========================#} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/create.sql index 3d8ae374c..ba3c810bd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/create.sql @@ -1,6 +1,6 @@ {#============================Create new view=========================#} {% if display_comments %} --- View: {{ conn|qtIdent(data.schema, data.name) }} +-- View: {{ data.schema }}.{{ data.name }} -- DROP VIEW {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview.sql index 952a10046..71636fdb0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_add_fillfactor.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_add_fillfactor.sql index 5b55f1d4d..a79299f2e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_add_fillfactor.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_add_fillfactor.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_add_table_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_add_table_parameter.sql index ff76b997e..72fb22614 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_add_table_parameter.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_add_table_parameter.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_definition.sql index 7f9fe95c6..53e177983 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_definition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_definition.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_drop_all_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_drop_all_priv.sql index 8e3bd1bc7..ee78e306d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_drop_all_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_drop_all_priv.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_remove_table_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_remove_table_parameter.sql index 5b55f1d4d..a79299f2e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_remove_table_parameter.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_mview_remove_table_parameter.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view.sql index 2588f4194..b3b83cd0d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@"'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_add_some_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_add_some_priv.sql index 03c03832e..584c7ffe1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_add_some_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_add_some_priv.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@"'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_definition.sql index b298f31fa..7a0a310ad 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_definition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_definition.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@""'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_delete_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_delete_priv.sql index 2588f4194..b3b83cd0d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_delete_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/alter_view_delete_priv.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@"'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/create_mview.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/create_mview.sql index 069be3c0f..acd7ced6c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/create_mview.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/create_mview.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/create_view.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/create_view.sql index a1901611a..655ee374d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/create_view.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/9.4_plus/create_view.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@"'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview.sql index b55878d2c..e0f8d603f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_add_fillfactor.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_add_fillfactor.sql index da3c3849f..8a297d450 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_add_fillfactor.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_add_fillfactor.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_add_table_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_add_table_parameter.sql index 874d20d5a..3fc763dd4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_add_table_parameter.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_add_table_parameter.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_definition.sql index 3d31af0d2..170a14d98 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_definition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_definition.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_drop_all_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_drop_all_priv.sql index ee5220e13..424c69c9f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_drop_all_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_drop_all_priv.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_remove_table_parameter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_remove_table_parameter.sql index da3c3849f..8a297d450 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_remove_table_parameter.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_mview_remove_table_parameter.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view.sql index 62ce17449..d267e529c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@"'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_add_some_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_add_some_priv.sql index b1ac54487..f378fb1be 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_add_some_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_add_some_priv.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@"'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_definition.sql index 6a91976ae..615538eb5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_definition.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_definition.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@"'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_delete_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_delete_priv.sql index 62ce17449..d267e529c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_delete_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/alter_view_delete_priv.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@"'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/create_mview.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/create_mview.sql index 121113526..b0f0e44dc 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/create_mview.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/create_mview.sql @@ -1,4 +1,4 @@ --- View: public."testmview_$%{}[]()&*^!/@`#" +-- View: public.testmview_$%{}[]()&*^!/@`# -- DROP MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#"; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/create_view.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/create_view.sql index 555658907..18c8d52ef 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/create_view.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/ppas/9.4_plus/create_view.sql @@ -1,4 +1,4 @@ --- View: public."testview_$%{}[]()&*^!@""'`\/#" +-- View: public.testview_$%{}[]()&*^!@"'`\/# -- DROP VIEW public."testview_$%{}[]()&*^!@""'`\/#";