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

Revisit all the CREATE and DROP DDL's to add appropriate 'IF EXISTS', 'CASCADE' and 'CREATE OR REPLACE'. Fixes #5741

pull/58/head
Nikhil Mohite 2021-07-30 13:21:38 +05:30 committed by Akshay Joshi
parent f6ac0d5877
commit 6021e07761
795 changed files with 1647 additions and 1597 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/delete.sql
View File

@ -10,5 +10,5 @@ WHERE
{% endif %}
{# DROP CAST Statement #}
{% if castsource and casttarget %}
DROP CAST ({{castsource}} AS {{casttarget}}) {% if cascade %}CASCADE{%endif%};
DROP CAST IF EXISTS ({{castsource}} AS {{casttarget}}) {% if cascade %}CASCADE{%endif%};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/sql/create.sql
View File

@ -7,7 +7,7 @@
{% endif %}
{% if data.name %}
CREATE EXTENSION {{ conn|qtIdent(data.name) }}{% if data.schema == '' and data.version == '' %};{% endif %}
CREATE EXTENSION IF NOT EXISTS {{ conn|qtIdent(data.name) }}{% if data.schema == '' and data.version == '' %};{% endif %}
{% if data.schema %}
SCHEMA {{ conn|qtIdent(data.schema) }}{% if data.version == '' %};{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/extensions/templates/extensions/sql/delete.sql
View File

@ -4,5 +4,5 @@ SELECT x.extname from pg_catalog.pg_extension x
WHERE x.oid = {{ eid }}::oid
{% endif %}
{% if name %}
DROP EXTENSION {{ conn|qtIdent(name) }}{% if cascade %} CASCADE{% endif %};
DROP EXTENSION IF EXISTS {{ conn|qtIdent(name) }}{% if cascade %} CASCADE{% endif %};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_schema.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION sslinfo;
CREATE EXTENSION sslinfo
CREATE EXTENSION IF NOT EXISTS sslinfo
SCHEMA public
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/alter_extension_version.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION citext;
CREATE EXTENSION citext
CREATE EXTENSION IF NOT EXISTS citext
SCHEMA public
VERSION "1.1";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_all_options.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION sslinfo;
CREATE EXTENSION sslinfo
CREATE EXTENSION IF NOT EXISTS sslinfo
SCHEMA test_extension_schema
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/create_extension_with_default_schema.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION citext;
CREATE EXTENSION citext
CREATE EXTENSION IF NOT EXISTS citext
SCHEMA public
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/msql_create_extension_with_all_options.sql
View File

@ -1,3 +1,3 @@
CREATE EXTENSION sslinfo
CREATE EXTENSION IF NOT EXISTS sslinfo
SCHEMA test_extension_schema
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.4_plus/msql_create_extension_with_default_schema.sql
View File

@ -1,2 +1,2 @@
CREATE EXTENSION citext
CREATE EXTENSION IF NOT EXISTS citext
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/alter_extension_schema.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION sslinfo;
CREATE EXTENSION sslinfo
CREATE EXTENSION IF NOT EXISTS sslinfo
SCHEMA public
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/create_extension_with_all_options.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION sslinfo;
CREATE EXTENSION sslinfo
CREATE EXTENSION IF NOT EXISTS sslinfo
SCHEMA test_extension_schema
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.5_plus/msql_create_extension_with_all_options.sql
View File

@ -1,3 +1,3 @@
CREATE EXTENSION sslinfo
CREATE EXTENSION IF NOT EXISTS sslinfo
SCHEMA test_extension_schema
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/alter_extension_schema.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION sslinfo;
CREATE EXTENSION sslinfo
CREATE EXTENSION IF NOT EXISTS sslinfo
SCHEMA public
VERSION "1.2";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/alter_extension_version.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION adminpack;
CREATE EXTENSION adminpack
CREATE EXTENSION IF NOT EXISTS adminpack
SCHEMA pg_catalog
VERSION "1.1";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/create_extension_with_all_options.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION sslinfo;
CREATE EXTENSION sslinfo
CREATE EXTENSION IF NOT EXISTS sslinfo
SCHEMA test_extension_schema
VERSION "1.2";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/create_extension_with_default_schema.sql
View File

@ -2,6 +2,6 @@
-- DROP EXTENSION adminpack;
CREATE EXTENSION adminpack
CREATE EXTENSION IF NOT EXISTS adminpack
SCHEMA pg_catalog
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/msql_create_extension_with_all_options.sql
View File

@ -1,3 +1,3 @@
CREATE EXTENSION sslinfo
CREATE EXTENSION IF NOT EXISTS sslinfo
SCHEMA test_extension_schema
VERSION "1.2";

2
web/pgadmin/browser/server_groups/servers/databases/extensions/tests/9.6_plus/msql_create_extension_with_default_schema.sql
View File

@ -1,2 +1,2 @@
CREATE EXTENSION adminpack
CREATE EXTENSION IF NOT EXISTS adminpack
VERSION "1.0";

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/templates/foreign_data_wrappers/sql/default/delete.sql
View File

@ -4,5 +4,5 @@ SELECT fdwname as name from pg_catalog.pg_foreign_data_wrapper WHERE oid={{fid}}
{% endif %}
{# ============= Delete/Drop cascade foreign data wrapper ============= #}
{% if name %}
DROP FOREIGN DATA WRAPPER {{ conn|qtIdent(name) }} {% if cascade %} CASCADE {% endif %};
DROP FOREIGN DATA WRAPPER IF EXISTS {{ conn|qtIdent(name) }} {% if cascade %} CASCADE {% endif %};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/languages/templates/languages/sql/default/delete.sql
View File

@ -4,5 +4,5 @@
{% endif %}
{# ============= Drop the language ============= #}
{% if lname %}
DROP LANGUAGE {{ conn|qtIdent(lname) }}{% if cascade %} CASCADE{% endif%};
DROP LANGUAGE IF EXISTS {{ conn|qtIdent(lname) }}{% if cascade %} CASCADE{% endif%};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/publications/templates/publications/sql/default/delete.sql
View File

@ -4,5 +4,5 @@ SELECT pubname FROM pg_catalog.pg_publication WHERE oid = {{pbid}}::oid;
{% endif %}
{# ============= Drop the publication ============= #}
{% if pname %}
DROP PUBLICATION {{ conn|qtIdent(pname) }}{% if cascade %} CASCADE{% endif%};
DROP PUBLICATION IF EXISTS {{ conn|qtIdent(pname) }}{% if cascade %} CASCADE{% endif%};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/publications/tests/10_plus/alter_publication.sql
View File

@ -1,6 +1,6 @@
-- Publication: alterd_publication
-- DROP PUBLICATION alterd_publication;
-- DROP PUBLICATION IF EXISTS alterd_publication;
CREATE PUBLICATION alterd_publication
FOR ALL TABLES

2
web/pgadmin/browser/server_groups/servers/databases/publications/tests/10_plus/alter_publication_event.sql
View File

@ -1,6 +1,6 @@
-- Publication: alterd_publication
-- DROP PUBLICATION alterd_publication;
-- DROP PUBLICATION IF EXISTS alterd_publication;
CREATE PUBLICATION alterd_publication
FOR ALL TABLES

2
web/pgadmin/browser/server_groups/servers/databases/publications/tests/10_plus/create_publication.sql
View File

@ -1,6 +1,6 @@
-- Publication: test_publication_create
-- DROP PUBLICATION test_publication_create;
-- DROP PUBLICATION IF EXISTS test_publication_create;
CREATE PUBLICATION test_publication_create
FOR ALL TABLES

2
web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication.sql
View File

@ -1,6 +1,6 @@
-- Publication: alterd_publication
-- DROP PUBLICATION alterd_publication;
-- DROP PUBLICATION IF EXISTS alterd_publication;
CREATE PUBLICATION alterd_publication
FOR ALL TABLES

2
web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/alter_publication_event.sql
View File

@ -1,6 +1,6 @@
-- Publication: alterd_publication
-- DROP PUBLICATION alterd_publication;
-- DROP PUBLICATION IF EXISTS alterd_publication;
CREATE PUBLICATION alterd_publication
FOR ALL TABLES

2
web/pgadmin/browser/server_groups/servers/databases/publications/tests/13_plus/create_publication.sql
View File

@ -1,6 +1,6 @@
-- Publication: test_publication_create
-- DROP PUBLICATION test_publication_create;
-- DROP PUBLICATION IF EXISTS test_publication_create;
CREATE PUBLICATION test_publication_create
FOR ALL TABLES

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/delete.sql
View File

@ -1 +1 @@
DROP COLLATION {{ conn|qtIdent(nspname, name) }}{% if cascade%} CASCADE{% endif %};
DROP COLLATION IF EXISTS {{ conn|qtIdent(nspname, name) }}{% if cascade%} CASCADE{% endif %};

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/default/alter_collation.sql
View File

@ -1,6 +1,6 @@
-- Collation: Cl1_$%{}[]()&*^!@"'`\/#a;
-- DROP COLLATION testschema."Cl1_$%{}[]()&*^!@""'`\/#a";
-- DROP COLLATION IF EXISTS testschema."Cl1_$%{}[]()&*^!@""'`\/#a";
CREATE COLLATION testschema."Cl1_$%{}[]()&*^!@""'`\/#a"
(LC_COLLATE = 'C', LC_CTYPE = 'C');

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/tests/default/create_collation.sql
View File

@ -1,6 +1,6 @@
-- Collation: Cl1_$%{}[]()&*^!@"'`\/#;
-- DROP COLLATION testschema."Cl1_$%{}[]()&*^!@""'`\/#";
-- DROP COLLATION IF EXISTS testschema."Cl1_$%{}[]()&*^!@""'`\/#";
CREATE COLLATION testschema."Cl1_$%{}[]()&*^!@""'`\/#"
(LC_COLLATE = 'C', LC_CTYPE = 'C');

2
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/templates/domains/sql/default/delete.sql
View File

@ -12,5 +12,5 @@ AND
{% endif %}
{% if name %}
DROP DOMAIN {{ conn|qtIdent(basensp, name) }}{% if cascade %} CASCADE{% endif %};
DROP DOMAIN IF EXISTS {{ conn|qtIdent(basensp, name) }}{% if cascade %} CASCADE{% endif %};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/create.sql
View File

@ -2,7 +2,7 @@
{% import 'macros/schemas/privilege.macros' as PRIVILEGE %}
{% set is_columns = [] %}
{% if data %}
CREATE FOREIGN TABLE {{ conn|qtIdent(data.basensp, data.name) }}(
CREATE FOREIGN TABLE IF NOT EXISTS {{ conn|qtIdent(data.basensp, data.name) }}(
{% if data.columns %}
{% for c in data.columns %}
{% if (not c.inheritedfrom or c.inheritedfrom =='' or c.inheritedfrom == None or c.inheritedfrom == 'None' ) %}

44
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/update.sql
View File

@ -3,27 +3,27 @@
{% if data %}
{% set name = o_data.name %}
{% if data.name %}{% if data.name != o_data.name %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, o_data.name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, o_data.name) }}
RENAME TO {{ conn|qtIdent(data.name) }};
{% set name = data.name %}
{% endif %}{% endif %}
{% if data.owner %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
OWNER TO {{ conn|qtIdent(data.owner) }};
{% endif %}
{% if data.columns %}
{% for c in data.columns.deleted %}
{% if (not c.inheritedfrom or c.inheritedfrom =='' or c.inheritedfrom == None or c.inheritedfrom == 'None' ) %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
DROP COLUMN {{conn|qtIdent(c.attname)}};
{% endif %}
{% endfor -%}
{% for c in data.columns.added %}
{% if (not c.inheritedfrom or c.inheritedfrom =='' or c.inheritedfrom == None or c.inheritedfrom == 'None' ) %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
ADD COLUMN {{conn|qtIdent(c.attname)}} {{ c.datatype }}{% if c.typlen %}({{c.typlen}}{% if c.precision %}, {{c.precision}}{% endif %}){% endif %}{% if c.isArrayType %}[]{% endif %}
{% if c.coloptions %}
{% for o in c.coloptions %}{% if o.option and o.value %}
@ -39,18 +39,18 @@ ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
{% set col_name = o_data['columns'][c.attnum]['attname'] %}
{% if c.attname != o_data['columns'][c.attnum]['attname'] %}
{% set col_name = c.attname %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
RENAME COLUMN {{conn|qtIdent(o_data['columns'][c.attnum]['attname'])}} TO {{conn|qtIdent(c.attname)}};
{% endif %}
{% if c.attnotnull != o_data['columns'][c.attnum]['attnotnull'] %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
ALTER COLUMN {{conn|qtIdent(col_name)}}{% if c.attnotnull %} SET{% else %} DROP{% endif %} NOT NULL;
{% endif %}
{% if c.datatype != o_data['columns'][c.attnum]['datatype'] or c.typlen != o_data['columns'][c.attnum]['typlen'] or
c.precision != o_data['columns'][c.attnum]['precision'] %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
ALTER COLUMN {{conn|qtIdent(col_name)}} TYPE {{ c.datatype }}{% if c.typlen %}({{c.typlen}}{% if c.precision %}, {{c.precision}}{% endif %}){% endif %}{% if c.isArrayType %}[]{% endif %};
{% endif %}
@ -60,26 +60,26 @@ ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
{% endif %}
{% if c.attstattarget != o_data['columns'][c.attnum]['attstattarget'] %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
ALTER COLUMN {{conn|qtIdent(col_name)}} SET STATISTICS {% if c.attstattarget %}{{c.attstattarget}}{% else %}-1{% endif %};
{% endif %}
{% if c.coloptions_updated %}
{% for o in c.coloptions_updated.deleted %}
{% if o.option %}
{% if loop.first %}ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
{% if loop.first %}ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
ALTER COLUMN {{conn|qtIdent(col_name)}} OPTIONS (DROP {% endif %}{% if not loop.first %}, {% endif %}{{o.option}}{% if loop.last %}){% endif %};
{% endif %}
{% endfor %}
{% for o in c.coloptions_updated.added %}
{% if o.option and o.value %}
{% if loop.first %}ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
{% if loop.first %}ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
ALTER COLUMN {{conn|qtIdent(col_name)}} OPTIONS (ADD {% endif %}{% if not loop.first %}, {% endif %}{{o.option}} {{o.value|qtLiteral}}{% if loop.last %});{% endif %}
{% endif %}
{% endfor %}
{% for o in c.coloptions_updated.changed %}
{% if o.option and o.value %}
{% if loop.first %}ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
{% if loop.first %}ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
ALTER COLUMN {{conn|qtIdent(col_name)}} OPTIONS (SET {% endif %}{% if not loop.first %}, {% endif %}{{o.option}} {{o.value|qtLiteral}}{% if loop.last %});{% endif %}
{% endif %}
{% endfor %}
@ -94,7 +94,7 @@ ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
{% endif %}
{% for i in data.inherits %}
{% if i not in inherits %}{% if i %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }} INHERIT {{i}};
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }} INHERIT {{i}};
{% endif %}
{% endif %}
{% endfor %}
@ -106,34 +106,34 @@ ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }} INHERIT {{i}};
{% set inherits = data.inherits %}
{% endif %}
{% for i in o_data.inherits %}{% if i not in inherits %}{% if i %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }} NO INHERIT {{i}};{% endif %}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }} NO INHERIT {{i}};{% endif %}
{% endif %}
{% endfor %}
{% endif %}
{% if data.constraints %}
{% for c in data.constraints.deleted %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
DROP CONSTRAINT {{conn|qtIdent(c.conname)}};
{% endfor -%}
{% for c in data.constraints.added %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
ADD CONSTRAINT {{ conn|qtIdent(c.conname) }} CHECK ({{ c.consrc }}){% if not c.convalidated %} NOT VALID{% endif %}{% if c.connoinherit %} NO INHERIT{% endif %};
{% endfor %}
{% if data.is_schema_diff is defined and data.is_schema_diff %}
{% for c in data.constraints.changed %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
DROP CONSTRAINT {{conn|qtIdent(c.conname)}};
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
ADD CONSTRAINT {{ conn|qtIdent(c.conname) }} CHECK ({{ c.consrc }}){% if not c.convalidated %} NOT VALID{% endif %}{% if c.connoinherit %} NO INHERIT{% endif %};
{% endfor %}
{% else %}
{% for c in data.constraints.changed %}
{% if c.convalidated %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
VALIDATE CONSTRAINT {{ conn|qtIdent(c.conname) }};
{% endif %}
@ -143,21 +143,21 @@ ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
{% if data.ftoptions %}
{% for o in data.ftoptions.deleted %}
{% if o.option and o.value %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
OPTIONS ( DROP {{o.option}});
{% endif %}
{% endfor %}
{% for o in data.ftoptions.added %}
{% if o.option and o.value %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
OPTIONS (ADD {{o.option}} {{o.value|qtLiteral}});
{% endif %}
{% endfor %}
{% for o in data.ftoptions.changed %}
{% if o.option and o.value %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
OPTIONS (SET {{o.option}} {{o.value|qtLiteral}});
{% endif %}
@ -210,7 +210,7 @@ COMMENT ON FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
{% endif %}
{% endif -%}
{% if data.basensp %}
ALTER FOREIGN TABLE {{ conn|qtIdent(o_data.basensp, name) }}
ALTER FOREIGN TABLE IF EXISTS {{ conn|qtIdent(o_data.basensp, name) }}
SET SCHEMA {{ conn|qtIdent(data.basensp) }};
{% endif %}
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_cons_opts.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default"
)

6
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_cons_opts_msql.sql
View File

@ -1,8 +1,8 @@
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ADD CONSTRAINT cons1 CHECK (true) NO INHERIT;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
OPTIONS (ADD schema_name 'public');
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
OPTIONS (ADD table_name 'test_table');

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_add_priv.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default"
)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_col_opts.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 integer NULL
)
SERVER test_fs_for_foreign_table

10
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_col_opts_msql.sql
View File

@ -1,14 +1,14 @@
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
DROP COLUMN col2;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER COLUMN col1 DROP NOT NULL;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER COLUMN col1 TYPE integer;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER COLUMN col1 SET STATISTICS -1;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
OPTIONS (SET schema_name 'test_public');

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_comment_add_columns.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default"
)

4
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_comment_add_columns_msql.sql
View File

@ -1,7 +1,7 @@
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ADD COLUMN col1 bigint NULL;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ADD COLUMN col2 text NULL;
COMMENT ON FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_remove_opts_priv_cons.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 integer NULL
)
SERVER test_fs_for_foreign_table

4
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/alter_remove_opts_priv_cons_msql.sql
View File

@ -1,7 +1,7 @@
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
DROP CONSTRAINT cons1;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
OPTIONS ( DROP schema_name);
REVOKE ALL ON TABLE public."FT1_$%{}[]()&*^!@""'`\/#" FROM PUBLIC;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/create_foreign_table_with_all_options.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default"
)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/pg/9.6_plus/create_foreign_table_with_all_options_msql.sql
View File

@ -1,4 +1,4 @@
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL
)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_add_priv.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default",
col3 bigint NULL,

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_comment_add_columns.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default",
col3 bigint NULL,

4
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/alter_comment_add_columns_msql.sql
View File

@ -1,7 +1,7 @@
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ADD COLUMN col3 bigint NULL;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ADD COLUMN col4 text NULL;
COMMENT ON FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/create_foreign_table_with_all_options.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default"
)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.2_plus/create_foreign_table_with_all_options_msql.sql
View File

@ -1,4 +1,4 @@
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL
)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_cons_opts.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default"
)

6
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_cons_opts_msql.sql
View File

@ -1,8 +1,8 @@
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ADD CONSTRAINT cons1 CHECK (true) NO INHERIT;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
OPTIONS (ADD schema_name 'public');
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
OPTIONS (ADD table_name 'test_table');

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_add_priv.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default"
)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_col_opts.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 integer NULL
)
SERVER test_fs_for_foreign_table

