From d13ee8db2995e7ebf80a47e3dcf7e2e8af8f96c8 Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Thu, 29 Sep 2022 16:45:51 +0530 Subject: [PATCH] 1) Remove folders that are no longer used for older database versions. 2) Fixed RESQL tests for View/MView. --- docs/en_US/release_notes_6_15.rst | 3 +- .../alter_fdw_change_opt2.sql | 0 .../alter_fdw_comment.sql | 0 .../{9.3_plus => 10_plus}/alter_fdw_opt1.sql | 0 .../{9.3_plus => 10_plus}/alter_fdw_opt2.sql | 0 .../alter_fdw_privileges.sql | 0 .../alter_fdw_rename.sql | 0 .../alter_fdw_validator.sql | 0 .../pg/{9.3_plus => 10_plus}/create_fdw.sql | 0 .../tests/pg/{9.3_plus => 10_plus}/test.json | 0 .../alter_fdw_change_opt2.sql | 0 .../alter_fdw_comment.sql | 0 .../{9.3_plus => 10_plus}/alter_fdw_opt1.sql | 0 .../{9.3_plus => 10_plus}/alter_fdw_opt2.sql | 0 .../alter_fdw_privileges.sql | 0 .../alter_fdw_rename.sql | 0 .../alter_fdw_validator.sql | 0 .../ppas/{9.3_plus => 10_plus}/create_fdw.sql | 0 .../ppas/{9.3_plus => 10_plus}/test.json | 0 .../alter_comment_privileges.sql | 0 .../alter_comment_privileges_msql.sql | 0 .../alter_revoke_privileges.sql | 0 .../alter_revoke_privileges_msql.sql | 0 .../alter_trusted_lan_name.sql | 0 .../alter_trusted_lan_name_msql.sql | 0 .../create_trusted_language.sql | 0 .../create_trusted_language_msql.sql | 0 .../create_untrusted_language.sql | 0 .../create_untrusted_language_msql.sql | 0 .../tests/pg/{9.4_plus => 10_plus}/test.json | 0 .../alter_comment_privileges.sql | 0 .../alter_comment_privileges_msql.sql | 0 .../alter_revoke_privileges.sql | 0 .../alter_revoke_privileges_msql.sql | 0 .../alter_trusted_lan_name.sql | 0 .../alter_trusted_lan_name_msql.sql | 0 .../create_trusted_language.sql | 0 .../create_trusted_language_msql.sql | 0 .../create_untrusted_language.sql | 0 .../create_untrusted_language_msql.sql | 0 .../ppas/{9.4_plus => 10_plus}/test.json | 0 .../sql/9.2_plus/create.sql | 10 - .../sql/9.2_plus/get_type_category.sql | 5 - .../sql/9.2_plus/properties.sql | 22 - .../sql/9.2_plus/update.sql | 13 - .../domain_constraints/sql/default/create.sql | 9 +- .../sql/default/properties.sql | 7 +- .../domain_constraints/sql/default/update.sql | 12 +- .../create_public_syn_with_func.sql | 0 .../create_public_syn_with_func_msql.sql | 0 .../create_public_syn_with_pkg.sql | 0 .../create_public_syn_with_pkg_msql.sql | 0 .../create_public_syn_with_proc.sql | 0 .../create_public_syn_with_proc_msql.sql | 0 .../create_public_syn_with_seq.sql | 0 .../create_public_syn_with_seq_msql.sql | 0 .../create_public_syn_with_table.sql | 0 .../create_public_syn_with_table_msql.sql | 0 .../create_synonyms_with_func.sql | 0 .../create_synonyms_with_func_msql.sql | 0 .../create_synonyms_with_pkg.sql | 0 .../create_synonyms_with_pkg_msql.sql | 0 .../create_synonyms_with_proc.sql | 0 .../create_synonyms_with_proc_msql.sql | 0 .../create_synonyms_with_seq.sql | 0 .../create_synonyms_with_seq_msql.sql | 0 .../create_synonyms_with_table.sql | 0 .../create_synonyms_with_table_msql.sql | 0 .../test_public_synonyms.json | 0 .../{9.4_plus => 10_plus}/test_synonyms.json | 0 .../sql/tests/test_foreign_key_properties.py | 5 +- .../catalog/pg/9.1_plus/allowed_privs.json | 26 - .../templates/catalog/pg/9.1_plus/sql/acl.sql | 24 - .../catalog/pg/9.1_plus/sql/create.sql | 17 - .../catalog/pg/9.1_plus/sql/get_name.sql | 1 - .../catalog/pg/9.1_plus/sql/is_catalog.sql | 9 - .../catalog/pg/9.1_plus/sql/nodes.sql | 16 - .../catalog/pg/9.1_plus/sql/properties.sql | 24 - .../catalog/pg/9.1_plus/sql/update.sql | 30 - .../catalog/pg/9.2_plus/allowed_privs.json | 30 - .../templates/catalog/pg/9.2_plus/sql/acl.sql | 24 - .../catalog/pg/9.2_plus/sql/create.sql | 17 - .../catalog/pg/9.2_plus/sql/get_name.sql | 1 - .../catalog/pg/9.2_plus/sql/is_catalog.sql | 9 - .../catalog/pg/9.2_plus/sql/nodes.sql | 16 - .../catalog/pg/9.2_plus/sql/properties.sql | 25 - .../catalog/pg/9.2_plus/sql/update.sql | 30 - .../catalog/ppas/9.1_plus/allowed_privs.json | 26 - .../catalog/ppas/9.1_plus/sql/acl.sql | 24 - .../catalog/ppas/9.1_plus/sql/create.sql | 17 - .../catalog/ppas/9.1_plus/sql/get_name.sql | 1 - .../catalog/ppas/9.1_plus/sql/is_catalog.sql | 9 - .../catalog/ppas/9.1_plus/sql/nodes.sql | 17 - .../catalog/ppas/9.1_plus/sql/properties.sql | 26 - .../catalog/ppas/9.1_plus/sql/update.sql | 30 - .../catalog/ppas/9.2_plus/allowed_privs.json | 30 - .../catalog/ppas/9.2_plus/sql/acl.sql | 24 - .../catalog/ppas/9.2_plus/sql/create.sql | 17 - .../catalog/ppas/9.2_plus/sql/get_name.sql | 1 - .../catalog/ppas/9.2_plus/sql/is_catalog.sql | 9 - .../catalog/ppas/9.2_plus/sql/nodes.sql | 17 - .../catalog/ppas/9.2_plus/sql/properties.sql | 27 - .../catalog/ppas/9.2_plus/sql/update.sql | 30 - .../views/tests/pg/default/alter_mview.sql | 2 +- .../pg/default/alter_view_add_some_priv.sql | 2 +- .../alter_resource_group_name.msql | 0 .../alter_resource_group_name.sql | 0 .../alter_resource_group_options.msql | 0 .../alter_resource_group_options.sql | 0 .../create_resource_group.msql | 0 .../create_resource_group.sql | 0 .../ppas/{9.4_plus => 10_plus}/test.json | 0 .../connect/sql/10_plus/check_recovery.sql | 9 - .../connect/sql/9.0_plus/check_recovery.sql | 9 - .../connect/sql/default/check_recovery.sql | 10 +- .../depends/pg/9.1_plus/dependencies.sql | 85 -- .../depends/pg/9.1_plus/dependents.sql | 71 - .../depends/pg/9.3_plus/dependencies.sql | 87 -- .../depends/pg/9.3_plus/dependents.sql | 73 - .../pg/{9.5_plus => default}/dependencies.sql | 0 .../pg/{9.5_plus => default}/dependents.sql | 0 .../role_dependencies.sql | 0 .../depends/ppas/9.1_plus/dependencies.sql | 89 -- .../depends/ppas/9.1_plus/dependents.sql | 75 - .../depends/ppas/9.3_plus/dependencies.sql | 91 -- .../depends/ppas/9.3_plus/dependents.sql | 77 -- .../{9.5_plus => default}/dependencies.sql | 0 .../ppas/{9.5_plus => default}/dependents.sql | 0 .../role_dependencies.sql | 0 .../servers/tests/test_check_recovery.py | 9 +- .../grant_wizard/pg/9.1_plus/sql/table.sql | 20 - .../pg/{9.1_plus => default}/acl.json | 0 .../sql/foreign_table.sql | 0 .../pg/{9.1_plus => default}/sql/function.sql | 0 .../{9.1_plus => default}/sql/get_schemas.sql | 0 .../sql/grant_foreign_table.sql | 0 .../sql/grant_function.sql | 0 .../sql/grant_sequence.sql | 0 .../{9.1_plus => default}/sql/grant_table.sql | 0 .../pg/{9.1_plus => default}/sql/sequence.sql | 0 .../pg/{10_plus => default}/sql/table.sql | 0 .../pg/{9.1_plus => default}/sql/view.sql | 0 .../grant_wizard/ppas/9.1_plus/sql/table.sql | 20 - .../ppas/{9.1_plus => default}/acl.json | 0 .../sql/foreign_table.sql | 0 .../{9.1_plus => default}/sql/function.sql | 0 .../{9.1_plus => default}/sql/get_schemas.sql | 0 .../sql/grant_foreign_table.sql | 0 .../sql/grant_function.sql | 0 .../sql/grant_package.sql | 0 .../sql/grant_sequence.sql | 0 .../{9.1_plus => default}/sql/grant_table.sql | 0 .../{9.1_plus => default}/sql/package.sql | 0 .../{9.1_plus => default}/sql/sequence.sql | 0 .../ppas/{10_plus => default}/sql/table.sql | 0 .../ppas/{9.1_plus => default}/sql/view.sql | 0 .../schema_diff/tests/pg/9.2_plus/source.sql | 1049 -------------- .../schema_diff/tests/pg/9.2_plus/target.sql | 1034 -------------- .../tests/ppas/9.2_plus/source.sql | 1207 ----------------- .../tests/ppas/9.2_plus/target.sql | 1182 ---------------- .../search_objects/sql/pg/10_plus/search.sql | 544 -------- .../search_objects/sql/pg/9.5_plus/search.sql | 414 ------ .../search_objects/sql/pg/default/search.sql | 221 ++- .../sql/ppas/10_plus/search.sql | 621 --------- .../sql/ppas/9.5_plus/search.sql | 489 ------- .../sql/ppas/default/search.sql | 227 +++- .../sqleditor/sql/10_plus/explain_plan.sql | 16 - .../sqleditor/sql/9.2_plus/explain_plan.sql | 14 - .../sqleditor/sql/default/explain_plan.sql | 2 + .../tests/test_explain_plan_templates.py | 58 +- 170 files changed, 410 insertions(+), 8087 deletions(-) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/{9.3_plus => 10_plus}/alter_fdw_change_opt2.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/{9.3_plus => 10_plus}/alter_fdw_comment.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/{9.3_plus => 10_plus}/alter_fdw_opt1.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/{9.3_plus => 10_plus}/alter_fdw_opt2.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/{9.3_plus => 10_plus}/alter_fdw_privileges.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/{9.3_plus => 10_plus}/alter_fdw_rename.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/{9.3_plus => 10_plus}/alter_fdw_validator.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/{9.3_plus => 10_plus}/create_fdw.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/{9.3_plus => 10_plus}/test.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/{9.3_plus => 10_plus}/alter_fdw_change_opt2.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/{9.3_plus => 10_plus}/alter_fdw_comment.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/{9.3_plus => 10_plus}/alter_fdw_opt1.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/{9.3_plus => 10_plus}/alter_fdw_opt2.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/{9.3_plus => 10_plus}/alter_fdw_privileges.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/{9.3_plus => 10_plus}/alter_fdw_rename.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/{9.3_plus => 10_plus}/alter_fdw_validator.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/{9.3_plus => 10_plus}/create_fdw.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/{9.3_plus => 10_plus}/test.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/alter_comment_privileges.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/alter_comment_privileges_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/alter_revoke_privileges.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/alter_revoke_privileges_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/alter_trusted_lan_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/alter_trusted_lan_name_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/create_trusted_language.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/create_trusted_language_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/create_untrusted_language.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/create_untrusted_language_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/{9.4_plus => 10_plus}/test.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/alter_comment_privileges.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/alter_comment_privileges_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/alter_revoke_privileges.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/alter_revoke_privileges_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/alter_trusted_lan_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/alter_trusted_lan_name_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/create_trusted_language.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/create_trusted_language_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/create_untrusted_language.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/create_untrusted_language_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/{9.4_plus => 10_plus}/test.json (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/get_type_category.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/update.sql rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_func.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_func_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_pkg.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_pkg_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_proc.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_proc_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_seq.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_seq_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_table.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_public_syn_with_table_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_func.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_func_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_pkg.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_pkg_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_proc.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_proc_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_seq.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_seq_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_table.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/create_synonyms_with_table_msql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/test_public_synonyms.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/{9.4_plus => 10_plus}/test_synonyms.json (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/allowed_privs.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/get_name.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/is_catalog.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/allowed_privs.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/get_name.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/is_catalog.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/allowed_privs.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/get_name.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/is_catalog.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/allowed_privs.json delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/acl.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/get_name.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/is_catalog.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/update.sql rename web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/{9.4_plus => 10_plus}/alter_resource_group_name.msql (100%) rename web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/{9.4_plus => 10_plus}/alter_resource_group_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/{9.4_plus => 10_plus}/alter_resource_group_options.msql (100%) rename web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/{9.4_plus => 10_plus}/alter_resource_group_options.sql (100%) rename web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/{9.4_plus => 10_plus}/create_resource_group.msql (100%) rename web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/{9.4_plus => 10_plus}/create_resource_group.sql (100%) rename web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/{9.4_plus => 10_plus}/test.json (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/connect/sql/10_plus/check_recovery.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/connect/sql/9.0_plus/check_recovery.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/dependencies.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/dependents.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.3_plus/dependencies.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.3_plus/dependents.sql rename web/pgadmin/browser/server_groups/servers/templates/depends/pg/{9.5_plus => default}/dependencies.sql (100%) rename web/pgadmin/browser/server_groups/servers/templates/depends/pg/{9.5_plus => default}/dependents.sql (100%) rename web/pgadmin/browser/server_groups/servers/templates/depends/pg/{9.1_plus => default}/role_dependencies.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/dependencies.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/dependents.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.3_plus/dependencies.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.3_plus/dependents.sql rename web/pgadmin/browser/server_groups/servers/templates/depends/ppas/{9.5_plus => default}/dependencies.sql (100%) rename web/pgadmin/browser/server_groups/servers/templates/depends/ppas/{9.5_plus => default}/dependents.sql (100%) rename web/pgadmin/browser/server_groups/servers/templates/depends/ppas/{9.1_plus => default}/role_dependencies.sql (100%) delete mode 100644 web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/table.sql rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/acl.json (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/sql/foreign_table.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/sql/function.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/sql/get_schemas.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/sql/grant_foreign_table.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/sql/grant_function.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/sql/grant_sequence.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/sql/grant_table.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/sql/sequence.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{10_plus => default}/sql/table.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/{9.1_plus => default}/sql/view.sql (100%) delete mode 100644 web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/table.sql rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/acl.json (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/foreign_table.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/function.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/get_schemas.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/grant_foreign_table.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/grant_function.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/grant_package.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/grant_sequence.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/grant_table.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/package.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/sequence.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{10_plus => default}/sql/table.sql (100%) rename web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/{9.1_plus => default}/sql/view.sql (100%) delete mode 100644 web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql delete mode 100644 web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql delete mode 100644 web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql delete mode 100644 web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql delete mode 100644 web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/10_plus/search.sql delete mode 100644 web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/9.5_plus/search.sql delete mode 100644 web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/10_plus/search.sql delete mode 100644 web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/9.5_plus/search.sql delete mode 100644 web/pgadmin/tools/sqleditor/templates/sqleditor/sql/10_plus/explain_plan.sql delete mode 100644 web/pgadmin/tools/sqleditor/templates/sqleditor/sql/9.2_plus/explain_plan.sql diff --git a/docs/en_US/release_notes_6_15.rst b/docs/en_US/release_notes_6_15.rst index f132bce13..3b24398e0 100644 --- a/docs/en_US/release_notes_6_15.rst +++ b/docs/en_US/release_notes_6_15.rst @@ -26,8 +26,9 @@ Housekeeping Bug fixes ********* + | `Issue #5101 `_ - Ensure consistent orderings for ACLS when comparing schemas in the schema diff. | `Issue #5145 `_ - Fixed intermittent error shown while OAuth2 login. - | `Issue #5167 `_ - Fixed the .psqlrc issue for PSQL Tool. + | `Issue #5167 `_ - Ensure that the path to the psqlrc file is correct when multiple users open the PSQL tool at the same time. | `Issue #5188 `_ - Ensure that the continue/start button should be disabled if the user stops the Debugger for the procedures. | `Issue #5210 `_ - Ensure that the query tool creates a new tab with the appropriate user when pressing Alt+Shift+Q. | `Issue #5212 `_ - Added the close button for all the notifications of the notistack. diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_change_opt2.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_change_opt2.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_change_opt2.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_change_opt2.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_comment.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_comment.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_comment.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_opt1.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_opt1.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_opt1.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_opt1.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_opt2.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_opt2.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_opt2.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_opt2.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_privileges.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_privileges.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_privileges.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_privileges.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_rename.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_rename.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_rename.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_rename.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_validator.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_validator.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/alter_fdw_validator.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/alter_fdw_validator.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/create_fdw.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/create_fdw.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/create_fdw.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/create_fdw.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/test.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/9.3_plus/test.json rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/pg/10_plus/test.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_change_opt2.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_change_opt2.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_change_opt2.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_change_opt2.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_comment.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_comment.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_comment.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_comment.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_opt1.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_opt1.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_opt1.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_opt1.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_opt2.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_opt2.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_opt2.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_opt2.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_privileges.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_privileges.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_privileges.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_privileges.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_rename.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_rename.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_rename.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_rename.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_validator.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_validator.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/alter_fdw_validator.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/alter_fdw_validator.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/create_fdw.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/create_fdw.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/create_fdw.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/create_fdw.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/test.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/9.3_plus/test.json rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/tests/ppas/10_plus/test.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_comment_privileges.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_comment_privileges.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_comment_privileges.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_comment_privileges.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_comment_privileges_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_comment_privileges_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_comment_privileges_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_comment_privileges_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_revoke_privileges.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_revoke_privileges.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_revoke_privileges.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_revoke_privileges.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_revoke_privileges_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_revoke_privileges_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_revoke_privileges_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_revoke_privileges_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_trusted_lan_name.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_trusted_lan_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_trusted_lan_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_trusted_lan_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_trusted_lan_name_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_trusted_lan_name_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/alter_trusted_lan_name_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/alter_trusted_lan_name_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/create_trusted_language.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/create_trusted_language.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/create_trusted_language.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/create_trusted_language.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/create_trusted_language_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/create_trusted_language_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/create_trusted_language_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/create_trusted_language_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/create_untrusted_language.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/create_untrusted_language.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/create_untrusted_language.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/create_untrusted_language.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/create_untrusted_language_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/create_untrusted_language_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/create_untrusted_language_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/create_untrusted_language_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/test.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/9.4_plus/test.json rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/pg/10_plus/test.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_comment_privileges.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_comment_privileges.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_comment_privileges.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_comment_privileges.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_comment_privileges_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_comment_privileges_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_comment_privileges_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_comment_privileges_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_revoke_privileges.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_revoke_privileges.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_revoke_privileges.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_revoke_privileges.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_revoke_privileges_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_revoke_privileges_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_revoke_privileges_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_revoke_privileges_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_trusted_lan_name.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_trusted_lan_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_trusted_lan_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_trusted_lan_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_trusted_lan_name_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_trusted_lan_name_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/alter_trusted_lan_name_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/alter_trusted_lan_name_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/create_trusted_language.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/create_trusted_language.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/create_trusted_language.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/create_trusted_language.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/create_trusted_language_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/create_trusted_language_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/create_trusted_language_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/create_trusted_language_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/create_untrusted_language.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/create_untrusted_language.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/create_untrusted_language.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/create_untrusted_language.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/create_untrusted_language_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/create_untrusted_language_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/create_untrusted_language_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/create_untrusted_language_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/test.json b/web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/test.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/9.4_plus/test.json rename to web/pgadmin/browser/server_groups/servers/databases/languages/tests/ppas/10_plus/test.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/create.sql deleted file mode 100644 index ad993f7ab..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/create.sql +++ /dev/null @@ -1,10 +0,0 @@ -{% if data and schema and domain %} -ALTER DOMAIN {{ conn|qtIdent(schema, domain) }} - ADD CONSTRAINT {{ conn|qtIdent(data.name) }} CHECK ({{ data.consrc }}){% if not data.convalidated %} - - NOT VALID{% endif %};{% if data.description %} - - -COMMENT ON CONSTRAINT {{ conn|qtIdent(data.name) }} ON DOMAIN {{ conn|qtIdent(schema, domain) }} - IS '{{ data.description }}';{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/get_type_category.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/get_type_category.sql deleted file mode 100644 index 3d92443f1..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/get_type_category.sql +++ /dev/null @@ -1,5 +0,0 @@ -SELECT - typcategory -FROM - pg_catalog.pg_type -WHERE typname = {{datatype}}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/properties.sql deleted file mode 100644 index 09a7be577..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/properties.sql +++ /dev/null @@ -1,22 +0,0 @@ -SELECT - c.oid, conname AS name, typname AS relname, nspname, description, - pg_catalog.regexp_replace(pg_catalog.pg_get_constraintdef(c.oid, true), E'CHECK \\((.*)\\).*', E'\\1') AS consrc, - connoinherit, convalidated, convalidated AS convalidated_p -FROM - pg_catalog.pg_constraint c -JOIN - pg_catalog.pg_type t ON t.oid=contypid -JOIN - pg_catalog.pg_namespace nl ON nl.oid=typnamespace -LEFT OUTER JOIN - pg_catalog.pg_description des ON (des.objoid=c.oid AND des.classoid='pg_constraint'::regclass) -{% if doid %} -WHERE - contype = 'c' AND contypid = {{doid}}::oid -{% if coid %} - AND c.oid = {{ coid }} -{% endif %} -{% elif coid %} -WHERE -c.oid = {{ coid }} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/update.sql deleted file mode 100644 index 5ea6a0c62..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/9.2_plus/update.sql +++ /dev/null @@ -1,13 +0,0 @@ -{% set name = o_data.name %} -{% if data.name %} -{% set name = data.name %} -ALTER DOMAIN {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - RENAME CONSTRAINT {{ conn|qtIdent(o_data.name) }} TO {{ conn|qtIdent(data.name) }};{% endif -%}{% if data.convalidated %} - - -ALTER DOMAIN {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - VALIDATE CONSTRAINT {{ conn|qtIdent(name) }};{% endif -%}{% if data.description is defined %} - - -COMMENT ON CONSTRAINT {{ conn|qtIdent(name) }} ON DOMAIN {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - IS {{ data.description|qtLiteral }};{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/create.sql index be943d2ce..ad993f7ab 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/create.sql @@ -1,3 +1,10 @@ {% if data and schema and domain %} ALTER DOMAIN {{ conn|qtIdent(schema, domain) }} - ADD CONSTRAINT {{ conn|qtIdent(data.name) }} CHECK ({{ data.consrc }});{% endif -%} + ADD CONSTRAINT {{ conn|qtIdent(data.name) }} CHECK ({{ data.consrc }}){% if not data.convalidated %} + + NOT VALID{% endif %};{% if data.description %} + + +COMMENT ON CONSTRAINT {{ conn|qtIdent(data.name) }} ON DOMAIN {{ conn|qtIdent(schema, domain) }} + IS '{{ data.description }}';{% endif %} +{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/properties.sql index 823fc9fd1..09a7be577 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/properties.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/properties.sql @@ -1,12 +1,15 @@ SELECT - c.oid, conname AS name, typname AS relname, nspname, - pg_catalog.regexp_replace(pg_catalog.pg_get_constraintdef(c.oid, true), E'CHECK \\((.*)\\).*', E'\\1') AS consrc + c.oid, conname AS name, typname AS relname, nspname, description, + pg_catalog.regexp_replace(pg_catalog.pg_get_constraintdef(c.oid, true), E'CHECK \\((.*)\\).*', E'\\1') AS consrc, + connoinherit, convalidated, convalidated AS convalidated_p FROM pg_catalog.pg_constraint c JOIN pg_catalog.pg_type t ON t.oid=contypid JOIN pg_catalog.pg_namespace nl ON nl.oid=typnamespace +LEFT OUTER JOIN + pg_catalog.pg_description des ON (des.objoid=c.oid AND des.classoid='pg_constraint'::regclass) {% if doid %} WHERE contype = 'c' AND contypid = {{doid}}::oid diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/update.sql index 299ba6b33..5ea6a0c62 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/sql/default/update.sql @@ -1,3 +1,13 @@ +{% set name = o_data.name %} {% if data.name %} +{% set name = data.name %} ALTER DOMAIN {{ conn|qtIdent(o_data.nspname, o_data.relname) }} - RENAME CONSTRAINT {{ conn|qtIdent(o_data.name) }} TO {{ conn|qtIdent(data.name) }};{% endif %} + RENAME CONSTRAINT {{ conn|qtIdent(o_data.name) }} TO {{ conn|qtIdent(data.name) }};{% endif -%}{% if data.convalidated %} + + +ALTER DOMAIN {{ conn|qtIdent(o_data.nspname, o_data.relname) }} + VALIDATE CONSTRAINT {{ conn|qtIdent(name) }};{% endif -%}{% if data.description is defined %} + + +COMMENT ON CONSTRAINT {{ conn|qtIdent(name) }} ON DOMAIN {{ conn|qtIdent(o_data.nspname, o_data.relname) }} + IS {{ data.description|qtLiteral }};{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_func.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_func.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_func.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_func.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_func_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_func_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_func_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_func_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_pkg.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_pkg.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_pkg.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_pkg.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_pkg_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_pkg_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_pkg_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_pkg_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_proc.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_proc.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_proc.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_proc.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_proc_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_proc_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_proc_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_proc_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_seq.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_seq.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_seq.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_seq_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_seq_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_seq_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_seq_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_table.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_table.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_table.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_table_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_table_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_public_syn_with_table_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_public_syn_with_table_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_func.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_func.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_func.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_func.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_func_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_func_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_func_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_func_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_pkg.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_pkg.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_pkg.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_pkg.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_pkg_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_pkg_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_pkg_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_pkg_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_proc.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_proc.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_proc.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_proc.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_proc_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_proc_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_proc_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_proc_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_seq.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_seq.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_seq.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_seq.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_seq_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_seq_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_seq_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_seq_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_table.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_table.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_table.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_table_msql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_table_msql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/create_synonyms_with_table_msql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/create_synonyms_with_table_msql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/test_public_synonyms.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/test_public_synonyms.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/test_public_synonyms.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/test_public_synonyms.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/test_synonyms.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/test_synonyms.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/9.4_plus/test_synonyms.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/tests/ppas/10_plus/test_synonyms.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py index 9c21030dc..419508789 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/foreign_key/sql/tests/test_foreign_key_properties.py @@ -38,10 +38,7 @@ class TestColumnForeignKeyGetConstraintCols(BaseTestGenerator): " and pg_attribute.attname = 'some_column'") table_id, column_id = cursor.fetchone() - if connection.server_version < 90100: - self.versions_to_test = ['default'] - else: - self.versions_to_test = ['9.1_plus'] + self.versions_to_test = ['default'] for version in self.versions_to_test: template_file = os.path.join( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/allowed_privs.json deleted file mode 100644 index b1bed681f..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/allowed_privs.json +++ /dev/null @@ -1,26 +0,0 @@ -{# List of allowed privileges for PostgreSQL 9.1 #} -{# - Format for allowed privileges is: - "acl_col": { - "type": "name", - "acl": [...] - } -#} -{ - "nspacl": { - "type": "DATABASE", - "acl": ["c", "C", "T"] - }, - "deftblacl": { - "type": "TABLE", - "acl": ["r", "a", "w", "d", "D", "x", "t"] - }, - "defseqacl": { - "type": "SEQUENCE", - "acl": ["U", "r", "w"] - }, - "deffuncacl": { - "type": "FUNCTION", - "acl": ["X"] - } -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/acl.sql deleted file mode 100644 index 58d0aff55..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/acl.sql +++ /dev/null @@ -1,24 +0,0 @@ -{# Fetch privileges for schema #} -SELECT - 'nspacl' as deftype, COALESCE(gt.rolname, 'PUBLIC') AS grantee, - g.rolname AS grantor, pg_catalog.array_agg(b.privilege_type) AS privileges, - pg_catalog.array_agg(b.is_grantable) AS grantable -FROM - (SELECT - (d).grantee AS grantee, (d).grantor AS grantor, - (d).is_grantable AS is_grantable, - CASE (d).privilege_type - WHEN 'CREATE' THEN 'C' - WHEN 'USAGE' THEN 'U' - ELSE 'UNKNOWN - ' || (d).privilege_type - END AS privilege_type - FROM - (SELECT pg_catalog.aclexplode(nsp.nspacl) as d - FROM pg_catalog.pg_namespace nsp - WHERE nsp.oid = {{ scid|qtLiteral }}::OID - ) a - ) b - LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid) - LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid) -GROUP BY g.rolname, gt.rolname -ORDER BY grantee; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/create.sql deleted file mode 100644 index 12dd10251..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/create.sql +++ /dev/null @@ -1,17 +0,0 @@ -{% import 'macros/privilege.macros' as PRIVILEGE %} -{% if data %} -CREATE SCHEMA {{ conn|qtIdent(data.name) }} -{% if data.namespaceowner %} - AUTHORIZATION {{ conn|qtIdent(data.namespaceowner) }}; - -{% endif %} -{% if data.description %} -COMMENT ON SCHEMA {{ conn|qtIdent(data.name) }} - IS {{ data.description|qtLiteral }}; - -{% endif %} -{% if data.nspacl %} -{% for priv in data.nspacl %} -{{ PRIVILEGE.APPLY(conn, 'SCHEMA', priv.grantee, data.name, priv.without_grant, priv.with_grant) }}{% endfor %} -{% endif %} -{% endif %} \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/get_name.sql deleted file mode 100644 index be20542b7..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/get_name.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT nsp.nspname FROM pg_catalog.pg_namespace nsp WHERE nsp.oid = {{ scid|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/is_catalog.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/is_catalog.sql deleted file mode 100644 index 9386acbf4..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/is_catalog.sql +++ /dev/null @@ -1,9 +0,0 @@ -{% import 'catalog/pg/macros/catalogs.sql' as CATALOGS %} -SELECT - nsp.nspname as schema_name, - {{ CATALOGS.LIST('nsp') }} AS is_catalog, - {{ CATALOGS.DB_SUPPORT('nsp') }} AS db_support -FROM - pg_catalog.pg_namespace nsp -WHERE - nsp.oid = {{ scid|qtLiteral }}::OID; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/nodes.sql deleted file mode 100644 index 5de3ee5b4..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/nodes.sql +++ /dev/null @@ -1,16 +0,0 @@ -{% import 'catalog/pg/macros/catalogs.sql' as CATALOGS %} -SELECT - nsp.oid, -{{ CATALOGS.LABELS('nsp', _) }}, - pg_catalog.has_schema_privilege(nsp.oid, 'CREATE') as can_create, - pg_catalog.has_schema_privilege(nsp.oid, 'USAGE') as has_usage -FROM - pg_catalog.pg_namespace nsp -WHERE - {% if scid %} - nsp.oid={{scid}}::oid AND - {% endif %} - ( -{{ CATALOGS.LIST('nsp') }} - ) -ORDER BY 2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/properties.sql deleted file mode 100644 index 759233d21..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/properties.sql +++ /dev/null @@ -1,24 +0,0 @@ -{% import 'catalog/pg/macros/catalogs.sql' as CATALOGS %} -SELECT - 2 AS nsptyp, - nsp.nspname AS name, - nsp.oid, - pg_catalog.array_to_string(nsp.nspacl::text[], ', ') as acl, - r.rolname AS namespaceowner, description, - has_schema_privilege(nsp.oid, 'CREATE') AS can_create, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'r' AND defaclnamespace = nsp.oid) AS tblacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'S' AND defaclnamespace = nsp.oid) AS seqacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'f' AND defaclnamespace = nsp.oid) AS funcacl -FROM - pg_catalog.pg_namespace nsp - LEFT OUTER JOIN pg_catalog.pg_description des ON - (des.objoid=nsp.oid AND des.classoid='pg_namespace'::regclass) - LEFT JOIN pg_catalog.pg_roles r ON (r.oid = nsp.nspowner) -WHERE - {% if scid %} - nsp.oid={{scid}}::oid AND - {% endif %} - ( -{{ CATALOGS.LIST('nsp') }} - ) -ORDER BY 1, nspname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/update.sql deleted file mode 100644 index 39f7f94c7..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.1_plus/sql/update.sql +++ /dev/null @@ -1,30 +0,0 @@ -{% import 'macros/security.macros' as SECLABEL %} -{% if data %} -{# ==== To update catalog comments ==== #} -{% if data.description and data.description != o_data.description %} -COMMENT ON SCHEMA {{ conn|qtIdent(o_data.name) }} - IS {{ data.description|qtLiteral }}; - -{% endif %} -{# ==== To update catalog securitylabel ==== #} -{# The SQL generated below will change Security Label #} -{% if data.seclabels and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.DROP(conn, 'SCHEMA', o_data.name, r.provider) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.APPLY(conn, 'SCHEMA', o_data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.APPLY(conn, 'SCHEMA', o_data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} - -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/allowed_privs.json deleted file mode 100644 index 1253e87dc..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/allowed_privs.json +++ /dev/null @@ -1,30 +0,0 @@ -{# List of allowed privileges for PostgreSQL 9.2 or later #} -{# - Format for allowed privileges is: - "acl_col": { - "type": "name", - "acl": [...] - } -#} -{ - "nspacl": { - "type": "DATABASE", - "acl": ["c", "C", "T"] - }, - "deftblacl": { - "type": "TABLE", - "acl": ["r", "a", "w", "d", "D", "x", "t"] - }, - "defseqacl": { - "type": "SEQUENCE", - "acl": ["U", "r", "w"] - }, - "deffuncacl": { - "type": "FUNCTION", - "acl": ["X"] - }, - "deftypeacl": { - "type": "TYPE", - "acl": ["U"] - } -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/acl.sql deleted file mode 100644 index 58d0aff55..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/acl.sql +++ /dev/null @@ -1,24 +0,0 @@ -{# Fetch privileges for schema #} -SELECT - 'nspacl' as deftype, COALESCE(gt.rolname, 'PUBLIC') AS grantee, - g.rolname AS grantor, pg_catalog.array_agg(b.privilege_type) AS privileges, - pg_catalog.array_agg(b.is_grantable) AS grantable -FROM - (SELECT - (d).grantee AS grantee, (d).grantor AS grantor, - (d).is_grantable AS is_grantable, - CASE (d).privilege_type - WHEN 'CREATE' THEN 'C' - WHEN 'USAGE' THEN 'U' - ELSE 'UNKNOWN - ' || (d).privilege_type - END AS privilege_type - FROM - (SELECT pg_catalog.aclexplode(nsp.nspacl) as d - FROM pg_catalog.pg_namespace nsp - WHERE nsp.oid = {{ scid|qtLiteral }}::OID - ) a - ) b - LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid) - LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid) -GROUP BY g.rolname, gt.rolname -ORDER BY grantee; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/create.sql deleted file mode 100644 index 2dd2328b6..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/create.sql +++ /dev/null @@ -1,17 +0,0 @@ -{% import 'macros/privilege.macros' as PRIVILEGE %} -{% if data %} -CREATE SCHEMA{% if add_not_exists_clause %} IF NOT EXISTS{% endif %} {{ conn|qtIdent(data.name) }} -{% if data.namespaceowner %} - AUTHORIZATION {{ conn|qtIdent(data.namespaceowner) }}; - -{% endif %} -{% if data.description %} -COMMENT ON SCHEMA {{ conn|qtIdent(data.name) }} - IS {{ data.description|qtLiteral }}; - -{% endif %} -{% if data.nspacl %} -{% for priv in data.nspacl %} -{{ PRIVILEGE.APPLY(conn, 'SCHEMA', priv.grantee, data.name, priv.without_grant, priv.with_grant) }}{% endfor %} -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/get_name.sql deleted file mode 100644 index be20542b7..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/get_name.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT nsp.nspname FROM pg_catalog.pg_namespace nsp WHERE nsp.oid = {{ scid|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/is_catalog.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/is_catalog.sql deleted file mode 100644 index 9386acbf4..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/is_catalog.sql +++ /dev/null @@ -1,9 +0,0 @@ -{% import 'catalog/pg/macros/catalogs.sql' as CATALOGS %} -SELECT - nsp.nspname as schema_name, - {{ CATALOGS.LIST('nsp') }} AS is_catalog, - {{ CATALOGS.DB_SUPPORT('nsp') }} AS db_support -FROM - pg_catalog.pg_namespace nsp -WHERE - nsp.oid = {{ scid|qtLiteral }}::OID; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/nodes.sql deleted file mode 100644 index 5de3ee5b4..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/nodes.sql +++ /dev/null @@ -1,16 +0,0 @@ -{% import 'catalog/pg/macros/catalogs.sql' as CATALOGS %} -SELECT - nsp.oid, -{{ CATALOGS.LABELS('nsp', _) }}, - pg_catalog.has_schema_privilege(nsp.oid, 'CREATE') as can_create, - pg_catalog.has_schema_privilege(nsp.oid, 'USAGE') as has_usage -FROM - pg_catalog.pg_namespace nsp -WHERE - {% if scid %} - nsp.oid={{scid}}::oid AND - {% endif %} - ( -{{ CATALOGS.LIST('nsp') }} - ) -ORDER BY 2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/properties.sql deleted file mode 100644 index 897e76254..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/properties.sql +++ /dev/null @@ -1,25 +0,0 @@ -{% import 'catalog/pg/macros/catalogs.sql' as CATALOGS %} -SELECT - 2 AS nsptyp, - nsp.nspname AS name, - nsp.oid, - pg_catalog.array_to_string(nsp.nspacl::text[], ', ') as acl, - r.rolname AS namespaceowner, description, - pg_catalog.has_schema_privilege(nsp.oid, 'CREATE') AS can_create, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'r' AND defaclnamespace = nsp.oid) AS tblacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'S' AND defaclnamespace = nsp.oid) AS seqacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'f' AND defaclnamespace = nsp.oid) AS funcacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'T' AND defaclnamespace = nsp.oid) AS typeacl -FROM - pg_catalog.pg_namespace nsp - LEFT OUTER JOIN pg_catalog.pg_description des ON - (des.objoid=nsp.oid AND des.classoid='pg_namespace'::regclass) - LEFT JOIN pg_catalog.pg_roles r ON (r.oid = nsp.nspowner) -WHERE - {% if scid %} - nsp.oid={{scid}}::oid AND - {% endif %} - ( -{{ CATALOGS.LIST('nsp') }} - ) -ORDER BY 1, nspname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/update.sql deleted file mode 100644 index 39f7f94c7..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/pg/9.2_plus/sql/update.sql +++ /dev/null @@ -1,30 +0,0 @@ -{% import 'macros/security.macros' as SECLABEL %} -{% if data %} -{# ==== To update catalog comments ==== #} -{% if data.description and data.description != o_data.description %} -COMMENT ON SCHEMA {{ conn|qtIdent(o_data.name) }} - IS {{ data.description|qtLiteral }}; - -{% endif %} -{# ==== To update catalog securitylabel ==== #} -{# The SQL generated below will change Security Label #} -{% if data.seclabels and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.DROP(conn, 'SCHEMA', o_data.name, r.provider) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.APPLY(conn, 'SCHEMA', o_data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.APPLY(conn, 'SCHEMA', o_data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} - -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/allowed_privs.json deleted file mode 100644 index c08b453ca..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/allowed_privs.json +++ /dev/null @@ -1,26 +0,0 @@ -{# List of allowed privileges for PPAS 9.1 #} -{# - Format for allowed privileges is: - "acl_col": { - "type": "name", - "acl": [...] - } -#} -{ - "nspacl": { - "type": "DATABASE", - "acl": ["c", "C", "T"] - }, - "deftblacl": { - "type": "TABLE", - "acl": ["r", "a", "w", "d", "D", "x", "t"] - }, - "defseqacl": { - "type": "SEQUENCE", - "acl": ["U", "r", "w"] - }, - "deffuncacl": { - "type": "FUNCTION", - "acl": ["X"] - } -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/acl.sql deleted file mode 100644 index 58d0aff55..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/acl.sql +++ /dev/null @@ -1,24 +0,0 @@ -{# Fetch privileges for schema #} -SELECT - 'nspacl' as deftype, COALESCE(gt.rolname, 'PUBLIC') AS grantee, - g.rolname AS grantor, pg_catalog.array_agg(b.privilege_type) AS privileges, - pg_catalog.array_agg(b.is_grantable) AS grantable -FROM - (SELECT - (d).grantee AS grantee, (d).grantor AS grantor, - (d).is_grantable AS is_grantable, - CASE (d).privilege_type - WHEN 'CREATE' THEN 'C' - WHEN 'USAGE' THEN 'U' - ELSE 'UNKNOWN - ' || (d).privilege_type - END AS privilege_type - FROM - (SELECT pg_catalog.aclexplode(nsp.nspacl) as d - FROM pg_catalog.pg_namespace nsp - WHERE nsp.oid = {{ scid|qtLiteral }}::OID - ) a - ) b - LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid) - LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid) -GROUP BY g.rolname, gt.rolname -ORDER BY grantee; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/create.sql deleted file mode 100644 index 38c553228..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/create.sql +++ /dev/null @@ -1,17 +0,0 @@ -{% import 'macros/privilege.macros' as PRIVILEGE %} -{% if data %} -CREATE SCHEMA {{ conn|qtIdent(data.name) }} -{% if data.namespaceowner %} - AUTHORIZATION {{ conn|qtIdent(data.namespaceowner) }}; - -{% endif %} -{% if data.description %} -COMMENT ON SCHEMA {{ conn|qtIdent(data.name) }} - IS {{ data.description|qtLiteral }}; - -{% endif %} -{% if data.nspacl %} -{% for priv in data.nspacl %} -{{ PRIVILEGE.APPLY(conn, 'SCHEMA', priv.grantee, data.name, priv.without_grant, priv.with_grant) }}{% endfor %} -{% endif %} -{% endif %} \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/get_name.sql deleted file mode 100644 index be20542b7..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/get_name.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT nsp.nspname FROM pg_catalog.pg_namespace nsp WHERE nsp.oid = {{ scid|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/is_catalog.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/is_catalog.sql deleted file mode 100644 index 992b18c3b..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/is_catalog.sql +++ /dev/null @@ -1,9 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -SELECT - nsp.nspname as schema_name, - {{ CATALOGS.LIST('nsp') }} AS is_catalog, - {{ CATALOGS.DB_SUPPORT('nsp') }} AS db_support -FROM - pg_catalog.pg_namespace nsp -WHERE - nsp.oid = {{ scid|qtLiteral }}::OID; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/nodes.sql deleted file mode 100644 index 89c74ed3e..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/nodes.sql +++ /dev/null @@ -1,17 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -SELECT - nsp.oid, -{{ CATALOGS.LABELS('nsp', _) }}, - pg_catalog.has_schema_privilege(nsp.oid, 'CREATE') as can_create, - pg_catalog.has_schema_privilege(nsp.oid, 'USAGE') as has_usage -FROM - pg_catalog.pg_namespace nsp -WHERE - {% if scid %} - nsp.oid={{scid}}::oid AND - {% endif %} - nsp.nspparent = 0 AND - ( -{{ CATALOGS.LIST('nsp') }} - ) -ORDER BY 2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/properties.sql deleted file mode 100644 index 2f94d8e17..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/properties.sql +++ /dev/null @@ -1,26 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -SELECT - 2 AS nsptyp, - nsp.nspname AS name, - nsp.oid, - pg_catalog.array_to_string(nsp.nspacl::text[], ', ') as acl, - r.rolname AS namespaceowner, description, - pg_catalog.has_schema_privilege(nsp.oid, 'CREATE') AS can_create, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'r' AND defaclnamespace = nsp.oid) AS tblacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'S' AND defaclnamespace = nsp.oid) AS seqacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'f' AND defaclnamespace = nsp.oid) AS funcacl, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=nsp.oid) AS seclabels -FROM - pg_catalog.pg_namespace nsp - LEFT OUTER JOIN pg_catalog.pg_description des ON - (des.objoid=nsp.oid AND des.classoid='pg_namespace'::regclass) - LEFT JOIN pg_catalog.pg_roles r ON (r.oid = nsp.nspowner) -WHERE - {% if scid %} - nsp.oid={{scid}}::oid AND - {% endif %} - nsp.nspparent = 0 AND - ( -{{ CATALOGS.LIST('nsp') }} - ) -ORDER BY 1, nspname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/update.sql deleted file mode 100644 index 39f7f94c7..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.1_plus/sql/update.sql +++ /dev/null @@ -1,30 +0,0 @@ -{% import 'macros/security.macros' as SECLABEL %} -{% if data %} -{# ==== To update catalog comments ==== #} -{% if data.description and data.description != o_data.description %} -COMMENT ON SCHEMA {{ conn|qtIdent(o_data.name) }} - IS {{ data.description|qtLiteral }}; - -{% endif %} -{# ==== To update catalog securitylabel ==== #} -{# The SQL generated below will change Security Label #} -{% if data.seclabels and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.DROP(conn, 'SCHEMA', o_data.name, r.provider) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.APPLY(conn, 'SCHEMA', o_data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.APPLY(conn, 'SCHEMA', o_data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} - -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/allowed_privs.json deleted file mode 100644 index 0d0b305e2..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/allowed_privs.json +++ /dev/null @@ -1,30 +0,0 @@ -{# List of allowed privileges for PPAS 9.2 or later #} -{# - Format for allowed privileges is: - "acl_col": { - "type": "name", - "acl": [...] - } -#} -{ - "nspacl": { - "type": "DATABASE", - "acl": ["c", "C", "T"] - }, - "deftblacl": { - "type": "TABLE", - "acl": ["r", "a", "w", "d", "D", "x", "t"] - }, - "defseqacl": { - "type": "SEQUENCE", - "acl": ["U", "r", "w"] - }, - "deffuncacl": { - "type": "FUNCTION", - "acl": ["X"] - }, - "deftypeacl": { - "type": "TYPE", - "acl": ["U"] - } -} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/acl.sql deleted file mode 100644 index 58d0aff55..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/acl.sql +++ /dev/null @@ -1,24 +0,0 @@ -{# Fetch privileges for schema #} -SELECT - 'nspacl' as deftype, COALESCE(gt.rolname, 'PUBLIC') AS grantee, - g.rolname AS grantor, pg_catalog.array_agg(b.privilege_type) AS privileges, - pg_catalog.array_agg(b.is_grantable) AS grantable -FROM - (SELECT - (d).grantee AS grantee, (d).grantor AS grantor, - (d).is_grantable AS is_grantable, - CASE (d).privilege_type - WHEN 'CREATE' THEN 'C' - WHEN 'USAGE' THEN 'U' - ELSE 'UNKNOWN - ' || (d).privilege_type - END AS privilege_type - FROM - (SELECT pg_catalog.aclexplode(nsp.nspacl) as d - FROM pg_catalog.pg_namespace nsp - WHERE nsp.oid = {{ scid|qtLiteral }}::OID - ) a - ) b - LEFT JOIN pg_catalog.pg_roles g ON (b.grantor = g.oid) - LEFT JOIN pg_catalog.pg_roles gt ON (b.grantee = gt.oid) -GROUP BY g.rolname, gt.rolname -ORDER BY grantee; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/create.sql deleted file mode 100644 index 38c553228..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/create.sql +++ /dev/null @@ -1,17 +0,0 @@ -{% import 'macros/privilege.macros' as PRIVILEGE %} -{% if data %} -CREATE SCHEMA {{ conn|qtIdent(data.name) }} -{% if data.namespaceowner %} - AUTHORIZATION {{ conn|qtIdent(data.namespaceowner) }}; - -{% endif %} -{% if data.description %} -COMMENT ON SCHEMA {{ conn|qtIdent(data.name) }} - IS {{ data.description|qtLiteral }}; - -{% endif %} -{% if data.nspacl %} -{% for priv in data.nspacl %} -{{ PRIVILEGE.APPLY(conn, 'SCHEMA', priv.grantee, data.name, priv.without_grant, priv.with_grant) }}{% endfor %} -{% endif %} -{% endif %} \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/get_name.sql deleted file mode 100644 index be20542b7..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/get_name.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT nsp.nspname FROM pg_catalog.pg_namespace nsp WHERE nsp.oid = {{ scid|qtLiteral }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/is_catalog.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/is_catalog.sql deleted file mode 100644 index 992b18c3b..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/is_catalog.sql +++ /dev/null @@ -1,9 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -SELECT - nsp.nspname as schema_name, - {{ CATALOGS.LIST('nsp') }} AS is_catalog, - {{ CATALOGS.DB_SUPPORT('nsp') }} AS db_support -FROM - pg_catalog.pg_namespace nsp -WHERE - nsp.oid = {{ scid|qtLiteral }}::OID; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/nodes.sql deleted file mode 100644 index 83db58499..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/nodes.sql +++ /dev/null @@ -1,17 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -SELECT - nsp.oid, -{{ CATALOGS.LABELS('nsp', _) }}, - pg_catalog.has_schema_privilege(nsp.oid, 'CREATE') as can_create, - pg_catalog.has_schema_privilege(nsp.oid, 'USAGE') as has_usage -FROM - pg_catalog.pg_namespace nsp -WHERE - {% if scid %} - nsp.oid={{scid}}::oid AND - {% endif %} - nsp.nspparent = 0 AND - ( -{{ CATALOGS.LIST('nsp') }} - ) -ORDER BY 2; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/properties.sql deleted file mode 100644 index 2e1af5b06..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/properties.sql +++ /dev/null @@ -1,27 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -SELECT - 2 AS nsptyp, - nsp.nspname AS name, - nsp.oid, - pg_catalog.array_to_string(nsp.nspacl::text[], ', ') as acl, - r.rolname AS namespaceowner, description, - pg_catalog.has_schema_privilege(nsp.oid, 'CREATE') AS can_create, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'r' AND defaclnamespace = nsp.oid) AS tblacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'S' AND defaclnamespace = nsp.oid) AS seqacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'f' AND defaclnamespace = nsp.oid) AS funcacl, - (SELECT pg_catalog.array_to_string(defaclacl::text[], ', ') FROM pg_catalog.pg_default_acl WHERE defaclobjtype = 'T' AND defaclnamespace = nsp.oid) AS typeacl, - (SELECT pg_catalog.array_agg(provider || '=' || label) FROM pg_catalog.pg_seclabels sl1 WHERE sl1.objoid=nsp.oid) AS seclabels -FROM - pg_catalog.pg_namespace nsp - LEFT OUTER JOIN pg_catalog.pg_description des ON - (des.objoid=nsp.oid AND des.classoid='pg_namespace'::regclass) - LEFT JOIN pg_catalog.pg_roles r ON (r.oid = nsp.nspowner) -WHERE - {% if scid %} - nsp.oid={{scid}}::oid AND - {% endif %} - nsp.nspparent = 0 AND - ( -{{ CATALOGS.LIST('nsp') }} - ) -ORDER BY 1, nspname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/update.sql deleted file mode 100644 index 39f7f94c7..000000000 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/catalog/ppas/9.2_plus/sql/update.sql +++ /dev/null @@ -1,30 +0,0 @@ -{% import 'macros/security.macros' as SECLABEL %} -{% if data %} -{# ==== To update catalog comments ==== #} -{% if data.description and data.description != o_data.description %} -COMMENT ON SCHEMA {{ conn|qtIdent(o_data.name) }} - IS {{ data.description|qtLiteral }}; - -{% endif %} -{# ==== To update catalog securitylabel ==== #} -{# The SQL generated below will change Security Label #} -{% if data.seclabels and data.seclabels|length > 0 %} -{% set seclabels = data.seclabels %} -{% if 'deleted' in seclabels and seclabels.deleted|length > 0 %} -{% for r in seclabels.deleted %} -{{ SECLABEL.DROP(conn, 'SCHEMA', o_data.name, r.provider) }} -{% endfor %} -{% endif %} -{% if 'added' in seclabels and seclabels.added|length > 0 %} -{% for r in seclabels.added %} -{{ SECLABEL.APPLY(conn, 'SCHEMA', o_data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} -{% if 'changed' in seclabels and seclabels.changed|length > 0 %} -{% for r in seclabels.changed %} -{{ SECLABEL.APPLY(conn, 'SCHEMA', o_data.name, r.provider, r.label) }} -{% endfor %} -{% endif %} - -{% endif %} -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_mview.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_mview.sql index e60d08e01..ca5a3bc1d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_mview.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_mview.sql @@ -14,5 +14,5 @@ ALTER TABLE IF EXISTS public."testmview_$%{}[]()&*^!/@`#" COMMENT ON MATERIALIZED VIEW public."testmview_$%{}[]()&*^!/@`#" IS 'comment1'; -GRANT ALL ON TABLE public."testmview_$%{}[]()&*^!/@`#" TO postgres; GRANT ALL ON TABLE public."testmview_$%{}[]()&*^!/@`#" TO PUBLIC; +GRANT ALL ON TABLE public."testmview_$%{}[]()&*^!/@`#" TO postgres; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_view_add_some_priv.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_view_add_some_priv.sql index 584c7ffe1..b5835cf5a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_view_add_some_priv.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/tests/pg/default/alter_view_add_some_priv.sql @@ -15,5 +15,5 @@ ALTER TABLE public."testview_$%{}[]()&*^!@""'`\/#" COMMENT ON VIEW public."testview_$%{}[]()&*^!@""'`\/#" IS 'Testcomment-updated'; -GRANT ALL ON TABLE public."testview_$%{}[]()&*^!@""'`\/#" TO postgres; GRANT SELECT ON TABLE public."testview_$%{}[]()&*^!@""'`\/#" TO PUBLIC; +GRANT ALL ON TABLE public."testview_$%{}[]()&*^!@""'`\/#" TO postgres; diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_name.msql b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/alter_resource_group_name.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_name.msql rename to web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/alter_resource_group_name.msql diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_name.sql b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/alter_resource_group_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_name.sql rename to web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/alter_resource_group_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_options.msql b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/alter_resource_group_options.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_options.msql rename to web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/alter_resource_group_options.msql diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_options.sql b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/alter_resource_group_options.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/alter_resource_group_options.sql rename to web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/alter_resource_group_options.sql diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/create_resource_group.msql b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/create_resource_group.msql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/create_resource_group.msql rename to web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/create_resource_group.msql diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/create_resource_group.sql b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/create_resource_group.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/create_resource_group.sql rename to web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/create_resource_group.sql diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/test.json b/web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/test.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/9.4_plus/test.json rename to web/pgadmin/browser/server_groups/servers/resource_groups/tests/ppas/10_plus/test.json diff --git a/web/pgadmin/browser/server_groups/servers/templates/connect/sql/10_plus/check_recovery.sql b/web/pgadmin/browser/server_groups/servers/templates/connect/sql/10_plus/check_recovery.sql deleted file mode 100644 index cf553b23d..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/connect/sql/10_plus/check_recovery.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT CASE WHEN usesuper - THEN pg_catalog.pg_is_in_recovery() - ELSE FALSE - END as inrecovery, - CASE WHEN usesuper AND pg_catalog.pg_is_in_recovery() - THEN pg_is_wal_replay_paused() - ELSE FALSE - END as isreplaypaused -FROM pg_catalog.pg_user WHERE usename=current_user diff --git a/web/pgadmin/browser/server_groups/servers/templates/connect/sql/9.0_plus/check_recovery.sql b/web/pgadmin/browser/server_groups/servers/templates/connect/sql/9.0_plus/check_recovery.sql deleted file mode 100644 index 03c4d6188..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/connect/sql/9.0_plus/check_recovery.sql +++ /dev/null @@ -1,9 +0,0 @@ -SELECT CASE WHEN usesuper - THEN pg_catalog.pg_is_in_recovery() - ELSE FALSE - END as inrecovery, - CASE WHEN usesuper AND pg_catalog.pg_is_in_recovery() - THEN pg_is_xlog_replay_paused() - ELSE FALSE - END as isreplaypaused -FROM pg_catalog.pg_user WHERE usename=current_user diff --git a/web/pgadmin/browser/server_groups/servers/templates/connect/sql/default/check_recovery.sql b/web/pgadmin/browser/server_groups/servers/templates/connect/sql/default/check_recovery.sql index 7dd62fc52..cf553b23d 100644 --- a/web/pgadmin/browser/server_groups/servers/templates/connect/sql/default/check_recovery.sql +++ b/web/pgadmin/browser/server_groups/servers/templates/connect/sql/default/check_recovery.sql @@ -1 +1,9 @@ -SELECT FALSE as inrecovery, FALSE as isreplaypaused; \ No newline at end of file +SELECT CASE WHEN usesuper + THEN pg_catalog.pg_is_in_recovery() + ELSE FALSE + END as inrecovery, + CASE WHEN usesuper AND pg_catalog.pg_is_in_recovery() + THEN pg_is_wal_replay_paused() + ELSE FALSE + END as isreplaypaused +FROM pg_catalog.pg_user WHERE usename=current_user diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/dependencies.sql deleted file mode 100644 index 2a55c2983..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/dependencies.sql +++ /dev/null @@ -1,85 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN 'n'::text - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.refobjid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.refobjid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.refobjid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.refobjid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.refobjid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.refobjid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.refobjid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.refobjid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.refobjid) -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.refobjid -{{where_clause}} AND -refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension')) -UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - ELSE '' END AS type, - NULL AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE cl.relname END AS refname, - nsc.nspname AS nspname, '0' AS is_inherits, '0' AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -WHERE dep.objid IN (SELECT oid FROM pg_catalog.pg_rewrite WHERE ev_class={{object_id}}) AND cl.relkind not in ('v', 'm') -ORDER BY refclassid, relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/dependents.sql deleted file mode 100644 index 7d14337d2..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/dependents.sql +++ /dev/null @@ -1,71 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN 'n'::text - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL AND att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.objid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.objid=att.attrelid AND dep.objsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.objid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.objid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.objid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.objid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.objid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.objid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.objid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.objid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.objid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.objid) -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.objid -{{where_clause}} AND -classid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension')) -ORDER BY classid, cl.relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.3_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.3_plus/dependencies.sql deleted file mode 100644 index 3c0cd5581..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.3_plus/dependencies.sql +++ /dev/null @@ -1,87 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN 'n'::text - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.refobjid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.refobjid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.refobjid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.refobjid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.refobjid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.refobjid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.refobjid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.refobjid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.refobjid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.refobjid -{{where_clause}} AND -refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension')) -UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - ELSE '' END AS type, - NULL AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE cl.relname END AS refname, - nsc.nspname AS nspname, '0' AS is_inherits, '0' AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -WHERE dep.objid IN (SELECT oid FROM pg_catalog.pg_rewrite WHERE ev_class={{object_id}}) AND cl.relkind not in ('v', 'm') -ORDER BY refclassid, relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.3_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.3_plus/dependents.sql deleted file mode 100644 index 1695b41ac..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.3_plus/dependents.sql +++ /dev/null @@ -1,73 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN 'n'::text - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL AND att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.objid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.objid=att.attrelid AND dep.objsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.objid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.objid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.objid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.objid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.objid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.objid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.objid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.objid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.objid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.objid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.objid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.objid -{{where_clause}} AND -classid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension')) -ORDER BY classid, cl.relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.5_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependencies.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.5_plus/dependencies.sql rename to web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependencies.sql diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.5_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependents.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.5_plus/dependents.sql rename to web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/dependents.sql diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/role_dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/role_dependencies.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/templates/depends/pg/9.1_plus/role_dependencies.sql rename to web/pgadmin/browser/server_groups/servers/templates/depends/pg/default/role_dependencies.sql diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/dependencies.sql deleted file mode 100644 index c356641bb..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/dependencies.sql +++ /dev/null @@ -1,89 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 THEN 'Pa'::text ELSE 'n'::text END - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN syn.oid IS NOT NULL THEN 'Sy'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, syn.synname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname, synns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.refobjid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.refobjid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.refobjid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.refobjid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.refobjid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.refobjid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.refobjid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.refobjid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.refobjid) -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_synonym syn ON syn.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace synns ON syn.synnamespace=synns.oid -{{where_clause}} AND -refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', - 'pg_synonym')) -UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - ELSE '' END AS type, - NULL AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE cl.relname END AS refname, - nsc.nspname AS nspname, '0' AS is_inherits, '0' AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -WHERE dep.objid IN (SELECT oid FROM pg_catalog.pg_rewrite WHERE ev_class={{object_id}}) AND cl.relkind not in ('v', 'm') -ORDER BY refclassid, relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/dependents.sql deleted file mode 100644 index 4823c404f..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/dependents.sql +++ /dev/null @@ -1,75 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 THEN 'Pa'::text ELSE 'n'::text END - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN syn.oid IS NOT NULL THEN 'Sy'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL AND att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, syn.synname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname, synns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.objid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.objid=att.attrelid AND dep.objsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.objid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.objid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.objid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.objid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.objid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.objid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.objid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.objid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.objid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.objid) -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.objid -LEFT JOIN pg_catalog.pg_synonym syn ON syn.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace synns ON syn.synnamespace=synns.oid -{{where_clause}} AND -classid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', - 'pg_synonym')) -ORDER BY classid, cl.relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.3_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.3_plus/dependencies.sql deleted file mode 100644 index c5bd80a39..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.3_plus/dependencies.sql +++ /dev/null @@ -1,91 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 THEN 'Pa'::text ELSE 'n'::text END - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN syn.oid IS NOT NULL THEN 'Sy'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, syn.synname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname, synns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.refobjid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.refobjid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.refobjid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.refobjid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.refobjid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.refobjid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.refobjid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.refobjid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.refobjid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_synonym syn ON syn.oid=dep.refobjid -LEFT JOIN pg_catalog.pg_namespace synns ON syn.synnamespace=synns.oid -{{where_clause}} AND -refclassid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', - 'pg_synonym')) -UNION -SELECT DISTINCT dep.deptype, dep.refclassid, dep.refobjid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.refobjsubid::text, '') ELSE cl.relkind::text END - ELSE '' END AS type, - NULL AS ownertable, - CASE WHEN cl.relname IS NOT NULL OR att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE cl.relname END AS refname, - nsc.nspname AS nspname, '0' AS is_inherits, '0' AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.refobjid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.refobjid=att.attrelid AND dep.refobjsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.adrelid=att.attrelid AND ad.adnum=att.attnum -WHERE dep.objid IN (SELECT oid FROM pg_catalog.pg_rewrite WHERE ev_class={{object_id}}) AND cl.relkind not in ('v', 'm') -ORDER BY refclassid, relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.3_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.3_plus/dependents.sql deleted file mode 100644 index 406c6622e..000000000 --- a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.3_plus/dependents.sql +++ /dev/null @@ -1,77 +0,0 @@ -SELECT DISTINCT dep.deptype, dep.classid, cl.relkind, ad.adbin, ad.adsrc, - CASE WHEN cl.relkind IS NOT NULL THEN CASE WHEN cl.relkind = 'r' THEN cl.relkind::text || COALESCE(dep.objsubid::text, '') ELSE cl.relkind::text END - WHEN tg.oid IS NOT NULL THEN 'Tr'::text - WHEN ty.oid IS NOT NULL THEN CASE WHEN ty.typtype = 'd' THEN 'd'::text ELSE 'Ty'::text END - WHEN ns.oid IS NOT NULL THEN CASE WHEN ns.nspparent != 0 THEN 'Pa'::text ELSE 'n'::text END - WHEN pr.oid IS NOT NULL AND (prtyp.typname = 'trigger' OR prtyp.typname = 'event_trigger') THEN 'Pt'::text - WHEN pr.oid IS NOT NULL THEN 'Pf'::text - WHEN la.oid IS NOT NULL THEN 'l'::text - WHEN rw.oid IS NOT NULL THEN 'Rl'::text - WHEN co.oid IS NOT NULL THEN CASE WHEN co.contypid > 0 THEN 'Cd' ELSE 'C'::text || contype::text END - WHEN ad.oid IS NOT NULL THEN 'A'::text - WHEN fs.oid IS NOT NULL THEN 'Fs'::text - WHEN fdw.oid IS NOT NULL THEN 'Fw'::text - WHEN evt.oid IS NOT NULL THEN 'Et'::text - WHEN col.oid IS NOT NULL THEN 'Co'::text - WHEN ftsc.oid IS NOT NULL THEN 'Fc'::text - WHEN ftsp.oid IS NOT NULL THEN 'Fp'::text - WHEN ftsd.oid IS NOT NULL THEN 'Fd'::text - WHEN ftst.oid IS NOT NULL THEN 'Ft'::text - WHEN ext.oid IS NOT NULL THEN 'Ex'::text - WHEN syn.oid IS NOT NULL THEN 'Sy'::text - ELSE '' - END AS type, - COALESCE(coc.relname, clrw.relname) AS ownertable, - CASE WHEN cl.relname IS NOT NULL AND att.attname IS NOT NULL THEN cl.relname || COALESCE('.' || att.attname, '') - ELSE COALESCE(cl.relname, co.conname, pr.proname, tg.tgname, ty.typname, la.lanname, rw.rulename, ns.nspname, - fs.srvname, fdw.fdwname, evt.evtname, col.collname, ftsc.cfgname, ftsd.dictname, ftsp.prsname, - ftst.tmplname, ext.extname, syn.synname) - END AS refname, - COALESCE(nsc.nspname, nso.nspname, nsp.nspname, nst.nspname, nsrw.nspname, colns.nspname, ftscns.nspname, - ftsdns.nspname, ftspns.nspname, ftstns.nspname, synns.nspname) AS nspname, - CASE WHEN inhits.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherits, - CASE WHEN inhed.inhparent IS NOT NULL THEN '1' ELSE '0' END AS is_inherited -FROM pg_catalog.pg_depend dep -LEFT JOIN pg_catalog.pg_class cl ON dep.objid=cl.oid -LEFT JOIN pg_catalog.pg_attribute att ON dep.objid=att.attrelid AND dep.objsubid=att.attnum -LEFT JOIN pg_catalog.pg_namespace nsc ON cl.relnamespace=nsc.oid -LEFT JOIN pg_catalog.pg_proc pr ON dep.objid=pr.oid -LEFT JOIN pg_catalog.pg_namespace nsp ON pr.pronamespace=nsp.oid -LEFT JOIN pg_catalog.pg_trigger tg ON dep.objid=tg.oid -LEFT JOIN pg_catalog.pg_type ty ON dep.objid=ty.oid -LEFT JOIN pg_catalog.pg_namespace nst ON ty.typnamespace=nst.oid -LEFT JOIN pg_catalog.pg_constraint co ON dep.objid=co.oid -LEFT JOIN pg_catalog.pg_class coc ON co.conrelid=coc.oid -LEFT JOIN pg_catalog.pg_namespace nso ON co.connamespace=nso.oid -LEFT JOIN pg_catalog.pg_rewrite rw ON dep.objid=rw.oid -LEFT JOIN pg_catalog.pg_class clrw ON clrw.oid=rw.ev_class -LEFT JOIN pg_catalog.pg_namespace nsrw ON clrw.relnamespace=nsrw.oid -LEFT JOIN pg_catalog.pg_language la ON dep.objid=la.oid -LEFT JOIN pg_catalog.pg_namespace ns ON dep.objid=ns.oid -LEFT JOIN pg_catalog.pg_attrdef ad ON ad.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_server fs ON fs.oid=dep.objid -LEFT JOIN pg_catalog.pg_foreign_data_wrapper fdw ON fdw.oid=dep.objid -LEFT JOIN pg_catalog.pg_type prtyp ON prtyp.oid = pr.prorettype -LEFT JOIN pg_catalog.pg_inherits inhits ON (inhits.inhrelid=dep.objid) -LEFT JOIN pg_catalog.pg_inherits inhed ON (inhed.inhparent=dep.objid) -LEFT JOIN pg_catalog.pg_event_trigger evt ON evt.oid=dep.objid -LEFT JOIN pg_catalog.pg_collation col ON col.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace colns ON col.collnamespace=colns.oid -LEFT JOIN pg_catalog.pg_ts_config ftsc ON ftsc.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftscns ON ftsc.cfgnamespace=ftscns.oid -LEFT JOIN pg_catalog.pg_ts_dict ftsd ON ftsd.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftsdns ON ftsd.dictnamespace=ftsdns.oid -LEFT JOIN pg_catalog.pg_ts_parser ftsp ON ftsp.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftspns ON ftsp.prsnamespace=ftspns.oid -LEFT JOIN pg_catalog.pg_ts_template ftst ON ftst.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace ftstns ON ftst.tmplnamespace=ftstns.oid -LEFT JOIN pg_catalog.pg_extension ext ON ext.oid=dep.objid -LEFT JOIN pg_catalog.pg_synonym syn ON syn.oid=dep.objid -LEFT JOIN pg_catalog.pg_namespace synns ON syn.synnamespace=synns.oid -{{where_clause}} AND -classid IN ( SELECT oid FROM pg_catalog.pg_class WHERE relname IN - ('pg_class', 'pg_constraint', 'pg_conversion', 'pg_language', 'pg_proc', 'pg_rewrite', 'pg_namespace', - 'pg_trigger', 'pg_type', 'pg_attrdef', 'pg_event_trigger', 'pg_foreign_server', 'pg_foreign_data_wrapper', - 'pg_collation', 'pg_ts_config', 'pg_ts_dict', 'pg_ts_parser', 'pg_ts_template', 'pg_extension', - 'pg_synonym')) -ORDER BY classid, cl.relkind diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.5_plus/dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependencies.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.5_plus/dependencies.sql rename to web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependencies.sql diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.5_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependents.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.5_plus/dependents.sql rename to web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/dependents.sql diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/role_dependencies.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/role_dependencies.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/templates/depends/ppas/9.1_plus/role_dependencies.sql rename to web/pgadmin/browser/server_groups/servers/templates/depends/ppas/default/role_dependencies.sql diff --git a/web/pgadmin/browser/server_groups/servers/tests/test_check_recovery.py b/web/pgadmin/browser/server_groups/servers/tests/test_check_recovery.py index b31fcc195..85f7946cb 100644 --- a/web/pgadmin/browser/server_groups/servers/tests/test_check_recovery.py +++ b/web/pgadmin/browser/server_groups/servers/tests/test_check_recovery.py @@ -20,14 +20,7 @@ class TestCheckRecovery(BaseTestGenerator): self.server['sslmode']).cursor() if cursor is not None and cursor.connection is not None: - server_version = cursor.connection.server_version - if server_version >= 100000: - version = '10_plus' - elif server_version >= 90000: - version = '9.0_plus' - else: - version = 'default' - + version = 'default' template_file = os.path.join( os.path.dirname(__file__), "../templates/connect/sql", version, "check_recovery.sql" diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/table.sql deleted file mode 100644 index da49f0487..000000000 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/table.sql +++ /dev/null @@ -1,20 +0,0 @@ -{# ===== Fetch list of Database object types(Tables) ===== #} -{% if node_id %} -SELECT - rel.relname AS name, - nsp.nspname AS nspname, - 'Table' AS object_type, - 'icon-table' AS icon -FROM - pg_catalog.pg_class rel -JOIN pg_catalog.pg_namespace nsp ON nsp.oid=rel.relnamespace -LEFT OUTER JOIN pg_catalog.pg_tablespace spc ON spc.oid=rel.reltablespace -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) -LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid AND con.contype='p' -LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid -LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid -WHERE - rel.relkind IN ('r','s','t') AND rel.relnamespace = {{ node_id }}::oid -ORDER BY - rel.relname -{% endif %} diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/acl.json b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/acl.json similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/acl.json rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/acl.json diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/foreign_table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/foreign_table.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/foreign_table.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/foreign_table.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/function.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/function.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/function.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/function.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/get_schemas.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/get_schemas.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/get_schemas.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/get_schemas.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_foreign_table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/grant_foreign_table.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_foreign_table.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/grant_foreign_table.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_function.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/grant_function.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_function.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/grant_function.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_sequence.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/grant_sequence.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_sequence.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/grant_sequence.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/grant_table.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/grant_table.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/grant_table.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/sequence.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/sequence.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/sequence.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/sequence.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/10_plus/sql/table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/table.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/10_plus/sql/table.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/table.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/view.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/view.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/9.1_plus/sql/view.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/pg/default/sql/view.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/table.sql deleted file mode 100644 index da49f0487..000000000 --- a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/table.sql +++ /dev/null @@ -1,20 +0,0 @@ -{# ===== Fetch list of Database object types(Tables) ===== #} -{% if node_id %} -SELECT - rel.relname AS name, - nsp.nspname AS nspname, - 'Table' AS object_type, - 'icon-table' AS icon -FROM - pg_catalog.pg_class rel -JOIN pg_catalog.pg_namespace nsp ON nsp.oid=rel.relnamespace -LEFT OUTER JOIN pg_catalog.pg_tablespace spc ON spc.oid=rel.reltablespace -LEFT OUTER JOIN pg_catalog.pg_description des ON (des.objoid=rel.oid AND des.objsubid=0 AND des.classoid='pg_class'::regclass) -LEFT OUTER JOIN pg_catalog.pg_constraint con ON con.conrelid=rel.oid AND con.contype='p' -LEFT OUTER JOIN pg_catalog.pg_class tst ON tst.oid = rel.reltoastrelid -LEFT JOIN pg_catalog.pg_type typ ON rel.reloftype=typ.oid -WHERE - rel.relkind IN ('r','s','t') AND rel.relnamespace = {{ node_id }}::oid -ORDER BY - rel.relname -{% endif %} diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/acl.json b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/acl.json similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/acl.json rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/acl.json diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/foreign_table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/foreign_table.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/foreign_table.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/foreign_table.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/function.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/function.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/function.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/function.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/get_schemas.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/get_schemas.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/get_schemas.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/get_schemas.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_foreign_table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_foreign_table.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_foreign_table.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_foreign_table.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_function.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_function.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_function.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_function.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_package.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_package.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_package.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_package.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_sequence.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_sequence.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_sequence.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_sequence.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_table.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/grant_table.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/grant_table.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/package.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/package.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/package.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/package.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/sequence.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/sequence.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/sequence.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/sequence.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/10_plus/sql/table.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/table.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/10_plus/sql/table.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/table.sql diff --git a/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/view.sql b/web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/view.sql similarity index 100% rename from web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/9.1_plus/sql/view.sql rename to web/pgadmin/tools/grant_wizard/templates/grant_wizard/ppas/default/sql/view.sql diff --git a/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql deleted file mode 100644 index a2e085f1a..000000000 --- a/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/source.sql +++ /dev/null @@ -1,1049 +0,0 @@ --- --- PostgreSQL database dump --- - --- Dumped from database version 10.7 --- Dumped by pg_dump version 12beta2 - --- Started on 2019-11-01 12:54:15 IST - -SET statement_timeout = 0; -SET lock_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SELECT pg_catalog.set_config('search_path', '', false); -SET check_function_bodies = false; -SET xmloption = content; -SET client_min_messages = warning; - --- --- TOC entry 17 (class 2615 OID 139770) --- Name: test_schema_diff; Type: SCHEMA; Schema: -; Owner: postgres --- - -CREATE SCHEMA test_schema_diff; - - -ALTER SCHEMA test_schema_diff OWNER TO postgres; - -SET default_tablespace = ''; - - -CREATE EXTENSION btree_gist - SCHEMA test_schema_diff; - - --- --- TOC entry 12258 (class 1259 OID 148963) --- Name: table_for_column; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_column ( - col1 bigint NOT NULL, - col2 text, - col3 text -); - - -ALTER TABLE test_schema_diff.table_for_column OWNER TO postgres; - --- --- TOC entry 12256 (class 1259 OID 148895) --- Name: table_for_constraints; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_constraints ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_constraints OWNER TO postgres; - --- --- TOC entry 61066 (class 0 OID 0) --- Dependencies: 12256 --- Name: TABLE table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON TABLE test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 12262 (class 1259 OID 149004) --- Name: table_for_identical; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_identical ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_identical OWNER TO postgres; - --- --- TOC entry 12260 (class 1259 OID 148977) --- Name: table_for_index; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_index ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_index OWNER TO postgres; - --- --- TOC entry 12269 (class 1259 OID 149128) --- Name: table_for_primary_key; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_primary_key ( - col1 integer NOT NULL, - col2 text NOT NULL -); - - -ALTER TABLE test_schema_diff.table_for_primary_key OWNER TO postgres; - --- --- TOC entry 12264 (class 1259 OID 149024) --- Name: table_for_rule; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_rule ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_rule OWNER TO postgres; - --- --- TOC entry 12266 (class 1259 OID 149048) --- Name: table_for_trigger; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_trigger ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_trigger OWNER TO postgres; - --- --- TOC entry 56893 (class 2606 OID 148904) --- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='12') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; - - --- --- TOC entry 61067 (class 0 OID 0) --- Dependencies: 56893 --- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT "Exclusion" ON test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 56891 (class 2606 OID 148911) --- Name: table_for_constraints check_con; Type: CHECK CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE test_schema_diff.table_for_constraints - ADD CONSTRAINT check_con CHECK ((col1 > 10)) NOT VALID; - - --- --- TOC entry 61068 (class 0 OID 0) --- Dependencies: 56891 --- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT check_con ON test_schema_diff.table_for_constraints IS 'coment'; - - --- --- TOC entry 56899 (class 2606 OID 148970) --- Name: table_for_column table_for_column_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_column - ADD CONSTRAINT table_for_column_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56895 (class 2606 OID 148902) --- Name: table_for_constraints table_for_constraints_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT table_for_constraints_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56904 (class 2606 OID 148984) --- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_index - ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56913 (class 2606 OID 149135) --- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_primary_key - ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1, col2); - - --- --- TOC entry 56909 (class 2606 OID 149031) --- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_rule - ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56907 (class 2606 OID 149011) --- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_identical - ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56911 (class 2606 OID 149055) --- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_trigger - ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56897 (class 2606 OID 148913) --- Name: table_for_constraints unique; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT "unique" UNIQUE (col1); - - --- --- TOC entry 61069 (class 0 OID 0) --- Dependencies: 56897 --- Name: CONSTRAINT "unique" ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT "unique" ON test_schema_diff.table_for_constraints IS 'cmnt'; - - --- --- TOC entry 56900 (class 1259 OID 149023) --- Name: index1; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index1 ON test_schema_diff.table_for_index USING btree (col2 varchar_pattern_ops); - - --- --- TOC entry 56905 (class 1259 OID 149012) --- Name: index_identical; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_identical ON test_schema_diff.table_for_identical USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56901 (class 1259 OID 149211) --- Name: index_same; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_same ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56902 (class 1259 OID 149022) --- Name: index_source; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_source ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 61044 (class 2618 OID 149032) --- Name: table_for_rule rule1; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule1 AS - ON UPDATE TO test_schema_diff.table_for_rule DO INSTEAD NOTHING; - - --- --- TOC entry 61070 (class 0 OID 0) --- Dependencies: 61044 --- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON RULE rule1 ON test_schema_diff.table_for_rule IS 'comments'; - - --- --- TOC entry 61045 (class 2618 OID 149033) --- Name: table_for_rule rule2; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule2 AS - ON INSERT TO test_schema_diff.table_for_rule DO NOTHING; - --- --- TOC entry 12283 (class 1259 OID 347818) --- Name: test view; Type: VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE VIEW test_schema_diff."test view" AS - SELECT pg_class.relname, - pg_class.relnamespace, - pg_class.reltype, - pg_class.reloftype, - pg_class.relowner, - pg_class.relam, - pg_class.relfilenode, - pg_class.reltablespace, - pg_class.relpages, - pg_class.reltuples, - pg_class.relallvisible, - pg_class.reltoastrelid, - pg_class.relhasindex, - pg_class.relisshared, - pg_class.relpersistence, - pg_class.relkind, - pg_class.relnatts, - pg_class.relchecks, - pg_class.relhasoids, - pg_class.relhaspkey, - pg_class.relhasrules, - pg_class.relhastriggers, - pg_class.relhassubclass, - pg_class.relrowsecurity, - pg_class.relforcerowsecurity, - pg_class.relispopulated, - pg_class.relreplident, - pg_class.relfrozenxid, - pg_class.relminmxid, - pg_class.relacl, - pg_class.reloptions - FROM pg_class - LIMIT 10; - - -ALTER TABLE test_schema_diff."test view" OWNER TO postgres; - --- --- TOC entry 12286 (class 1259 OID 347832) --- Name: test view f; Type: VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE VIEW test_schema_diff."test view f" WITH (security_barrier='false') AS - SELECT 2; - - -ALTER TABLE test_schema_diff."test view f" OWNER TO postgres; - --- --- TOC entry 61111 (class 0 OID 0) --- Dependencies: 12286 --- Name: VIEW "test view f"; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON VIEW test_schema_diff."test view f" IS 'cmn'; - --- Collation scripts -CREATE COLLATION test_schema_diff.coll_src - FROM pg_catalog."POSIX"; - -ALTER COLLATION test_schema_diff.coll_src - OWNER TO postgres; - -COMMENT ON COLLATION test_schema_diff.coll_src - IS 'Test Comment'; - -CREATE COLLATION test_schema_diff.coll_diff - (LC_COLLATE = 'POSIX', LC_CTYPE = 'POSIX'); - -ALTER COLLATION test_schema_diff.coll_diff - OWNER TO postgres; - -COMMENT ON COLLATION test_schema_diff.coll_diff - IS 'Test Comment'; - --- FTS Configuration scripts -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_src ( - COPY=german -); - -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_src OWNER TO postgres; - -COMMENT ON TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_src - IS 'Test Comment'; - -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ( - PARSER = default -); -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR asciiword WITH german_stem; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR email WITH simple; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR hword WITH dutch_stem; - --- FTS Dictionary scripts -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_src ( - TEMPLATE = simple, - stopwords = 'english' -); - -COMMENT ON TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_src - IS 'Test Comment'; - -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff ( - TEMPLATE = simple, - stopwords = 'english' -); - -COMMENT ON TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff - IS 'Test Comment'; - --- FTS Parser scripts -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_src ( - START = prsd_start, - GETTOKEN = prsd_nexttoken, - END = prsd_end, - LEXTYPES = prsd_lextype); - -COMMENT ON TEXT SEARCH PARSER test_schema_diff.fts_par_src - IS 'Test Comment'; - -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_diff ( - START = prsd_start, - GETTOKEN = prsd_nexttoken, - END = prsd_end, - LEXTYPES = prsd_lextype); - -COMMENT ON TEXT SEARCH PARSER test_schema_diff.fts_par_diff - IS 'Test Comment'; - --- FTS Template scripts -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_src ( - INIT = dispell_init, - LEXIZE = dispell_lexize -); - -COMMENT ON TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_src IS 'Test Comment'; - -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff ( - INIT = dispell_init, - LEXIZE = dispell_lexize -); - -COMMENT ON TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff IS 'Test Comment'; - --- Domain and Domain Constraint script -CREATE DOMAIN test_schema_diff.dom_src - AS bigint - DEFAULT 100 - NOT NULL; - -ALTER DOMAIN test_schema_diff.dom_src OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_src - ADD CONSTRAINT con_src CHECK (VALUE <> 100); - -CREATE DOMAIN test_schema_diff.dom_cons_diff - AS bigint - DEFAULT 100 - NOT NULL; - -ALTER DOMAIN test_schema_diff.dom_cons_diff OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 50); - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_src_only CHECK (VALUE <> 25); - -CREATE DOMAIN test_schema_diff.dom_type_diff - AS character varying(40) - COLLATE pg_catalog."POSIX"; - -ALTER DOMAIN test_schema_diff.dom_type_diff OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons1 CHECK (VALUE::text <> 'pgAdmin3'::text); - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons2 CHECK (VALUE::text <> 'pgAdmin4'::text); - -COMMENT ON DOMAIN test_schema_diff.dom_type_diff - IS 'Test comment'; - --- Type Script composite type -CREATE TYPE test_schema_diff.typ_comp_src AS -( - m1 bit(5), - m2 text COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_src - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_diff AS -( - m1 numeric(5,2), - m3 character varying(30) COLLATE pg_catalog."C" -); -ALTER TYPE test_schema_diff.typ_comp_diff - OWNER TO postgres; -COMMENT ON TYPE test_schema_diff.typ_comp_diff - IS 'Test Comment'; -GRANT USAGE ON TYPE test_schema_diff.typ_comp_diff TO PUBLIC; -GRANT USAGE ON TYPE test_schema_diff.typ_comp_diff TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_diff_no_column AS -( -); -ALTER TYPE test_schema_diff.typ_comp_diff_no_column - OWNER TO postgres; - --- Type Script ENUM type -CREATE TYPE test_schema_diff.typ_enum_src AS ENUM - ('test_enum'); -ALTER TYPE test_schema_diff.typ_enum_src - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_diff - OWNER TO postgres; -COMMENT ON TYPE test_schema_diff.typ_enum_diff - IS 'Test Comment'; - --- Type Script RANGE type -CREATE TYPE test_schema_diff.typ_range_src AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."POSIX", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_src - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_col_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_col_diff - OWNER TO postgres; -COMMENT ON TYPE test_schema_diff.typ_range_col_diff - IS 'Test Comment'; -GRANT USAGE ON TYPE test_schema_diff.typ_range_col_diff TO PUBLIC; -GRANT USAGE ON TYPE test_schema_diff.typ_range_col_diff TO postgres WITH GRANT OPTION; - -CREATE TYPE test_schema_diff.typ_range_subtype_diff AS RANGE -( - SUBTYPE=bpchar, - COLLATION = pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_range_subtype_diff - OWNER TO postgres; - --- Type Script SHELL type -CREATE TYPE test_schema_diff.typ_shell_src; -ALTER TYPE test_schema_diff.typ_shell_src - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_shell_diff; -ALTER TYPE test_schema_diff.typ_shell_diff - OWNER TO postgres; -COMMENT ON TYPE test_schema_diff.typ_shell_diff - IS 'Test Comment'; - --- Type script to test when Type is different -CREATE TYPE test_schema_diff.typ_comp_range_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_range_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_enum_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_range_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_comp_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_enum_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_enum_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_comp_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_range_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_range_diff - OWNER TO postgres; - --- Sequences Script -CREATE SEQUENCE test_schema_diff.seq_src - CYCLE - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 3 - CACHE 6; -ALTER SEQUENCE test_schema_diff.seq_src - OWNER TO postgres; -COMMENT ON SEQUENCE test_schema_diff.seq_src - IS 'Test Comment'; -GRANT ALL ON SEQUENCE test_schema_diff.seq_src TO PUBLIC; -GRANT ALL ON SEQUENCE test_schema_diff.seq_src TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl - OWNER TO postgres; -COMMENT ON SEQUENCE test_schema_diff.seq_diff_comment_acl - IS 'Test Comment'; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl TO PUBLIC; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff - CYCLE - INCREMENT 3 - START 3 - MINVALUE 3 - MAXVALUE 100 - CACHE 2; -ALTER SEQUENCE test_schema_diff.seq_diff - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_start_diff - INCREMENT 5 - START 3 - MINVALUE 3 - MAXVALUE 20; -ALTER SEQUENCE test_schema_diff.seq_start_diff - OWNER TO postgres; - --- Foreign Data Wrapper to test foreign table -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table - OWNER TO postgres; - --- Foreign Server to test foreign table -CREATE SERVER test_fs_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs_for_foreign_table - OWNER TO postgres; -CREATE SERVER test_fs2_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs2_for_foreign_table - OWNER TO postgres; - --- Table to test inheritance in foreign table -CREATE TABLE public.test_table_for_foreign_table -( - tid bigint NOT NULL, - tname text COLLATE pg_catalog."default", - CONSTRAINT test_table_for_foreign_table_pkey PRIMARY KEY (tid) -) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; -ALTER TABLE public.test_table_for_foreign_table - OWNER to postgres; - --- Foreign Table scripts -CREATE FOREIGN TABLE test_schema_diff.ft_src( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_src - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_src - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_src - IS 'Test Comment'; -GRANT INSERT ON TABLE test_schema_diff.ft_src TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_src TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_col( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default", - fcity character varying(40) NULL COLLATE pg_catalog."POSIX" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_diff_col - IS 'Test Comment'; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_const( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - OWNER TO postgres; - -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck1 CHECK ((fid > 1000)) NO INHERIT NOT VALID; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck2 CHECK ((fid > 20)); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck_src CHECK ((fid > 50)); - -GRANT INSERT ON TABLE test_schema_diff.ft_diff_const TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_diff_const TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_opt( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table - OPTIONS (opt1 'val1', opt2 'val20', opt_src 'val_src'); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_opt - OWNER TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server - OWNER TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table - OPTIONS (opt1 'val1'); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - ADD CONSTRAINT cs1 CHECK ((fid > 200)) NO INHERIT; - --- Test for RM #5350 -CREATE TABLE test_schema_diff.events_transactions -( - event_code integer, - numerator integer, - account_token text COLLATE pg_catalog."default", - transaction_dt timestamp without time zone, - payment_method integer, - payment_pin integer, - approval text COLLATE pg_catalog."default", - amount integer, - file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP, - file_name character varying(256) COLLATE pg_catalog."default", - transfer_dt timestamp without time zone, - transaction_type integer -); - --- Casts script -CREATE CAST (money AS bigint) - WITHOUT FUNCTION - AS IMPLICIT; - -COMMENT ON CAST (money AS bigint) IS 'money -> bigint'; - --- Event Trigger script -CREATE FUNCTION public.evt_tri_fun() - RETURNS event_trigger - LANGUAGE 'plpgsql' - NOT LEAKPROOF -AS $BODY$ -BEGIN -PERFORM 1; -END; -$BODY$; -ALTER FUNCTION public.evt_tri_fun() - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_src ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -COMMENT ON EVENT TRIGGER evt_tri_src - IS 'Event Trigger Source'; -ALTER EVENT TRIGGER evt_tri_src - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event1 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event1 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event2 ON DDL_COMMAND_END - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event2 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event3 ON SQL_DROP - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event3 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status1 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status1 - DISABLE; -ALTER EVENT TRIGGER evt_tri_diff_enable_status1 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status2 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - ENABLE REPLICA; -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status3 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status3 - ENABLE ALWAYS; -ALTER EVENT TRIGGER evt_tri_diff_enable_status3 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_func ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_func - OWNER TO postgres; - --- Extension script -CREATE EXTENSION adminpack - SCHEMA pg_catalog - VERSION "1.0"; - --- Language script -CREATE TRUSTED PROCEDURAL LANGUAGE src_trusted_language - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE src_trusted_language - OWNER TO postgres; -COMMENT ON LANGUAGE src_trusted_language - IS 'Custom Trusted Language'; -GRANT USAGE ON LANGUAGE src_trusted_language TO PUBLIC; -GRANT USAGE ON LANGUAGE src_trusted_language TO postgres WITH GRANT OPTION; - -CREATE PROCEDURAL LANGUAGE src_proc_language - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE src_proc_language - OWNER TO postgres; -COMMENT ON LANGUAGE src_proc_language - IS 'Custom Procedural Language'; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_add - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_add - OWNER TO postgres; -GRANT USAGE ON LANGUAGE lan_diff_acl_add TO PUBLIC; -GRANT USAGE ON LANGUAGE lan_diff_acl_add TO postgres WITH GRANT OPTION; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_revoke - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_revoke - OWNER TO postgres; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_type - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_type - OWNER TO postgres; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_inline_validator - HANDLER plpgsql_call_handler - INLINE prsd_end - VALIDATOR pg_stat_reset_single_table_counters; -ALTER LANGUAGE lan_diff_type - OWNER TO postgres; - --- Foreign Data Wrapper Script -CREATE FOREIGN DATA WRAPPER fdw_src - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_src - OWNER TO postgres; -COMMENT ON FOREIGN DATA WRAPPER fdw_src - IS 'Foreign Data Wrapper'; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_add - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_add - OWNER TO postgres; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_add TO PUBLIC; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_add TO postgres WITH GRANT OPTION; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_revoke - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_revoke - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_validator - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_add_validator - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_validator - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_options - OPTIONS (debug 'true'); -ALTER FOREIGN DATA WRAPPER fdw_diff_add_options - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_options; -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_options - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_options - OPTIONS (debug 'false'); -ALTER FOREIGN DATA WRAPPER fdw_diff_options - OWNER TO postgres; - --- Foreign Server Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_server - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OWNER TO postgres; - -CREATE SERVER fs_src - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_src - OWNER TO postgres; -COMMENT ON SERVER fs_src - IS 'Foreign Server'; - -CREATE SERVER fs_diff_acl_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_add - OWNER TO postgres; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_add TO PUBLIC; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_add TO postgres WITH GRANT OPTION; - -CREATE SERVER fs_diff_acl_revoke - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_revoke - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_add - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_add - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_remove - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_remove - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_modify - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_modify - OWNER TO postgres; - -CREATE SERVER fs_diff_options_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_diff_options_add - OWNER TO postgres; - -CREATE SERVER fs_diff_options_remove - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_options_remove - OWNER TO postgres; - -CREATE SERVER fs_diff_options_modify - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '192.168.1.1', port '8080'); -ALTER SERVER fs_diff_options_modify - OWNER TO postgres; - --- User Mapping Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_user_mapping - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_user_mapping - OWNER TO postgres; - -CREATE SERVER test_fs_for_user_mapping - FOREIGN DATA WRAPPER test_fdw_for_user_mapping; -ALTER SERVER test_fs_for_user_mapping - OWNER TO postgres; - -CREATE USER MAPPING FOR public SERVER test_fs_for_user_mapping; - -CREATE USER MAPPING FOR postgres SERVER test_fs_for_user_mapping - OPTIONS (password 'admin123'); diff --git a/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql deleted file mode 100644 index 7c2e88a1a..000000000 --- a/web/pgadmin/tools/schema_diff/tests/pg/9.2_plus/target.sql +++ /dev/null @@ -1,1034 +0,0 @@ --- --- PostgreSQL database dump --- - --- Dumped from database version 10.7 --- Dumped by pg_dump version 12beta2 - --- Started on 2019-11-01 12:55:22 IST - -SET statement_timeout = 0; -SET lock_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SELECT pg_catalog.set_config('search_path', '', false); -SET check_function_bodies = false; -SET xmloption = content; -SET client_min_messages = warning; - --- --- TOC entry 18 (class 2615 OID 139771) --- Name: test_schema_diff; Type: SCHEMA; Schema: -; Owner: postgres --- - -CREATE SCHEMA test_schema_diff; - -ALTER SCHEMA test_schema_diff OWNER TO postgres; - -SET default_tablespace = ''; - -CREATE EXTENSION btree_gist - SCHEMA test_schema_diff; - --- --- TOC entry 12250 (class 1259 OID 139938) --- Name: MView; Type: MATERIALIZED VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE MATERIALIZED VIEW test_schema_diff."MView" AS - SELECT 'tekst'::text AS text - WITH NO DATA; - - -ALTER TABLE test_schema_diff."MView" OWNER TO postgres; - --- --- TOC entry 12259 (class 1259 OID 148971) --- Name: table_for_column; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_column ( - col1 bigint, - col2 bigint, - col4 text -); - - -ALTER TABLE test_schema_diff.table_for_column OWNER TO postgres; - --- --- TOC entry 12268 (class 1259 OID 149089) --- Name: table_for_constraints; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_constraints ( - col1 integer NOT NULL, - col2 text, - CONSTRAINT check_con CHECK ((col1 > 30)) -); - - -ALTER TABLE test_schema_diff.table_for_constraints OWNER TO postgres; - --- --- TOC entry 61066 (class 0 OID 0) --- Dependencies: 12268 --- Name: TABLE table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON TABLE test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 61067 (class 0 OID 0) --- Dependencies: 12268 --- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT check_con ON test_schema_diff.table_for_constraints IS 'coment'; - - --- --- TOC entry 12257 (class 1259 OID 148960) --- Name: table_for_del; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_del ( -); - - -ALTER TABLE test_schema_diff.table_for_del OWNER TO postgres; - --- --- TOC entry 12271 (class 1259 OID 149172) --- Name: table_for_foreign_key; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_foreign_key ( - col1 integer NOT NULL, - col2 "char", - col3 bigint -); - - -ALTER TABLE test_schema_diff.table_for_foreign_key OWNER TO postgres; - --- --- TOC entry 12263 (class 1259 OID 149013) --- Name: table_for_identical; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_identical ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_identical OWNER TO postgres; - --- --- TOC entry 12261 (class 1259 OID 148986) --- Name: table_for_index; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_index ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_index OWNER TO postgres; - --- --- TOC entry 12270 (class 1259 OID 149144) --- Name: table_for_primary_key; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_primary_key ( - col1 integer NOT NULL, - col2 text NOT NULL -); - - -ALTER TABLE test_schema_diff.table_for_primary_key OWNER TO postgres; - --- --- TOC entry 12265 (class 1259 OID 149034) --- Name: table_for_rule; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_rule ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_rule OWNER TO postgres; - --- --- TOC entry 12267 (class 1259 OID 149066) --- Name: table_for_trigger; Type: TABLE; Schema: test_schema_diff; Owner: postgres --- - -CREATE TABLE test_schema_diff.table_for_trigger ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_trigger OWNER TO postgres; - - --- --- TOC entry 56906 (class 2606 OID 149097) --- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='15') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; - - --- --- TOC entry 61068 (class 0 OID 0) --- Dependencies: 56906 --- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON CONSTRAINT "Exclusion" ON test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 56910 (class 2606 OID 149176) --- Name: table_for_foreign_key table_for_foreign_key_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_foreign_key - ADD CONSTRAINT table_for_foreign_key_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56897 (class 2606 OID 148993) --- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_index - ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56908 (class 2606 OID 149151) --- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_primary_key - ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56902 (class 2606 OID 149041) --- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_rule - ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56900 (class 2606 OID 149020) --- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_identical - ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56904 (class 2606 OID 149073) --- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: postgres --- - -ALTER TABLE ONLY test_schema_diff.table_for_trigger - ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56893 (class 1259 OID 148994) --- Name: index1; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index1 ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56894 (class 1259 OID 148995) --- Name: index2; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index2 ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56898 (class 1259 OID 149021) --- Name: index_identical; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_identical ON test_schema_diff.table_for_identical USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56895 (class 1259 OID 149212) --- Name: index_same; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX index_same ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56892 (class 1259 OID 139945) --- Name: mview_index; Type: INDEX; Schema: test_schema_diff; Owner: postgres --- - -CREATE INDEX mview_index ON test_schema_diff."MView" USING btree (text text_pattern_ops); - - --- --- TOC entry 61045 (class 2618 OID 149042) --- Name: table_for_rule rule1; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule1 AS - ON UPDATE TO test_schema_diff.table_for_rule DO INSTEAD NOTHING; - - --- --- TOC entry 61069 (class 0 OID 0) --- Dependencies: 61045 --- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON RULE rule1 ON test_schema_diff.table_for_rule IS 'comments'; - - --- --- TOC entry 61046 (class 2618 OID 149043) --- Name: table_for_rule rule2; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule2 AS - ON UPDATE TO test_schema_diff.table_for_rule DO NOTHING; - - --- --- TOC entry 61047 (class 2618 OID 149044) --- Name: table_for_rule rule3; Type: RULE; Schema: test_schema_diff; Owner: postgres --- - -CREATE RULE rule3 AS - ON INSERT TO test_schema_diff.table_for_rule DO NOTHING; - - --- --- TOC entry 61050 (class 0 OID 139938) --- Dependencies: 12250 61062 --- Name: MView; Type: MATERIALIZED VIEW DATA; Schema: test_schema_diff; Owner: postgres --- - -REFRESH MATERIALIZED VIEW test_schema_diff."MView"; - - --- --- TOC entry 12284 (class 1259 OID 347823) --- Name: test view; Type: VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE VIEW test_schema_diff."test view" AS - SELECT pg_class.relname, - pg_class.relnamespace, - pg_class.reltype, - pg_class.reloftype, - pg_class.relowner, - pg_class.relam, - pg_class.relfilenode, - pg_class.reltablespace, - pg_class.relpages, - pg_class.reltuples, - pg_class.relallvisible, - pg_class.reltoastrelid, - pg_class.relhasindex, - pg_class.relisshared, - pg_class.relpersistence, - pg_class.relkind, - pg_class.relnatts, - pg_class.relchecks, - pg_class.relhasoids, - pg_class.relhaspkey, - pg_class.relhasrules, - pg_class.relhastriggers, - pg_class.relhassubclass, - pg_class.relrowsecurity, - pg_class.relforcerowsecurity, - pg_class.relispopulated, - pg_class.relreplident, - pg_class.relfrozenxid, - pg_class.relminmxid, - pg_class.relacl, - pg_class.reloptions - FROM pg_class - LIMIT 10; - - -ALTER TABLE test_schema_diff."test view" OWNER TO postgres; - --- --- TOC entry 12285 (class 1259 OID 347828) --- Name: test view f; Type: VIEW; Schema: test_schema_diff; Owner: postgres --- - -CREATE VIEW test_schema_diff."test view f" WITH (security_barrier='true') AS - SELECT 2; - - -ALTER TABLE test_schema_diff."test view f" OWNER TO postgres; - --- --- TOC entry 61105 (class 0 OID 0) --- Dependencies: 12285 --- Name: VIEW "test view f"; Type: COMMENT; Schema: test_schema_diff; Owner: postgres --- - -COMMENT ON VIEW test_schema_diff."test view f" IS 'cmn'; - --- Collation scripts -CREATE COLLATION test_schema_diff.coll_tar - FROM pg_catalog."POSIX"; - -ALTER COLLATION test_schema_diff.coll_tar - OWNER TO postgres; - -CREATE COLLATION test_schema_diff.coll_diff - (LC_COLLATE = 'C', LC_CTYPE = 'C'); - -ALTER COLLATION test_schema_diff.coll_diff - OWNER TO postgres; - --- FTS Configuration scripts -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_tar ( - COPY=german -); - -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_tar OWNER TO postgres; - -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ( - PARSER = default -); -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR asciiword WITH dutch_stem; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR email WITH simple; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR hword WITH german_stem; - --- FTS Dictionary scripts -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_tar ( - TEMPLATE = simple, - stopwords = 'english' -); - -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff ( - TEMPLATE = simple, - stopwords = 'german' -); - -COMMENT ON TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff - IS 'Comment'; - --- FTS Parser scripts -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_tar ( - START = prsd_start, - GETTOKEN = prsd_nexttoken, - END = prsd_end, - LEXTYPES = prsd_lextype); - -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_diff ( - START = int4_accum, - GETTOKEN = inet_gist_penalty, - END = btint2sortsupport, - LEXTYPES = dispell_init); - -COMMENT ON TEXT SEARCH PARSER test_schema_diff.fts_par_diff - IS 'Comment'; - --- FTS Template scripts -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_tar ( - INIT = dispell_init, - LEXIZE = dispell_lexize -); - -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff ( - INIT = dsimple_init, - LEXIZE = dsimple_lexize -); - -COMMENT ON TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff IS 'Comment'; - --- Domain and Domain Constraint script -CREATE DOMAIN test_schema_diff.dom_tar - AS bigint - DEFAULT 100 - NOT NULL; - -ALTER DOMAIN test_schema_diff.dom_tar OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_tar - ADD CONSTRAINT con_tar CHECK (VALUE <> 100); - -CREATE DOMAIN test_schema_diff.dom_cons_diff - AS bigint - DEFAULT 400; - -ALTER DOMAIN test_schema_diff.dom_cons_diff OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 40); - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_tar_only CHECK (VALUE <> 25); - -CREATE DOMAIN test_schema_diff.dom_type_diff - AS numeric(8,4); - -ALTER DOMAIN test_schema_diff.dom_type_diff OWNER TO postgres; - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons1 CHECK (VALUE <> 45::numeric); - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons2 CHECK (VALUE <> 50::numeric); - -COMMENT ON DOMAIN test_schema_diff.dom_type_diff - IS 'Comment'; - --- Type Script composite type -CREATE TYPE test_schema_diff.typ_comp_tar AS -( - m1 bit(5), - m2 text COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_tar - OWNER TO postgres; -CREATE TYPE test_schema_diff.typ_comp_diff AS -( - m1 bit(5), - m2 text COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_diff_no_column AS -( - a "char", - b "char" -); -ALTER TYPE test_schema_diff.typ_comp_diff_no_column - OWNER TO postgres; - --- Type Script ENUM type -CREATE TYPE test_schema_diff.typ_enum_tar AS ENUM - ('test_enum'); -ALTER TYPE test_schema_diff.typ_enum_tar - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_diff - OWNER TO postgres; - --- Type Script RANGE type -CREATE TYPE test_schema_diff.typ_range_tar AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."POSIX", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_tar - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_col_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."POSIX", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_col_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_subtype_diff AS RANGE -( - SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops -); -ALTER TYPE test_schema_diff.typ_range_subtype_diff - OWNER TO postgres; - --- Type Script SHELL type -CREATE TYPE test_schema_diff.typ_shell_tar; -ALTER TYPE test_schema_diff.typ_shell_tar - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_shell_diff; -ALTER TYPE test_schema_diff.typ_shell_diff - OWNER TO postgres; - --- Type script to test when Type is different -CREATE TYPE test_schema_diff.typ_comp_range_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_comp_range_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_comp_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_comp_enum_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_comp_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_range_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_range_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_range_enum_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_comp_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_enum_comp_diff - OWNER TO postgres; - -CREATE TYPE test_schema_diff.typ_enum_range_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_enum_range_diff - OWNER TO postgres; - --- Sequences Script -CREATE SEQUENCE test_schema_diff.seq_tar - CYCLE - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 3 - CACHE 6; -ALTER SEQUENCE test_schema_diff.seq_tar - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; - -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - OWNER TO postgres; -COMMENT ON SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - IS 'Test Comment'; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl_remove TO PUBLIC; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl_remove TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_diff - INCREMENT 5 - START 3 - MINVALUE 3 - MAXVALUE 80 - CACHE 1; - -ALTER SEQUENCE test_schema_diff.seq_diff - OWNER TO postgres; - -CREATE SEQUENCE test_schema_diff.seq_start_diff - INCREMENT 5 - START 1 - MINVALUE 1 - MAXVALUE 20; -ALTER SEQUENCE test_schema_diff.seq_start_diff - OWNER TO postgres; - --- Foreign Data Wrapper to test foreign table -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table - OWNER TO postgres; - --- Foreign Server to test foreign table -CREATE SERVER test_fs_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs_for_foreign_table - OWNER TO postgres; -CREATE SERVER test_fs2_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs2_for_foreign_table - OWNER TO postgres; - --- Table to test inheritance in foreign table -CREATE TABLE public.test_table_for_foreign_table -( - tid bigint NOT NULL, - tname text COLLATE pg_catalog."default", - CONSTRAINT test_table_for_foreign_table_pkey PRIMARY KEY (tid) -) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; -ALTER TABLE public.test_table_for_foreign_table - OWNER to postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_tar( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_tar - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_tar - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_tar - IS 'Test Comment'; -GRANT INSERT ON TABLE test_schema_diff.ft_tar TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_tar TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_col( - fid bigint NULL, - fname text NOT NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_diff_col - IS 'Comment'; -GRANT INSERT ON TABLE test_schema_diff.ft_diff_col TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_diff_col TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_const( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - OWNER TO postgres; - -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck1 CHECK ((fid > 50)) NO INHERIT NOT VALID; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck2 CHECK ((fid > 20)) NO INHERIT; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck_tar CHECK ((fid > 50)); - -GRANT INSERT ON TABLE test_schema_diff.ft_diff_const TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_diff_const TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_opt( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table - OPTIONS (debug 'true', opt2 'val30', opt_tar 'val_tar'); - -ALTER FOREIGN TABLE test_schema_diff.ft_diff_opt - OWNER TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs2_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server - OWNER TO postgres; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1( - fid bigint NULL, - fcity text NULL COLLATE pg_catalog."default" -) - SERVER test_fs2_for_foreign_table - OPTIONS (opt1 'val1', opt2 'val2'); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - OWNER TO postgres; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - ADD CONSTRAINT cs2 CHECK ((fid > 200)) NO INHERIT; - --- Test for RM #5350 -CREATE TABLE test_schema_diff.events_transactions -( - event_code integer, - numerator integer, - account_token text COLLATE pg_catalog."default", - transaction_dt timestamp without time zone, - payment_method integer, - approval text COLLATE pg_catalog."default", - amount integer, - file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP, - file_name character varying(256) COLLATE pg_catalog."default", - payment_pin integer, - transfer_dt timestamp without time zone, - transaction_type integer -); - --- Event Trigger script -CREATE FUNCTION public.evt_tri_fun() - RETURNS event_trigger - LANGUAGE 'plpgsql' - NOT LEAKPROOF -AS $BODY$ -BEGIN -PERFORM 1; -END; -$BODY$; -ALTER FUNCTION public.evt_tri_fun() - OWNER TO postgres; - -CREATE FUNCTION public.evt_tri_fun2() - RETURNS event_trigger - LANGUAGE 'plpgsql' - NOT LEAKPROOF -AS $BODY$ -BEGIN -PERFORM 1; -END; -$BODY$; -ALTER FUNCTION public.evt_tri_fun2() - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_tar ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -COMMENT ON EVENT TRIGGER evt_tri_tar - IS 'Event Trigger Source'; -ALTER EVENT TRIGGER evt_tri_tar - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event1 ON DDL_COMMAND_END - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event1 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event2 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event2 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_event3 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event3 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status1 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status1 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status2 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - DISABLE; -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status3 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status3 - OWNER TO postgres; - -CREATE EVENT TRIGGER evt_tri_diff_func ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun2(); -ALTER EVENT TRIGGER evt_tri_diff_func - OWNER TO postgres; - --- Extension script -CREATE EXTENSION adminpack - SCHEMA pg_catalog - VERSION "1.0"; - --- Language script -CREATE TRUSTED PROCEDURAL LANGUAGE tar_language - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE tar_language - OWNER TO postgres; -GRANT USAGE ON LANGUAGE tar_language TO PUBLIC; -GRANT USAGE ON LANGUAGE tar_language TO postgres WITH GRANT OPTION; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_add - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_add - OWNER TO postgres; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_revoke - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_revoke - OWNER TO postgres; -GRANT USAGE ON LANGUAGE lan_diff_acl_revoke TO PUBLIC; -GRANT USAGE ON LANGUAGE lan_diff_acl_revoke TO postgres WITH GRANT OPTION; - -CREATE PROCEDURAL LANGUAGE lan_diff_type - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_type - OWNER TO postgres; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_inline_validator - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_type - OWNER TO postgres; - --- Foreign Data Wrapper Script -CREATE FOREIGN DATA WRAPPER fdw_tar - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_tar - OWNER TO postgres; -COMMENT ON FOREIGN DATA WRAPPER fdw_tar - IS 'Foreign Data Wrapper'; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_add - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_add - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_revoke - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_revoke - OWNER TO postgres; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_revoke TO PUBLIC; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_revoke TO postgres WITH GRANT OPTION; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_add_validator - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_validator - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_validator - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_options; -ALTER FOREIGN DATA WRAPPER fdw_diff_add_options - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_options - OPTIONS (debug 'true'); -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_options - OWNER TO postgres; - -CREATE FOREIGN DATA WRAPPER fdw_diff_options - OPTIONS (debug 'true'); -ALTER FOREIGN DATA WRAPPER fdw_diff_options - OWNER TO postgres; - --- Foreign Server Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_server - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OWNER TO postgres; - -CREATE SERVER fs_tar - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_tar - OWNER TO postgres; -COMMENT ON SERVER fs_tar - IS 'Foreign Server'; - -CREATE SERVER fs_diff_acl_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_add - OWNER TO postgres; - -CREATE SERVER fs_diff_acl_revoke - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_revoke - OWNER TO postgres; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_revoke TO PUBLIC; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_revoke TO postgres WITH GRANT OPTION; - -CREATE SERVER fs_diff_type_version_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_add - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_remove - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_remove - OWNER TO postgres; - -CREATE SERVER fs_diff_type_version_modify - TYPE 'EPAS' - VERSION '11' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_modify - OWNER TO postgres; - -CREATE SERVER fs_diff_options_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_options_add - OWNER TO postgres; - -CREATE SERVER fs_diff_options_remove - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_diff_options_remove - OWNER TO postgres; - -CREATE SERVER fs_diff_options_modify - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_diff_options_modify - OWNER TO postgres; - --- User Mapping Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_user_mapping - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_user_mapping - OWNER TO postgres; - -CREATE SERVER test_fs_for_user_mapping - FOREIGN DATA WRAPPER test_fdw_for_user_mapping; -ALTER SERVER test_fs_for_user_mapping - OWNER TO postgres; - -CREATE USER MAPPING FOR public SERVER test_fs_for_user_mapping - OPTIONS (password 'admin123'); - -CREATE USER MAPPING FOR postgres SERVER test_fs_for_user_mapping; diff --git a/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql b/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql deleted file mode 100644 index 61cb49e78..000000000 --- a/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/source.sql +++ /dev/null @@ -1,1207 +0,0 @@ --- --- enterprisedbQL database dump --- - --- Dumped from database version 10.7 --- Dumped by pg_dump version 12beta2 - --- Started on 2019-11-01 12:54:15 IST - -SET statement_timeout = 0; -SET lock_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SELECT pg_catalog.set_config('search_path', '', false); -SET check_function_bodies = false; -SET xmloption = content; -SET client_min_messages = warning; - --- --- TOC entry 17 (class 2615 OID 139770) --- Name: test_schema_diff; Type: SCHEMA; Schema: -; Owner: enterprisedb --- - -CREATE SCHEMA test_schema_diff; - - -ALTER SCHEMA test_schema_diff OWNER TO enterprisedb; - -SET default_tablespace = ''; - - -CREATE EXTENSION btree_gist - SCHEMA test_schema_diff; - - --- --- TOC entry 12258 (class 1259 OID 148963) --- Name: table_for_column; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_column ( - col1 bigint NOT NULL, - col2 text, - col3 text -); - - -ALTER TABLE test_schema_diff.table_for_column OWNER TO enterprisedb; - --- --- TOC entry 12256 (class 1259 OID 148895) --- Name: table_for_constraints; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_constraints ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_constraints OWNER TO enterprisedb; - --- --- TOC entry 61066 (class 0 OID 0) --- Dependencies: 12256 --- Name: TABLE table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON TABLE test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 12262 (class 1259 OID 149004) --- Name: table_for_identical; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb; --- - -CREATE TABLE test_schema_diff.table_for_identical ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_identical OWNER TO enterprisedb; - --- --- TOC entry 12260 (class 1259 OID 148977) --- Name: table_for_index; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_index ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_index OWNER TO enterprisedb; - --- --- TOC entry 12269 (class 1259 OID 149128) --- Name: table_for_primary_key; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_primary_key ( - col1 integer NOT NULL, - col2 text NOT NULL -); - - -ALTER TABLE test_schema_diff.table_for_primary_key OWNER TO enterprisedb; - --- --- TOC entry 12264 (class 1259 OID 149024) --- Name: table_for_rule; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_rule ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_rule OWNER TO enterprisedb; - --- --- TOC entry 12266 (class 1259 OID 149048) --- Name: table_for_trigger; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_trigger ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_trigger OWNER TO enterprisedb; - --- --- TOC entry 56893 (class 2606 OID 148904) --- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='12') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; - - --- --- TOC entry 61067 (class 0 OID 0) --- Dependencies: 56893 --- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON CONSTRAINT "Exclusion" ON test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 56891 (class 2606 OID 148911) --- Name: table_for_constraints check_con; Type: CHECK CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE test_schema_diff.table_for_constraints - ADD CONSTRAINT check_con CHECK ((col1 > 10)) NOT VALID; - - --- --- TOC entry 61068 (class 0 OID 0) --- Dependencies: 56891 --- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON CONSTRAINT check_con ON test_schema_diff.table_for_constraints IS 'coment'; - - --- --- TOC entry 56899 (class 2606 OID 148970) --- Name: table_for_column table_for_column_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_column - ADD CONSTRAINT table_for_column_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56895 (class 2606 OID 148902) --- Name: table_for_constraints table_for_constraints_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT table_for_constraints_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56904 (class 2606 OID 148984) --- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_index - ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56913 (class 2606 OID 149135) --- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_primary_key - ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1, col2); - - --- --- TOC entry 56909 (class 2606 OID 149031) --- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_rule - ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56907 (class 2606 OID 149011) --- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb; --- - -ALTER TABLE ONLY test_schema_diff.table_for_identical - ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56911 (class 2606 OID 149055) --- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_trigger - ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56897 (class 2606 OID 148913) --- Name: table_for_constraints unique; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT "unique" UNIQUE (col1); - - --- --- TOC entry 61069 (class 0 OID 0) --- Dependencies: 56897 --- Name: CONSTRAINT "unique" ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON CONSTRAINT "unique" ON test_schema_diff.table_for_constraints IS 'cmnt'; - - --- --- TOC entry 56900 (class 1259 OID 149023) --- Name: index1; Type: INDEX; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE INDEX index1 ON test_schema_diff.table_for_index USING btree (col2 varchar_pattern_ops); - - --- --- TOC entry 56905 (class 1259 OID 149012) --- Name: index_identical; Type: INDEX; Schema: test_schema_diff; Owner: enterprisedb; --- - -CREATE INDEX index_identical ON test_schema_diff.table_for_identical USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56901 (class 1259 OID 149211) --- Name: index_same; Type: INDEX; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE INDEX index_same ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56902 (class 1259 OID 149022) --- Name: index_source; Type: INDEX; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE INDEX index_source ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 61044 (class 2618 OID 149032) --- Name: table_for_rule rule1; Type: RULE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE RULE rule1 AS - ON UPDATE TO test_schema_diff.table_for_rule DO INSTEAD NOTHING; - - --- --- TOC entry 61070 (class 0 OID 0) --- Dependencies: 61044 --- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON RULE rule1 ON test_schema_diff.table_for_rule IS 'comments'; - - --- --- TOC entry 61045 (class 2618 OID 149033) --- Name: table_for_rule rule2; Type: RULE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE RULE rule2 AS - ON INSERT TO test_schema_diff.table_for_rule DO NOTHING; - --- --- TOC entry 12283 (class 1259 OID 347818) --- Name: test view; Type: VIEW; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE VIEW test_schema_diff."test view" AS - SELECT pg_class.relname, - pg_class.relnamespace, - pg_class.reltype, - pg_class.reloftype, - pg_class.relowner, - pg_class.relam, - pg_class.relfilenode, - pg_class.reltablespace, - pg_class.relpages, - pg_class.reltuples, - pg_class.relallvisible, - pg_class.reltoastrelid, - pg_class.relhasindex, - pg_class.relisshared, - pg_class.relpersistence, - pg_class.relkind, - pg_class.relnatts, - pg_class.relchecks, - pg_class.relhasoids, - pg_class.relhaspkey, - pg_class.relhasrules, - pg_class.relhastriggers, - pg_class.relhassubclass, - pg_class.relrowsecurity, - pg_class.relforcerowsecurity, - pg_class.relispopulated, - pg_class.relreplident, - pg_class.relfrozenxid, - pg_class.relminmxid, - pg_class.relacl, - pg_class.reloptions - FROM pg_class - LIMIT 10; - - -ALTER TABLE test_schema_diff."test view" OWNER TO enterprisedb; - --- --- TOC entry 12286 (class 1259 OID 347832) --- Name: test view f; Type: VIEW; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE VIEW test_schema_diff."test view f" WITH (security_barrier='false') AS - SELECT 2; - - -ALTER TABLE test_schema_diff."test view f" OWNER TO enterprisedb; - --- --- TOC entry 61111 (class 0 OID 0) --- Dependencies: 12286 --- Name: VIEW "test view f"; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON VIEW test_schema_diff."test view f" IS 'cmn'; - --- Collation scripts -CREATE COLLATION test_schema_diff.coll_src - FROM pg_catalog."default"; - -ALTER COLLATION test_schema_diff.coll_src - OWNER TO enterprisedb; - -COMMENT ON COLLATION test_schema_diff.coll_src - IS 'Test Comment'; - -CREATE COLLATION test_schema_diff.coll_diff - FROM pg_catalog."default"; - -ALTER COLLATION test_schema_diff.coll_diff - OWNER TO enterprisedb; - -COMMENT ON COLLATION test_schema_diff.coll_diff - IS 'Test Comment'; - --- FTS Configuration scripts -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_src ( - COPY=german -); - -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_src OWNER TO enterprisedb; - -COMMENT ON TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_src - IS 'Test Comment'; - -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ( - PARSER = default -); -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR asciiword WITH german_stem; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR email WITH simple; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR hword WITH dutch_stem; - --- FTS Dictionary scripts -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_src ( - TEMPLATE = simple, - stopwords = 'english' -); - -COMMENT ON TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_src - IS 'Test Comment'; - -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff ( - TEMPLATE = simple, - stopwords = 'english' -); - -COMMENT ON TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff - IS 'Test Comment'; - --- FTS Parser scripts -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_src ( - START = prsd_start, - GETTOKEN = prsd_nexttoken, - END = prsd_end, - LEXTYPES = prsd_lextype); - -COMMENT ON TEXT SEARCH PARSER test_schema_diff.fts_par_src - IS 'Test Comment'; - -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_diff ( - START = prsd_start, - GETTOKEN = prsd_nexttoken, - END = prsd_end, - LEXTYPES = prsd_lextype); - -COMMENT ON TEXT SEARCH PARSER test_schema_diff.fts_par_diff - IS 'Test Comment'; - --- FTS Template scripts -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_src ( - INIT = dispell_init, - LEXIZE = dispell_lexize -); - -COMMENT ON TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_src IS 'Test Comment'; - -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff ( - INIT = dispell_init, - LEXIZE = dispell_lexize -); - -COMMENT ON TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff IS 'Test Comment'; - --- Domain and Domain Constraint script -CREATE DOMAIN test_schema_diff.dom_src - AS bigint - DEFAULT 100 - NOT NULL; - -ALTER DOMAIN test_schema_diff.dom_src OWNER TO enterprisedb; - -ALTER DOMAIN test_schema_diff.dom_src - ADD CONSTRAINT con_src CHECK (VALUE <> 100); - -CREATE DOMAIN test_schema_diff.dom_cons_diff - AS bigint - DEFAULT 100 - NOT NULL; - -ALTER DOMAIN test_schema_diff.dom_cons_diff OWNER TO enterprisedb; - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 50); - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_src_only CHECK (VALUE <> 25); - -CREATE DOMAIN test_schema_diff.dom_type_diff - AS character varying(40) - COLLATE pg_catalog."POSIX"; - -ALTER DOMAIN test_schema_diff.dom_type_diff OWNER TO enterprisedb; - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons1 CHECK (VALUE::text <> 'pgAdmin3'::text); - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons2 CHECK (VALUE::text <> 'pgAdmin4'::text); - -COMMENT ON DOMAIN test_schema_diff.dom_type_diff - IS 'Test comment'; - --- Type Script composite type -CREATE TYPE test_schema_diff.typ_comp_src AS -( - m1 bit(5), - m2 text COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_src - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_comp_diff AS -( - m1 numeric(5,2), - m3 character varying(30) COLLATE pg_catalog."C" -); -ALTER TYPE test_schema_diff.typ_comp_diff - OWNER TO enterprisedb; -COMMENT ON TYPE test_schema_diff.typ_comp_diff - IS 'Test Comment'; -GRANT USAGE ON TYPE test_schema_diff.typ_comp_diff TO PUBLIC; -GRANT USAGE ON TYPE test_schema_diff.typ_comp_diff TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_comp_diff_no_column AS -( -); -ALTER TYPE test_schema_diff.typ_comp_diff_no_column - OWNER TO enterprisedb; - --- Type Script ENUM type -CREATE TYPE test_schema_diff.typ_enum_src AS ENUM - ('test_enum'); -ALTER TYPE test_schema_diff.typ_enum_src - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_diff - OWNER TO enterprisedb; -COMMENT ON TYPE test_schema_diff.typ_enum_diff - IS 'Test Comment'; - --- Type Script RANGE type -CREATE TYPE test_schema_diff.typ_range_src AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."POSIX", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_src - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_range_col_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_col_diff - OWNER TO enterprisedb; -COMMENT ON TYPE test_schema_diff.typ_range_col_diff - IS 'Test Comment'; -GRANT USAGE ON TYPE test_schema_diff.typ_range_col_diff TO PUBLIC; -GRANT USAGE ON TYPE test_schema_diff.typ_range_col_diff TO enterprisedb WITH GRANT OPTION; - -CREATE TYPE test_schema_diff.typ_range_subtype_diff AS RANGE -( - SUBTYPE=bpchar, - COLLATION = pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_range_subtype_diff - OWNER TO enterprisedb; - --- Type Script SHELL type -CREATE TYPE test_schema_diff.typ_shell_src; -ALTER TYPE test_schema_diff.typ_shell_src - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_shell_diff; -ALTER TYPE test_schema_diff.typ_shell_diff - OWNER TO enterprisedb; -COMMENT ON TYPE test_schema_diff.typ_shell_diff - IS 'Test Comment'; - --- Type script to test when Type is different -CREATE TYPE test_schema_diff.typ_comp_range_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_range_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_comp_enum_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_range_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_range_comp_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_comp_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_range_enum_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_enum_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_enum_comp_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_comp_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_enum_range_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_range_diff - OWNER TO enterprisedb; - --- Package script (test_schema_diff only) -CREATE OR REPLACE PACKAGE test_schema_diff.pkg_src -IS - FUNCTION get_dept_name(p_deptno numeric) RETURN character varying; - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric); -END pkg_src; - -CREATE OR REPLACE PACKAGE BODY test_schema_diff.pkg_src -IS - FUNCTION get_dept_name(p_deptno numeric) RETURN character varying IS - v_dname VARCHAR2(14); - BEGIN - SELECT dname INTO v_dname FROM dept WHERE deptno = p_deptno; - RETURN v_dname; - EXCEPTION - WHEN NO_DATA_FOUND THEN - DBMS_OUTPUT.PUT_LINE('Invalid department number ' || p_deptno); - RETURN ''; - END; - - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric) IS - BEGIN - INSERT INTO emp(empno, ename, job, sal, hiredate, comm, mgr, deptno) - VALUES(p_empno, p_ename, p_job, p_sal, - p_hiredate, p_comm, p_mgr, p_deptno); - END; -END pkg_src; - -COMMENT ON PACKAGE test_schema_diff.pkg_src - IS 'Target'; - --- Package script difference in header, acl and comment -CREATE OR REPLACE PACKAGE test_schema_diff.pkg_header_diff -IS - FUNCTION get_dept_name(p_deptno numeric) RETURN character varying; - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric); -END pkg_header_diff; - -CREATE OR REPLACE PACKAGE BODY test_schema_diff.pkg_header_diff -IS - FUNCTION get_dept_name(p_deptno numeric) RETURN character varying IS - v_dname VARCHAR2(14); - BEGIN - SELECT dname INTO v_dname FROM dept WHERE deptno = p_deptno; - RETURN v_dname; - EXCEPTION - WHEN NO_DATA_FOUND THEN - DBMS_OUTPUT.PUT_LINE('Invalid department number ' || p_deptno); - RETURN ''; - END; - - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric) IS - BEGIN - INSERT INTO emp(empno, ename, job, sal, hiredate, comm, mgr, deptno) - VALUES(p_empno, p_ename, p_job, p_sal, - p_hiredate, p_comm, p_mgr, p_deptno); - END; -END pkg_header_diff; - -COMMENT ON PACKAGE test_schema_diff.pkg_header_diff - IS 'Header Diff'; - -GRANT EXECUTE ON PACKAGE test_schema_diff.pkg_header_diff TO PUBLIC; -GRANT EXECUTE ON PACKAGE test_schema_diff.pkg_header_diff TO enterprisedb WITH GRANT OPTION; - --- Package script difference in body, acl and comment -CREATE OR REPLACE PACKAGE test_schema_diff.pkg_body_diff -IS - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric); -END pkg_body_diff; - -CREATE OR REPLACE PACKAGE BODY test_schema_diff.pkg_body_diff -IS - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric) IS - BEGIN - DBMS_OUTPUT.PUT_LINE('Before Insert '); - INSERT INTO emp(empno, ename, job, sal, hiredate, comm, mgr, deptno) - VALUES(p_empno, p_ename, p_job, p_sal, - p_hiredate, p_comm, p_mgr, p_deptno); - DBMS_OUTPUT.PUT_LINE('After Insert '); - END; -END pkg_body_diff; - --- Synonyms Scripts --- Prerequisite for synonyms -CREATE OR REPLACE FUNCTION test_schema_diff.fun_for_syn() -RETURNS void - LANGUAGE 'plpgsql' - VOLATILE - COST 100 - -AS $BODY$BEGIN -SELECT 1; -END;$BODY$; -ALTER FUNCTION test_schema_diff.fun_for_syn() - OWNER TO enterprisedb; - -CREATE OR REPLACE PROCEDURE test_schema_diff.proc_for_syn() -AS $BODY$BEGIN -SELECT 1; -END;$BODY$; - -CREATE OR REPLACE PACKAGE test_schema_diff.pkg_for_syn -IS -FUNCTION get_dept_name(p_deptno numeric) RETURN character varying; -END pkg_for_syn; -CREATE OR REPLACE PACKAGE BODY test_schema_diff.pkg_for_syn -IS -FUNCTION get_dept_name(p_deptno numeric) RETURN character varying IS -BEGIN - RETURN ''; -END; -END pkg_for_syn; - -CREATE TABLE test_schema_diff.table_for_syn -( - id bigint, - name text COLLATE pg_catalog."default" -) -TABLESPACE pg_default; -ALTER TABLE test_schema_diff.table_for_syn - OWNER to enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_for_syn - INCREMENT 5 - START 1 - MINVALUE 1 - MAXVALUE 100 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_for_syn - OWNER TO enterprisedb; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_fun_src - FOR test_schema_diff.fun_for_syn; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_pkg_src - FOR test_schema_diff.pkg_for_syn; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_proc_src - FOR test_schema_diff.proc_for_syn; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_seq_src - FOR test_schema_diff.seq_for_syn; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_table_src - FOR test_schema_diff.table_for_syn; - -CREATE TABLE public.table_for_syn -( - id bigint, - name text COLLATE pg_catalog."default" -) -TABLESPACE pg_default; -ALTER TABLE public.table_for_syn - OWNER to enterprisedb; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_diff - FOR public.table_for_syn; - --- Sequences Script -CREATE SEQUENCE test_schema_diff.seq_src - CYCLE - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 3 - CACHE 6; -ALTER SEQUENCE test_schema_diff.seq_src - OWNER TO enterprisedb; -COMMENT ON SEQUENCE test_schema_diff.seq_src - IS 'Test Comment'; -GRANT ALL ON SEQUENCE test_schema_diff.seq_src TO PUBLIC; -GRANT ALL ON SEQUENCE test_schema_diff.seq_src TO enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl - OWNER TO enterprisedb; -COMMENT ON SEQUENCE test_schema_diff.seq_diff_comment_acl - IS 'Test Comment'; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl TO PUBLIC; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl TO enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - OWNER TO enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_diff - CYCLE - INCREMENT 3 - START 3 - MINVALUE 3 - MAXVALUE 100 - CACHE 2; -ALTER SEQUENCE test_schema_diff.seq_diff - OWNER TO enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_start_diff - INCREMENT 5 - START 3 - MINVALUE 3 - MAXVALUE 20; -ALTER SEQUENCE test_schema_diff.seq_start_diff - OWNER TO enterprisedb; - --- Foreign Data Wrapper to test foreign table -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table - OWNER TO enterprisedb; - --- Foreign Server to test foreign table -CREATE SERVER test_fs_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs_for_foreign_table - OWNER TO enterprisedb; -CREATE SERVER test_fs2_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs2_for_foreign_table - OWNER TO enterprisedb; - --- Table to test inheritance in foreign table -CREATE TABLE public.test_table_for_foreign_table -( - tid bigint NOT NULL, - tname text COLLATE pg_catalog."default", - CONSTRAINT test_table_for_foreign_table_pkey PRIMARY KEY (tid) -) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; -ALTER TABLE public.test_table_for_foreign_table - OWNER to enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_src( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_src - OWNER TO enterprisedb; -ALTER FOREIGN TABLE test_schema_diff.ft_src - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_src - IS 'Test Comment'; -GRANT INSERT ON TABLE test_schema_diff.ft_src TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_src TO enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_col( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default", - fcity character varying(40) NULL COLLATE pg_catalog."POSIX" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - OWNER TO enterprisedb; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_diff_col - IS 'Test Comment'; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_const( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - OWNER TO enterprisedb; - -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck1 CHECK ((fid > 1000)) NO INHERIT NOT VALID; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck2 CHECK ((fid > 20)); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck_src CHECK ((fid > 50)); - -GRANT INSERT ON TABLE test_schema_diff.ft_diff_const TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_diff_const TO enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_opt( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table - OPTIONS (opt1 'val1', opt2 'val20', opt_src 'val_src'); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_opt - OWNER TO enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server - OWNER TO enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table - OPTIONS (opt1 'val1'); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - OWNER TO enterprisedb; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - ADD CONSTRAINT cs1 CHECK ((fid > 200)) NO INHERIT; - --- Test for RM #5350 -CREATE TABLE test_schema_diff.events_transactions -( - event_code integer, - numerator integer, - account_token text COLLATE pg_catalog."default", - transaction_dt timestamp without time zone, - payment_method integer, - payment_pin integer, - approval text COLLATE pg_catalog."default", - amount integer, - file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP, - file_name character varying(256) COLLATE pg_catalog."default", - transfer_dt timestamp without time zone, - transaction_type integer -); - --- Casts script -CREATE CAST (money AS bigint) - WITHOUT FUNCTION - AS IMPLICIT; - -COMMENT ON CAST (money AS bigint) IS 'money -> bigint'; - --- Event Trigger script -CREATE FUNCTION public.evt_tri_fun() - RETURNS event_trigger - LANGUAGE 'plpgsql' - NOT LEAKPROOF -AS $BODY$ -BEGIN -PERFORM 1; -END; -$BODY$; -ALTER FUNCTION public.evt_tri_fun() - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_src ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -COMMENT ON EVENT TRIGGER evt_tri_src - IS 'Event Trigger Source'; -ALTER EVENT TRIGGER evt_tri_src - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_event1 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event1 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_event2 ON DDL_COMMAND_END - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event2 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_event3 ON SQL_DROP - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event3 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status1 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status1 - DISABLE; -ALTER EVENT TRIGGER evt_tri_diff_enable_status1 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status2 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - ENABLE REPLICA; -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status3 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status3 - ENABLE ALWAYS; -ALTER EVENT TRIGGER evt_tri_diff_enable_status3 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_func ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_func - OWNER TO enterprisedb; - --- Extension script -CREATE EXTENSION adminpack - SCHEMA pg_catalog - VERSION "1.0"; - --- Language script -CREATE TRUSTED PROCEDURAL LANGUAGE src_trusted_language - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE src_trusted_language - OWNER TO enterprisedb; -COMMENT ON LANGUAGE src_trusted_language - IS 'Custom Trusted Language'; -GRANT USAGE ON LANGUAGE src_trusted_language TO PUBLIC; -GRANT USAGE ON LANGUAGE src_trusted_language TO enterprisedb WITH GRANT OPTION; - -CREATE PROCEDURAL LANGUAGE src_proc_language - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE src_proc_language - OWNER TO enterprisedb; -COMMENT ON LANGUAGE src_proc_language - IS 'Custom Procedural Language'; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_add - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_add - OWNER TO enterprisedb; -GRANT USAGE ON LANGUAGE lan_diff_acl_add TO PUBLIC; -GRANT USAGE ON LANGUAGE lan_diff_acl_add TO enterprisedb WITH GRANT OPTION; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_revoke - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_revoke - OWNER TO enterprisedb; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_type - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_type - OWNER TO enterprisedb; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_inline_validator - HANDLER plpgsql_call_handler - INLINE prsd_end - VALIDATOR pg_stat_reset_single_table_counters; -ALTER LANGUAGE lan_diff_type - OWNER TO enterprisedb; - --- Foreign Data Wrapper Script -CREATE FOREIGN DATA WRAPPER fdw_src - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_src - OWNER TO enterprisedb; -COMMENT ON FOREIGN DATA WRAPPER fdw_src - IS 'Foreign Data Wrapper'; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_add - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_add - OWNER TO enterprisedb; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_add TO PUBLIC; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_add TO enterprisedb WITH GRANT OPTION; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_revoke - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_revoke - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_validator - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_add_validator - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_validator - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_options - OPTIONS (debug 'true'); -ALTER FOREIGN DATA WRAPPER fdw_diff_add_options - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_options; -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_options - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_options - OPTIONS (debug 'false'); -ALTER FOREIGN DATA WRAPPER fdw_diff_options - OWNER TO enterprisedb; - --- Foreign Server Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_server - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OWNER TO enterprisedb; - -CREATE SERVER fs_src - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_src - OWNER TO enterprisedb; -COMMENT ON SERVER fs_src - IS 'Foreign Server'; - -CREATE SERVER fs_diff_acl_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_add - OWNER TO enterprisedb; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_add TO PUBLIC; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_add TO enterprisedb WITH GRANT OPTION; - -CREATE SERVER fs_diff_acl_revoke - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_revoke - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_type_version_add - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_add - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_type_version_remove - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_remove - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_type_version_modify - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_modify - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_options_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_diff_options_add - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_options_remove - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_options_remove - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_options_modify - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '192.168.1.1', port '8080'); -ALTER SERVER fs_diff_options_modify - OWNER TO enterprisedb; - --- User Mapping Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_user_mapping - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_user_mapping - OWNER TO enterprisedb; - -CREATE SERVER test_fs_for_user_mapping - FOREIGN DATA WRAPPER test_fdw_for_user_mapping; -ALTER SERVER test_fs_for_user_mapping - OWNER TO enterprisedb; - -CREATE USER MAPPING FOR public SERVER test_fs_for_user_mapping; - -CREATE USER MAPPING FOR enterprisedb SERVER test_fs_for_user_mapping - OPTIONS (password 'admin123'); diff --git a/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql b/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql deleted file mode 100644 index a8120d8a5..000000000 --- a/web/pgadmin/tools/schema_diff/tests/ppas/9.2_plus/target.sql +++ /dev/null @@ -1,1182 +0,0 @@ --- --- enterprisedbQL database dump --- - --- Dumped from database version 10.7 --- Dumped by pg_dump version 12beta2 - --- Started on 2019-11-01 12:55:22 IST - -SET statement_timeout = 0; -SET lock_timeout = 0; -SET client_encoding = 'UTF8'; -SET standard_conforming_strings = on; -SELECT pg_catalog.set_config('search_path', '', false); -SET check_function_bodies = false; -SET xmloption = content; -SET client_min_messages = warning; - --- --- TOC entry 18 (class 2615 OID 139771) --- Name: test_schema_diff; Type: SCHEMA; Schema: -; Owner: enterprisedb --- - -CREATE SCHEMA test_schema_diff; - -ALTER SCHEMA test_schema_diff OWNER TO enterprisedb; - -SET default_tablespace = ''; - -CREATE EXTENSION btree_gist - SCHEMA test_schema_diff; - --- --- TOC entry 12250 (class 1259 OID 139938) --- Name: MView; Type: MATERIALIZED VIEW; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE MATERIALIZED VIEW test_schema_diff."MView" AS - SELECT 'tekst'::text AS text - WITH NO DATA; - - -ALTER TABLE test_schema_diff."MView" OWNER TO enterprisedb; - --- --- TOC entry 12259 (class 1259 OID 148971) --- Name: table_for_column; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_column ( - col1 bigint, - col2 bigint, - col4 text -); - - -ALTER TABLE test_schema_diff.table_for_column OWNER TO enterprisedb; - --- --- TOC entry 12268 (class 1259 OID 149089) --- Name: table_for_constraints; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_constraints ( - col1 integer NOT NULL, - col2 text, - CONSTRAINT check_con CHECK ((col1 > 30)) -); - - -ALTER TABLE test_schema_diff.table_for_constraints OWNER TO enterprisedb; - --- --- TOC entry 61066 (class 0 OID 0) --- Dependencies: 12268 --- Name: TABLE table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON TABLE test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 61067 (class 0 OID 0) --- Dependencies: 12268 --- Name: CONSTRAINT check_con ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON CONSTRAINT check_con ON test_schema_diff.table_for_constraints IS 'coment'; - - --- --- TOC entry 12257 (class 1259 OID 148960) --- Name: table_for_del; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_del ( -); - - -ALTER TABLE test_schema_diff.table_for_del OWNER TO enterprisedb; - --- --- TOC entry 12271 (class 1259 OID 149172) --- Name: table_for_foreign_key; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_foreign_key ( - col1 integer NOT NULL, - col2 "char", - col3 bigint -); - - -ALTER TABLE test_schema_diff.table_for_foreign_key OWNER TO enterprisedb; - --- --- TOC entry 12263 (class 1259 OID 149013) --- Name: table_for_identical; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_identical ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_identical OWNER TO enterprisedb; - --- --- TOC entry 12261 (class 1259 OID 148986) --- Name: table_for_index; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_index ( - col1 integer NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_index OWNER TO enterprisedb; - --- --- TOC entry 12270 (class 1259 OID 149144) --- Name: table_for_primary_key; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_primary_key ( - col1 integer NOT NULL, - col2 text NOT NULL -); - - -ALTER TABLE test_schema_diff.table_for_primary_key OWNER TO enterprisedb; - --- --- TOC entry 12265 (class 1259 OID 149034) --- Name: table_for_rule; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_rule ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_rule OWNER TO enterprisedb; - --- --- TOC entry 12267 (class 1259 OID 149066) --- Name: table_for_trigger; Type: TABLE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE TABLE test_schema_diff.table_for_trigger ( - col1 bigint NOT NULL, - col2 text -); - - -ALTER TABLE test_schema_diff.table_for_trigger OWNER TO enterprisedb; - - --- --- TOC entry 56906 (class 2606 OID 149097) --- Name: table_for_constraints Exclusion; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_constraints - ADD CONSTRAINT "Exclusion" EXCLUDE USING gist (col2 WITH <>) WITH (fillfactor='15') WHERE ((col1 > 1)) DEFERRABLE INITIALLY DEFERRED; - - --- --- TOC entry 61068 (class 0 OID 0) --- Dependencies: 56906 --- Name: CONSTRAINT "Exclusion" ON table_for_constraints; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON CONSTRAINT "Exclusion" ON test_schema_diff.table_for_constraints IS 'comments'; - - --- --- TOC entry 56910 (class 2606 OID 149176) --- Name: table_for_foreign_key table_for_foreign_key_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_foreign_key - ADD CONSTRAINT table_for_foreign_key_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56897 (class 2606 OID 148993) --- Name: table_for_index table_for_index_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_index - ADD CONSTRAINT table_for_index_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56908 (class 2606 OID 149151) --- Name: table_for_primary_key table_for_primary_key_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_primary_key - ADD CONSTRAINT table_for_primary_key_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56902 (class 2606 OID 149041) --- Name: table_for_rule table_for_rule_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_rule - ADD CONSTRAINT table_for_rule_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56900 (class 2606 OID 149020) --- Name: table_for_identical table_for_table_for_identical_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_identical - ADD CONSTRAINT table_for_table_for_identical_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56904 (class 2606 OID 149073) --- Name: table_for_trigger table_for_trigger_pkey; Type: CONSTRAINT; Schema: test_schema_diff; Owner: enterprisedb --- - -ALTER TABLE ONLY test_schema_diff.table_for_trigger - ADD CONSTRAINT table_for_trigger_pkey PRIMARY KEY (col1); - - --- --- TOC entry 56893 (class 1259 OID 148994) --- Name: index1; Type: INDEX; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE INDEX index1 ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56894 (class 1259 OID 148995) --- Name: index2; Type: INDEX; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE INDEX index2 ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56898 (class 1259 OID 149021) --- Name: index_identical; Type: INDEX; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE INDEX index_identical ON test_schema_diff.table_for_identical USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56895 (class 1259 OID 149212) --- Name: index_same; Type: INDEX; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE INDEX index_same ON test_schema_diff.table_for_index USING btree (col2 text_pattern_ops); - - --- --- TOC entry 56892 (class 1259 OID 139945) --- Name: mview_index; Type: INDEX; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE INDEX mview_index ON test_schema_diff."MView" USING btree (text text_pattern_ops); - - --- --- TOC entry 61045 (class 2618 OID 149042) --- Name: table_for_rule rule1; Type: RULE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE RULE rule1 AS - ON UPDATE TO test_schema_diff.table_for_rule DO INSTEAD NOTHING; - - --- --- TOC entry 61069 (class 0 OID 0) --- Dependencies: 61045 --- Name: RULE rule1 ON table_for_rule; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON RULE rule1 ON test_schema_diff.table_for_rule IS 'comments'; - - --- --- TOC entry 61046 (class 2618 OID 149043) --- Name: table_for_rule rule2; Type: RULE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE RULE rule2 AS - ON UPDATE TO test_schema_diff.table_for_rule DO NOTHING; - - --- --- TOC entry 61047 (class 2618 OID 149044) --- Name: table_for_rule rule3; Type: RULE; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE RULE rule3 AS - ON INSERT TO test_schema_diff.table_for_rule DO NOTHING; - - --- --- TOC entry 61050 (class 0 OID 139938) --- Dependencies: 12250 61062 --- Name: MView; Type: MATERIALIZED VIEW DATA; Schema: test_schema_diff; Owner: enterprisedb --- - -REFRESH MATERIALIZED VIEW test_schema_diff."MView"; - - --- --- TOC entry 12284 (class 1259 OID 347823) --- Name: test view; Type: VIEW; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE VIEW test_schema_diff."test view" AS - SELECT pg_class.relname, - pg_class.relnamespace, - pg_class.reltype, - pg_class.reloftype, - pg_class.relowner, - pg_class.relam, - pg_class.relfilenode, - pg_class.reltablespace, - pg_class.relpages, - pg_class.reltuples, - pg_class.relallvisible, - pg_class.reltoastrelid, - pg_class.relhasindex, - pg_class.relisshared, - pg_class.relpersistence, - pg_class.relkind, - pg_class.relnatts, - pg_class.relchecks, - pg_class.relhasoids, - pg_class.relhaspkey, - pg_class.relhasrules, - pg_class.relhastriggers, - pg_class.relhassubclass, - pg_class.relrowsecurity, - pg_class.relforcerowsecurity, - pg_class.relispopulated, - pg_class.relreplident, - pg_class.relfrozenxid, - pg_class.relminmxid, - pg_class.relacl, - pg_class.reloptions - FROM pg_class - LIMIT 10; - - -ALTER TABLE test_schema_diff."test view" OWNER TO enterprisedb; - --- --- TOC entry 12285 (class 1259 OID 347828) --- Name: test view f; Type: VIEW; Schema: test_schema_diff; Owner: enterprisedb --- - -CREATE VIEW test_schema_diff."test view f" WITH (security_barrier='true') AS - SELECT 2; - - -ALTER TABLE test_schema_diff."test view f" OWNER TO enterprisedb; - --- --- TOC entry 61105 (class 0 OID 0) --- Dependencies: 12285 --- Name: VIEW "test view f"; Type: COMMENT; Schema: test_schema_diff; Owner: enterprisedb --- - -COMMENT ON VIEW test_schema_diff."test view f" IS 'cmn'; - --- Collation scripts -CREATE COLLATION test_schema_diff.coll_tar - FROM pg_catalog."default"; - -ALTER COLLATION test_schema_diff.coll_tar - OWNER TO enterprisedb; - -CREATE COLLATION test_schema_diff.coll_diff - (LC_COLLATE = 'C', LC_CTYPE = 'C'); - -ALTER COLLATION test_schema_diff.coll_diff - OWNER TO enterprisedb; - --- FTS Configuration scripts -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_tar ( - COPY=german -); - -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_tar OWNER TO enterprisedb; - -CREATE TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ( - PARSER = default -); -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR asciiword WITH dutch_stem; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR email WITH simple; -ALTER TEXT SEARCH CONFIGURATION test_schema_diff.fts_con_diff ADD MAPPING FOR hword WITH german_stem; - --- FTS Dictionary scripts -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_tar ( - TEMPLATE = simple, - stopwords = 'english' -); - -CREATE TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff ( - TEMPLATE = simple, - stopwords = 'german' -); - -COMMENT ON TEXT SEARCH DICTIONARY test_schema_diff.fts_dict_diff - IS 'Comment'; - --- FTS Parser scripts -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_tar ( - START = prsd_start, - GETTOKEN = prsd_nexttoken, - END = prsd_end, - LEXTYPES = prsd_lextype); - -CREATE TEXT SEARCH PARSER test_schema_diff.fts_par_diff ( - START = int4_accum, - GETTOKEN = inet_gist_penalty, - END = btint2sortsupport, - LEXTYPES = dispell_init); - -COMMENT ON TEXT SEARCH PARSER test_schema_diff.fts_par_diff - IS 'Comment'; - --- FTS Template scripts -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_tar ( - INIT = dispell_init, - LEXIZE = dispell_lexize -); - -CREATE TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff ( - INIT = dsimple_init, - LEXIZE = dsimple_lexize -); - -COMMENT ON TEXT SEARCH TEMPLATE test_schema_diff.fts_templ_diff IS 'Comment'; - --- Domain and Domain Constraint script -CREATE DOMAIN test_schema_diff.dom_tar - AS bigint - DEFAULT 100 - NOT NULL; - -ALTER DOMAIN test_schema_diff.dom_tar OWNER TO enterprisedb; - -ALTER DOMAIN test_schema_diff.dom_tar - ADD CONSTRAINT con_tar CHECK (VALUE <> 100); - -CREATE DOMAIN test_schema_diff.dom_cons_diff - AS bigint - DEFAULT 400; - -ALTER DOMAIN test_schema_diff.dom_cons_diff OWNER TO enterprisedb; - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_diff_1 CHECK (VALUE <> 40); - -ALTER DOMAIN test_schema_diff.dom_cons_diff - ADD CONSTRAINT cons_tar_only CHECK (VALUE <> 25); - -CREATE DOMAIN test_schema_diff.dom_type_diff - AS numeric(8,4); - -ALTER DOMAIN test_schema_diff.dom_type_diff OWNER TO enterprisedb; - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons1 CHECK (VALUE <> 45::numeric); - -ALTER DOMAIN test_schema_diff.dom_type_diff - ADD CONSTRAINT cons2 CHECK (VALUE <> 50::numeric); - -COMMENT ON DOMAIN test_schema_diff.dom_type_diff - IS 'Comment'; - --- Type Script composite type -CREATE TYPE test_schema_diff.typ_comp_tar AS -( - m1 bit(5), - m2 text COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_tar - OWNER TO enterprisedb; -CREATE TYPE test_schema_diff.typ_comp_diff AS -( - m1 bit(5), - m2 text COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_comp_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_comp_diff_no_column AS -( - a "char", - b "char" -); -ALTER TYPE test_schema_diff.typ_comp_diff_no_column - OWNER TO enterprisedb; - --- Type Script ENUM type -CREATE TYPE test_schema_diff.typ_enum_tar AS ENUM - ('test_enum'); -ALTER TYPE test_schema_diff.typ_enum_tar - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_enum_diff - OWNER TO enterprisedb; - --- Type Script RANGE type -CREATE TYPE test_schema_diff.typ_range_tar AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."POSIX", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_tar - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_range_col_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."POSIX", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_range_col_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_range_subtype_diff AS RANGE -( - SUBTYPE=bool, - SUBTYPE_OPCLASS = bool_ops -); -ALTER TYPE test_schema_diff.typ_range_subtype_diff - OWNER TO enterprisedb; - --- Type Script SHELL type -CREATE TYPE test_schema_diff.typ_shell_tar; -ALTER TYPE test_schema_diff.typ_shell_tar - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_shell_diff; -ALTER TYPE test_schema_diff.typ_shell_diff - OWNER TO enterprisedb; - --- Type script to test when Type is different -CREATE TYPE test_schema_diff.typ_comp_range_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_comp_range_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_comp_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_comp_enum_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_range_comp_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_range_comp_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_range_enum_diff AS ENUM - ('test_enum', 'test_enum_1'); -ALTER TYPE test_schema_diff.typ_range_enum_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_enum_comp_diff AS -( - m1 bigint, - m2 text[] COLLATE pg_catalog."POSIX" -); -ALTER TYPE test_schema_diff.typ_enum_comp_diff - OWNER TO enterprisedb; - -CREATE TYPE test_schema_diff.typ_enum_range_diff AS RANGE -( - SUBTYPE=text, - COLLATION = pg_catalog."C", - SUBTYPE_OPCLASS = text_ops -); -ALTER TYPE test_schema_diff.typ_enum_range_diff - OWNER TO enterprisedb; - --- Package script (test_schema_diff only) -CREATE OR REPLACE PACKAGE test_schema_diff.pkg_tar -IS - FUNCTION get_dept_name(p_deptno numeric) RETURN character varying; - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric); -END pkg_tar; - - -CREATE OR REPLACE PACKAGE BODY test_schema_diff.pkg_tar -IS - FUNCTION get_dept_name(p_deptno numeric) RETURN character varying IS - v_dname VARCHAR2(14); - BEGIN - SELECT dname INTO v_dname FROM dept WHERE deptno = p_deptno; - RETURN v_dname; - EXCEPTION - WHEN NO_DATA_FOUND THEN - DBMS_OUTPUT.PUT_LINE('Invalid department number ' || p_deptno); - RETURN ''; - END; - - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric) IS - BEGIN - INSERT INTO emp(empno, ename, job, sal, hiredate, comm, mgr, deptno) - VALUES(p_empno, p_ename, p_job, p_sal, - p_hiredate, p_comm, p_mgr, p_deptno); - END; -END pkg_tar; - -COMMENT ON PACKAGE test_schema_diff.pkg_tar - IS 'test_schema_diff'; - --- Package script difference in header, acl and comment -CREATE OR REPLACE PACKAGE test_schema_diff.pkg_header_diff -IS - FUNCTION get_dept_name(p_deptno numeric) RETURN character varying; -END pkg_header_diff; - -CREATE OR REPLACE PACKAGE BODY test_schema_diff.pkg_header_diff -IS - FUNCTION get_dept_name(p_deptno numeric) RETURN character varying IS - v_dname VARCHAR2(14); - BEGIN - SELECT dname INTO v_dname FROM dept WHERE deptno = p_deptno; - RETURN v_dname; - EXCEPTION - WHEN NO_DATA_FOUND THEN - DBMS_OUTPUT.PUT_LINE('Invalid department number ' || p_deptno); - RETURN ''; - END; -END pkg_header_diff; - --- Package script difference in body, acl and comment -CREATE OR REPLACE PACKAGE test_schema_diff.pkg_body_diff -IS - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric); -END pkg_body_diff; - -CREATE OR REPLACE PACKAGE BODY test_schema_diff.pkg_body_diff -IS - PROCEDURE hire_emp(p_empno numeric, p_ename character varying, p_job character varying, p_sal numeric, p_hiredate timestamp without time zone, p_comm numeric, p_mgr numeric, p_deptno numeric) IS - BEGIN - DBMS_OUTPUT.PUT_LINE('Before Insert '); - INSERT INTO emp(empno, ename, job, sal, hiredate, comm, mgr, deptno) - VALUES(p_empno, p_ename, p_job, p_sal, - p_hiredate, p_comm, p_mgr, p_deptno); - DBMS_OUTPUT.PUT_LINE('After Insert '); - END; -END pkg_body_diff; - -COMMENT ON PACKAGE test_schema_diff.pkg_body_diff - IS 'Header Diff'; - -GRANT EXECUTE ON PACKAGE test_schema_diff.pkg_body_diff TO PUBLIC; -GRANT EXECUTE ON PACKAGE test_schema_diff.pkg_body_diff TO enterprisedb WITH GRANT OPTION; - --- Synonyms Scripts --- Prerequisite for synonyms -CREATE OR REPLACE FUNCTION test_schema_diff.fun_for_syn() -RETURNS void - LANGUAGE 'plpgsql' - VOLATILE - COST 100 - -AS $BODY$BEGIN -SELECT 1; -END;$BODY$; -ALTER FUNCTION test_schema_diff.fun_for_syn() - OWNER TO enterprisedb; - -CREATE OR REPLACE PROCEDURE test_schema_diff.proc_for_syn() -AS $BODY$BEGIN -SELECT 1; -END;$BODY$; - -CREATE OR REPLACE PACKAGE test_schema_diff.pkg_for_syn -IS -FUNCTION get_dept_name(p_deptno numeric) RETURN character varying; -END pkg_for_syn; -CREATE OR REPLACE PACKAGE BODY test_schema_diff.pkg_for_syn -IS -FUNCTION get_dept_name(p_deptno numeric) RETURN character varying IS -BEGIN - RETURN ''; -END; -END pkg_for_syn; - -CREATE TABLE test_schema_diff.table_for_syn -( - id bigint, - name text COLLATE pg_catalog."default" -) -TABLESPACE pg_default; -ALTER TABLE test_schema_diff.table_for_syn - OWNER to enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_for_syn - INCREMENT 5 - START 1 - MINVALUE 1 - MAXVALUE 100 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_for_syn - OWNER TO enterprisedb; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_fun_src - FOR test_schema_diff.fun_for_syn; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_pkg_src - FOR test_schema_diff.pkg_for_syn; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_proc_src - FOR test_schema_diff.proc_for_syn; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_seq_src - FOR test_schema_diff.seq_for_syn; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_table_src - FOR test_schema_diff.table_for_syn; - -CREATE OR REPLACE PROCEDURE public.proc_for_syn() -AS $BODY$BEGIN -SELECT 1; -END;$BODY$; - -CREATE OR REPLACE SYNONYM test_schema_diff.syn_diff - FOR public.proc_for_syn; - --- Sequences Script -CREATE SEQUENCE test_schema_diff.seq_tar - CYCLE - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 3 - CACHE 6; -ALTER SEQUENCE test_schema_diff.seq_tar - OWNER TO enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; - -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl - OWNER TO enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - INCREMENT 1 - START 1 - MINVALUE 1 - MAXVALUE 9223372036854775807 - CACHE 1; -ALTER SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - OWNER TO enterprisedb; -COMMENT ON SEQUENCE test_schema_diff.seq_diff_comment_acl_remove - IS 'Test Comment'; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl_remove TO PUBLIC; -GRANT ALL ON SEQUENCE test_schema_diff.seq_diff_comment_acl_remove TO enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_diff - INCREMENT 5 - START 3 - MINVALUE 3 - MAXVALUE 80 - CACHE 1; - -ALTER SEQUENCE test_schema_diff.seq_diff - OWNER TO enterprisedb; - -CREATE SEQUENCE test_schema_diff.seq_start_diff - INCREMENT 5 - START 1 - MINVALUE 1 - MAXVALUE 20; -ALTER SEQUENCE test_schema_diff.seq_start_diff - OWNER TO enterprisedb; - --- Foreign Data Wrapper to test foreign table -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_table - OWNER TO enterprisedb; - --- Foreign Server to test foreign table -CREATE SERVER test_fs_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs_for_foreign_table - OWNER TO enterprisedb; -CREATE SERVER test_fs2_for_foreign_table - FOREIGN DATA WRAPPER test_fdw_for_foreign_table; -ALTER SERVER test_fs2_for_foreign_table - OWNER TO enterprisedb; - --- Table to test inheritance in foreign table -CREATE TABLE public.test_table_for_foreign_table -( - tid bigint NOT NULL, - tname text COLLATE pg_catalog."default", - CONSTRAINT test_table_for_foreign_table_pkey PRIMARY KEY (tid) -) -WITH ( - OIDS = FALSE -) -TABLESPACE pg_default; -ALTER TABLE public.test_table_for_foreign_table - OWNER to enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_tar( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_tar - OWNER TO enterprisedb; -ALTER FOREIGN TABLE test_schema_diff.ft_tar - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_tar - IS 'Test Comment'; -GRANT INSERT ON TABLE test_schema_diff.ft_tar TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_tar TO enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_col( - fid bigint NULL, - fname text NOT NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - OWNER TO enterprisedb; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_col - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -COMMENT ON FOREIGN TABLE test_schema_diff.ft_diff_col - IS 'Comment'; -GRANT INSERT ON TABLE test_schema_diff.ft_diff_col TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_diff_col TO enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_const( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - OWNER TO enterprisedb; - -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck CHECK ((fid > 1000)) NO INHERIT; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck1 CHECK ((fid > 50)) NO INHERIT NOT VALID; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck2 CHECK ((fid > 20)) NO INHERIT; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_const - ADD CONSTRAINT fcheck_tar CHECK ((fid > 50)); - -GRANT INSERT ON TABLE test_schema_diff.ft_diff_const TO PUBLIC; -GRANT ALL ON TABLE test_schema_diff.ft_diff_const TO enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_opt( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs_for_foreign_table - OPTIONS (debug 'true', opt2 'val30', opt_tar 'val_tar'); - -ALTER FOREIGN TABLE test_schema_diff.ft_diff_opt - OWNER TO enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server( - fid bigint NULL, - fname text NULL COLLATE pg_catalog."default" -) - SERVER test_fs2_for_foreign_table; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server - OWNER TO enterprisedb; - -CREATE FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1( - fid bigint NULL, - fcity text NULL COLLATE pg_catalog."default" -) - SERVER test_fs2_for_foreign_table - OPTIONS (opt1 'val1', opt2 'val2'); -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - OWNER TO enterprisedb; -ALTER FOREIGN TABLE test_schema_diff.ft_diff_foreign_server_1 - ADD CONSTRAINT cs2 CHECK ((fid > 200)) NO INHERIT; - --- Test for RM #5350 -CREATE TABLE test_schema_diff.events_transactions -( - event_code integer, - numerator integer, - account_token text COLLATE pg_catalog."default", - transaction_dt timestamp without time zone, - payment_method integer, - approval text COLLATE pg_catalog."default", - amount integer, - file_dt timestamp without time zone DEFAULT CURRENT_TIMESTAMP, - file_name character varying(256) COLLATE pg_catalog."default", - payment_pin integer, - transfer_dt timestamp without time zone, - transaction_type integer -); - --- Event Trigger script -CREATE FUNCTION public.evt_tri_fun() - RETURNS event_trigger - LANGUAGE 'plpgsql' - NOT LEAKPROOF -AS $BODY$ -BEGIN -PERFORM 1; -END; -$BODY$; -ALTER FUNCTION public.evt_tri_fun() - OWNER TO enterprisedb; - -CREATE FUNCTION public.evt_tri_fun2() - RETURNS event_trigger - LANGUAGE 'plpgsql' - NOT LEAKPROOF -AS $BODY$ -BEGIN -PERFORM 1; -END; -$BODY$; -ALTER FUNCTION public.evt_tri_fun2() - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_tar ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -COMMENT ON EVENT TRIGGER evt_tri_tar - IS 'Event Trigger Source'; -ALTER EVENT TRIGGER evt_tri_tar - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_event1 ON DDL_COMMAND_END - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event1 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_event2 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event2 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_event3 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_event3 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status1 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status1 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status2 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - DISABLE; -ALTER EVENT TRIGGER evt_tri_diff_enable_status2 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_enable_status3 ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun(); -ALTER EVENT TRIGGER evt_tri_diff_enable_status3 - OWNER TO enterprisedb; - -CREATE EVENT TRIGGER evt_tri_diff_func ON DDL_COMMAND_START - EXECUTE PROCEDURE public.evt_tri_fun2(); -ALTER EVENT TRIGGER evt_tri_diff_func - OWNER TO enterprisedb; - --- Extension script -CREATE EXTENSION adminpack - SCHEMA pg_catalog - VERSION "1.0"; - --- Language script -CREATE TRUSTED PROCEDURAL LANGUAGE tar_language - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE tar_language - OWNER TO enterprisedb; -GRANT USAGE ON LANGUAGE tar_language TO PUBLIC; -GRANT USAGE ON LANGUAGE tar_language TO enterprisedb WITH GRANT OPTION; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_add - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_add - OWNER TO enterprisedb; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_acl_revoke - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_acl_revoke - OWNER TO enterprisedb; -GRANT USAGE ON LANGUAGE lan_diff_acl_revoke TO PUBLIC; -GRANT USAGE ON LANGUAGE lan_diff_acl_revoke TO enterprisedb WITH GRANT OPTION; - -CREATE PROCEDURAL LANGUAGE lan_diff_type - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_type - OWNER TO enterprisedb; - -CREATE TRUSTED PROCEDURAL LANGUAGE lan_diff_inline_validator - HANDLER plpgsql_call_handler - INLINE plpgsql_inline_handler - VALIDATOR plpgsql_validator; -ALTER LANGUAGE lan_diff_type - OWNER TO enterprisedb; - --- Foreign Data Wrapper Script -CREATE FOREIGN DATA WRAPPER fdw_tar - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_tar - OWNER TO enterprisedb; -COMMENT ON FOREIGN DATA WRAPPER fdw_tar - IS 'Foreign Data Wrapper'; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_add - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_add - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_acl_revoke - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_acl_revoke - OWNER TO enterprisedb; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_revoke TO PUBLIC; -GRANT USAGE ON FOREIGN DATA WRAPPER fdw_diff_acl_revoke TO enterprisedb WITH GRANT OPTION; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_add_validator - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_validator - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_validator - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_add_options; -ALTER FOREIGN DATA WRAPPER fdw_diff_add_options - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_remove_options - OPTIONS (debug 'true'); -ALTER FOREIGN DATA WRAPPER fdw_diff_remove_options - OWNER TO enterprisedb; - -CREATE FOREIGN DATA WRAPPER fdw_diff_options - OPTIONS (debug 'true'); -ALTER FOREIGN DATA WRAPPER fdw_diff_options - OWNER TO enterprisedb; - --- Foreign Server Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_foreign_server - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OWNER TO enterprisedb; - -CREATE SERVER fs_tar - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_tar - OWNER TO enterprisedb; -COMMENT ON SERVER fs_tar - IS 'Foreign Server'; - -CREATE SERVER fs_diff_acl_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_add - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_acl_revoke - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_acl_revoke - OWNER TO enterprisedb; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_revoke TO PUBLIC; -GRANT USAGE ON FOREIGN SERVER fs_diff_acl_revoke TO enterprisedb WITH GRANT OPTION; - -CREATE SERVER fs_diff_type_version_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_add - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_type_version_remove - TYPE 'PG' - VERSION '10' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_remove - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_type_version_modify - TYPE 'EPAS' - VERSION '11' - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_type_version_modify - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_options_add - FOREIGN DATA WRAPPER test_fdw_for_foreign_server; -ALTER SERVER fs_diff_options_add - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_options_remove - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_diff_options_remove - OWNER TO enterprisedb; - -CREATE SERVER fs_diff_options_modify - FOREIGN DATA WRAPPER test_fdw_for_foreign_server - OPTIONS (host '127.0.0.1', port '5432'); -ALTER SERVER fs_diff_options_modify - OWNER TO enterprisedb; - --- User Mapping Script -CREATE FOREIGN DATA WRAPPER test_fdw_for_user_mapping - VALIDATOR pg_catalog.postgresql_fdw_validator; -ALTER FOREIGN DATA WRAPPER test_fdw_for_user_mapping - OWNER TO enterprisedb; - -CREATE SERVER test_fs_for_user_mapping - FOREIGN DATA WRAPPER test_fdw_for_user_mapping; -ALTER SERVER test_fs_for_user_mapping - OWNER TO enterprisedb; - -CREATE USER MAPPING FOR public SERVER test_fs_for_user_mapping - OPTIONS (password 'admin123'); - -CREATE USER MAPPING FOR enterprisedb SERVER test_fs_for_user_mapping; diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/10_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/10_plus/search.sql deleted file mode 100644 index 11634059f..000000000 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/10_plus/search.sql +++ /dev/null @@ -1,544 +0,0 @@ -{% import 'catalog/pg/macros/catalogs.sql' as CATALOGS %} -{% set all_obj = false %} -{% if obj_type == 'all' or obj_type is none %} -{% set all_obj = true %} -{% endif %} -SELECT obj_type, obj_name, - pg_catalog.REPLACE(obj_path, '/'||sn.schema_name||'/', '/'||{{ CATALOGS.LABELS_SCHEMACOL('sn.schema_name', _) }}||'/') AS obj_path, - schema_name, show_node, other_info, - CASE - WHEN {{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }} THEN - CASE WHEN {{ CATALOGS.DB_SUPPORT_SCHEMACOL('sn.schema_name') }} THEN 'D' ELSE 'O' END - ELSE 'N' - END AS catalog_level -FROM ( -{% if all_obj or obj_type in ['sequence', 'view', 'mview'] %} - SELECT - CASE - WHEN c.relkind = 'S' THEN 'sequence' - WHEN c.relkind = 'v' THEN 'view' - WHEN c.relkind = 'm' THEN 'mview' - ELSE 'should not happen' - END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || - CASE - WHEN c.relkind = 'S' THEN ':sequence.' - WHEN c.relkind = 'v' THEN ':view.' - WHEN c.relkind = 'm' THEN ':mview.' - ELSE 'should not happen' - END || c.oid ||':/' || c.relname AS obj_path, n.nspname AS schema_name, - CASE - WHEN c.relkind = 'S' THEN {{ show_node_prefs['sequence'] }} - WHEN c.relkind = 'v' THEN {{ show_node_prefs['view'] }} - WHEN c.relkind = 'm' THEN {{ show_node_prefs['mview'] }} - ELSE False - END AS show_node, NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - {% if all_obj %} - WHERE c.relkind in ('S','v','m') - {% elif obj_type == 'sequence' %} - WHERE c.relkind = 'S' - {% elif obj_type == 'view' %} - WHERE c.relkind = 'v' - {% elif obj_type == 'mview' %} - WHERE c.relkind = 'm' - {% endif %} - AND CASE WHEN c.relkind in ('S', 'm') THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['table', 'partition'] %} - SELECT CASE WHEN c.relispartition THEN 'partition' ELSE 'table' END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || ( - WITH RECURSIVE table_path_data as ( - select c.oid as oid, 0 as height, c.relkind, - CASE c.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || c.oid || ':/' || c.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || c.oid || ':/' || c.relname END AS path - from table_path_data order by height desc limit 1 - ) obj_path, n.nspname AS schema_name, - CASE WHEN c.relispartition THEN {{ show_node_prefs['partition'] }} - ELSE {{ show_node_prefs['table'] }} END AS show_node, - NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - WHERE c.relkind in ('p','r','t') - {% if obj_type == 'table' %} - AND NOT c.relispartition - {% elif obj_type == 'partition' %} - AND c.relispartition - {% endif %} - AND CASE WHEN c.relispartition THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['index'] %} - SELECT 'index'::text AS obj_type, cls.relname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || '/' || - case - when tab.relkind = 'm' then ':mview.' || tab.oid || ':' || '/' || tab.relname - WHEN tab.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select tab.oid as oid, 0 as height, tab.relkind, - CASE tab.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || tab.oid || ':/' || tab.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || tab.oid || ':/' || tab.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid=indrelid - JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='pg_constraint') AND dep.deptype='i') - LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) - LEFT OUTER JOIN pg_catalog.pg_description des ON des.objoid=cls.oid - LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) - WHERE contype IS NULL - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger_function', 'function'] %} - SELECT - CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN 'trigger_function' - ELSE 'function' END::text AS obj_type, p.proname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || case when t.typname = 'trigger' then ':trigger_function.' else ':function.' end || p.oid ||':/' || p.proname AS obj_path, n.nspname AS schema_name, - CASE WHEN t.typname IN ('trigger', 'event_trigger') THEN {{ show_node_prefs['trigger_function'] }} ELSE {{ show_node_prefs['function'] }} END AS show_node, - pg_catalog.pg_get_function_identity_arguments(p.oid) AS other_info - from pg_catalog.pg_proc p - left join pg_catalog.pg_namespace n on p.pronamespace = n.oid - left join pg_catalog.pg_type t on p.prorettype = t.oid - WHERE ({{ CATALOGS.DB_SUPPORT('n') }}) AND NOT p.proisagg -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['event_trigger'] %} - select 'event_trigger'::text AS obj_type, evtname AS obj_name, ':event_trigger.'||oid||':/' || evtname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info from pg_catalog.pg_event_trigger -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['schema'] %} - select 'schema'::text AS obj_type, n.nspname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname as obj_path, n.nspname AS schema_name, - {{ show_node_prefs['schema'] }} AS show_node, NULL AS other_info from pg_catalog.pg_namespace n - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['column'] %} - select 'column'::text AS obj_type, a.attname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN ':table.' - WHEN t.relkind = 'v' THEN ':view.' - WHEN t.relkind = 'm' THEN ':mview.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:column.'|| a.attnum ||':/' || a.attname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['column'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_attribute a - inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r','t','p','v','m') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where a.attnum > 0 - and not t.relispartition -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['constraints', 'check_constraint', 'foreign_key', 'primary_key', 'unique_constraint', 'exclusion_constraint'] %} - SELECT - CASE - WHEN c.contype = 'c' THEN 'check_constraint' - WHEN c.contype = 'f' THEN 'foreign_key' - WHEN c.contype = 'p' THEN 'primary_key' - WHEN c.contype = 'u' THEN 'unique_constraint' - WHEN c.contype = 'x' THEN 'exclusion_constraint' - END::text AS obj_type, - case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_name, - ':schema.'||n.oid||':/' || n.nspname||'/'|| - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) || - CASE - WHEN c.contype = 'c' THEN '/:check_constraint.' ||c.oid - WHEN c.contype = 'f' THEN '/:foreign_key.' ||c.oid - WHEN c.contype = 'p' THEN '/:primary_key.' ||c.conindid - WHEN c.contype = 'u' THEN '/:unique_constraint.' ||c.conindid - WHEN c.contype = 'x' THEN '/:exclusion_constraint.' ||c.conindid - END ||':/'|| case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['constraints'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_constraint c - left join pg_catalog.pg_class t on c.conrelid = t.oid - left join pg_catalog.pg_class tf on c.confrelid = tf.oid - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where c.contypid = 0 - {% if obj_type == 'check_constraint' %} - AND c.contype = 'c' - {% elif obj_type == 'foreign_key' %} - AND c.contype = 'f' - {% elif obj_type == 'primary_key' %} - AND c.contype = 'p' - {% elif obj_type == 'unique_constraint' %} - AND c.contype = 'u' - {% elif obj_type == 'exclusion_constraint' %} - AND c.contype = 'x' - {% else %} - AND c.contype IN ('c', 'f', 'p', 'u', 'x') - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['rule'] %} - select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['rule'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_rewrite r - inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r','t','p','v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger'] %} - select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_trigger tr - inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'p', 'v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where tr.tgisinternal = false - and {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['type'] %} - SELECT 'type'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || - '/:type.'|| t.oid ||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['type'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_namespace n on t.typnamespace = n.oid - WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' - {% if not show_system_objects %} - AND ct.oid is NULL - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['cast'] %} - SELECT 'cast'::text AS obj_type, pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_name, - ':cast.'||ca.oid||':/' || pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['cast'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_cast ca - JOIN pg_catalog.pg_type st ON st.oid=castsource - JOIN pg_catalog.pg_type tt ON tt.oid=casttarget - {% if not show_system_objects %} - WHERE ca.oid > {{last_system_oid}}::OID - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} - -{% if all_obj or obj_type in ['publication'] %} - SELECT 'publication'::text AS obj_type, pubname AS obj_name, ':publication.'||pub.oid||':/' || pubname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['publication'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_publication pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} - -{% if 'subscription' not in skip_obj_type%} -{% if all_obj or obj_type in ['subscription'] %} - SELECT 'subscription'::text AS obj_type, subname AS obj_name, ':subscription.'||pub.oid||':/' || subname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['subscription'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_subscription pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% endif %} -{% if all_obj or obj_type in ['language'] %} - SELECT 'language'::text AS obj_type, lanname AS obj_name, ':language.'||lan.oid||':/' || lanname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['language'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_language lan - WHERE lanispl IS TRUE -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_configuration'] %} - SELECT 'fts_configuration'::text AS obj_type, cfg.cfgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:fts_configuration.'||cfg.oid||':/' || cfg.cfgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['fts_configuration'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_config cfg - left join pg_catalog.pg_namespace n on cfg.cfgnamespace = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_dictionary'] %} - SELECT 'fts_dictionary' AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_dictionary'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_dict dict - left join pg_catalog.pg_namespace ns on dict.dictnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_parser'] %} - SELECT 'fts_parser' AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_parser'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_parser prs - left join pg_catalog.pg_namespace ns on prs.prsnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_template'] %} - SELECT 'fts_template' AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_template'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_template tmpl - left join pg_catalog.pg_namespace ns on tmpl.tmplnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain'] %} - select 'domain' AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['domain'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_type t - inner join pg_catalog.pg_namespace n on t.typnamespace = n.oid - where t.typtype = 'd' - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain_constraints'] %} - SELECT 'domain_constraints' AS obj_type, - c.conname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname || '/:domain_constraints.'||c.oid||':/' || c.conname AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['domain_constraints'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_constraint c JOIN pg_catalog.pg_type t - ON t.oid=contypid JOIN pg_catalog.pg_namespace n - ON n.oid=t.typnamespace - WHERE t.typtype = 'd' - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_data_wrapper'] %} - select 'foreign_data_wrapper' AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_data_wrapper'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_data_wrapper -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_server'] %} - select 'foreign_server' AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_server'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_server sr - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['user_mapping'] %} - select 'user_mapping' AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['user_mapping'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_user_mappings um - inner join pg_catalog.pg_foreign_server sr on um.srvid = sr.oid - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_table'] %} - select 'foreign_table' AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['foreign_table'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_table ft - inner join pg_catalog.pg_class c on ft.ftrelid = c.oid - inner join pg_catalog.pg_namespace ns on c.relnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['extension'] %} - select 'extension' AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_extension x - JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid - join pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['collation'] %} - SELECT 'collation' AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['collation'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_collation c - JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['row_security_policy'] %} - select 'row_security_policy'::text AS obj_type, pl.polname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:row_security_policy.'|| pl.oid ||':/'|| pl.polname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['row_security_policy'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_policy pl - JOIN pg_catalog.pg_class t on pl.polrelid = t.oid and t.relkind in ('r','t','p') - JOIN pg_catalog.pg_policies rw ON (pl.polname=rw.policyname AND t.relname=rw.tablename) - JOIN pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['aggregate'] %} - SELECT 'aggregate' AS obj_type, pr.proname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_aggregate ag - LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['operator'] %} - SELECT 'operator' AS obj_type, op.oprname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':operator.' || op.oid::oid ||':/' || op.oprname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['operator'] }} AS show_node, - CASE WHEN lt.typname IS NOT NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(lt.oid, NULL) || ', ' || pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NOT NULL AND rt.typname IS NULL THEN - pg_catalog.format_type(lt.oid, NULL) - ELSE '' END AS other_info - FROM pg_catalog.pg_operator op - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=op.oprnamespace - LEFT OUTER JOIN pg_catalog.pg_type lt ON lt.oid=op.oprleft - LEFT OUTER JOIN pg_catalog.pg_type rt ON rt.oid=op.oprright - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} - -) sn -where lower(sn.obj_name) like '%{{ search_text }}%' -{% if not show_system_objects %} -AND NOT ({{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }}) -AND (sn.schema_name IS NOT NULL AND sn.schema_name NOT LIKE 'pg\_%') -{% endif %} -ORDER BY 1, 2, 3 diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/9.5_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/9.5_plus/search.sql deleted file mode 100644 index ff58d435b..000000000 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/9.5_plus/search.sql +++ /dev/null @@ -1,414 +0,0 @@ -{% import 'catalog/pg/macros/catalogs.sql' as CATALOGS %} -{% set all_obj = false %} -{% if obj_type == 'all' or obj_type is none %} -{% set all_obj = true %} -{% endif %} -SELECT obj_type, obj_name, - pg_catalog.REPLACE(obj_path, '/'||sn.schema_name||'/', '/'||{{ CATALOGS.LABELS_SCHEMACOL('sn.schema_name', _) }}||'/') AS obj_path, - schema_name, show_node, other_info, - CASE - WHEN {{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }} THEN - CASE WHEN {{ CATALOGS.DB_SUPPORT_SCHEMACOL('sn.schema_name') }} THEN 'D' ELSE 'O' END - ELSE 'N' - END AS catalog_level -FROM ( -{% if all_obj or obj_type in ['table', 'sequence', 'view', 'mview'] %} - SELECT - CASE - WHEN c.relkind in ('r', 't') THEN 'table' - WHEN c.relkind = 'S' THEN 'sequence' - WHEN c.relkind = 'v' THEN 'view' - WHEN c.relkind = 'm' THEN 'mview' - ELSE 'should not happen' - END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || - CASE - WHEN c.relkind in ('r', 't') THEN ':table.' - WHEN c.relkind = 'S' THEN ':sequence.' - WHEN c.relkind = 'v' THEN ':view.' - WHEN c.relkind = 'm' THEN ':mview.' - ELSE 'should not happen' - END || c.oid ||':/' || c.relname AS obj_path, n.nspname AS schema_name, - CASE - WHEN c.relkind in ('r', 't') THEN {{ show_node_prefs['table'] }} - WHEN c.relkind = 'S' THEN {{ show_node_prefs['sequence'] }} - WHEN c.relkind = 'v' THEN {{ show_node_prefs['view'] }} - WHEN c.relkind = 'm' THEN {{ show_node_prefs['mview'] }} - ELSE False - END AS show_node, NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - {% if all_obj %} - WHERE c.relkind in ('r','t','S','v','m') - {% elif obj_type == 'table' %} - WHERE c.relkind in ('r', 't') - {% elif obj_type == 'sequence' %} - WHERE c.relkind = 'S' - {% elif obj_type == 'view' %} - WHERE c.relkind = 'v' - {% elif obj_type == 'mview' %} - WHERE c.relkind = 'm' - {% endif %} - AND CASE WHEN c.relkind in ('S', 'm') THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['index'] %} - SELECT 'index'::text AS obj_type, cls.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/:table.'|| tab.oid ||':/' || tab.relname || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid=indrelid - JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='pg_constraint') AND dep.deptype='i') - LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) - LEFT OUTER JOIN pg_catalog.pg_description des ON des.objoid=cls.oid - LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) - WHERE contype IS NULL - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger_function', 'function'] %} - SELECT - CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN 'trigger_function' - ELSE 'function' END::text AS obj_type, p.proname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || case when t.typname = 'trigger' then ':trigger_function.' else ':function.' end || p.oid ||':/' || p.proname AS obj_path, n.nspname AS schema_name, - CASE WHEN t.typname IN ('trigger', 'event_trigger') THEN {{ show_node_prefs['trigger_function'] }} ELSE {{ show_node_prefs['function'] }} END AS show_node, - pg_catalog.pg_get_function_identity_arguments(p.oid) AS other_info - from pg_catalog.pg_proc p - left join pg_catalog.pg_namespace n on p.pronamespace = n.oid - left join pg_catalog.pg_type t on p.prorettype = t.oid - WHERE ({{ CATALOGS.DB_SUPPORT('n') }}) AND NOT p.proisagg -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['event_trigger'] %} - select 'event_trigger'::text AS obj_type, evtname AS obj_name, ':event_trigger.'||oid||':/' || evtname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info from pg_catalog.pg_event_trigger -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['schema'] %} - select 'schema'::text AS obj_type, n.nspname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname as obj_path, n.nspname AS schema_name, - {{ show_node_prefs['schema'] }} AS show_node, NULL AS other_info from pg_catalog.pg_namespace n - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['column'] %} - select 'column'::text AS obj_type, a.attname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/' || - case - WHEN t.relkind in ('r', 't') THEN ':table.' - WHEN t.relkind = 'v' THEN ':view.' - WHEN t.relkind = 'm' THEN ':mview.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:column.'|| a.attnum ||':/' || a.attname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['column'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_attribute a - inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r', 't','v','m') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where a.attnum > 0 -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['constraints', 'check_constraint', 'foreign_key', 'primary_key', 'unique_constraint', 'exclusion_constraint'] %} - SELECT - CASE - WHEN c.contype = 'c' THEN 'check_constraint' - WHEN c.contype = 'f' THEN 'foreign_key' - WHEN c.contype = 'p' THEN 'primary_key' - WHEN c.contype = 'u' THEN 'unique_constraint' - WHEN c.contype = 'x' THEN 'exclusion_constraint' - END::text AS obj_type, - case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_name, - ':schema.'||n.oid||':/' || n.nspname||'/:table.'|| t.oid || ':/'||t.relname|| - CASE - WHEN c.contype = 'c' THEN '/:check_constraint.' ||c.oid - WHEN c.contype = 'f' THEN '/:foreign_key.' ||c.oid - WHEN c.contype = 'p' THEN '/:primary_key.' ||c.conindid - WHEN c.contype = 'u' THEN '/:unique_constraint.' ||c.conindid - WHEN c.contype = 'x' THEN '/:exclusion_constraint.' ||c.conindid - END ||':/'|| case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['constraints'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_constraint c - left join pg_catalog.pg_class t on c.conrelid = t.oid - left join pg_catalog.pg_class tf on c.confrelid = tf.oid - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where c.contypid = 0 - {% if obj_type == 'check_constraint' %} - AND c.contype = 'c' - {% elif obj_type == 'foreign_key' %} - AND c.contype = 'f' - {% elif obj_type == 'primary_key' %} - AND c.contype = 'p' - {% elif obj_type == 'unique_constraint' %} - AND c.contype = 'u' - {% elif obj_type == 'exclusion_constraint' %} - AND c.contype = 'x' - {% else %} - AND c.contype IN ('c', 'f', 'p', 'u', 'x') - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['rule'] %} - select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| - case - WHEN t.relkind in ('r', 't') THEN '/:table.' - when t.relkind = 'v' then '/:view.' - else 'should not happen' - end || t.oid || ':/' || t.relname ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['rule'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_rewrite r - inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r', 't','v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger'] %} - select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| - case - WHEN t.relkind in ('r', 't') THEN '/:table.' - when t.relkind = 'v' then '/:view.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_trigger tr - inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where tr.tgisinternal = false - and {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['type'] %} - SELECT 'type'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || - '/:type.'|| t.oid ||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['type'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_namespace n on t.typnamespace = n.oid - WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' - {% if not show_system_objects %} - AND ct.oid is NULL - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['cast'] %} - SELECT 'cast'::text AS obj_type, pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_name, - ':cast.'||ca.oid||':/' || pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['cast'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_cast ca - JOIN pg_catalog.pg_type st ON st.oid=castsource - JOIN pg_catalog.pg_type tt ON tt.oid=casttarget - {% if not show_system_objects %} - WHERE ca.oid > {{last_system_oid}}::OID - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['language'] %} - SELECT 'language'::text AS obj_type, lanname AS obj_name, ':language.'||lan.oid||':/' || lanname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['language'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_language lan - WHERE lanispl IS TRUE -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_configuration'] %} - SELECT 'fts_configuration'::text AS obj_type, cfg.cfgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:fts_configuration.'||cfg.oid||':/' || cfg.cfgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['fts_configuration'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_config cfg - left join pg_catalog.pg_namespace n on cfg.cfgnamespace = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_dictionary'] %} - SELECT 'fts_dictionary'::text AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_dictionary'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_dict dict - left join pg_catalog.pg_namespace ns on dict.dictnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_parser'] %} - SELECT 'fts_parser'::text AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_parser'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_parser prs - left join pg_catalog.pg_namespace ns on prs.prsnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_template'] %} - SELECT 'fts_template'::text AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_template'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_template tmpl - left join pg_catalog.pg_namespace ns on tmpl.tmplnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain'] %} - select 'domain'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['domain'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_type t - inner join pg_catalog.pg_namespace n on t.typnamespace = n.oid - where t.typtype = 'd' - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain_constraints'] %} - SELECT 'domain_constraints'::text AS obj_type, - c.conname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname || '/:domain_constraints.'||c.oid||':/' || c.conname AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['domain_constraints'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_constraint c JOIN pg_catalog.pg_type t - ON t.oid=contypid JOIN pg_catalog.pg_namespace n - ON n.oid=t.typnamespace - WHERE t.typtype = 'd' - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_data_wrapper'] %} - select 'foreign_data_wrapper'::text AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_data_wrapper'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_data_wrapper -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_server'] %} - select 'foreign_server'::text AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_server'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_server sr - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['user_mapping'] %} - select 'user_mapping'::text AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['user_mapping'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_user_mappings um - inner join pg_catalog.pg_foreign_server sr on um.srvid = sr.oid - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_table'] %} - select 'foreign_table'::text AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['foreign_table'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_table ft - inner join pg_catalog.pg_class c on ft.ftrelid = c.oid - inner join pg_catalog.pg_namespace ns on c.relnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['extension'] %} - select 'extension'::text AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_extension x - JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid - join pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['collation'] %} - SELECT 'collation'::text AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['collation'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_collation c - JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['row_security_policy'] %} - select 'row_security_policy'::text AS obj_type, pl.polname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || - '/:table.'|| t.oid ||':/' || t.relname || '/:row_security_policy.'|| pl.oid ||':/' || pl.polname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['row_security_policy'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_policy pl - JOIN pg_catalog.pg_class t on pl.polrelid = t.oid and t.relkind in ('r','t','p') - JOIN pg_catalog.pg_policies rw ON (pl.polname=rw.policyname AND t.relname=rw.tablename) - JOIN pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['aggregate'] %} - SELECT 'aggregate'::text AS obj_type, pr.proname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_aggregate ag - LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['operator'] %} - SELECT 'operator'::text AS obj_type, op.oprname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':operator.' || op.oid::oid ||':/' || op.oprname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['operator'] }} AS show_node, - CASE WHEN lt.typname IS NOT NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(lt.oid, NULL) || ', ' || pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NOT NULL AND rt.typname IS NULL THEN - pg_catalog.format_type(lt.oid, NULL) - ELSE '' END AS other_info - FROM pg_catalog.pg_operator op - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=op.oprnamespace - LEFT OUTER JOIN pg_catalog.pg_type lt ON lt.oid=op.oprleft - LEFT OUTER JOIN pg_catalog.pg_type rt ON rt.oid=op.oprright - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} - -) sn -where lower(sn.obj_name) like '%{{ search_text }}%' -{% if not show_system_objects %} -AND NOT ({{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }}) -AND (sn.schema_name IS NOT NULL AND sn.schema_name NOT LIKE 'pg\_%') -{% endif %} -ORDER BY 1, 2, 3 diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql index 45dee6555..11634059f 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/pg/default/search.sql @@ -12,10 +12,9 @@ SELECT obj_type, obj_name, ELSE 'N' END AS catalog_level FROM ( -{% if all_obj or obj_type in ['table', 'sequence', 'view', 'mview'] %} +{% if all_obj or obj_type in ['sequence', 'view', 'mview'] %} SELECT CASE - WHEN c.relkind in ('r', 't') THEN 'table' WHEN c.relkind = 'S' THEN 'sequence' WHEN c.relkind = 'v' THEN 'view' WHEN c.relkind = 'm' THEN 'mview' @@ -23,14 +22,12 @@ FROM ( END::text AS obj_type, c.relname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || '/' || CASE - WHEN c.relkind in ('r', 't') THEN ':table.' WHEN c.relkind = 'S' THEN ':sequence.' WHEN c.relkind = 'v' THEN ':view.' WHEN c.relkind = 'm' THEN ':mview.' ELSE 'should not happen' END || c.oid ||':/' || c.relname AS obj_path, n.nspname AS schema_name, CASE - WHEN c.relkind in ('r', 't') THEN {{ show_node_prefs['table'] }} WHEN c.relkind = 'S' THEN {{ show_node_prefs['sequence'] }} WHEN c.relkind = 'v' THEN {{ show_node_prefs['view'] }} WHEN c.relkind = 'm' THEN {{ show_node_prefs['mview'] }} @@ -39,9 +36,7 @@ FROM ( FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace {% if all_obj %} - WHERE c.relkind in ('r','t','S','v','m') - {% elif obj_type == 'table' %} - WHERE c.relkind in ('r', 't') + WHERE c.relkind in ('S','v','m') {% elif obj_type == 'sequence' %} WHERE c.relkind = 'S' {% elif obj_type == 'view' %} @@ -54,15 +49,67 @@ FROM ( {% if all_obj %} UNION {% endif %} +{% if all_obj or obj_type in ['table', 'partition'] %} + SELECT CASE WHEN c.relispartition THEN 'partition' ELSE 'table' END::text AS obj_type, c.relname AS obj_name, + ':schema.'|| n.oid || ':/' || n.nspname || '/' || ( + WITH RECURSIVE table_path_data as ( + select c.oid as oid, 0 as height, c.relkind, + CASE c.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || c.oid || ':/' || c.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || c.oid || ':/' || c.relname END AS path + from table_path_data order by height desc limit 1 + ) obj_path, n.nspname AS schema_name, + CASE WHEN c.relispartition THEN {{ show_node_prefs['partition'] }} + ELSE {{ show_node_prefs['table'] }} END AS show_node, + NULL AS other_info + FROM pg_catalog.pg_class c + LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace + WHERE c.relkind in ('p','r','t') + {% if obj_type == 'table' %} + AND NOT c.relispartition + {% elif obj_type == 'partition' %} + AND c.relispartition + {% endif %} + AND CASE WHEN c.relispartition THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END +{% endif %} +{% if all_obj %} + UNION +{% endif %} {% if all_obj or obj_type in ['index'] %} - SELECT 'index'::text AS obj_type, cls.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/:table.'|| tab.oid ||':/' || tab.relname || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, + SELECT 'index'::text AS obj_type, cls.relname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || '/' || + case + when tab.relkind = 'm' then ':mview.' || tab.oid || ':' || '/' || tab.relname + WHEN tab.relkind in ('r', 't', 'p') THEN + ( + WITH RECURSIVE table_path_data as ( + select tab.oid as oid, 0 as height, tab.relkind, + CASE tab.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || tab.oid || ':/' || tab.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || tab.oid || ':/' || tab.relname END AS path + from table_path_data order by height desc limit 1 + ) + end + || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_index idx JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid JOIN pg_catalog.pg_class tab ON tab.oid=indrelid JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_class WHERE relname='pg_constraint') AND dep.deptype='i') + LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='pg_constraint') AND dep.deptype='i') LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) LEFT OUTER JOIN pg_catalog.pg_description des ON des.objoid=cls.oid LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) @@ -108,15 +155,16 @@ FROM ( select 'column'::text AS obj_type, a.attname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/' || case - WHEN t.relkind in ('r', 't') THEN ':table.' + WHEN t.relkind in ('r', 't', 'p') THEN ':table.' WHEN t.relkind = 'v' THEN ':view.' WHEN t.relkind = 'm' THEN ':mview.' else 'should not happen' end || t.oid || ':/' || t.relname || '/:column.'|| a.attnum ||':/' || a.attname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['column'] }} AS show_node, NULL AS other_info from pg_catalog.pg_attribute a - inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r', 't','v','m') + inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r','t','p','v','m') left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where a.attnum > 0 + and not t.relispartition {% endif %} {% if all_obj %} UNION @@ -131,7 +179,22 @@ FROM ( WHEN c.contype = 'x' THEN 'exclusion_constraint' END::text AS obj_type, case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_name, - ':schema.'||n.oid||':/' || n.nspname||'/:table.'|| t.oid || ':/'||t.relname|| + ':schema.'||n.oid||':/' || n.nspname||'/'|| + ( + WITH RECURSIVE table_path_data as ( + select t.oid as oid, 0 as height, t.relkind, + CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path + from table_path_data order by height desc limit 1 + ) || CASE WHEN c.contype = 'c' THEN '/:check_constraint.' ||c.oid WHEN c.contype = 'f' THEN '/:foreign_key.' ||c.oid @@ -164,16 +227,31 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['rule'] %} - select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| + select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || case - WHEN t.relkind in ('r', 't') THEN '/:table.' - when t.relkind = 'v' then '/:view.' - else 'should not happen' - end || t.oid || ':/' || t.relname ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, + when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname + WHEN t.relkind in ('r', 't', 'p') THEN + ( + WITH RECURSIVE table_path_data as ( + select t.oid as oid, 0 as height, t.relkind, + CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path + from table_path_data order by height desc limit 1 + ) + end + ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['rule'] }} AS show_node, NULL AS other_info from pg_catalog.pg_rewrite r - inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r', 't','v') + inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r','t','p','v') left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where {{ CATALOGS.DB_SUPPORT('n') }} {% endif %} @@ -181,15 +259,29 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['trigger'] %} - select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| - case - WHEN t.relkind in ('r', 't') THEN '/:table.' - when t.relkind = 'v' then '/:view.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_trigger tr - inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'v') + select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || + case + when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname + WHEN t.relkind in ('r', 't', 'p') THEN + ( + WITH RECURSIVE table_path_data as ( + select t.oid as oid, 0 as height, t.relkind, + CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path + from table_path_data order by height desc limit 1 + ) + end || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, + {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info + from pg_catalog.pg_trigger tr + inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'p', 'v') left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where tr.tgisinternal = false and {{ CATALOGS.DB_SUPPORT('n') }} @@ -228,6 +320,26 @@ FROM ( {% if all_obj %} UNION {% endif %} + +{% if all_obj or obj_type in ['publication'] %} + SELECT 'publication'::text AS obj_type, pubname AS obj_name, ':publication.'||pub.oid||':/' || pubname AS obj_path, ''::text AS schema_name, + {{ show_node_prefs['publication'] }} AS show_node, NULL AS other_info + FROM pg_catalog.pg_publication pub +{% endif %} +{% if all_obj %} + UNION +{% endif %} + +{% if 'subscription' not in skip_obj_type%} +{% if all_obj or obj_type in ['subscription'] %} + SELECT 'subscription'::text AS obj_type, subname AS obj_name, ':subscription.'||pub.oid||':/' || subname AS obj_path, ''::text AS schema_name, + {{ show_node_prefs['subscription'] }} AS show_node, NULL AS other_info + FROM pg_catalog.pg_subscription pub +{% endif %} +{% if all_obj %} + UNION +{% endif %} +{% endif %} {% if all_obj or obj_type in ['language'] %} SELECT 'language'::text AS obj_type, lanname AS obj_name, ':language.'||lan.oid||':/' || lanname AS obj_path, ''::text AS schema_name, {{ show_node_prefs['language'] }} AS show_node, NULL AS other_info @@ -248,7 +360,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['fts_dictionary'] %} - SELECT 'fts_dictionary'::text AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, + SELECT 'fts_dictionary' AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['fts_dictionary'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_ts_dict dict left join pg_catalog.pg_namespace ns on dict.dictnamespace = ns.oid @@ -258,7 +370,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['fts_parser'] %} - SELECT 'fts_parser'::text AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, + SELECT 'fts_parser' AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['fts_parser'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_ts_parser prs left join pg_catalog.pg_namespace ns on prs.prsnamespace = ns.oid @@ -268,7 +380,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['fts_template'] %} - SELECT 'fts_template'::text AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, + SELECT 'fts_template' AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['fts_template'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_ts_template tmpl left join pg_catalog.pg_namespace ns on tmpl.tmplnamespace = ns.oid @@ -278,7 +390,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['domain'] %} - select 'domain'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, + select 'domain' AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['domain'] }} AS show_node, NULL AS other_info from pg_catalog.pg_type t inner join pg_catalog.pg_namespace n on t.typnamespace = n.oid @@ -289,7 +401,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['domain_constraints'] %} - SELECT 'domain_constraints'::text AS obj_type, + SELECT 'domain_constraints' AS obj_type, c.conname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname || '/:domain_constraints.'||c.oid||':/' || c.conname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['domain_constraints'] }} AS show_node, NULL AS other_info @@ -303,7 +415,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['foreign_data_wrapper'] %} - select 'foreign_data_wrapper'::text AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, + select 'foreign_data_wrapper' AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, {{ show_node_prefs['foreign_data_wrapper'] }} AS show_node, NULL AS other_info from pg_catalog.pg_foreign_data_wrapper {% endif %} @@ -311,7 +423,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['foreign_server'] %} - select 'foreign_server'::text AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, + select 'foreign_server' AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, {{ show_node_prefs['foreign_server'] }} AS show_node, NULL AS other_info from pg_catalog.pg_foreign_server sr inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid @@ -320,7 +432,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['user_mapping'] %} - select 'user_mapping'::text AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, + select 'user_mapping' AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, {{ show_node_prefs['user_mapping'] }} AS show_node, NULL AS other_info from pg_catalog.pg_user_mappings um inner join pg_catalog.pg_foreign_server sr on um.srvid = sr.oid @@ -330,7 +442,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['foreign_table'] %} - select 'foreign_table'::text AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, + select 'foreign_table' AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['foreign_table'] }} AS show_node, NULL AS other_info from pg_catalog.pg_foreign_table ft inner join pg_catalog.pg_class c on ft.ftrelid = c.oid @@ -341,7 +453,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['extension'] %} - select 'extension'::text AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, + select 'extension' AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_extension x JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid @@ -351,7 +463,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['collation'] %} - SELECT 'collation'::text AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, + SELECT 'collation' AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['collation'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_collation c JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace @@ -360,6 +472,37 @@ FROM ( {% if all_obj %} UNION {% endif %} +{% if all_obj or obj_type in ['row_security_policy'] %} + select 'row_security_policy'::text AS obj_type, pl.polname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || + case + WHEN t.relkind in ('r', 't', 'p') THEN + ( + WITH RECURSIVE table_path_data as ( + select t.oid as oid, 0 as height, t.relkind, + CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path + from table_path_data order by height desc limit 1 + ) + end + ||'/:row_security_policy.'|| pl.oid ||':/'|| pl.polname AS obj_path, n.nspname AS schema_name, + {{ show_node_prefs['row_security_policy'] }} AS show_node, NULL AS other_info + FROM pg_catalog.pg_policy pl + JOIN pg_catalog.pg_class t on pl.polrelid = t.oid and t.relkind in ('r','t','p') + JOIN pg_catalog.pg_policies rw ON (pl.polname=rw.policyname AND t.relname=rw.tablename) + JOIN pg_catalog.pg_namespace n on t.relnamespace = n.oid + where {{ CATALOGS.DB_SUPPORT('n') }} +{% endif %} +{% if all_obj %} + UNION +{% endif %} {% if all_obj or obj_type in ['aggregate'] %} SELECT 'aggregate' AS obj_type, pr.proname AS obj_name, ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/10_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/10_plus/search.sql deleted file mode 100644 index 1ff4b561b..000000000 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/10_plus/search.sql +++ /dev/null @@ -1,621 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -{% set all_obj = false %} -{% if obj_type == 'all' or obj_type is none %} -{% set all_obj = true %} -{% endif %} -SELECT obj_type, obj_name, - pg_catalog.REPLACE(obj_path, '/'||sn.schema_name||'/', '/'||{{ CATALOGS.LABELS_SCHEMACOL('sn.schema_name', _) }}||'/') AS obj_path, - schema_name, show_node, other_info, - CASE - WHEN {{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }} THEN - CASE WHEN {{ CATALOGS.DB_SUPPORT_SCHEMACOL('sn.schema_name') }} THEN 'D' ELSE 'O' END - ELSE 'N' - END AS catalog_level -FROM ( -{% if all_obj or obj_type in ['sequence', 'view', 'mview'] %} - SELECT - CASE - WHEN c.relkind = 'S' THEN 'sequence' - WHEN c.relkind = 'v' THEN 'view' - WHEN c.relkind = 'm' THEN 'mview' - ELSE 'should not happen' - END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || - CASE - WHEN c.relkind = 'S' THEN ':sequence.' - WHEN c.relkind = 'v' THEN ':view.' - WHEN c.relkind = 'm' THEN ':mview.' - ELSE 'should not happen' - END || c.oid ||':/' || c.relname AS obj_path, n.nspname AS schema_name, - CASE - WHEN c.relkind = 'S' THEN {{ show_node_prefs['sequence'] }} - WHEN c.relkind = 'v' THEN {{ show_node_prefs['view'] }} - WHEN c.relkind = 'm' THEN {{ show_node_prefs['mview'] }} - ELSE False - END AS show_node, NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - {% if all_obj %} - WHERE c.relkind in ('S','v','m') - {% elif obj_type == 'sequence' %} - WHERE c.relkind = 'S' - {% elif obj_type == 'view' %} - WHERE c.relkind = 'v' - {% elif obj_type == 'mview' %} - WHERE c.relkind = 'm' - {% endif %} - AND CASE WHEN c.relkind in ('S', 'm') THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['table', 'partition'] %} - SELECT CASE WHEN c.relispartition THEN 'partition' ELSE 'table' END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || ( - WITH RECURSIVE table_path_data as ( - select c.oid as oid, 0 as height, c.relkind, - CASE c.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || c.oid || ':/' || c.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || c.oid || ':/' || c.relname END AS path - from table_path_data order by height desc limit 1 - ) obj_path, n.nspname AS schema_name, - CASE WHEN c.relispartition THEN {{ show_node_prefs['partition'] }} - ELSE {{ show_node_prefs['table'] }} END AS show_node, - NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - WHERE c.relkind in ('p','r','t') - {% if obj_type == 'table' %} - AND NOT c.relispartition - {% elif obj_type == 'partition' %} - AND c.relispartition - {% endif %} - AND CASE WHEN c.relispartition THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['index'] %} - SELECT 'index'::text AS obj_type, cls.relname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || '/' || - case - when tab.relkind = 'm' then ':mview.' || tab.oid || ':' || '/' || tab.relname - WHEN tab.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select tab.oid as oid, 0 as height, tab.relkind, - CASE tab.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || tab.oid || ':/' || tab.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || tab.oid || ':/' || tab.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid=indrelid - JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='pg_constraint') AND dep.deptype='i') - LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) - LEFT OUTER JOIN pg_catalog.pg_description des ON des.objoid=cls.oid - LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) - WHERE contype IS NULL - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger_function', 'function', 'procedure', 'edbfunc', 'edbproc'] %} - SELECT fd.obj_type, fd.obj_name, - CASE - WHEN fd.obj_type = 'function' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:function.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'procedure' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:procedure.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'trigger_function' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:trigger_function.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'edbfunc' THEN - ':schema.'|| fd.next_schema_oid || ':/' || fd.next_schema_name || '/:package.'|| fd.schema_oid || ':/' || fd.schema_name || '/:edbfunc.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'edbproc' THEN - ':schema.'|| fd.next_schema_oid || ':/' || fd.next_schema_name || '/:package.'|| fd.schema_oid || ':/' || fd.schema_name || '/:edbproc.' || fd.obj_oid ||':/' || fd.obj_name - ELSE NULL - END AS obj_path, - CASE - WHEN fd.obj_type IN ('function', 'procedure', 'trigger_function') THEN fd.schema_name - WHEN fd.obj_type IN ('edbfunc', 'edbproc') THEN fd.next_schema_name - ELSE NULL - END AS schema_name, - CASE - WHEN fd.obj_type = 'function' THEN {{ show_node_prefs['function'] }} - WHEN fd.obj_type = 'procedure' THEN {{ show_node_prefs['procedure'] }} - WHEN fd.obj_type = 'trigger_function' THEN {{ show_node_prefs['trigger_function'] }} - WHEN fd.obj_type = 'edbfunc' THEN {{ show_node_prefs['edbfunc'] }} - WHEN fd.obj_type = 'edbproc' THEN {{ show_node_prefs['edbproc'] }} - ELSE NULL - END AS show_node, other_info - FROM ( - SELECT - CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN 'trigger_function' - WHEN pr.protype = '0'::char THEN - CASE WHEN np.oid IS NOT NULL THEN 'edbfunc' ELSE 'function' END - WHEN pr.protype = '1'::char THEN - CASE WHEN np.oid IS NOT NULL THEN 'edbproc' ELSE 'procedure' END - ELSE null - END::text AS obj_type, pr.proname AS obj_name, pr.oid AS obj_oid, n.oid AS schema_oid, n.nspname AS schema_name, np.oid next_schema_oid, np.nspname next_schema_name, - pg_catalog.pg_get_function_identity_arguments(pr.oid) AS other_info - FROM pg_catalog.pg_proc pr left join pg_catalog.pg_namespace n - ON pr.pronamespace = n.oid left JOIN pg_catalog.pg_namespace np - ON np.oid=n.nspparent left JOIN pg_catalog.pg_type t - ON t.oid = pr.prorettype left JOIN pg_catalog.pg_language l - ON l.oid = pr.prolang - WHERE NOT (t.typname = 'trigger' AND l.lanname = 'edbspl') - AND ({{ CATALOGS.DB_SUPPORT('n') }} AND {{ CATALOGS.DB_SUPPORT('np') }}) AND NOT pr.proisagg - ) fd - {% if not all_obj %} - WHERE fd.obj_type = '{{ obj_type }}' - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['event_trigger'] %} - select 'event_trigger'::text AS obj_type, evtname AS obj_name, ':event_trigger.'||oid||':/' || evtname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info from pg_catalog.pg_event_trigger -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['schema'] %} - select 'schema'::text AS obj_type, n.nspname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname as obj_path, n.nspname AS schema_name, - {{ show_node_prefs['schema'] }} AS show_node, NULL AS other_info from pg_catalog.pg_namespace n - where n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['column'] %} - select 'column'::text AS obj_type, a.attname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN ':table.' - WHEN t.relkind = 'v' THEN ':view.' - WHEN t.relkind = 'm' THEN ':mview.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:column.'|| a.attnum ||':/' || a.attname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['column'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_attribute a - inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r','t','p','v','m') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where a.attnum > 0 - and not t.relispartition -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['constraints', 'check_constraint', 'foreign_key', 'primary_key', 'unique_constraint', 'exclusion_constraint'] %} - SELECT - CASE - WHEN c.contype = 'c' THEN 'check_constraint' - WHEN c.contype = 'f' THEN 'foreign_key' - WHEN c.contype = 'p' THEN 'primary_key' - WHEN c.contype = 'u' THEN 'unique_constraint' - WHEN c.contype = 'x' THEN 'exclusion_constraint' - END::text AS obj_type, - case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_name, - ':schema.'||n.oid||':/' || n.nspname||'/'|| - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) || - CASE - WHEN c.contype = 'c' THEN '/:check_constraint.' ||c.oid - WHEN c.contype = 'f' THEN '/:foreign_key.' ||c.oid - WHEN c.contype = 'p' THEN '/:primary_key.' ||c.conindid - WHEN c.contype = 'u' THEN '/:unique_constraint.' ||c.conindid - WHEN c.contype = 'x' THEN '/:exclusion_constraint.' ||c.conindid - END ||':/'|| case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['constraints'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_constraint c - left join pg_catalog.pg_class t on c.conrelid = t.oid - left join pg_catalog.pg_class tf on c.confrelid = tf.oid - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where c.contypid = 0 - {% if obj_type == 'check_constraint' %} - AND c.contype = 'c' - {% elif obj_type == 'foreign_key' %} - AND c.contype = 'f' - {% elif obj_type == 'primary_key' %} - AND c.contype = 'p' - {% elif obj_type == 'unique_constraint' %} - AND c.contype = 'u' - {% elif obj_type == 'exclusion_constraint' %} - AND c.contype = 'x' - {% else %} - AND c.contype IN ('c', 'f', 'p', 'u', 'x') - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['rule'] %} - select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['rule'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_rewrite r - inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r','t','p','v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger'] %} - select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname - when t.relkind = 'm' then ':mview.' || t.oid || ':' || '/' || t.relname - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_trigger tr - inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'p', 'v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where tr.tgisinternal = false - and {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['type'] %} - SELECT 'type'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || - '/:type.'|| t.oid ||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['type'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_namespace n on t.typnamespace = n.oid - WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' - {% if not show_system_objects %} - AND ct.oid is NULL - {% endif %} - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['cast'] %} - SELECT 'cast'::text AS obj_type, pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_name, - ':cast.'||ca.oid||':/' || pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['cast'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_cast ca - JOIN pg_catalog.pg_type st ON st.oid=castsource - JOIN pg_catalog.pg_type tt ON tt.oid=casttarget - {% if not show_system_objects %} - WHERE ca.oid > {{last_system_oid}}::OID - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} - -{% if all_obj or obj_type in ['publication'] %} - SELECT 'publication'::text AS obj_type, pubname AS obj_name, ':publication.'||pub.oid||':/' || pubname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['publication'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_publication pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} - -{% if 'subscription' not in skip_obj_type%} -{% if all_obj or obj_type in ['subscription'] %} - SELECT 'subscription'::text AS obj_type, subname AS obj_name, ':subscription.'||pub.oid||':/' || subname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['subscription'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_subscription pub -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% endif %} - -{% if all_obj or obj_type in ['language'] %} - SELECT 'language'::text AS obj_type, lanname AS obj_name, ':language.'||lan.oid||':/' || lanname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['language'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_language lan - WHERE lanispl IS TRUE -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_configuration'] %} - SELECT 'fts_configuration'::text AS obj_type, cfg.cfgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:fts_configuration.'||cfg.oid||':/' || cfg.cfgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['fts_configuration'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_config cfg - left join pg_catalog.pg_namespace n on cfg.cfgnamespace = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_dictionary'] %} - SELECT 'fts_dictionary' AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_dictionary'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_dict dict - left join pg_catalog.pg_namespace ns on dict.dictnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_parser'] %} - SELECT 'fts_parser' AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_parser'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_parser prs - left join pg_catalog.pg_namespace ns on prs.prsnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_template'] %} - SELECT 'fts_template' AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_template'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_template tmpl - left join pg_catalog.pg_namespace ns on tmpl.tmplnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain'] %} - select 'domain' AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['domain'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_type t - inner join pg_catalog.pg_namespace n on t.typnamespace = n.oid - where t.typtype = 'd' - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain_constraints'] %} - SELECT 'domain_constraints' AS obj_type, - c.conname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname || '/:domain_constraints.'||c.oid||':/' || c.conname AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['domain_constraints'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_constraint c JOIN pg_catalog.pg_type t - ON t.oid=contypid JOIN pg_catalog.pg_namespace n - ON n.oid=t.typnamespace - WHERE t.typtype = 'd' - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_data_wrapper'] %} - select 'foreign_data_wrapper' AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_data_wrapper'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_data_wrapper -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_server'] %} - select 'foreign_server' AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_server'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_server sr - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['user_mapping'] %} - select 'user_mapping' AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['user_mapping'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_user_mappings um - inner join pg_catalog.pg_foreign_server sr on um.srvid = sr.oid - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_table'] %} - select 'foreign_table' AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['foreign_table'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_table ft - inner join pg_catalog.pg_class c on ft.ftrelid = c.oid - inner join pg_catalog.pg_namespace ns on c.relnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['extension'] %} - select 'extension' AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_extension x - JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid - join pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['collation'] %} - SELECT 'collation' AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['collation'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_collation c - JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['synonym'] %} - SELECT 'synonym' AS obj_type, s.synname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:synonym.'||s.oid||':/' || s.synname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['synonym'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_synonym s - JOIN pg_catalog.pg_namespace n ON n.oid=s.synnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['package'] %} - SELECT 'package' AS obj_type, p.nspname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['package'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_namespace p - JOIN pg_catalog.pg_namespace n ON n.oid=p.nspparent - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['edbvar'] %} - SELECT 'edbvar' AS obj_type, v.varname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname || '/:edbvar.'||v.oid||':/' || v.varname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['edbvar'] }} AS show_node, NULL AS other_info - FROM pg_catalog.edb_variable v JOIN pg_catalog.pg_namespace p - ON v.varpackage = p.oid JOIN pg_catalog.pg_namespace n - ON p.nspparent = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('p') }} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['row_security_policy'] %} - select 'row_security_policy'::text AS obj_type, pl.polname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || - case - WHEN t.relkind in ('r', 't', 'p') THEN - ( - WITH RECURSIVE table_path_data as ( - select t.oid as oid, 0 as height, t.relkind, - CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path - union - select rel.oid, pt.height+1 as height, rel.relkind, - CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END - || rel.oid || ':/' || rel.relname || '/' || pt.path as path - from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid - join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid - join table_path_data pt ON inh.inhrelid = pt.oid - ) - select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path - from table_path_data order by height desc limit 1 - ) - end - ||'/:row_security_policy.'|| pl.oid ||':/'|| pl.polname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['row_security_policy'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_policy pl - JOIN pg_catalog.pg_class t on pl.polrelid = t.oid and t.relkind in ('r','t','p') - JOIN pg_catalog.pg_policies rw ON (pl.polname=rw.policyname AND t.relname=rw.tablename) - JOIN pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['aggregate'] %} - SELECT 'aggregate' AS obj_type, pr.proname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_aggregate ag - LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['operator'] %} - SELECT 'operator' AS obj_type, op.oprname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':operator.' || op.oid::oid ||':/' || op.oprname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['operator'] }} AS show_node, - CASE WHEN lt.typname IS NOT NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(lt.oid, NULL) || ', ' || pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NOT NULL AND rt.typname IS NULL THEN - pg_catalog.format_type(lt.oid, NULL) - ELSE '' END AS other_info - FROM pg_catalog.pg_operator op - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=op.oprnamespace - LEFT OUTER JOIN pg_catalog.pg_type lt ON lt.oid=op.oprleft - LEFT OUTER JOIN pg_catalog.pg_type rt ON rt.oid=op.oprright - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} - -) sn -where lower(sn.obj_name) like '%{{ search_text }}%' -{% if not show_system_objects %} -AND NOT ({{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }}) -AND (sn.schema_name IS NOT NULL AND sn.schema_name NOT LIKE 'pg\_%') -{% endif %} -ORDER BY 1, 2, 3 diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/9.5_plus/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/9.5_plus/search.sql deleted file mode 100644 index 2120d9e5c..000000000 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/9.5_plus/search.sql +++ /dev/null @@ -1,489 +0,0 @@ -{% import 'catalog/ppas/macros/catalogs.sql' as CATALOGS %} -{% set all_obj = false %} -{% if obj_type == 'all' or obj_type is none %} -{% set all_obj = true %} -{% endif %} -SELECT obj_type, obj_name, - pg_catalog.REPLACE(obj_path, '/'||sn.schema_name||'/', '/'||{{ CATALOGS.LABELS_SCHEMACOL('sn.schema_name', _) }}||'/') AS obj_path, - schema_name, show_node, other_info, - CASE - WHEN {{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }} THEN - CASE WHEN {{ CATALOGS.DB_SUPPORT_SCHEMACOL('sn.schema_name') }} THEN 'D' ELSE 'O' END - ELSE 'N' - END AS catalog_level -FROM ( -{% if all_obj or obj_type in ['table', 'sequence', 'view', 'mview'] %} - SELECT - CASE - WHEN c.relkind in ('r', 't') THEN 'table' - WHEN c.relkind = 'S' THEN 'sequence' - WHEN c.relkind = 'v' THEN 'view' - WHEN c.relkind = 'm' THEN 'mview' - ELSE 'should not happen' - END::text AS obj_type, c.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/' || - CASE - WHEN c.relkind in ('r', 't') THEN ':table.' - WHEN c.relkind = 'S' THEN ':sequence.' - WHEN c.relkind = 'v' THEN ':view.' - WHEN c.relkind = 'm' THEN ':mview.' - ELSE 'should not happen' - END || c.oid ||':/' || c.relname AS obj_path, n.nspname AS schema_name, - CASE - WHEN c.relkind in ('r', 't') THEN {{ show_node_prefs['table'] }} - WHEN c.relkind = 'S' THEN {{ show_node_prefs['sequence'] }} - WHEN c.relkind = 'v' THEN {{ show_node_prefs['view'] }} - WHEN c.relkind = 'm' THEN {{ show_node_prefs['mview'] }} - ELSE False - END AS show_node, NULL AS other_info - FROM pg_catalog.pg_class c - LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace - {% if all_obj %} - WHERE c.relkind in ('r','t','S','v','m') - {% elif obj_type == 'table' %} - WHERE c.relkind in ('r', 't') - {% elif obj_type == 'sequence' %} - WHERE c.relkind = 'S' - {% elif obj_type == 'view' %} - WHERE c.relkind = 'v' - {% elif obj_type == 'mview' %} - WHERE c.relkind = 'm' - {% endif %} - AND CASE WHEN c.relkind in ('S', 'm') THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['index'] %} - SELECT 'index'::text AS obj_type, cls.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/:table.'|| tab.oid ||':/' || tab.relname || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_index idx - JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid - JOIN pg_catalog.pg_class tab ON tab.oid=indrelid - JOIN pg_catalog.pg_namespace n ON n.oid=tab.relnamespace - LEFT JOIN pg_catalog.pg_depend dep ON (dep.classid = cls.tableoid AND dep.objid = cls.oid AND dep.refobjsubid = '0' AND dep.refclassid=(SELECT oid FROM pg_catalog.pg_class WHERE relname='pg_constraint') AND dep.deptype='i') - LEFT OUTER JOIN pg_catalog.pg_constraint con ON (con.tableoid = dep.refclassid AND con.oid = dep.refobjid) - LEFT OUTER JOIN pg_catalog.pg_description des ON des.objoid=cls.oid - LEFT OUTER JOIN pg_catalog.pg_description desp ON (desp.objoid=con.oid AND desp.objsubid = 0) - WHERE contype IS NULL - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger_function', 'function', 'procedure', 'edbfunc', 'edbproc'] %} - SELECT fd.obj_type, fd.obj_name, - CASE - WHEN fd.obj_type = 'function' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:function.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'procedure' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:procedure.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'trigger_function' THEN - ':schema.'|| fd.schema_oid || ':/' || fd.schema_name || '/:trigger_function.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'edbfunc' THEN - ':schema.'|| fd.next_schema_oid || ':/' || fd.next_schema_name || '/:package.'|| fd.schema_oid || ':/' || fd.schema_name || '/:edbfunc.' || fd.obj_oid ||':/' || fd.obj_name - WHEN fd.obj_type = 'edbproc' THEN - ':schema.'|| fd.next_schema_oid || ':/' || fd.next_schema_name || '/:package.'|| fd.schema_oid || ':/' || fd.schema_name || '/:edbproc.' || fd.obj_oid ||':/' || fd.obj_name - ELSE NULL - END AS obj_path, - CASE - WHEN fd.obj_type IN ('function', 'procedure', 'trigger_function') THEN fd.schema_name - WHEN fd.obj_type IN ('edbfunc', 'edbproc') THEN fd.next_schema_name - ELSE NULL - END AS schema_name, - CASE - WHEN fd.obj_type = 'function' THEN {{ show_node_prefs['function'] }} - WHEN fd.obj_type = 'procedure' THEN {{ show_node_prefs['procedure'] }} - WHEN fd.obj_type = 'trigger_function' THEN {{ show_node_prefs['trigger_function'] }} - WHEN fd.obj_type = 'edbfunc' THEN {{ show_node_prefs['edbfunc'] }} - WHEN fd.obj_type = 'edbproc' THEN {{ show_node_prefs['edbproc'] }} - ELSE NULL - END AS show_node, other_info - FROM ( - SELECT - CASE - WHEN t.typname IN ('trigger', 'event_trigger') THEN 'trigger_function' - WHEN pr.protype = '0'::char THEN - CASE WHEN np.oid IS NOT NULL THEN 'edbfunc' ELSE 'function' END - WHEN pr.protype = '1'::char THEN - CASE WHEN np.oid IS NOT NULL THEN 'edbproc' ELSE 'procedure' END - ELSE null - END::text AS obj_type, pr.proname AS obj_name, pr.oid AS obj_oid, n.oid AS schema_oid, n.nspname AS schema_name, np.oid next_schema_oid, np.nspname next_schema_name, - pg_catalog.pg_get_function_identity_arguments(pr.oid) AS other_info - FROM pg_catalog.pg_proc pr left join pg_catalog.pg_namespace n - ON pr.pronamespace = n.oid left JOIN pg_catalog.pg_namespace np - ON np.oid=n.nspparent left JOIN pg_catalog.pg_type t - ON t.oid = pr.prorettype left JOIN pg_catalog.pg_language l - ON l.oid = pr.prolang - WHERE NOT (t.typname = 'trigger' AND l.lanname = 'edbspl') - AND ({{ CATALOGS.DB_SUPPORT('n') }} AND {{ CATALOGS.DB_SUPPORT('np') }}) AND NOT pr.proisagg - ) fd - {% if not all_obj %} - WHERE fd.obj_type = '{{ obj_type }}' - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['event_trigger'] %} - select 'event_trigger'::text AS obj_type, evtname AS obj_name, ':event_trigger.'||oid||':/' || evtname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info from pg_catalog.pg_event_trigger -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['schema'] %} - select 'schema'::text AS obj_type, n.nspname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname as obj_path, n.nspname AS schema_name, - {{ show_node_prefs['schema'] }} AS show_node, NULL AS other_info from pg_catalog.pg_namespace n - where n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['column'] %} - select 'column'::text AS obj_type, a.attname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/' || - case - WHEN t.relkind in ('r', 't') THEN ':table.' - WHEN t.relkind = 'v' THEN ':view.' - WHEN t.relkind = 'm' THEN ':mview.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:column.'|| a.attnum ||':/' || a.attname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['column'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_attribute a - inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r', 't','v','m') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where a.attnum > 0 -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['constraints', 'check_constraint', 'foreign_key', 'primary_key', 'unique_constraint', 'exclusion_constraint'] %} - SELECT - CASE - WHEN c.contype = 'c' THEN 'check_constraint' - WHEN c.contype = 'f' THEN 'foreign_key' - WHEN c.contype = 'p' THEN 'primary_key' - WHEN c.contype = 'u' THEN 'unique_constraint' - WHEN c.contype = 'x' THEN 'exclusion_constraint' - END::text AS obj_type, - case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_name, - ':schema.'||n.oid||':/' || n.nspname||'/:table.'|| t.oid || ':/'||t.relname|| - CASE - WHEN c.contype = 'c' THEN '/:check_constraint.' ||c.oid - WHEN c.contype = 'f' THEN '/:foreign_key.' ||c.oid - WHEN c.contype = 'p' THEN '/:primary_key.' ||c.conindid - WHEN c.contype = 'u' THEN '/:unique_constraint.' ||c.conindid - WHEN c.contype = 'x' THEN '/:exclusion_constraint.' ||c.conindid - END ||':/'|| case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['constraints'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_constraint c - left join pg_catalog.pg_class t on c.conrelid = t.oid - left join pg_catalog.pg_class tf on c.confrelid = tf.oid - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where c.contypid = 0 - {% if obj_type == 'check_constraint' %} - AND c.contype = 'c' - {% elif obj_type == 'foreign_key' %} - AND c.contype = 'f' - {% elif obj_type == 'primary_key' %} - AND c.contype = 'p' - {% elif obj_type == 'unique_constraint' %} - AND c.contype = 'u' - {% elif obj_type == 'exclusion_constraint' %} - AND c.contype = 'x' - {% else %} - AND c.contype IN ('c', 'f', 'p', 'u', 'x') - {% endif %} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['rule'] %} - select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| - case - WHEN t.relkind in ('r', 't') THEN '/:table.' - when t.relkind = 'v' then '/:view.' - else 'should not happen' - end || t.oid || ':/' || t.relname ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['rule'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_rewrite r - inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r', 't','v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['trigger'] %} - select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| - case - WHEN t.relkind in ('r', 't') THEN '/:table.' - when t.relkind = 'v' then '/:view.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_trigger tr - inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'v') - left join pg_catalog.pg_namespace n on t.relnamespace = n.oid - where tr.tgisinternal = false - and {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['type'] %} - SELECT 'type'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || - '/:type.'|| t.oid ||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['type'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_type t - LEFT OUTER JOIN pg_catalog.pg_type e ON e.oid=t.typelem - LEFT OUTER JOIN pg_catalog.pg_class ct ON ct.oid=t.typrelid AND ct.relkind <> 'c' - LEFT OUTER JOIN pg_catalog.pg_namespace n on t.typnamespace = n.oid - WHERE t.typtype != 'd' AND t.typname NOT LIKE E'\\_%' - {% if not show_system_objects %} - AND ct.oid is NULL - {% endif %} - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['cast'] %} - SELECT 'cast'::text AS obj_type, pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_name, - ':cast.'||ca.oid||':/' || pg_catalog.format_type(st.oid,NULL) ||'->'|| pg_catalog.format_type(tt.oid,tt.typtypmod) AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['cast'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_cast ca - JOIN pg_catalog.pg_type st ON st.oid=castsource - JOIN pg_catalog.pg_type tt ON tt.oid=casttarget - {% if not show_system_objects %} - WHERE ca.oid > {{last_system_oid}}::OID - {% endif %} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['language'] %} - SELECT 'language'::text AS obj_type, lanname AS obj_name, ':language.'||lan.oid||':/' || lanname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['language'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_language lan - WHERE lanispl IS TRUE -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_configuration'] %} - SELECT 'fts_configuration'::text AS obj_type, cfg.cfgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:fts_configuration.'||cfg.oid||':/' || cfg.cfgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['fts_configuration'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_config cfg - left join pg_catalog.pg_namespace n on cfg.cfgnamespace = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_dictionary'] %} - SELECT 'fts_dictionary'::text AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_dictionary'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_dict dict - left join pg_catalog.pg_namespace ns on dict.dictnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_parser'] %} - SELECT 'fts_parser'::text AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_parser'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_parser prs - left join pg_catalog.pg_namespace ns on prs.prsnamespace = ns.oid - WHERE {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['fts_template'] %} - SELECT 'fts_template'::text AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['fts_template'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_ts_template tmpl - left join pg_catalog.pg_namespace ns on tmpl.tmplnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain'] %} - select 'domain'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['domain'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_type t - inner join pg_catalog.pg_namespace n on t.typnamespace = n.oid - where t.typtype = 'd' - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['domain_constraints'] %} - SELECT 'domain_constraints'::text AS obj_type, - c.conname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname || '/:domain_constraints.'||c.oid||':/' || c.conname AS obj_path, - n.nspname AS schema_name, - {{ show_node_prefs['domain_constraints'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_constraint c JOIN pg_catalog.pg_type t - ON t.oid=contypid JOIN pg_catalog.pg_namespace n - ON n.oid=t.typnamespace - WHERE t.typtype = 'd' - AND n.nspparent = 0 - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_data_wrapper'] %} - select 'foreign_data_wrapper'::text AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_data_wrapper'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_data_wrapper -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_server'] %} - select 'foreign_server'::text AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['foreign_server'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_server sr - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['user_mapping'] %} - select 'user_mapping'::text AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['user_mapping'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_user_mappings um - inner join pg_catalog.pg_foreign_server sr on um.srvid = sr.oid - inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['foreign_table'] %} - select 'foreign_table'::text AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, - {{ show_node_prefs['foreign_table'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_foreign_table ft - inner join pg_catalog.pg_class c on ft.ftrelid = c.oid - inner join pg_catalog.pg_namespace ns on c.relnamespace = ns.oid - AND {{ CATALOGS.DB_SUPPORT('ns') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['extension'] %} - select 'extension'::text AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, - {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_extension x - JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid - join pg_catalog.pg_available_extensions() e(name, default_version, comment) ON x.extname=e.name -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['collation'] %} - SELECT 'collation'::text AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['collation'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_collation c - JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['synonym'] %} - SELECT 'synonym'::text AS obj_type, s.synname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:synonym.'||s.oid||':/' || s.synname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['synonym'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_synonym s - JOIN pg_catalog.pg_namespace n ON n.oid=s.synnamespace - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['package'] %} - SELECT 'package'::text AS obj_type, p.nspname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['package'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_namespace p - JOIN pg_catalog.pg_namespace n ON n.oid=p.nspparent - WHERE {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['edbvar'] %} - SELECT 'edbvar'::text AS obj_type, v.varname AS obj_name, - ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname || '/:edbvar.'||v.oid||':/' || v.varname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['edbvar'] }} AS show_node, NULL AS other_info - FROM pg_catalog.edb_variable v JOIN pg_catalog.pg_namespace p - ON v.varpackage = p.oid JOIN pg_catalog.pg_namespace n - ON p.nspparent = n.oid - WHERE {{ CATALOGS.DB_SUPPORT('p') }} - AND {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['row_security_policy'] %} - select 'row_security_policy'::text AS obj_type, pl.polname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || - '/:table.'|| t.oid ||':/' || t.relname || '/:row_security_policy.'|| pl.oid ||':/' || pl.polname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['row_security_policy'] }} AS show_node, NULL AS other_info - FROM pg_catalog.pg_policy pl - JOIN pg_catalog.pg_class t on pl.polrelid = t.oid and t.relkind in ('r','t','p') - JOIN pg_catalog.pg_policies rw ON (pl.polname=rw.policyname AND t.relname=rw.tablename) - JOIN pg_catalog.pg_namespace n on t.relnamespace = n.oid - where {{ CATALOGS.DB_SUPPORT('n') }} -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['aggregate'] %} - SELECT 'aggregate'::text AS obj_type, pr.proname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['aggregate'] }} AS show_node, pg_catalog.pg_get_function_arguments(aggfnoid::oid) AS other_info - FROM pg_aggregate ag - LEFT OUTER JOIN pg_catalog.pg_proc pr ON pr.oid = ag.aggfnoid - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=pr.pronamespace - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} -{% if all_obj %} - UNION -{% endif %} -{% if all_obj or obj_type in ['operator'] %} - SELECT 'operator'::text AS obj_type, op.oprname AS obj_name, - ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':operator.' || op.oid::oid ||':/' || op.oprname AS obj_path, - ns.nspname AS schema_name, - {{ show_node_prefs['operator'] }} AS show_node, - CASE WHEN lt.typname IS NOT NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(lt.oid, NULL) || ', ' || pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NULL AND rt.typname IS NOT NULL THEN - pg_catalog.format_type(rt.oid, NULL) - WHEN lt.typname IS NOT NULL AND rt.typname IS NULL THEN - pg_catalog.format_type(lt.oid, NULL) - ELSE '' END AS other_info - FROM pg_catalog.pg_operator op - LEFT OUTER JOIN pg_catalog.pg_namespace ns ON ns.oid=op.oprnamespace - LEFT OUTER JOIN pg_catalog.pg_type lt ON lt.oid=op.oprleft - LEFT OUTER JOIN pg_catalog.pg_type rt ON rt.oid=op.oprright - WHERE ({{ CATALOGS.DB_SUPPORT('ns') }}) -{% endif %} - -) sn -where lower(sn.obj_name) like '%{{ search_text }}%' -{% if not show_system_objects %} -AND NOT ({{ CATALOGS.IS_CATALOG_SCHEMA('sn.schema_name') }}) -AND (sn.schema_name IS NOT NULL AND sn.schema_name NOT LIKE 'pg\_%') -{% endif %} -ORDER BY 1, 2, 3 diff --git a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql index 0965d7f35..1ff4b561b 100644 --- a/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql +++ b/web/pgadmin/tools/search_objects/templates/search_objects/sql/ppas/default/search.sql @@ -12,10 +12,9 @@ SELECT obj_type, obj_name, ELSE 'N' END AS catalog_level FROM ( -{% if all_obj or obj_type in ['table', 'sequence', 'view', 'mview'] %} +{% if all_obj or obj_type in ['sequence', 'view', 'mview'] %} SELECT CASE - WHEN c.relkind in ('r', 't') THEN 'table' WHEN c.relkind = 'S' THEN 'sequence' WHEN c.relkind = 'v' THEN 'view' WHEN c.relkind = 'm' THEN 'mview' @@ -23,14 +22,12 @@ FROM ( END::text AS obj_type, c.relname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || '/' || CASE - WHEN c.relkind in ('r', 't') THEN ':table.' WHEN c.relkind = 'S' THEN ':sequence.' WHEN c.relkind = 'v' THEN ':view.' WHEN c.relkind = 'm' THEN ':mview.' ELSE 'should not happen' END || c.oid ||':/' || c.relname AS obj_path, n.nspname AS schema_name, CASE - WHEN c.relkind in ('r', 't') THEN {{ show_node_prefs['table'] }} WHEN c.relkind = 'S' THEN {{ show_node_prefs['sequence'] }} WHEN c.relkind = 'v' THEN {{ show_node_prefs['view'] }} WHEN c.relkind = 'm' THEN {{ show_node_prefs['mview'] }} @@ -39,9 +36,7 @@ FROM ( FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace {% if all_obj %} - WHERE c.relkind in ('r','t','S','v','m') - {% elif obj_type == 'table' %} - WHERE c.relkind in ('r', 't') + WHERE c.relkind in ('S','v','m') {% elif obj_type == 'sequence' %} WHERE c.relkind = 'S' {% elif obj_type == 'view' %} @@ -54,9 +49,61 @@ FROM ( {% if all_obj %} UNION {% endif %} +{% if all_obj or obj_type in ['table', 'partition'] %} + SELECT CASE WHEN c.relispartition THEN 'partition' ELSE 'table' END::text AS obj_type, c.relname AS obj_name, + ':schema.'|| n.oid || ':/' || n.nspname || '/' || ( + WITH RECURSIVE table_path_data as ( + select c.oid as oid, 0 as height, c.relkind, + CASE c.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || c.oid || ':/' || c.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || c.oid || ':/' || c.relname END AS path + from table_path_data order by height desc limit 1 + ) obj_path, n.nspname AS schema_name, + CASE WHEN c.relispartition THEN {{ show_node_prefs['partition'] }} + ELSE {{ show_node_prefs['table'] }} END AS show_node, + NULL AS other_info + FROM pg_catalog.pg_class c + LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace + WHERE c.relkind in ('p','r','t') + {% if obj_type == 'table' %} + AND NOT c.relispartition + {% elif obj_type == 'partition' %} + AND c.relispartition + {% endif %} + AND CASE WHEN c.relispartition THEN {{ CATALOGS.DB_SUPPORT('n') }} ELSE true END +{% endif %} +{% if all_obj %} + UNION +{% endif %} {% if all_obj or obj_type in ['index'] %} - SELECT 'index'::text AS obj_type, cls.relname AS obj_name, - ':schema.'|| n.oid || ':/' || n.nspname || '/:table.'|| tab.oid ||':/' || tab.relname || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, + SELECT 'index'::text AS obj_type, cls.relname AS obj_name, ':schema.'|| n.oid || ':/' || n.nspname || '/' || + case + when tab.relkind = 'm' then ':mview.' || tab.oid || ':' || '/' || tab.relname + WHEN tab.relkind in ('r', 't', 'p') THEN + ( + WITH RECURSIVE table_path_data as ( + select tab.oid as oid, 0 as height, tab.relkind, + CASE tab.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || tab.oid || ':/' || tab.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || tab.oid || ':/' || tab.relname END AS path + from table_path_data order by height desc limit 1 + ) + end + || '/:index.'|| cls.oid ||':/' || cls.relname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['index'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_index idx JOIN pg_catalog.pg_class cls ON cls.oid=indexrelid @@ -147,15 +194,16 @@ FROM ( select 'column'::text AS obj_type, a.attname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/' || case - WHEN t.relkind in ('r', 't') THEN ':table.' + WHEN t.relkind in ('r', 't', 'p') THEN ':table.' WHEN t.relkind = 'v' THEN ':view.' WHEN t.relkind = 'm' THEN ':mview.' else 'should not happen' end || t.oid || ':/' || t.relname || '/:column.'|| a.attnum ||':/' || a.attname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['column'] }} AS show_node, NULL AS other_info from pg_catalog.pg_attribute a - inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r', 't','v','m') + inner join pg_catalog.pg_class t on a.attrelid = t.oid and t.relkind in ('r','t','p','v','m') left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where a.attnum > 0 + and not t.relispartition {% endif %} {% if all_obj %} UNION @@ -170,7 +218,22 @@ FROM ( WHEN c.contype = 'x' THEN 'exclusion_constraint' END::text AS obj_type, case when tf.relname is null then c.conname else c.conname || ' -> ' || tf.relname end AS obj_name, - ':schema.'||n.oid||':/' || n.nspname||'/:table.'|| t.oid || ':/'||t.relname|| + ':schema.'||n.oid||':/' || n.nspname||'/'|| + ( + WITH RECURSIVE table_path_data as ( + select t.oid as oid, 0 as height, t.relkind, + CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path + from table_path_data order by height desc limit 1 + ) || CASE WHEN c.contype = 'c' THEN '/:check_constraint.' ||c.oid WHEN c.contype = 'f' THEN '/:foreign_key.' ||c.oid @@ -203,16 +266,31 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['rule'] %} - select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| + select 'rule'::text AS obj_type, r.rulename AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || case - WHEN t.relkind in ('r', 't') THEN '/:table.' - when t.relkind = 'v' then '/:view.' - else 'should not happen' - end || t.oid || ':/' || t.relname ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, + when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname + WHEN t.relkind in ('r', 't', 'p') THEN + ( + WITH RECURSIVE table_path_data as ( + select t.oid as oid, 0 as height, t.relkind, + CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path + from table_path_data order by height desc limit 1 + ) + end + ||'/:rule.'||r.oid||':/'|| r.rulename AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['rule'] }} AS show_node, NULL AS other_info from pg_catalog.pg_rewrite r - inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r', 't','v') + inner join pg_catalog.pg_class t on r.ev_class = t.oid and t.relkind in ('r','t','p','v') left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where {{ CATALOGS.DB_SUPPORT('n') }} {% endif %} @@ -220,15 +298,30 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['trigger'] %} - select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| - case - WHEN t.relkind in ('r', 't') THEN '/:table.' - when t.relkind = 'v' then '/:view.' - else 'should not happen' - end || t.oid || ':/' || t.relname || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, - {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info - from pg_catalog.pg_trigger tr - inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'v') + select 'trigger'::text AS obj_type, tr.tgname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || + case + when t.relkind = 'v' then ':view.' || t.oid || ':' || '/' || t.relname + when t.relkind = 'm' then ':mview.' || t.oid || ':' || '/' || t.relname + WHEN t.relkind in ('r', 't', 'p') THEN + ( + WITH RECURSIVE table_path_data as ( + select t.oid as oid, 0 as height, t.relkind, + CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path + from table_path_data order by height desc limit 1 + ) + end || '/:trigger.'|| tr.oid || ':/' || tr.tgname AS obj_path, n.nspname AS schema_name, + {{ show_node_prefs['trigger'] }} AS show_node, NULL AS other_info + from pg_catalog.pg_trigger tr + inner join pg_catalog.pg_class t on tr.tgrelid = t.oid and t.relkind in ('r', 't', 'p', 'v') left join pg_catalog.pg_namespace n on t.relnamespace = n.oid where tr.tgisinternal = false and {{ CATALOGS.DB_SUPPORT('n') }} @@ -268,6 +361,27 @@ FROM ( {% if all_obj %} UNION {% endif %} + +{% if all_obj or obj_type in ['publication'] %} + SELECT 'publication'::text AS obj_type, pubname AS obj_name, ':publication.'||pub.oid||':/' || pubname AS obj_path, ''::text AS schema_name, + {{ show_node_prefs['publication'] }} AS show_node, NULL AS other_info + FROM pg_catalog.pg_publication pub +{% endif %} +{% if all_obj %} + UNION +{% endif %} + +{% if 'subscription' not in skip_obj_type%} +{% if all_obj or obj_type in ['subscription'] %} + SELECT 'subscription'::text AS obj_type, subname AS obj_name, ':subscription.'||pub.oid||':/' || subname AS obj_path, ''::text AS schema_name, + {{ show_node_prefs['subscription'] }} AS show_node, NULL AS other_info + FROM pg_catalog.pg_subscription pub +{% endif %} +{% if all_obj %} + UNION +{% endif %} +{% endif %} + {% if all_obj or obj_type in ['language'] %} SELECT 'language'::text AS obj_type, lanname AS obj_name, ':language.'||lan.oid||':/' || lanname AS obj_path, ''::text AS schema_name, {{ show_node_prefs['language'] }} AS show_node, NULL AS other_info @@ -288,7 +402,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['fts_dictionary'] %} - SELECT 'fts_dictionary'::text AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, + SELECT 'fts_dictionary' AS obj_type, dict.dictname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_dictionary.'||dict.oid||':/' || dict.dictname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['fts_dictionary'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_ts_dict dict left join pg_catalog.pg_namespace ns on dict.dictnamespace = ns.oid @@ -298,7 +412,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['fts_parser'] %} - SELECT 'fts_parser'::text AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, + SELECT 'fts_parser' AS obj_type, prs.prsname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_parser.'||prs.oid||':/' || prs.prsname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['fts_parser'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_ts_parser prs left join pg_catalog.pg_namespace ns on prs.prsnamespace = ns.oid @@ -308,7 +422,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['fts_template'] %} - SELECT 'fts_template'::text AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, + SELECT 'fts_template' AS obj_type, tmpl.tmplname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:fts_template.'||tmpl.oid||':/' || tmpl.tmplname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['fts_template'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_ts_template tmpl left join pg_catalog.pg_namespace ns on tmpl.tmplnamespace = ns.oid @@ -318,7 +432,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['domain'] %} - select 'domain'::text AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, + select 'domain' AS obj_type, t.typname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['domain'] }} AS show_node, NULL AS other_info from pg_catalog.pg_type t inner join pg_catalog.pg_namespace n on t.typnamespace = n.oid @@ -330,7 +444,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['domain_constraints'] %} - SELECT 'domain_constraints'::text AS obj_type, + SELECT 'domain_constraints' AS obj_type, c.conname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:domain.'||t.oid||':/' || t.typname || '/:domain_constraints.'||c.oid||':/' || c.conname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['domain_constraints'] }} AS show_node, NULL AS other_info @@ -345,7 +459,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['foreign_data_wrapper'] %} - select 'foreign_data_wrapper'::text AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, + select 'foreign_data_wrapper' AS obj_type, fdwname AS obj_name, ':foreign_data_wrapper.'||oid||':/' || fdwname AS obj_path, ''::text AS schema_name, {{ show_node_prefs['foreign_data_wrapper'] }} AS show_node, NULL AS other_info from pg_catalog.pg_foreign_data_wrapper {% endif %} @@ -353,7 +467,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['foreign_server'] %} - select 'foreign_server'::text AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, + select 'foreign_server' AS obj_type, sr.srvname AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname AS obj_path, ''::text AS schema_name, {{ show_node_prefs['foreign_server'] }} AS show_node, NULL AS other_info from pg_catalog.pg_foreign_server sr inner join pg_catalog.pg_foreign_data_wrapper fdw on sr.srvfdw = fdw.oid @@ -362,7 +476,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['user_mapping'] %} - select 'user_mapping'::text AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, + select 'user_mapping' AS obj_type, um.usename AS obj_name, ':foreign_data_wrapper.'||fdw.oid||':/' || fdw.fdwname || '/:foreign_server.'||sr.oid||':/' || sr.srvname || '/:user_mapping.'||um.umid||':/' || um.usename AS obj_path, ''::text AS schema_name, {{ show_node_prefs['user_mapping'] }} AS show_node, NULL AS other_info from pg_catalog.pg_user_mappings um inner join pg_catalog.pg_foreign_server sr on um.srvid = sr.oid @@ -372,7 +486,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['foreign_table'] %} - select 'foreign_table'::text AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, + select 'foreign_table' AS obj_type, c.relname AS obj_name, ':schema.'||ns.oid||':/' || ns.nspname || '/:foreign_table.'||c.oid||':/' || c.relname AS obj_path, ns.nspname AS schema_name, {{ show_node_prefs['foreign_table'] }} AS show_node, NULL AS other_info from pg_catalog.pg_foreign_table ft inner join pg_catalog.pg_class c on ft.ftrelid = c.oid @@ -383,7 +497,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['extension'] %} - select 'extension'::text AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, + select 'extension' AS obj_type, x.extname AS obj_name, ':extension.'||x.oid||':/' || x.extname AS obj_path, ''::text AS schema_name, {{ show_node_prefs['extension'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_extension x JOIN pg_catalog.pg_namespace n on x.extnamespace=n.oid @@ -393,7 +507,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['collation'] %} - SELECT 'collation'::text AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, + SELECT 'collation' AS obj_type, c.collname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:collation.'||c.oid||':/' || c.collname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['collation'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_collation c JOIN pg_catalog.pg_namespace n ON n.oid=c.collnamespace @@ -403,7 +517,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['synonym'] %} - SELECT 'synonym'::text AS obj_type, s.synname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:synonym.'||s.oid||':/' || s.synname AS obj_path, n.nspname AS schema_name, + SELECT 'synonym' AS obj_type, s.synname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:synonym.'||s.oid||':/' || s.synname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['synonym'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_synonym s JOIN pg_catalog.pg_namespace n ON n.oid=s.synnamespace @@ -413,7 +527,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['package'] %} - SELECT 'package'::text AS obj_type, p.nspname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname AS obj_path, n.nspname AS schema_name, + SELECT 'package' AS obj_type, p.nspname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['package'] }} AS show_node, NULL AS other_info FROM pg_catalog.pg_namespace p JOIN pg_catalog.pg_namespace n ON n.oid=p.nspparent @@ -423,7 +537,7 @@ FROM ( UNION {% endif %} {% if all_obj or obj_type in ['edbvar'] %} - SELECT 'edbvar'::text AS obj_type, v.varname AS obj_name, + SELECT 'edbvar' AS obj_type, v.varname AS obj_name, ':schema.'||n.oid||':/' || n.nspname || '/:package.'||p.oid||':/' || p.nspname || '/:edbvar.'||v.oid||':/' || v.varname AS obj_path, n.nspname AS schema_name, {{ show_node_prefs['edbvar'] }} AS show_node, NULL AS other_info FROM pg_catalog.edb_variable v JOIN pg_catalog.pg_namespace p @@ -435,6 +549,37 @@ FROM ( {% if all_obj %} UNION {% endif %} +{% if all_obj or obj_type in ['row_security_policy'] %} + select 'row_security_policy'::text AS obj_type, pl.polname AS obj_name, ':schema.'||n.oid||':/' || n.nspname|| '/' || + case + WHEN t.relkind in ('r', 't', 'p') THEN + ( + WITH RECURSIVE table_path_data as ( + select t.oid as oid, 0 as height, t.relkind, + CASE t.relispartition WHEN true THEN ':partition.' ELSE ':table.' END || t.oid || ':/' || t.relname as path + union + select rel.oid, pt.height+1 as height, rel.relkind, + CASE rel.relispartition WHEN true THEN ':partition.' ELSE ':table.' END + || rel.oid || ':/' || rel.relname || '/' || pt.path as path + from pg_catalog.pg_class rel JOIN pg_catalog.pg_namespace nsp ON rel.relnamespace = nsp.oid + join pg_catalog.pg_inherits inh ON inh.inhparent = rel.oid + join table_path_data pt ON inh.inhrelid = pt.oid + ) + select CASE WHEN relkind = 'p' THEN path ELSE ':table.' || t.oid || ':/' || t.relname END AS path + from table_path_data order by height desc limit 1 + ) + end + ||'/:row_security_policy.'|| pl.oid ||':/'|| pl.polname AS obj_path, n.nspname AS schema_name, + {{ show_node_prefs['row_security_policy'] }} AS show_node, NULL AS other_info + FROM pg_catalog.pg_policy pl + JOIN pg_catalog.pg_class t on pl.polrelid = t.oid and t.relkind in ('r','t','p') + JOIN pg_catalog.pg_policies rw ON (pl.polname=rw.policyname AND t.relname=rw.tablename) + JOIN pg_catalog.pg_namespace n on t.relnamespace = n.oid + where {{ CATALOGS.DB_SUPPORT('n') }} +{% endif %} +{% if all_obj %} + UNION +{% endif %} {% if all_obj or obj_type in ['aggregate'] %} SELECT 'aggregate' AS obj_type, pr.proname AS obj_name, ':schema.'|| ns.oid || ':/' || ns.nspname || '/' || ':aggregate.' || ag.aggfnoid::oid ||':/' || pr.proname AS obj_path, diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/10_plus/explain_plan.sql b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/10_plus/explain_plan.sql deleted file mode 100644 index 5b30a13ee..000000000 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/10_plus/explain_plan.sql +++ /dev/null @@ -1,16 +0,0 @@ -{% import 'sql/macros/utils.macros' as UTILS %} -EXPLAIN ({% if format -%} - FORMAT {{ format.upper() }} -{%- endif %}{% if analyze is defined -%} - , ANALYZE {{ UTILS.BOOL_TEXT(analyze) }} -{%- endif %}{% if verbose is defined -%} - , VERBOSE {{ UTILS.BOOL_TEXT(verbose) }} -{%- endif %}{% if costs is defined -%} - , COSTS {{ UTILS.BOOL_TEXT(costs) }} -{%- endif %}{% if timing is defined -%} - , TIMING {{ UTILS.BOOL_TEXT(timing) }} -{%- endif %}{% if buffers is defined -%} - , BUFFERS {{ UTILS.BOOL_TEXT(buffers) }} -{%- endif %}{% if summary is defined -%} - , SUMMARY {{ UTILS.BOOL_TEXT(summary) }} -{%- endif %}) {{ sql }} diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/9.2_plus/explain_plan.sql b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/9.2_plus/explain_plan.sql deleted file mode 100644 index f1bcbebc3..000000000 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/9.2_plus/explain_plan.sql +++ /dev/null @@ -1,14 +0,0 @@ -{% import 'sql/macros/utils.macros' as UTILS %} -EXPLAIN ({% if format -%} - FORMAT {{ format.upper() }} -{%- endif %}{% if analyze is defined -%} - , ANALYZE {{ UTILS.BOOL_TEXT(analyze) }} -{%- endif %}{% if verbose is defined -%} - , VERBOSE {{ UTILS.BOOL_TEXT(verbose) }} -{%- endif %}{% if costs is defined -%} - , COSTS {{ UTILS.BOOL_TEXT(costs) }} -{%- endif %}{% if timing is defined -%} - , TIMING {{ UTILS.BOOL_TEXT(timing) }} -{%- endif %}{% if buffers is defined -%} - , BUFFERS {{ UTILS.BOOL_TEXT(buffers) }} -{%- endif %}) {{ sql }} diff --git a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/explain_plan.sql b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/explain_plan.sql index f1bcbebc3..5b30a13ee 100644 --- a/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/explain_plan.sql +++ b/web/pgadmin/tools/sqleditor/templates/sqleditor/sql/default/explain_plan.sql @@ -11,4 +11,6 @@ EXPLAIN ({% if format -%} , TIMING {{ UTILS.BOOL_TEXT(timing) }} {%- endif %}{% if buffers is defined -%} , BUFFERS {{ UTILS.BOOL_TEXT(buffers) }} +{%- endif %}{% if summary is defined -%} + , SUMMARY {{ UTILS.BOOL_TEXT(summary) }} {%- endif %}) {{ sql }} diff --git a/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py b/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py index 57e13c126..7b4aa98ff 100644 --- a/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py +++ b/web/pgadmin/tools/sqleditor/tests/test_explain_plan_templates.py @@ -19,68 +19,12 @@ from pgadmin import tools class TestExplainPlanTemplates(BaseTestGenerator): scenarios = [ - ( - 'When rendering Postgres 9.0 template, ' - 'when passing all parameters,' - 'it returns the explain plan with all parameters', - dict( - template_path='sqleditor/sql/default/explain_plan.sql', - input_parameters=dict( - sql='SELECT * FROM places', - format='xml', - analyze=True, - verbose=True, - costs=False, - buffers=True - ), - sql_statement='SELECT * FROM places', - expected_return_value='EXPLAIN ' - '(FORMAT XML, ANALYZE true, ' - 'VERBOSE true, COSTS false, ' - 'BUFFERS true) SELECT * FROM places' - ) - ), - ( - 'When rendering Postgres 9.0 template, ' - 'when not all parameters are present,' - 'it returns the explain plan with the present parameters', - dict( - template_path='sqleditor/sql/default/explain_plan.sql', - input_parameters=dict( - sql='SELECT * FROM places', - format='json', - buffers=True - ), - sql_statement='SELECT * FROM places', - expected_return_value='EXPLAIN ' - '(FORMAT JSON, BUFFERS true) ' - 'SELECT * FROM places' - ) - ), - ( - 'When rendering Postgres 9.2 template, ' - 'when timing is present,' - 'it returns the explain plan with timing', - dict( - template_path='sqleditor/sql/9.2_plus/explain_plan.sql', - input_parameters=dict( - sql='SELECT * FROM places', - format='json', - buffers=True, - timing=False - ), - sql_statement='SELECT * FROM places', - expected_return_value='EXPLAIN ' - '(FORMAT JSON, TIMING false, ' - 'BUFFERS true) SELECT * FROM places' - ) - ), ( 'When rendering Postgres 10 template, ' 'when summary is present,' 'it returns the explain plan with summary', dict( - template_path='sqleditor/sql/10_plus/explain_plan.sql', + template_path='sqleditor/sql/default/explain_plan.sql', input_parameters=dict( sql='SELECT * FROM places', format='yaml',