mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Ensure all object names in the title line of the reverse-engineered SQL are not quoted. Fixes #4445
This commit is contained in:
parent
781b766ac4
commit
41521a9b98
@ -30,6 +30,7 @@ Bug fixes
|
||||
| `Issue #3988 <https://redmine.postgresql.org/issues/3988>`_ - Fixed cursor disappeared issue in the query editor for some of the characters when zoomed out.
|
||||
| `Issue #4206 <https://redmine.postgresql.org/issues/4206>`_ - Ensure that the grant wizard should be closed on pressing the ESC key.
|
||||
| `Issue #4292 <https://redmine.postgresql.org/issues/4292>`_ - Added dark mode support for the configuration dialog on Windows/macOS runtime.
|
||||
| `Issue #4445 <https://redmine.postgresql.org/issues/4445>`_ - Ensure all object names in the title line of the reverse-engineered SQL are not quoted.
|
||||
| `Issue #4512 <https://redmine.postgresql.org/issues/4512>`_ - Fixed calendar opening issue on the exception tab inside the schedules tab of pgAgent.
|
||||
| `Issue #4856 <https://redmine.postgresql.org/issues/4856>`_ - Enable the save button by default when a query tool is opened with CREATE or other scripts.
|
||||
| `Issue #4864 <https://redmine.postgresql.org/issues/4864>`_ - Make the configuration window in runtime to auto-resize.
|
||||
|
@ -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
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom2_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom2_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom2_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom2_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom2_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom2_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- DOMAIN: public."Dom1_$%{}[]()&*^!@""'`\/#"
|
||||
-- DOMAIN: public.Dom1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP DOMAIN public."Dom1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -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']))
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FOREIGN TABLE: public."FT1_$%{}[]()&*^!@""'`\/#"
|
||||
-- FOREIGN TABLE: public.FT1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -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 %}
|
||||
{% endif %}
|
||||
|
@ -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_$%{}[]()&*^!@""'`\/#"
|
||||
|
||||
|
@ -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']))
|
||||
|
||||
|
@ -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";
|
||||
|
||||
|
@ -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";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Text Search Dictionary: public."Dictionary1_$%{}[]()&*^!@""'`\/#"
|
||||
-- Text Search Dictionary: public.Dictionary1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP TEXT SEARCH DICTIONARY public."Dictionary1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -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 %}
|
||||
{% endif %}
|
||||
|
@ -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_$%{}[]()&*^!@""'`\/#"
|
||||
|
||||
|
@ -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_$%{}[]()&*^!@""'`\/#"
|
||||
|
||||
|
@ -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;
|
||||
) as c;
|
||||
|
@ -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_$%{}[]()&*^!@""'`\/#"
|
||||
|
||||
|
@ -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_$%{}[]()&*^!@""'`\/#"
|
||||
|
||||
|
@ -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_$%{}[]()&*^!@""'`\/#"
|
||||
|
||||
|
@ -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)
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- FUNCTION: public."Trig1_$%{}[]()&*^!@""'`\/#"()
|
||||
-- FUNCTION: public.Trig1_$%{}[]()&*^!@"'`\/#()
|
||||
|
||||
-- DROP FUNCTION public."Trig1_$%{}[]()&*^!@""'`\/#"();
|
||||
|
||||
|
@ -717,9 +717,8 @@ class PackageView(PGChildNodeView, SchemaDiffObjectCompare):
|
||||
if not json_resp:
|
||||
return sql
|
||||
|
||||
sql_header = u"-- Package: {}\n\n-- ".format(
|
||||
self.qtIdent(self.conn, self.schema, result['name'])
|
||||
)
|
||||
sql_header = u"-- Package: {0}.{1}\n\n-- ".format(
|
||||
self.schema, result['name'])
|
||||
|
||||
sql_header += render_template(
|
||||
"/".join([self.template_path, 'delete.sql']),
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Package: public."pkg_emp_$%{}[]()&*^!@""'`\/#"
|
||||
-- Package: public.pkg_emp_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP PACKAGE "pkg_emp_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Package: public."pkg_emp_$%{}[]()&*^!@""'`\/#"
|
||||
-- Package: public.pkg_emp_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP PACKAGE "pkg_emp_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Package: public."pkg_emp_$%{}[]()&*^!@""'`\/#"
|
||||
-- Package: public.pkg_emp_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP PACKAGE "pkg_emp_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Package: public."pkg_emp_$%{}[]()&*^!@""'`\/#"
|
||||
-- Package: public.pkg_emp_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP PACKAGE "pkg_emp_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -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)):
|
||||
@ -736,9 +738,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']))
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- SEQUENCE: public."Seq1_$%{}[]()&*^!@""'`\/#"
|
||||
-- SEQUENCE: public.Seq1_$%{}[]()&*^!@"'`\/#
|
||||
|
||||
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -3,8 +3,8 @@
|
||||
{% set is_public = True %}
|
||||
{% endif %}
|
||||
{% if comment %}
|
||||
-- {% if is_public %}Public{% else %}Private{% endif %} synonym: {% if is_public %}{{ conn|qtIdent(data.name) }};
|
||||
{% else %}{{ conn|qtIdent(data.schema, data.name) }};
|
||||
-- {% if is_public %}Public{% else %}Private{% endif %} synonym: {% if is_public %}{{ data.name }};
|
||||
{% else %}{{ data.schema }}.{{ data.name }};
|
||||
{% endif %}
|
||||
|
||||
-- DROP {% if is_public %}PUBLIC {% endif %}SYNONYM {% if is_public %}{{ conn|qtIdent(data.name) }};
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Public synonym: "syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Public synonym: syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP PUBLIC SYNONYM "syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Public synonym: "syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Public synonym: syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP PUBLIC SYNONYM "syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Public synonym: "syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Public synonym: syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP PUBLIC SYNONYM "syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Public synonym: "syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Public synonym: syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP PUBLIC SYNONYM "syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Public synonym: "syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Public synonym: syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP PUBLIC SYNONYM "syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Private synonym: enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Private synonym: enterprisedb.syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP SYNONYM enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Private synonym: enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Private synonym: enterprisedb.syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP SYNONYM enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Private synonym: enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Private synonym: enterprisedb.syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP SYNONYM enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Private synonym: enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Private synonym: enterprisedb.syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP SYNONYM enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- Private synonym: enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
-- Private synonym: enterprisedb.syn_$%{}[]()&*^!@"'`\/#;
|
||||
|
||||
-- DROP SYNONYM enterprisedb."syn_$%{}[]()&*^!@""'`\/#";
|
||||
|
||||
|
@ -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']),
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user