10
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_col_opts_msql.sql
View File

@ -1,14 +1,14 @@
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
DROP COLUMN col2;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER COLUMN col1 DROP NOT NULL;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER COLUMN col1 TYPE integer;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER COLUMN col1 SET STATISTICS -1;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
OPTIONS (SET schema_name 'test_public');

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_comment_add_columns.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default"
)

4
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_comment_add_columns_msql.sql
View File

@ -1,7 +1,7 @@
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ADD COLUMN col1 bigint NULL;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
ADD COLUMN col2 text NULL;
COMMENT ON FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_remove_opts_priv_cons.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 integer NULL
)
SERVER test_fs_for_foreign_table

4
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/alter_remove_opts_priv_cons_msql.sql
View File

@ -1,7 +1,7 @@
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
DROP CONSTRAINT cons1;
ALTER FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"
ALTER FOREIGN TABLE IF EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"
OPTIONS ( DROP schema_name);
REVOKE ALL ON TABLE public."FT1_$%{}[]()&*^!@""'`\/#" FROM PUBLIC;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/create_foreign_table_with_all_options.sql
View File

@ -2,7 +2,7 @@
-- DROP FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#";
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL COLLATE pg_catalog."default"
)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/tests/ppas/9.6_plus/create_foreign_table_with_all_options_msql.sql
View File

@ -1,4 +1,4 @@
CREATE FOREIGN TABLE public."FT1_$%{}[]()&*^!@""'`\/#"(
CREATE FOREIGN TABLE IF NOT EXISTS public."FT1_$%{}[]()&*^!@""'`\/#"(
col1 bigint NULL,
col2 text NULL
)

4
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/delete.sql
View File

@ -1,4 +1,4 @@
{# DROP FTS CONFIGURATION Statement #}
{% if schema and name %}
DROP TEXT SEARCH CONFIGURATION {{conn|qtIdent(schema)}}.{{conn|qtIdent(name)}} {% if cascade %}CASCADE{%endif%};
{% endif %}
DROP TEXT SEARCH CONFIGURATION IF EXISTS {{conn|qtIdent(schema)}}.{{conn|qtIdent(name)}} {% if cascade %}CASCADE{%endif%};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/delete.sql
View File

@ -19,5 +19,5 @@ WHERE
{# DROP FTS DICTIOANRY Statement #}
{% if schema and name %}
DROP TEXT SEARCH DICTIONARY {{conn|qtIdent(schema)}}.{{conn|qtIdent(name)}} {% if cascade %}CASCADE{%endif%};
DROP TEXT SEARCH DICTIONARY IF EXISTS {{conn|qtIdent(schema)}}.{{conn|qtIdent(name)}} {% if cascade %}CASCADE{%endif%};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/delete.sql
View File

@ -19,5 +19,5 @@ WHERE
{# DROP FTS PARSER Statement #}
{% if schema and name %}
DROP TEXT SEARCH PARSER {{conn|qtIdent(schema)}}.{{conn|qtIdent(name)}} {% if cascade %}CASCADE{%endif%};
DROP TEXT SEARCH PARSER IF EXISTS {{conn|qtIdent(schema)}}.{{conn|qtIdent(name)}} {% if cascade %}CASCADE{%endif%};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/delete.sql
View File

@ -19,5 +19,5 @@ WHERE
{# DROP TEXT SEARCH TEMPLATE Statement #}
{% if schema and name %}
DROP TEXT SEARCH TEMPLATE {{conn|qtIdent(schema)}}.{{conn|qtIdent(name)}} {% if cascade %}CASCADE{%endif%};
DROP TEXT SEARCH TEMPLATE IF EXISTS {{conn|qtIdent(schema)}}.{{conn|qtIdent(name)}} {% if cascade %}CASCADE{%endif%};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/delete.sql
View File

@ -17,5 +17,5 @@ WHERE
{% endif %}
{% if name %}
DROP FUNCTION {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
DROP FUNCTION IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
{% endif %}

21
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.6_plus/delete.sql Normal file
View File

@ -0,0 +1,21 @@
{% if scid and fnid %}
SELECT
pr.proname as name, '(' || COALESCE(pg_catalog
.pg_get_function_identity_arguments(pr.oid), '') || ')' as func_args,
nspname
FROM
pg_catalog.pg_proc pr
JOIN
pg_catalog.pg_type typ ON typ.oid=prorettype
JOIN
pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace
WHERE
proisagg = FALSE
AND pronamespace = {{scid}}::oid
AND typname NOT IN ('trigger', 'event_trigger')
AND pr.oid = {{fnid}};
{% endif %}
{% if name %}
DROP FUNCTION IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/delete.sql
View File

@ -17,6 +17,6 @@ WHERE
{% endif %}
{% if name %}
DROP FUNCTION {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
DROP FUNCTION IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
{% endif %}

21
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.6_plus/delete.sql Normal file
View File

@ -0,0 +1,21 @@
{% if scid and fnid %}
SELECT
pr.proname as name, '(' || COALESCE(pg_catalog
.pg_get_function_identity_arguments(pr.oid), '') || ')' as func_args,
nspname
FROM
pg_catalog.pg_proc pr
JOIN
pg_catalog.pg_type typ ON typ.oid=prorettype
JOIN
pg_catalog.pg_namespace nsp ON nsp.oid=pr.pronamespace
WHERE
proisagg = FALSE
AND pronamespace = {{scid}}::oid
AND typname NOT IN ('trigger', 'event_trigger')
AND pr.oid = {{fnid}};
{% endif %}
{% if name %}
DROP FUNCTION IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/delete.sql
View File

@ -17,5 +17,5 @@ WHERE
{% endif %}
{% if name %}
DROP PROCEDURE {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
DROP PROCEDURE IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/delete.sql
View File

@ -17,5 +17,5 @@ WHERE
{% endif %}
{% if name %}
DROP PROCEDURE {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
DROP PROCEDURE IF EXISTS {{ conn|qtIdent(nspname, name) }}{{func_args}}{% if cascade %} CASCADE{% endif %};
{% endif %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/create.sql
View File

@ -1,4 +1,4 @@
CREATE SEQUENCE {{ conn|qtIdent(data.schema, data.name) }}{% if data.increment is defined and data.cycled %}
CREATE SEQUENCE IF NOT EXISTS {{ conn|qtIdent(data.schema, data.name) }}{% if data.increment is defined and data.cycled %}
CYCLE{% endif %}{% if data.increment is defined %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/delete.sql
View File

@ -1 +1 @@
DROP SEQUENCE {{ conn|qtIdent(data.schema) }}.{{ conn|qtIdent(data.name) }}{% if cascade%} CASCADE{% endif %};
DROP SEQUENCE IF EXISTS {{ conn|qtIdent(data.schema) }}.{{ conn|qtIdent(data.name) }}{% if cascade%} CASCADE{% endif %};

8
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/update.sql
View File

@ -2,12 +2,12 @@
{% import 'macros/schemas/privilege.macros' as PRIVILEGE %}
{% if data %}
{% if data.name != o_data.name %}
ALTER SEQUENCE {{ conn|qtIdent(o_data.schema, o_data.name) }}
ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, o_data.name) }}
RENAME TO {{ conn|qtIdent(data.name) }};
{% endif %}
{% if data.seqowner and data.seqowner != o_data.seqowner %}
ALTER SEQUENCE {{ conn|qtIdent(o_data.schema, data.name) }}
ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }}
OWNER TO {{ conn|qtIdent(data.seqowner) }};
{% endif %}
@ -38,11 +38,11 @@ SELECT setval({{ seqname|qtLiteral }}, {{ data.current_value }}, true);
{% set defquery = defquery+'\n NO CYCLE' %}
{% endif %}
{% if defquery and defquery != '' %}
ALTER SEQUENCE {{ conn|qtIdent(o_data.schema, data.name) }}{{ defquery }};
ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }}{{ defquery }};
{% endif %}
{% if data.schema and data.schema != o_data.schema %}
ALTER SEQUENCE {{ conn|qtIdent(o_data.schema, data.name) }}
ALTER SEQUENCE IF EXISTS {{ conn|qtIdent(o_data.schema, data.name) }}
SET SCHEMA {{ conn|qtIdent(data.schema) }};
{% set seqname = conn|qtIdent(data.schema, data.name) %}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_neg_seq_props.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT -7
START -30
MINVALUE -35

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_neg_seq_props_msql.sql
View File

@ -1,4 +1,4 @@
ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT -7
MINVALUE -35
MAXVALUE -15;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_change_grantee_privs.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_comment.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT 5
START 5
MINVALUE 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_add.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_remove.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_privs_update.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/alter_seq_props_msql.sql
View File

@ -1,6 +1,6 @@
SELECT setval('public."Seq1_$%{}[]()&*^!@""''`\/#"', 7, true);
ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT 12
MINVALUE 2
MAXVALUE 9992

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_negative_sequence.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT -5
START -30
MINVALUE -40

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_negative_sequence_msql.sql
View File

@ -1,4 +1,4 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT -5
START -30
MINVALUE -40

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT 5
START 5
MINVALUE 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/pg/default/create_sequence_msql.sql
View File

@ -1,4 +1,4 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT 5
START 5
MINVALUE 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_neg_seq_props.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT -7
START -30
MINVALUE -35

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_neg_seq_props_msql.sql
View File

@ -1,4 +1,4 @@
ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT -7
MINVALUE -35
MAXVALUE -15;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_change_grantee_privs.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_comment.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT 5
START 5
MINVALUE 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_add.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_remove.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_privs_update.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
CYCLE
INCREMENT 12
START 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/alter_seq_props_msql.sql
View File

@ -1,6 +1,6 @@
SELECT setval('public."Seq1_$%{}[]()&*^!@""''`\/#"', 7, true);
ALTER SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
ALTER SEQUENCE IF EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT 12
MINVALUE 2
MAXVALUE 9992

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_negative_sequence.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT -5
START -30
MINVALUE -40

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_negative_sequence_msql.sql
View File

@ -1,4 +1,4 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT -5
START -30
MINVALUE -40

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence.sql
View File

@ -2,7 +2,7 @@
-- DROP SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#";
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT 5
START 5
MINVALUE 5

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/tests/ppas/default/create_sequence_msql.sql
View File

@ -1,4 +1,4 @@
CREATE SEQUENCE public."Seq1_$%{}[]()&*^!@""'`\/#"
CREATE SEQUENCE IF NOT EXISTS public."Seq1_$%{}[]()&*^!@""'`\/#"
INCREMENT 5
START 5
MINVALUE 5

6
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/tests/pg/10_plus/alter_column_alt_privilege.sql
View File

@ -1,9 +1,9 @@
-- Column: testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#"
-- ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#";
-- ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#" DROP COLUMN IF EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#";
ALTER TABLE testschema."table_2_$%{}[]()&*^!@""'`\/#"
ADD COLUMN "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1;
ALTER TABLE IF EXISTS testschema."table_2_$%{}[]()&*^!@""'`\/#"
ADD COLUMN IF NOT EXISTS "new_col_1_$%{}[]()&*^!@""'`\/#" real NOT NULL DEFAULT 1;
COMMENT ON COLUMN testschema."table_2_$%{}[]()&*^!@""'`\/#"."new_col_1_$%{}[]()&*^!@""'`\/#"
IS 'Comment for alter';

Some files were not shown because too many files have changed in this diff Show More