From b7121bb2d2cd10d655037a1effee41e63e410b4b Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Wed, 15 May 2019 15:09:08 +0530 Subject: [PATCH] 1) Make folder name pluralise inside 'templates' folder and fix naming inconsistency. 2) Remove unwanted functions "module_js()" from the code. 3) Change naming convention for 'Roles' module. --- .../servers/databases/casts/__init__.py | 2 +- .../{cast => casts}/sql/default/create.sql | 0 .../{cast => casts}/sql/default/delete.sql | 0 .../{cast => casts}/sql/default/functions.sql | 0 .../sql/default/getsrcandtrgttype.sql | 0 .../{cast => casts}/sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../{cast => casts}/sql/default/sql.sql | 0 .../{cast => casts}/sql/default/update.sql | 0 .../foreign_servers/__init__.py | 20 +--- .../__init__.py | 20 +--- .../static/img/coll-user_mapping.svg | 0 .../static/img/user_mapping.svg | 0 .../static/js/user_mapping.js | 0 .../user_mappings/sql/default/create.sql | 0 .../user_mappings/sql/default/delete.sql | 0 .../user_mappings/sql/default/properties.sql | 0 .../user_mappings/sql/default/update.sql | 0 .../tests/__init__.py | 0 .../tests/test_user_mapping_add.py | 0 .../tests/test_user_mapping_delete.py | 0 .../test_user_mapping_delete_multiple.py | 0 .../tests/test_user_mapping_get.py | 0 .../tests/test_user_mapping_put.py | 0 .../tests/utils.py | 0 .../servers/databases/schemas/__init__.py | 2 +- .../schemas/catalog_objects/__init__.py | 3 +- .../catalog_objects/columns/__init__.py | 3 +- .../databases/schemas/collations/__init__.py | 3 +- .../sql/default/backend_support.sql | 0 .../sql/default/create.sql | 0 .../sql/default/delete.sql | 0 .../sql/default/get_collations.sql | 0 .../sql/default/get_name.sql | 0 .../sql/default/get_oid.sql | 0 .../sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../sql/default/update.sql | 0 .../sql/gpdb_5.0_plus/get_collations.sql | 0 .../databases/schemas/domains/__init__.py | 16 --- .../schemas/foreign_tables/__init__.py | 16 --- .../schemas/fts_configurations/__init__.py | 19 +--- .../sql/default/copy_config.sql | 0 .../sql/default/create.sql | 0 .../sql/default/delete.sql | 0 .../sql/default/dictionaries.sql | 0 .../sql/default/get_name.sql | 0 .../sql/default/nodes.sql | 0 .../sql/default/parser.sql | 0 .../sql/default/properties.sql | 0 .../sql/default/schema.sql | 0 .../sql/default/sql.sql | 0 .../sql/default/tokenDictList.sql | 0 .../sql/default/tokens.sql | 0 .../sql/default/update.sql | 0 .../schemas/fts_dictionaries/__init__.py | 19 +--- .../sql/default/create.sql | 0 .../sql/default/delete.sql | 0 .../sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../sql/default/schema.sql | 0 .../sql/default/templates.sql | 0 .../sql/default/update.sql | 0 .../databases/schemas/fts_parsers/__init__.py | 7 +- .../sql/default/create.sql | 0 .../sql/default/delete.sql | 0 .../sql/default/functions.sql | 0 .../sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../sql/default/schema.sql | 0 .../sql/default/sql.sql | 0 .../sql/default/update.sql | 0 .../schemas/fts_templates/__init__.py | 19 +--- .../sql/default/create.sql | 0 .../sql/default/delete.sql | 0 .../sql/default/functions.sql | 0 .../sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../sql/default/schema.sql | 0 .../sql/default/sql.sql | 0 .../sql/default/update.sql | 0 .../databases/schemas/functions/__init__.py | 56 ++-------- .../gpdb/sql/default/acl.sql | 0 .../gpdb/sql/default/coll_stats.sql | 0 .../gpdb/sql/default/create.sql | 0 .../gpdb/sql/default/delete.sql | 0 .../gpdb/sql/default/get_definition.sql | 0 .../gpdb/sql/default/get_languages.sql | 0 .../gpdb/sql/default/get_oid.sql | 0 .../gpdb/sql/default/get_out_types.sql | 0 .../gpdb/sql/default/get_schema.sql | 0 .../gpdb/sql/default/get_types.sql | 0 .../gpdb/sql/default/node.sql | 0 .../gpdb/sql/default/properties.sql | 0 .../gpdb/sql/default/stats.sql | 0 .../gpdb/sql/default/update.sql | 0 .../gpdb/sql/default/variables.sql | 0 .../pg/sql/11_plus/coll_stats.sql | 0 .../pg/sql/11_plus/create.sql | 0 .../pg/sql/11_plus/delete.sql | 0 .../pg/sql/11_plus/get_definition.sql | 0 .../pg/sql/11_plus/get_oid.sql | 0 .../pg/sql/11_plus/node.sql | 0 .../pg/sql/11_plus/properties.sql | 0 .../pg/sql/11_plus/update.sql | 0 .../pg/sql/9.2_plus/create.sql | 0 .../pg/sql/9.2_plus/properties.sql | 0 .../pg/sql/9.2_plus/update.sql | 0 .../pg/sql/9.5_plus/create.sql | 0 .../pg/sql/9.5_plus/properties.sql | 0 .../pg/sql/9.5_plus/update.sql | 0 .../pg/sql/9.6_plus/create.sql | 0 .../pg/sql/9.6_plus/update.sql | 0 .../pg/sql/default/acl.sql | 0 .../pg/sql/default/coll_stats.sql | 0 .../pg/sql/default/create.sql | 0 .../pg/sql/default/delete.sql | 0 .../pg/sql/default/get_definition.sql | 0 .../pg/sql/default/get_languages.sql | 0 .../pg/sql/default/get_oid.sql | 0 .../pg/sql/default/get_out_types.sql | 0 .../pg/sql/default/get_schema.sql | 0 .../pg/sql/default/get_types.sql | 0 .../pg/sql/default/node.sql | 0 .../pg/sql/default/properties.sql | 0 .../pg/sql/default/stats.sql | 0 .../pg/sql/default/update.sql | 0 .../pg/sql/default/variables.sql | 0 .../ppas/sql/11_plus/coll_stats.sql | 0 .../ppas/sql/11_plus/delete.sql | 0 .../ppas/sql/11_plus/get_definition.sql | 0 .../ppas/sql/11_plus/get_oid.sql | 0 .../ppas/sql/11_plus/node.sql | 0 .../ppas/sql/11_plus/properties.sql | 0 .../ppas/sql/9.2_plus/create.sql | 0 .../ppas/sql/9.2_plus/delete.sql | 0 .../ppas/sql/9.2_plus/get_oid.sql | 0 .../ppas/sql/9.2_plus/update.sql | 0 .../ppas/sql/9.5_plus/create.sql | 0 .../ppas/sql/9.5_plus/delete.sql | 0 .../ppas/sql/9.5_plus/update.sql | 0 .../ppas/sql/9.6_plus/create.sql | 0 .../ppas/sql/9.6_plus/update.sql | 0 .../ppas/sql/default/acl.sql | 0 .../ppas/sql/default/coll_stats.sql | 0 .../ppas/sql/default/create.sql | 0 .../ppas/sql/default/delete.sql | 0 .../ppas/sql/default/get_definition.sql | 0 .../ppas/sql/default/get_languages.sql | 0 .../ppas/sql/default/get_oid.sql | 0 .../ppas/sql/default/get_out_types.sql | 0 .../ppas/sql/default/get_schema.sql | 0 .../ppas/sql/default/get_types.sql | 0 .../ppas/sql/default/node.sql | 0 .../ppas/sql/default/properties.sql | 0 .../ppas/sql/default/stats.sql | 0 .../ppas/sql/default/update.sql | 0 .../ppas/sql/default/variables.sql | 0 .../pg/sql/11_plus/acl.sql | 0 .../pg/sql/11_plus/coll_stats.sql | 0 .../pg/sql/11_plus/create.sql | 0 .../pg/sql/11_plus/delete.sql | 0 .../pg/sql/11_plus/get_definition.sql | 0 .../pg/sql/11_plus/get_languages.sql | 0 .../pg/sql/11_plus/get_oid.sql | 0 .../pg/sql/11_plus/get_out_types.sql | 0 .../pg/sql/11_plus/get_schema.sql | 0 .../pg/sql/11_plus/get_types.sql | 0 .../pg/sql/11_plus/node.sql | 0 .../pg/sql/11_plus/properties.sql | 0 .../pg/sql/11_plus/stats.sql | 0 .../pg/sql/11_plus/update.sql | 0 .../pg/sql/11_plus/variables.sql | 0 .../ppas/sql/11_plus/coll_stats.sql | 0 .../ppas/sql/11_plus/create.sql | 0 .../ppas/sql/11_plus/delete.sql | 0 .../ppas/sql/11_plus/get_definition.sql | 0 .../ppas/sql/11_plus/get_oid.sql | 0 .../ppas/sql/11_plus/node.sql | 0 .../ppas/sql/11_plus/properties.sql | 0 .../ppas/sql/11_plus/update.sql | 0 .../ppas/sql/9.2_plus/create.sql | 0 .../ppas/sql/9.2_plus/update.sql | 0 .../ppas/sql/9.5_plus/create.sql | 0 .../ppas/sql/9.5_plus/update.sql | 0 .../ppas/sql/9.6_plus/create.sql | 0 .../ppas/sql/9.6_plus/update.sql | 0 .../ppas/sql/default/acl.sql | 0 .../ppas/sql/default/coll_stats.sql | 0 .../ppas/sql/default/create.sql | 0 .../ppas/sql/default/delete.sql | 0 .../ppas/sql/default/get_definition.sql | 0 .../ppas/sql/default/get_languages.sql | 0 .../ppas/sql/default/get_oid.sql | 0 .../ppas/sql/default/get_out_types.sql | 0 .../ppas/sql/default/get_schema.sql | 0 .../ppas/sql/default/get_types.sql | 0 .../ppas/sql/default/node.sql | 0 .../ppas/sql/default/properties.sql | 0 .../ppas/sql/default/stats.sql | 0 .../ppas/sql/default/update.sql | 0 .../ppas/sql/default/variables.sql | 0 .../pg/sql/11_plus/coll_stats.sql | 0 .../pg/sql/11_plus/create.sql | 0 .../pg/sql/11_plus/delete.sql | 0 .../pg/sql/11_plus/get_definition.sql | 0 .../pg/sql/11_plus/get_oid.sql | 0 .../pg/sql/11_plus/node.sql | 0 .../pg/sql/11_plus/properties.sql | 0 .../pg/sql/11_plus/update.sql | 0 .../pg/sql/9.2_plus/create.sql | 0 .../pg/sql/9.2_plus/delete.sql | 0 .../pg/sql/9.2_plus/get_oid.sql | 0 .../pg/sql/9.2_plus/node.sql | 0 .../pg/sql/9.2_plus/properties.sql | 0 .../pg/sql/9.2_plus/update.sql | 0 .../pg/sql/9.5_plus/create.sql | 0 .../pg/sql/9.5_plus/node.sql | 0 .../pg/sql/9.5_plus/update.sql | 0 .../pg/sql/default/acl.sql | 0 .../pg/sql/default/coll_stats.sql | 0 .../pg/sql/default/create.sql | 0 .../pg/sql/default/delete.sql | 0 .../pg/sql/default/get_definition.sql | 0 .../pg/sql/default/get_languages.sql | 0 .../pg/sql/default/get_oid.sql | 0 .../pg/sql/default/get_out_types.sql | 0 .../pg/sql/default/get_schema.sql | 0 .../pg/sql/default/get_types.sql | 0 .../pg/sql/default/node.sql | 0 .../pg/sql/default/properties.sql | 0 .../pg/sql/default/stats.sql | 0 .../pg/sql/default/update.sql | 0 .../pg/sql/default/variables.sql | 0 .../ppas/sql/11_plus/coll_stats.sql | 0 .../ppas/sql/11_plus/delete.sql | 0 .../ppas/sql/11_plus/get_definition.sql | 0 .../ppas/sql/11_plus/get_oid.sql | 0 .../ppas/sql/11_plus/node.sql | 0 .../ppas/sql/11_plus/properties.sql | 0 .../ppas/sql/9.2_plus/create.sql | 0 .../ppas/sql/9.2_plus/delete.sql | 0 .../ppas/sql/9.2_plus/get_oid.sql | 0 .../ppas/sql/9.2_plus/node.sql | 0 .../ppas/sql/9.2_plus/properties.sql | 0 .../ppas/sql/9.2_plus/update.sql | 0 .../ppas/sql/9.5_plus/create.sql | 0 .../ppas/sql/9.5_plus/delete.sql | 0 .../ppas/sql/9.5_plus/update.sql | 0 .../ppas/sql/default/acl.sql | 0 .../ppas/sql/default/coll_stats.sql | 0 .../ppas/sql/default/create.sql | 0 .../ppas/sql/default/delete.sql | 0 .../ppas/sql/default/get_definition.sql | 0 .../ppas/sql/default/get_languages.sql | 0 .../ppas/sql/default/get_oid.sql | 0 .../ppas/sql/default/get_out_types.sql | 0 .../ppas/sql/default/get_schema.sql | 0 .../ppas/sql/default/get_types.sql | 0 .../ppas/sql/default/node.sql | 0 .../ppas/sql/default/properties.sql | 0 .../ppas/sql/default/stats.sql | 0 .../ppas/sql/default/update.sql | 0 .../ppas/sql/default/variables.sql | 0 .../databases/schemas/packages/__init__.py | 17 +-- .../schemas/packages/edbfuncs/__init__.py | 39 ++----- .../ppas/11_plus/get_oid.sql | 0 .../ppas/11_plus/properties.sql | 0 .../ppas/default/get_body.sql | 0 .../ppas/default/get_name.sql | 0 .../ppas/default/get_oid.sql | 0 .../ppas/default/get_schema.sql | 0 .../ppas/default/node.sql | 0 .../ppas/default/properties.sql | 0 .../ppas/default/stats.sql | 0 .../ppas/11_plus/get_oid.sql | 0 .../ppas/11_plus/properties.sql | 0 .../ppas/default/get_body.sql | 0 .../ppas/default/get_name.sql | 0 .../ppas/default/get_oid.sql | 0 .../ppas/default/get_schema.sql | 0 .../ppas/default/node.sql | 0 .../ppas/default/properties.sql | 0 .../ppas/default/stats.sql | 0 .../schemas/packages/edbvars/__init__.py | 21 +--- .../{edbvar => edbvars}/ppas/node.sql | 0 .../{edbvar => edbvars}/ppas/properties.sql | 0 .../ppas/9.1_plus/acl.sql | 0 .../ppas/9.1_plus/create.sql | 0 .../ppas/9.1_plus/delete.sql | 0 .../ppas/9.1_plus/get_oid.sql | 0 .../ppas/9.1_plus/get_schema.sql | 0 .../ppas/9.1_plus/grant.sql | 0 .../ppas/9.1_plus/nodes.sql | 0 .../ppas/9.1_plus/properties.sql | 0 .../ppas/9.1_plus/update.sql | 0 .../ppas/9.2_plus/acl.sql | 0 .../ppas/9.2_plus/create.sql | 0 .../ppas/9.2_plus/delete.sql | 0 .../ppas/9.2_plus/get_oid.sql | 0 .../ppas/9.2_plus/get_schema.sql | 0 .../ppas/9.2_plus/grant.sql | 0 .../ppas/9.2_plus/nodes.sql | 0 .../ppas/9.2_plus/properties.sql | 0 .../ppas/9.2_plus/update.sql | 0 .../databases/schemas/sequences/__init__.py | 17 +-- .../sql/10_plus/get_def.sql | 0 .../sql/default/acl.sql | 0 .../sql/default/backend_support.sql | 0 .../sql/default/coll_stats.sql | 0 .../sql/default/create.sql | 0 .../sql/default/delete.sql | 0 .../sql/default/get_def.sql | 0 .../sql/default/get_dependencies.sql | 0 .../sql/default/get_oid.sql | 0 .../sql/default/grant.sql | 0 .../sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../sql/default/stats.sql | 0 .../sql/default/update.sql | 0 .../sql/gpdb_5.0_plus/acl.sql | 0 .../databases/schemas/synonyms/__init__.py | 3 +- .../sql/9.2_plus/get_objects.sql | 0 .../sql/9.2_plus/properties.sql | 0 .../sql/9.5_plus/get_objects.sql | 0 .../sql/9.5_plus/get_schema.sql | 0 .../sql/9.5_plus/properties.sql | 0 .../sql/default/create.sql | 0 .../sql/default/delete.sql | 0 .../sql/default/get_objects.sql | 0 .../sql/default/get_parent_oid.sql | 0 .../sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../sql/default/update.sql | 0 .../databases/schemas/tables/__init__.py | 5 - .../schemas/tables/columns/__init__.py | 9 +- .../macros/privilege.macros | 0 .../macros/security.macros | 0 .../schemas/tables/constraints/__init__.py | 19 ---- .../constraints/check_constraint/__init__.py | 16 --- .../exclusion_constraint/__init__.py | 20 +--- .../constraints/foreign_key/__init__.py | 18 ---- .../constraints/index_constraint/__init__.py | 22 +--- .../schemas/tables/indexes/__init__.py | 7 +- .../schemas/tables/partitions/__init__.py | 2 +- .../tests/test_backend_supported.py | 4 +- .../schemas/tables/rules/__init__.py | 13 --- .../macros/privilege.macros | 0 .../macros/security.macros | 0 .../sql/10_plus/create.sql | 6 +- .../sql/10_plus/properties.sql | 0 .../sql/10_plus/update.sql | 6 +- .../{column => columns}/sql/9.1_plus/acl.sql | 0 .../sql/9.1_plus/properties.sql | 0 .../sql/9.2_plus/get_collations.sql | 0 .../sql/9.2_plus/nodes.sql | 0 .../sql/9.2_plus/properties.sql | 0 .../sql/9.2_plus/update.sql | 6 +- .../{column => columns}/sql/default/acl.sql | 0 .../sql/default/create.sql | 6 +- .../sql/default/delete.sql | 0 .../sql/default/depend.sql | 0 .../sql/default/edit_mode_types.sql | 0 .../sql/default/get_collations.sql | 0 .../sql/default/get_inherited_tables.sql | 0 .../sql/default/get_parent.sql | 0 .../sql/default/get_position.sql | 0 .../sql/default/get_types.sql | 0 .../sql/default/is_referenced.sql | 0 .../{column => columns}/sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../{column => columns}/sql/default/stats.sql | 0 .../sql/default/update.sql | 6 +- .../sql/gpdb_5.0_plus/acl.sql | 0 .../sql/gpdb_5.0_plus/get_collations.sql | 0 .../sql/11_plus/column_details.sql | 0 .../{index => indexes}/sql/11_plus/create.sql | 0 .../sql/11_plus/include_details.sql | 0 .../{index => indexes}/sql/default/alter.sql | 0 .../sql/default/backend_support.sql | 0 .../sql/default/coll_stats.sql | 0 .../sql/default/column_details.sql | 0 .../{index => indexes}/sql/default/create.sql | 0 .../{index => indexes}/sql/default/delete.sql | 0 .../{index => indexes}/sql/default/get_am.sql | 0 .../sql/default/get_collations.sql | 0 .../sql/default/get_oid.sql | 0 .../sql/default/get_op_class.sql | 0 .../sql/default/get_parent.sql | 0 .../{index => indexes}/sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../{index => indexes}/sql/default/stats.sql | 0 .../{index => indexes}/sql/default/update.sql | 0 .../sql/gpdb_5.0_plus/column_details.sql | 0 .../sql/gpdb_5.0_plus/get_collations.sql | 0 .../sql/gpdb/5_plus/attach.sql | 0 .../sql/gpdb/5_plus/backend_support.sql | 0 .../sql/gpdb/5_plus/detach.sql | 0 .../sql/gpdb/5_plus/get_attach_tables.sql | 0 .../sql/gpdb/5_plus/nodes.sql | 0 .../sql/gpdb/5_plus/properties.sql | 0 .../sql/pg/10_plus/attach.sql | 0 .../sql/pg/10_plus/backend_support.sql | 0 .../sql/pg/10_plus/create.sql | 2 +- .../sql/pg/10_plus/detach.sql | 0 .../sql/pg/10_plus/get_attach_tables.sql | 0 .../sql/pg/10_plus/nodes.sql | 0 .../sql/pg/10_plus/properties.sql | 0 .../sql/ppas/10_plus/attach.sql | 0 .../sql/ppas/10_plus/backend_support.sql | 0 .../sql/ppas/10_plus/create.sql | 2 +- .../sql/ppas/10_plus/detach.sql | 0 .../sql/ppas/10_plus/get_attach_tables.sql | 0 .../sql/ppas/10_plus/nodes.sql | 0 .../sql/ppas/10_plus/properties.sql | 0 .../{table => tables}/sql/10_plus/acl.sql | 0 .../{table => tables}/sql/10_plus/create.sql | 8 +- .../sql/10_plus/get_columns_for_table.sql | 0 .../sql/10_plus/get_inherits.sql | 2 +- .../{table => tables}/sql/10_plus/get_oid.sql | 0 .../sql/10_plus/get_table.sql | 0 .../{table => tables}/sql/10_plus/nodes.sql | 0 .../sql/10_plus/properties.sql | 0 .../{table => tables}/sql/9.1_plus/acl.sql | 0 .../sql/9.1_plus/get_inherits.sql | 2 +- .../{table => tables}/sql/9.1_plus/nodes.sql | 0 .../sql/9.1_plus/properties.sql | 0 .../{table => tables}/sql/9.1_plus/stats.sql | 0 .../{table => tables}/sql/9.2_plus/stats.sql | 0 .../{table => tables}/sql/default/acl.sql | 0 .../sql/default/backend_support.sql | 0 .../sql/default/coll_table_stats.sql | 0 .../{table => tables}/sql/default/create.sql | 8 +- .../{table => tables}/sql/default/delete.sql | 0 .../{table => tables}/sql/default/depend.sql | 0 .../sql/default/enable_disable_trigger.sql | 0 .../sql/default/get_columns_for_table.sql | 0 .../sql/default/get_inherits.sql | 2 +- .../sql/default/get_oftype.sql | 4 +- .../{table => tables}/sql/default/get_oid.sql | 0 .../sql/default/get_relations.sql | 4 +- .../sql/default/get_schema.sql | 0 .../sql/default/get_schema_oid.sql | 0 .../sql/default/get_table.sql | 0 .../sql/default/get_table_row_count.sql | 0 .../default/get_tables_for_constraints.sql | 0 .../sql/default/get_types_where_condition.sql | 0 .../{table => tables}/sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../sql/default/reset_stats.sql | 0 .../{table => tables}/sql/default/stats.sql | 0 .../sql/default/truncate.sql | 0 .../{table => tables}/sql/default/update.sql | 0 .../sql/gpdb_5.0_plus/acl.sql | 0 .../sql/gpdb_5.0_plus/create.sql | 8 +- .../sql/gpdb_5.0_plus/nodes.sql | 0 .../sql/gpdb_5.0_plus/properties.sql | 0 .../sql/gpdb_5.0_plus/stats.sql | 0 .../sql/macros/constraints.macro | 0 .../sql/macros/db_catalogs.macro | 0 .../sql/10_plus/create.sql | 0 .../sql/10_plus/properties.sql | 0 .../sql/9.1_plus/get_oid.sql | 0 .../sql/9.1_plus/nodes.sql | 0 .../sql/9.1_plus/properties.sql | 0 .../sql/default/alter.sql | 0 .../sql/default/backend_support.sql | 0 .../sql/default/create.sql | 0 .../sql/default/delete.sql | 0 .../sql/default/enable_disable_trigger.sql | 0 .../sql/default/get_columns.sql | 0 .../sql/default/get_oid.sql | 0 .../sql/default/get_parent.sql | 0 .../sql/default/get_triggerfunctions.sql | 0 .../sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../sql/default/update.sql | 0 .../tables/tests/test_column_acl_sql.py | 2 +- .../tests/test_column_properties_sql.py | 2 +- .../tables/tests/test_tables_acl_sql.py | 2 +- .../tables/tests/test_tables_node_sql.py | 2 +- .../tests/test_tables_properties_sql.py | 2 +- .../tables/tests/test_template_create.py | 6 +- .../tables/tests/test_trigger_get_oid_sql.py | 2 +- .../tables/tests/test_trigger_nodes_sql.py | 2 +- .../schemas/tables/tests/test_utils.py | 6 +- .../schemas/tables/triggers/__init__.py | 11 +- .../{trigger => triggers}/css/trigger.css | 0 .../servers/databases/schemas/tables/utils.py | 10 +- .../gpdb_5.0_plus/allowed_privs.json | 0 .../gpdb_5.0_plus/sql/acl.sql | 0 .../gpdb_5.0_plus/sql/create.sql | 0 .../gpdb_5.0_plus/sql/defacl.sql | 0 .../gpdb_5.0_plus/sql/delete.sql | 0 .../gpdb_5.0_plus/sql/get_name.sql | 0 .../gpdb_5.0_plus/sql/is_catalog.sql | 0 .../gpdb_5.0_plus/sql/nodes.sql | 0 .../gpdb_5.0_plus/sql/oid.sql | 0 .../gpdb_5.0_plus/sql/properties.sql | 0 .../gpdb_5.0_plus/sql/update.sql | 0 .../pg/9.2_plus/allowed_privs.json | 0 .../pg/9.2_plus/sql/acl.sql | 0 .../pg/9.2_plus/sql/create.sql | 0 .../pg/9.2_plus/sql/defacl.sql | 0 .../pg/9.2_plus/sql/delete.sql | 0 .../pg/9.2_plus/sql/get_name.sql | 0 .../pg/9.2_plus/sql/is_catalog.sql | 0 .../pg/9.2_plus/sql/nodes.sql | 0 .../pg/9.2_plus/sql/oid.sql | 0 .../pg/9.2_plus/sql/properties.sql | 0 .../pg/9.2_plus/sql/update.sql | 0 .../pg/default/allowed_privs.json | 0 .../pg/default/sql/acl.sql | 0 .../pg/default/sql/create.sql | 0 .../pg/default/sql/defacl.sql | 0 .../pg/default/sql/delete.sql | 0 .../pg/default/sql/get_name.sql | 0 .../pg/default/sql/is_catalog.sql | 0 .../pg/default/sql/nodes.sql | 0 .../pg/default/sql/oid.sql | 0 .../pg/default/sql/properties.sql | 0 .../pg/default/sql/update.sql | 0 .../ppas/9.1_plus/allowed_privs.json | 0 .../ppas/9.1_plus/sql/acl.sql | 0 .../ppas/9.1_plus/sql/create.sql | 0 .../ppas/9.1_plus/sql/defacl.sql | 0 .../ppas/9.1_plus/sql/delete.sql | 0 .../ppas/9.1_plus/sql/get_name.sql | 0 .../ppas/9.1_plus/sql/is_catalog.sql | 0 .../ppas/9.1_plus/sql/nodes.sql | 0 .../ppas/9.1_plus/sql/oid.sql | 0 .../ppas/9.1_plus/sql/properties.sql | 0 .../ppas/9.1_plus/sql/update.sql | 0 .../ppas/9.2_plus/allowed_privs.json | 0 .../ppas/9.2_plus/sql/acl.sql | 0 .../ppas/9.2_plus/sql/create.sql | 0 .../ppas/9.2_plus/sql/defacl.sql | 0 .../ppas/9.2_plus/sql/delete.sql | 0 .../ppas/9.2_plus/sql/get_name.sql | 0 .../ppas/9.2_plus/sql/is_catalog.sql | 0 .../ppas/9.2_plus/sql/nodes.sql | 0 .../ppas/9.2_plus/sql/oid.sql | 0 .../ppas/9.2_plus/sql/properties.sql | 0 .../ppas/9.2_plus/sql/update.sql | 0 .../databases/schemas/types/__init__.py | 3 +- .../macros/get_full_type_sql_format.macros | 0 .../{type => types}/sql/default/acl.sql | 0 .../sql/default/additional_properties.sql | 0 .../{type => types}/sql/default/create.sql | 2 +- .../{type => types}/sql/default/delete.sql | 0 .../sql/default/get_collations.sql | 0 .../sql/default/get_external_functions.sql | 0 .../{type => types}/sql/default/get_oid.sql | 0 .../{type => types}/sql/default/get_scid.sql | 0 .../sql/default/get_subtypes.sql | 0 .../{type => types}/sql/default/get_types.sql | 0 .../{type => types}/sql/default/nodes.sql | 0 .../sql/default/properties.sql | 0 .../{type => types}/sql/default/update.sql | 2 +- .../{type => types}/sql/gpdb_5.0_plus/acl.sql | 0 .../gpdb_5.0_plus/additional_properties.sql | 0 .../sql/gpdb_5.0_plus/get_collations.sql | 0 .../sql/gpdb_5.0_plus/properties.sql | 0 .../sql/postgres_inbuit_types.txt | 0 .../databases/schemas/views/__init__.py | 19 +--- .../templates/{mview => mviews}/css/mview.css | 0 .../{mview => mviews}/pg/9.3_plus/sql/acl.sql | 0 .../pg/9.3_plus/sql/allowed_privs.json | 0 .../pg/9.3_plus/sql/create.sql | 0 .../pg/9.3_plus/sql/delete.sql | 0 .../pg/9.3_plus/sql/get_oid.sql | 0 .../pg/9.3_plus/sql/get_schema.sql | 0 .../pg/9.3_plus/sql/get_view_name.sql | 0 .../pg/9.3_plus/sql/grant.sql | 0 .../pg/9.3_plus/sql/nodes.sql | 0 .../pg/9.3_plus/sql/properties.sql | 0 .../pg/9.3_plus/sql/refresh.sql | 0 .../pg/9.3_plus/sql/update.sql | 0 .../pg/9.3_plus/sql/view_id.sql | 0 .../{mview => mviews}/pg/9.4_plus/sql/acl.sql | 0 .../pg/9.4_plus/sql/allowed_privs.json | 0 .../pg/9.4_plus/sql/create.sql | 0 .../pg/9.4_plus/sql/delete.sql | 0 .../pg/9.4_plus/sql/get_oid.sql | 0 .../pg/9.4_plus/sql/get_schema.sql | 0 .../pg/9.4_plus/sql/get_view_name.sql | 0 .../pg/9.4_plus/sql/grant.sql | 0 .../pg/9.4_plus/sql/nodes.sql | 0 .../pg/9.4_plus/sql/properties.sql | 0 .../pg/9.4_plus/sql/refresh.sql | 0 .../pg/9.4_plus/sql/update.sql | 0 .../pg/9.4_plus/sql/view_id.sql | 0 .../ppas/9.3_plus/sql/acl.sql | 0 .../ppas/9.3_plus/sql/allowed_privs.json | 0 .../ppas/9.3_plus/sql/create.sql | 0 .../ppas/9.3_plus/sql/delete.sql | 0 .../ppas/9.3_plus/sql/get_oid.sql | 0 .../ppas/9.3_plus/sql/get_schema.sql | 0 .../ppas/9.3_plus/sql/get_view_name.sql | 0 .../ppas/9.3_plus/sql/grant.sql | 0 .../ppas/9.3_plus/sql/nodes.sql | 0 .../ppas/9.3_plus/sql/properties.sql | 0 .../ppas/9.3_plus/sql/refresh.sql | 0 .../ppas/9.3_plus/sql/update.sql | 0 .../ppas/9.3_plus/sql/view_id.sql | 0 .../templates/{view => views}/css/view.css | 0 .../{view => views}/gpdb_5.0_plus/sql/acl.sql | 0 .../gpdb_5.0_plus/sql/allowed_privs.json | 0 .../gpdb_5.0_plus/sql/create.sql | 0 .../gpdb_5.0_plus/sql/delete.sql | 0 .../gpdb_5.0_plus/sql/get_oid.sql | 0 .../gpdb_5.0_plus/sql/get_schema.sql | 0 .../gpdb_5.0_plus/sql/grant.sql | 0 .../gpdb_5.0_plus/sql/nodes.sql | 0 .../gpdb_5.0_plus/sql/properties.sql | 0 .../gpdb_5.0_plus/sql/update.sql | 0 .../gpdb_5.0_plus/sql/view_id.sql | 0 .../{view => views}/pg/9.1_plus/sql/acl.sql | 0 .../pg/9.1_plus/sql/allowed_privs.json | 0 .../pg/9.1_plus/sql/create.sql | 0 .../pg/9.1_plus/sql/delete.sql | 0 .../pg/9.1_plus/sql/get_oid.sql | 0 .../pg/9.1_plus/sql/get_schema.sql | 0 .../{view => views}/pg/9.1_plus/sql/grant.sql | 0 .../{view => views}/pg/9.1_plus/sql/nodes.sql | 0 .../pg/9.1_plus/sql/properties.sql | 0 .../pg/9.1_plus/sql/update.sql | 0 .../pg/9.1_plus/sql/view_id.sql | 0 .../{view => views}/pg/9.2_plus/sql/acl.sql | 0 .../pg/9.2_plus/sql/allowed_privs.json | 0 .../pg/9.2_plus/sql/create.sql | 0 .../pg/9.2_plus/sql/delete.sql | 0 .../pg/9.2_plus/sql/get_oid.sql | 0 .../pg/9.2_plus/sql/get_schema.sql | 0 .../{view => views}/pg/9.2_plus/sql/grant.sql | 0 .../{view => views}/pg/9.2_plus/sql/nodes.sql | 0 .../pg/9.2_plus/sql/properties.sql | 0 .../pg/9.2_plus/sql/update.sql | 0 .../pg/9.2_plus/sql/view_id.sql | 0 .../{view => views}/pg/9.3_plus/sql/acl.sql | 0 .../pg/9.3_plus/sql/allowed_privs.json | 0 .../pg/9.3_plus/sql/create.sql | 0 .../pg/9.3_plus/sql/delete.sql | 0 .../pg/9.3_plus/sql/get_oid.sql | 0 .../pg/9.3_plus/sql/get_schema.sql | 0 .../{view => views}/pg/9.3_plus/sql/grant.sql | 0 .../{view => views}/pg/9.3_plus/sql/nodes.sql | 0 .../pg/9.3_plus/sql/properties.sql | 0 .../pg/9.3_plus/sql/update.sql | 0 .../pg/9.3_plus/sql/view_id.sql | 0 .../{view => views}/pg/9.4_plus/sql/acl.sql | 0 .../pg/9.4_plus/sql/allowed_privs.json | 0 .../pg/9.4_plus/sql/create.sql | 0 .../pg/9.4_plus/sql/delete.sql | 0 .../pg/9.4_plus/sql/get_oid.sql | 0 .../pg/9.4_plus/sql/get_schema.sql | 0 .../{view => views}/pg/9.4_plus/sql/grant.sql | 0 .../{view => views}/pg/9.4_plus/sql/nodes.sql | 0 .../pg/9.4_plus/sql/properties.sql | 0 .../pg/9.4_plus/sql/update.sql | 0 .../pg/9.4_plus/sql/view_id.sql | 0 .../{view => views}/ppas/9.1_plus/sql/acl.sql | 0 .../ppas/9.1_plus/sql/allowed_privs.json | 0 .../ppas/9.1_plus/sql/create.sql | 0 .../ppas/9.1_plus/sql/delete.sql | 0 .../ppas/9.1_plus/sql/get_oid.sql | 0 .../ppas/9.1_plus/sql/get_schema.sql | 0 .../ppas/9.1_plus/sql/grant.sql | 0 .../ppas/9.1_plus/sql/nodes.sql | 0 .../ppas/9.1_plus/sql/properties.sql | 0 .../ppas/9.1_plus/sql/update.sql | 0 .../ppas/9.1_plus/sql/view_id.sql | 0 .../{view => views}/ppas/9.2_plus/sql/acl.sql | 0 .../ppas/9.2_plus/sql/allowed_privs.json | 0 .../ppas/9.2_plus/sql/create.sql | 0 .../ppas/9.2_plus/sql/delete.sql | 0 .../ppas/9.2_plus/sql/get_oid.sql | 0 .../ppas/9.2_plus/sql/get_schema.sql | 0 .../ppas/9.2_plus/sql/grant.sql | 0 .../ppas/9.2_plus/sql/nodes.sql | 0 .../ppas/9.2_plus/sql/properties.sql | 0 .../ppas/9.2_plus/sql/update.sql | 0 .../ppas/9.2_plus/sql/view_id.sql | 0 .../{view => views}/ppas/9.3_plus/sql/acl.sql | 0 .../ppas/9.3_plus/sql/allowed_privs.json | 0 .../ppas/9.3_plus/sql/create.sql | 0 .../ppas/9.3_plus/sql/delete.sql | 0 .../ppas/9.3_plus/sql/get_oid.sql | 0 .../ppas/9.3_plus/sql/get_schema.sql | 0 .../ppas/9.3_plus/sql/grant.sql | 0 .../ppas/9.3_plus/sql/nodes.sql | 0 .../ppas/9.3_plus/sql/properties.sql | 0 .../ppas/9.3_plus/sql/update.sql | 0 .../ppas/9.3_plus/sql/view_id.sql | 0 .../{view => views}/ppas/9.4_plus/sql/acl.sql | 0 .../ppas/9.4_plus/sql/allowed_privs.json | 0 .../ppas/9.4_plus/sql/create.sql | 0 .../ppas/9.4_plus/sql/delete.sql | 0 .../ppas/9.4_plus/sql/get_oid.sql | 0 .../ppas/9.4_plus/sql/get_schema.sql | 0 .../ppas/9.4_plus/sql/grant.sql | 0 .../ppas/9.4_plus/sql/nodes.sql | 0 .../ppas/9.4_plus/sql/properties.sql | 0 .../ppas/9.4_plus/sql/update.sql | 0 .../ppas/9.4_plus/sql/view_id.sql | 0 .../servers/resource_groups/__init__.py | 20 +--- .../server_groups/servers/roles/__init__.py | 14 +-- .../templates/role/sql/post8_4/create.sql | 46 -------- .../templates/role/sql/post8_4/nodes.sql | 8 -- .../templates/role/sql/post8_4/properties.sql | 16 --- .../roles/templates/role/sql/post8_4/sql.sql | 68 ------------ .../templates/role/sql/post8_4/update.sql | 102 ------------------ .../templates/role/sql/post9_0/create.sql | 45 -------- .../templates/role/sql/post9_0/dependents.sql | 40 ------- .../templates/role/sql/post9_0/nodes.sql | 8 -- .../templates/role/sql/post9_0/permission.sql | 5 - .../templates/role/sql/post9_0/properties.sql | 16 --- .../roles/templates/role/sql/post9_0/sql.sql | 98 ----------------- .../templates/role/sql/post9_0/update.sql | 100 ----------------- .../templates/role/sql/post9_1/dependents.sql | 40 ------- .../templates/role/sql/post9_1/permission.sql | 5 - .../templates/role/sql/post9_1/variables.sql | 25 ----- .../templates/role/sql/post9_4/variables.sql | 25 ----- .../templates/{role => roles}/css/role.css | 0 .../post9_1 => roles/sql/9.1_plus}/create.sql | 0 .../sql/9.1_plus}/dependents.sql | 0 .../post9_1 => roles/sql/9.1_plus}/nodes.sql | 0 .../sql/9.1_plus}/permission.sql | 0 .../sql/9.1_plus}/properties.sql | 0 .../post9_1 => roles/sql/9.1_plus}/sql.sql | 0 .../post9_1 => roles/sql/9.1_plus}/update.sql | 0 .../sql/9.1_plus}/variables.sql | 0 .../post9_4 => roles/sql/9.4_plus}/create.sql | 0 .../sql/9.4_plus}/dependents.sql | 0 .../post9_4 => roles/sql/9.4_plus}/nodes.sql | 0 .../sql/9.4_plus}/permission.sql | 0 .../sql/9.4_plus}/properties.sql | 0 .../post9_4 => roles/sql/9.4_plus}/sql.sql | 0 .../post9_4 => roles/sql/9.4_plus}/update.sql | 0 .../sql/9.4_plus}/variables.sql | 0 .../servers/tablespaces/__init__.py | 14 --- web/pgadmin/browser/utils.py | 12 --- web/pgadmin/tools/sqleditor/__init__.py | 2 +- web/webpack.shim.js | 2 +- 744 files changed, 113 insertions(+), 1180 deletions(-) rename web/pgadmin/browser/server_groups/servers/databases/casts/templates/{cast => casts}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/casts/templates/{cast => casts}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/casts/templates/{cast => casts}/sql/default/functions.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/casts/templates/{cast => casts}/sql/default/getsrcandtrgttype.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/casts/templates/{cast => casts}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/casts/templates/{cast => casts}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/casts/templates/{cast => casts}/sql/default/sql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/casts/templates/{cast => casts}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/__init__.py (97%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/static/img/coll-user_mapping.svg (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/static/img/user_mapping.svg (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/static/js/user_mapping.js (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/templates/user_mappings/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/templates/user_mappings/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/templates/user_mappings/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/templates/user_mappings/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/tests/__init__.py (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/tests/test_user_mapping_add.py (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/tests/test_user_mapping_delete.py (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/tests/test_user_mapping_delete_multiple.py (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/tests/test_user_mapping_get.py (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/tests/test_user_mapping_put.py (100%) rename web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/{user_mapping => user_mappings}/tests/utils.py (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/default/backend_support.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/default/get_collations.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/default/get_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/{collation => collations}/sql/gpdb_5.0_plus/get_collations.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/copy_config.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/dictionaries.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/get_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/parser.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/sql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/tokenDictList.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/tokens.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/{fts_configuration => fts_configurations}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/{fts_dictionary => fts_dictionaries}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/{fts_dictionary => fts_dictionaries}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/{fts_dictionary => fts_dictionaries}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/{fts_dictionary => fts_dictionaries}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/{fts_dictionary => fts_dictionaries}/sql/default/schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/{fts_dictionary => fts_dictionaries}/sql/default/templates.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/{fts_dictionary => fts_dictionaries}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/{fts_parser => fts_parsers}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/{fts_parser => fts_parsers}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/{fts_parser => fts_parsers}/sql/default/functions.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/{fts_parser => fts_parsers}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/{fts_parser => fts_parsers}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/{fts_parser => fts_parsers}/sql/default/schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/{fts_parser => fts_parsers}/sql/default/sql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/{fts_parser => fts_parsers}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/{fts_template => fts_templates}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/{fts_template => fts_templates}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/{fts_template => fts_templates}/sql/default/functions.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/{fts_template => fts_templates}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/{fts_template => fts_templates}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/{fts_template => fts_templates}/sql/default/schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/{fts_template => fts_templates}/sql/default/sql.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/{fts_template => fts_templates}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/get_languages.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/get_out_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/gpdb/sql/default/variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/11_plus/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/11_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/11_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/11_plus/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/11_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/11_plus/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/11_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/11_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/9.2_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/9.2_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/9.2_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/9.5_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/9.5_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/9.5_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/9.6_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/9.6_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/get_languages.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/get_out_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/pg/sql/default/variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/11_plus/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/11_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/11_plus/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/11_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/11_plus/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/11_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/9.2_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/9.2_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/9.2_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/9.2_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/9.5_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/9.5_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/9.5_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/9.6_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/9.6_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/get_languages.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/get_out_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{function => functions}/ppas/sql/default/variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/get_languages.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/get_out_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/pg/sql/11_plus/variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/11_plus/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/11_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/11_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/11_plus/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/11_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/11_plus/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/11_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/11_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/9.2_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/9.2_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/9.5_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/9.5_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/9.6_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/9.6_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/get_languages.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/get_out_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{procedure => procedures}/ppas/sql/default/variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/11_plus/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/11_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/11_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/11_plus/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/11_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/11_plus/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/11_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/11_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/9.2_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/9.2_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/9.2_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/9.2_plus/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/9.2_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/9.2_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/9.5_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/9.5_plus/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/9.5_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/get_languages.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/get_out_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/pg/sql/default/variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/11_plus/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/11_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/11_plus/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/11_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/11_plus/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/11_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/9.2_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/9.2_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/9.2_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/9.2_plus/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/9.2_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/9.2_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/9.5_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/9.5_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/9.5_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/get_definition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/get_languages.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/get_out_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/{trigger_function => trigger_functions}/ppas/sql/default/variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbfunc => edbfuncs}/ppas/11_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbfunc => edbfuncs}/ppas/11_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbfunc => edbfuncs}/ppas/default/get_body.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbfunc => edbfuncs}/ppas/default/get_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbfunc => edbfuncs}/ppas/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbfunc => edbfuncs}/ppas/default/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbfunc => edbfuncs}/ppas/default/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbfunc => edbfuncs}/ppas/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbfunc => edbfuncs}/ppas/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbproc => edbprocs}/ppas/11_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbproc => edbprocs}/ppas/11_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbproc => edbprocs}/ppas/default/get_body.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbproc => edbprocs}/ppas/default/get_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbproc => edbprocs}/ppas/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbproc => edbprocs}/ppas/default/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbproc => edbprocs}/ppas/default/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbproc => edbprocs}/ppas/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/{edbproc => edbprocs}/ppas/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/{edbvar => edbvars}/ppas/node.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/{edbvar => edbvars}/ppas/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.1_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.1_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.1_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.1_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.1_plus/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.1_plus/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.1_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.1_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.1_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.2_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.2_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.2_plus/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.2_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.2_plus/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.2_plus/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.2_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.2_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/{package => packages}/ppas/9.2_plus/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/10_plus/get_def.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/backend_support.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/get_def.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/get_dependencies.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/{sequence => sequences}/sql/gpdb_5.0_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/9.2_plus/get_objects.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/9.2_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/9.5_plus/get_objects.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/9.5_plus/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/9.5_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/default/get_objects.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/default/get_parent_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/{synonym => synonyms}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/{column => columns}/macros/privilege.macros (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/{column => columns}/macros/security.macros (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/macros/privilege.macros (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/macros/security.macros (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/10_plus/create.sql (92%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/10_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/10_plus/update.sql (98%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/9.1_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/9.1_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/9.2_plus/get_collations.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/9.2_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/9.2_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/9.2_plus/update.sql (97%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/create.sql (87%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/depend.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/edit_mode_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/get_collations.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/get_inherited_tables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/get_parent.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/get_position.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/is_referenced.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/default/update.sql (97%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/gpdb_5.0_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{column => columns}/sql/gpdb_5.0_plus/get_collations.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/11_plus/column_details.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/11_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/11_plus/include_details.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/alter.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/backend_support.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/coll_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/column_details.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/get_am.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/get_collations.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/get_op_class.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/get_parent.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/gpdb_5.0_plus/column_details.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{index => indexes}/sql/gpdb_5.0_plus/get_collations.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/gpdb/5_plus/attach.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/gpdb/5_plus/backend_support.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/gpdb/5_plus/detach.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/gpdb/5_plus/get_attach_tables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/gpdb/5_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/gpdb/5_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/pg/10_plus/attach.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/pg/10_plus/backend_support.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/pg/10_plus/create.sql (97%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/pg/10_plus/detach.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/pg/10_plus/get_attach_tables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/pg/10_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/pg/10_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/ppas/10_plus/attach.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/ppas/10_plus/backend_support.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/ppas/10_plus/create.sql (97%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/ppas/10_plus/detach.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/ppas/10_plus/get_attach_tables.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/ppas/10_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{partition => partitions}/sql/ppas/10_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/10_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/10_plus/create.sql (97%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/10_plus/get_columns_for_table.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/10_plus/get_inherits.sql (87%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/10_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/10_plus/get_table.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/10_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/10_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/9.1_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/9.1_plus/get_inherits.sql (86%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/9.1_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/9.1_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/9.1_plus/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/9.2_plus/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/backend_support.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/coll_table_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/create.sql (96%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/depend.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/enable_disable_trigger.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_columns_for_table.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_inherits.sql (87%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_oftype.sql (75%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_relations.sql (78%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_schema_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_table.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_table_row_count.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_tables_for_constraints.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/get_types_where_condition.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/reset_stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/truncate.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/gpdb_5.0_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/gpdb_5.0_plus/create.sql (96%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/gpdb_5.0_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/gpdb_5.0_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/gpdb_5.0_plus/stats.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/macros/constraints.macro (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{table => tables}/sql/macros/db_catalogs.macro (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/10_plus/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/10_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/9.1_plus/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/9.1_plus/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/9.1_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/alter.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/backend_support.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/enable_disable_trigger.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/get_columns.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/get_parent.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/get_triggerfunctions.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/{trigger => triggers}/sql/default/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/{trigger => triggers}/css/trigger.css (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/defacl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/get_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/is_catalog.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/gpdb_5.0_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/defacl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/get_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/is_catalog.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/9.2_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/defacl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/get_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/is_catalog.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/pg/default/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/defacl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/get_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/is_catalog.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.1_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/defacl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/get_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/is_catalog.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/templates/{schema => schemas}/ppas/9.2_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/macros/get_full_type_sql_format.macros (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/additional_properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/create.sql (98%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/get_collations.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/get_external_functions.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/get_scid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/get_subtypes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/get_types.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/default/update.sql (98%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/gpdb_5.0_plus/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/gpdb_5.0_plus/additional_properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/gpdb_5.0_plus/get_collations.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/gpdb_5.0_plus/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/{type => types}/sql/postgres_inbuit_types.txt (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/css/mview.css (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/get_view_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/refresh.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.3_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/get_view_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/refresh.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/pg/9.4_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/get_view_name.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/refresh.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{mview => mviews}/ppas/9.3_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/css/view.css (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/gpdb_5.0_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.1_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.2_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.3_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/pg/9.4_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.1_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.2_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.3_plus/sql/view_id.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/acl.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/allowed_privs.json (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/delete.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/get_oid.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/get_schema.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/grant.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/{view => views}/ppas/9.4_plus/sql/view_id.sql (100%) delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/sql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/create.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/dependents.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/nodes.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/permission.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/properties.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/sql.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/update.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/dependents.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/permission.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/variables.sql delete mode 100644 web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/variables.sql rename web/pgadmin/browser/server_groups/servers/roles/templates/{role => roles}/css/role.css (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_1 => roles/sql/9.1_plus}/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post8_4 => roles/sql/9.1_plus}/dependents.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_1 => roles/sql/9.1_plus}/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post8_4 => roles/sql/9.1_plus}/permission.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_1 => roles/sql/9.1_plus}/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_1 => roles/sql/9.1_plus}/sql.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_1 => roles/sql/9.1_plus}/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post8_4 => roles/sql/9.1_plus}/variables.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_4 => roles/sql/9.4_plus}/create.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_4 => roles/sql/9.4_plus}/dependents.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_4 => roles/sql/9.4_plus}/nodes.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_4 => roles/sql/9.4_plus}/permission.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_4 => roles/sql/9.4_plus}/properties.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_4 => roles/sql/9.4_plus}/sql.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_4 => roles/sql/9.4_plus}/update.sql (100%) rename web/pgadmin/browser/server_groups/servers/roles/templates/{role/sql/post9_0 => roles/sql/9.4_plus}/variables.sql (100%) diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py index 2d85745d3..eec197e42 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py @@ -208,7 +208,7 @@ class CastView(PGChildNodeView): ).connection_manager(kwargs['sid']) self.conn = self.manager.connection(did=kwargs['did']) # Set template path for the SQL scripts - self.template_path = 'cast/sql/#{0}#'.format(self.manager.version) + self.template_path = 'casts/sql/#{0}#'.format(self.manager.version) return f(*args, **kwargs) diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/functions.sql b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/functions.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/functions.sql rename to web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/functions.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/getsrcandtrgttype.sql b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/getsrcandtrgttype.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/getsrcandtrgttype.sql rename to web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/getsrcandtrgttype.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/sql.sql b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/sql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/sql.sql rename to web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/sql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/casts/templates/cast/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/casts/templates/casts/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py index 78f7d281a..3ab1f4dd4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/__init__.py @@ -116,10 +116,6 @@ class ForeignServerView(PGChildNodeView): * __init__(**kwargs) - Method is used to initialize the ForeignServerView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -192,23 +188,9 @@ class ForeignServerView(PGChildNodeView): 'msql': [{'get': 'msql'}, {'get': 'msql'}], 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) - def module_js(self): - """ - This property defines (if javascript) exists for this node. - Override this property for your own logic. - """ - return make_response( - render_template( - "foreign_servers/js/foreign_servers.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py similarity index 97% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py index 0ba0ac500..ed7de23ac 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/__init__.py @@ -132,10 +132,6 @@ class UserMappingView(PGChildNodeView): * __init__(**kwargs) - Method is used to initialize the UserMappingView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -209,23 +205,9 @@ class UserMappingView(PGChildNodeView): 'msql': [{'get': 'msql'}, {'get': 'msql'}], 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) - def module_js(self): - """ - This property defines (if javascript) exists for this node. - Override this property for your own logic. - """ - return make_response( - render_template( - "user_mappings/js/user_mappings.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/img/coll-user_mapping.svg b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/img/coll-user_mapping.svg similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/img/coll-user_mapping.svg rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/img/coll-user_mapping.svg diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/img/user_mapping.svg b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/img/user_mapping.svg similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/img/user_mapping.svg rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/img/user_mapping.svg diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/templates/user_mappings/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/templates/user_mappings/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/templates/user_mappings/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/templates/user_mappings/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/templates/user_mappings/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/templates/user_mappings/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/templates/user_mappings/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/templates/user_mappings/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/templates/user_mappings/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/__init__.py similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/__init__.py rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/__init__.py diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_add.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_add.py rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_add.py diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete.py rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete.py diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete_multiple.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_delete_multiple.py rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_delete_multiple.py diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_get.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_get.py rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_get.py diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_put.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/test_user_mapping_put.py rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/test_user_mapping_put.py diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/utils.py b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/tests/utils.py rename to web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/tests/utils.py diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py index 5404c5022..72c2df5a9 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/__init__.py @@ -237,7 +237,7 @@ class SchemaView(PGChildNodeView): self.manager = None self.conn = None self.template_path = None - self.template_initial = 'schema' + self.template_initial = 'schemas' @staticmethod def ppas_template_path(ver): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py index 29bff51d7..e56f488e5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/__init__.py @@ -128,8 +128,7 @@ class CatalogObjectView(PGChildNodeView): 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) def check_precondition(f): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py index 73b229862..75bce58b7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/__init__.py @@ -155,8 +155,7 @@ class CatalogObjectColumnsView(PGChildNodeView): 'nodes': [{'get': 'node'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) def check_precondition(f): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py index 51f530a71..2aef28b7b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py @@ -171,7 +171,6 @@ class CollationView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_collations': [{'get': 'get_collation'}, {'get': 'get_collation'}] }) @@ -193,7 +192,7 @@ class CollationView(PGChildNodeView): self.conn = self.manager.connection(did=kwargs['did']) # Set the template path for the SQL scripts self.template_path = compile_template_path( - 'collation/sql/', + 'collations/sql/', self.manager.server_type, self.manager.version ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/backend_support.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/backend_support.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/backend_support.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/backend_support.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/get_collations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/get_collations.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/get_collations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/get_collations.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/get_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/get_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/get_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/gpdb_5.0_plus/get_collations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/gpdb_5.0_plus/get_collations.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collation/sql/gpdb_5.0_plus/get_collations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/collations/templates/collations/sql/gpdb_5.0_plus/get_collations.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py index 1bc8b6570..20e477986 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/__init__.py @@ -95,9 +95,6 @@ class DomainView(PGChildNodeView, DataTypeReader): - Works as a decorator. Validating request on the request of create, update and modified SQL. - * module_js(): - - Load JS file (domains.js) for this module. - * check_precondition(f): - Works as a decorator. - Checks database connection status. @@ -168,7 +165,6 @@ class DomainView(PGChildNodeView, DataTypeReader): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_types': [{'get': 'types'}, {'get': 'types'}], 'get_collations': [ {'get': 'get_collations'}, @@ -246,18 +242,6 @@ class DomainView(PGChildNodeView, DataTypeReader): return wrap - def module_js(self): - """ - Load JS file (domains.js) for this module. - """ - return make_response( - render_template( - "domains/js/domains.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ Works as a decorator. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py index 8999d2e1f..d85b5f3e1 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py @@ -109,9 +109,6 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): - Works as a decorator. Validating request on the request of create, update and modified SQL. - * module_js(): - - Overrides this property to define javascript for Foreign Table node. - * check_precondition(f): - Works as a decorator. - Checks database connection status. @@ -204,7 +201,6 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_collations': [ {'get': 'get_collations'}, {'get': 'get_collations'} @@ -319,18 +315,6 @@ class ForeignTableView(PGChildNodeView, DataTypeReader): return wrap - def module_js(self): - """ - Load JS file (foreign_tables.js) for this module. - """ - return make_response( - render_template( - "foreign_tables/js/foreign_tables.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ Works as a decorator. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py index 7c0a22637..4aa6cc2b4 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py @@ -108,10 +108,6 @@ class FtsConfigurationView(PGChildNodeView): - Method is used to initialize the FtsConfigurationView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -200,7 +196,6 @@ class FtsConfigurationView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'parsers': [{'get': 'parsers'}, {'get': 'parsers'}], 'copyConfig': [{'get': 'copyConfig'}, @@ -215,18 +210,6 @@ class FtsConfigurationView(PGChildNodeView): self.manager = None super(FtsConfigurationView, self).__init__(**kwargs) - def module_js(self): - """ - Load JS file (fts_configuration.js) for this module. - """ - return make_response( - render_template( - "fts_configuration/js/fts_configuration.js", - _=_ - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks @@ -242,7 +225,7 @@ class FtsConfigurationView(PGChildNodeView): kwargs['sid']) self.conn = self.manager.connection(did=kwargs['did']) # Set the template path for the SQL scripts - self.template_path = 'fts_configuration/sql/#{0}#'.format( + self.template_path = 'fts_configurations/sql/#{0}#'.format( self.manager.version) return f(*args, **kwargs) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/copy_config.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/copy_config.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/copy_config.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/copy_config.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/dictionaries.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/dictionaries.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/dictionaries.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/dictionaries.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/get_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/get_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/get_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/parser.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/parser.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/parser.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/parser.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/sql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/sql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/sql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/sql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/tokenDictList.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/tokenDictList.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/tokenDictList.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/tokenDictList.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/tokens.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/tokens.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/tokens.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/tokens.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configuration/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/templates/fts_configurations/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py index 5bb913391..f69f3af7f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/__init__.py @@ -105,10 +105,6 @@ class FtsDictionaryView(PGChildNodeView): * __init__(**kwargs) - Method is used to initialize the FtsDictionaryView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -192,7 +188,6 @@ class FtsDictionaryView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'fetch_templates': [{'get': 'fetch_templates'}, {'get': 'fetch_templates'}], }) @@ -203,18 +198,6 @@ class FtsDictionaryView(PGChildNodeView): self.manager = None super(FtsDictionaryView, self).__init__(**kwargs) - def module_js(self): - """ - Load JS file (fts_dictionary.js) for this module. - """ - return make_response( - render_template( - "fts_dictionary/js/fts_dictionary.js", - _=_ - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks @@ -232,7 +215,7 @@ class FtsDictionaryView(PGChildNodeView): driver = get_driver(PG_DEFAULT_DRIVER) self.qtIdent = driver.qtIdent # Set the template path for the SQL scripts - self.template_path = 'fts_dictionary/sql/#{0}#'.format( + self.template_path = 'fts_dictionaries/sql/#{0}#'.format( self.manager.version) return f(*args, **kwargs) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/templates.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/templates.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/templates.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/templates.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionary/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/templates/fts_dictionaries/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py index 62d93768c..384ae62e8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py @@ -98,10 +98,6 @@ class FtsParserView(PGChildNodeView): * __init__(**kwargs) - Method is used to initialize the FtsParserView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -194,7 +190,6 @@ class FtsParserView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'start_functions': [{'get': 'start_functions'}, {'get': 'start_functions'}], 'token_functions': [{'get': 'token_functions'}, @@ -234,7 +229,7 @@ class FtsParserView(PGChildNodeView): kwargs['sid']) self.conn = self.manager.connection(did=kwargs['did']) # Set the template path for the SQL scripts - self.template_path = 'fts_parser/sql/#{0}#'.format( + self.template_path = 'fts_parsers/sql/#{0}#'.format( self.manager.version) return f(*args, **kwargs) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/functions.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/functions.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/functions.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/functions.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/sql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/sql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/sql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/sql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parser/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/templates/fts_parsers/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py index ea3a58db0..8e952d912 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py @@ -105,10 +105,6 @@ class FtsTemplateView(PGChildNodeView): * __init__(**kwargs) - Method is used to initialize the FtsTemplateView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -187,7 +183,6 @@ class FtsTemplateView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_lexize': [{'get': 'get_lexize'}, {'get': 'get_lexize'}], 'get_init': [{'get': 'get_init'}, {'get': 'get_init'}], }) @@ -198,18 +193,6 @@ class FtsTemplateView(PGChildNodeView): self.manager = None super(FtsTemplateView, self).__init__(**kwargs) - def module_js(self): - """ - This property defines whether javascript exists for this node. - """ - return make_response( - render_template( - "fts_template/js/fts_templates.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks @@ -224,7 +207,7 @@ class FtsTemplateView(PGChildNodeView): self.manager = get_driver(PG_DEFAULT_DRIVER).connection_manager( kwargs['sid']) self.conn = self.manager.connection(did=kwargs['did']) - self.template_path = 'fts_template/sql/#{0}#'.format( + self.template_path = 'fts_templates/sql/#{0}#'.format( self.manager.version) return f(*args, **kwargs) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/functions.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/functions.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/functions.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/functions.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/sql.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/sql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/sql.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/sql.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_template/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/templates/fts_templates/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py index b41ec44d7..ba2c90212 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py @@ -131,9 +131,6 @@ class FunctionView(PGChildNodeView, DataTypeReader): - Works as a decorator. Validating request on the request of create, update and modified SQL. - * module_js(): - - Overrides this property to define javascript for Functions node. - * check_precondition(f): - Works as a decorator. - Checks database connection status. @@ -207,7 +204,6 @@ class FunctionView(PGChildNodeView, DataTypeReader): 'stats': [{'get': 'statistics'}, {'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_types': [{'get': 'types'}, {'get': 'types'}], 'get_languages': [{'get': 'get_languages'}, {'get': 'get_languages'}], 'vopts': [{}, {'get': 'variable_options'}], @@ -303,19 +299,6 @@ class FunctionView(PGChildNodeView, DataTypeReader): return wrap - def module_js(self): - """ - Load JS file (functions.js) for this module. - """ - - return make_response( - render_template( - "function/js/functions.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ Works as a decorator. @@ -334,12 +317,17 @@ class FunctionView(PGChildNodeView, DataTypeReader): self.qtIdent = driver.qtIdent self.qtLiteral = driver.qtLiteral + template_initial = None + if self.node_type == 'function': + template_initial = 'functions' + elif self.node_type == 'procedure': + template_initial = 'procedures' + elif self.node_type == 'trigger_function': + template_initial = 'trigger_functions' + # Set the template path for the SQL scripts - self.template_path = "/".join([ - self.node_type - ]) self.sql_template_path = "/".join([ - self.template_path, + template_initial, self.manager.server_type, 'sql', '#{0}#' @@ -1676,19 +1664,6 @@ class ProcedureView(FunctionView): 'lanname', 'prosrc'] - def module_js(self): - """ - Load JS file (procedures.js) for this module. - """ - - return make_response( - render_template( - "procedure/js/procedures.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - ProcedureView.register_node_view(procedure_blueprint) @@ -1787,18 +1762,5 @@ class TriggerFunctionView(FunctionView): 'lanname', 'prosrc'] - def module_js(self): - """ - Load JS file (trigger_function.js) for this module. - """ - - return make_response( - render_template( - "trigger_function/js/trigger_functions.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - TriggerFunctionView.register_node_view(trigger_function_blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_languages.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_languages.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_languages.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_languages.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_out_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_out_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_out_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_out_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/gpdb/sql/default/variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/gpdb/sql/default/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/11_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/11_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.2_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.2_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.2_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.2_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.2_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.2_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.2_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.2_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.2_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.2_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.5_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.5_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.5_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.5_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.5_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.5_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.5_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.5_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.5_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.5_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.5_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.5_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.6_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.6_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.6_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.6_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.6_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.6_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/9.6_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/9.6_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_languages.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_languages.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_languages.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_languages.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_out_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_out_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_out_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_out_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/pg/sql/default/variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/pg/sql/default/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/11_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/11_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.2_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.2_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.2_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.2_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.2_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.2_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.2_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.2_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.2_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.2_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.2_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.2_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.2_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.2_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.2_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.5_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.5_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.5_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.5_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.5_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.5_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.5_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.5_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.5_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.5_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.5_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.5_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.6_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.6_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.6_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.6_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.6_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.6_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/9.6_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/9.6_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_languages.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_languages.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_languages.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_languages.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_out_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_out_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_out_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_out_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/ppas/sql/default/variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/functions/ppas/sql/default/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_languages.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_languages.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_languages.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_languages.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_out_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_out_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_out_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_out_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/pg/sql/11_plus/variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/pg/sql/11_plus/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/11_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/11_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.2_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.2_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.2_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.2_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.2_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.2_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.2_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.5_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.5_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.5_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.5_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.5_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.5_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.5_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.5_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.6_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.6_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.6_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.6_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.6_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.6_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/9.6_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/9.6_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_languages.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_languages.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_languages.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_languages.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_out_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_out_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_out_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_out_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedure/ppas/sql/default/variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/procedures/ppas/sql/default/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/11_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/11_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.2_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.2_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.5_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.5_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.5_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.5_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.5_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.5_plus/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.5_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.5_plus/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.5_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.5_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/9.5_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/9.5_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_languages.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_languages.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_languages.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_languages.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_out_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_out_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_out_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_out_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/pg/sql/default/variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/pg/sql/default/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/11_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/11_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.2_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.2_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.5_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.5_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.5_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.5_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.5_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.5_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.5_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.5_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.5_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.5_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/9.5_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/9.5_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_definition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_definition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_definition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_definition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_languages.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_languages.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_languages.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_languages.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_out_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_out_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_out_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_out_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/variables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_function/ppas/sql/default/variables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/trigger_functions/ppas/sql/default/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py index 8e6c463ea..3d1daa75c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py @@ -108,22 +108,9 @@ class PackageView(PGChildNodeView): 'msql': [{'get': 'msql'}, {'get': 'msql'}], 'stats': [{'get': 'statistics'}, {'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) - def module_js(self): - """ - This property defines whether javascript exists for this node. - """ - return make_response( - render_template( - "package/js/package.js", - _=_ - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(action=None): """ This function will behave as a decorator which will checks @@ -150,7 +137,7 @@ class PackageView(PGChildNodeView): "Connection to the server has been lost." ) ) - self.template_path = 'package/ppas/#{0}#'.format( + self.template_path = 'packages/ppas/#{0}#'.format( self.manager.version) SQL = render_template( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py index 286018242..4809be85b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/__init__.py @@ -138,9 +138,6 @@ class EdbFuncView(PGChildNodeView, DataTypeReader): - Works as a decorator. Validating request on the request of create, update and modified SQL. - * module_js(): - - Overrides this property to define javascript for Functions node. - * check_precondition(f): - Works as a decorator. - Checks database connection status. @@ -187,23 +184,9 @@ class EdbFuncView(PGChildNodeView, DataTypeReader): 'nodes': [{'get': 'nodes'}, {'get': 'nodes'}], 'sql': [{'get': 'sql'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) - def module_js(self): - """ - Load JS file (functions.js) for this module. - """ - - return make_response( - render_template( - "edbfunc/js/edbfunc.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ Works as a decorator. @@ -232,9 +215,14 @@ class EdbFuncView(PGChildNodeView, DataTypeReader): # Set template path for sql scripts depending # on the server version. + template_initial = None + if self.node_type == 'edbfunc': + template_initial = 'edbfuncs' + elif self.node_type == 'edbproc': + template_initial = 'edbprocs' self.sql_template_path = "/".join([ - self.node_type, + template_initial, self.manager.server_type, '#{0}#' ]).format(self.manager.version) @@ -699,18 +687,5 @@ procedure_blueprint = EdbProcModule(__name__) class EdbProcView(EdbFuncView): node_type = procedure_blueprint.node_type - def module_js(self): - """ - Load JS file (procedures.js) for this module. - """ - - return make_response( - render_template( - "edbproc/js/edbproc.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - EdbProcView.register_node_view(procedure_blueprint) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/11_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/11_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/11_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/11_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/get_body.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_body.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/get_body.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_body.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/get_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfunc/ppas/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbfuncs/ppas/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/11_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/11_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/11_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/11_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/11_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/get_body.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_body.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/get_body.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_body.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/get_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbproc/ppas/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/templates/edbprocs/ppas/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py index 3c4346e18..ddce19a65 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/__init__.py @@ -120,9 +120,6 @@ class EdbVarView(PGChildNodeView, DataTypeReader): - Works as a decorator. Validating request on the request of create, update and modified SQL. - * module_js(): - - Overrides this property to define javascript for Functions node. - * check_precondition(f): - Works as a decorator. - Checks database connection status. @@ -161,23 +158,9 @@ class EdbVarView(PGChildNodeView, DataTypeReader): {'get': 'list'} ], 'nodes': [{'get': 'nodes'}, {'get': 'nodes'}], - 'sql': [{'get': 'sql'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'sql': [{'get': 'sql'}] }) - def module_js(self): - """ - Load JS file (edbvar.js) for this module. - """ - - return make_response( - render_template( - "edbvar/js/edbvar.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ Works as a decorator. @@ -204,7 +187,7 @@ class EdbVarView(PGChildNodeView, DataTypeReader): ) ) - self.sql_template_path = "/edbvar/ppas" + self.sql_template_path = "/edbvars/ppas" return f(*args, **kwargs) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/edbvar/ppas/node.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/edbvars/ppas/node.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/edbvar/ppas/node.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/edbvars/ppas/node.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/edbvar/ppas/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/edbvars/ppas/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/edbvar/ppas/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/templates/edbvars/ppas/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.1_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.1_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/package/ppas/9.2_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/packages/templates/packages/ppas/9.2_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py index 96fd0e6df..31d37dbed 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/__init__.py @@ -113,22 +113,9 @@ class SequenceView(PGChildNodeView): 'msql': [{'get': 'msql'}, {'get': 'msql'}], 'stats': [{'get': 'statistics'}, {'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) - def module_js(self): - """ - This property defines whether javascript exists for this node. - """ - return make_response( - render_template( - "sequence/js/sequence.js", - _=_ - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(action=None): """ This function will behave as a decorator which will checks @@ -150,7 +137,7 @@ class SequenceView(PGChildNodeView): else: self.conn = self.manager.connection() - self.template_path = 'sequence/sql/#{0}#'.format( + self.template_path = 'sequences/sql/#{0}#'.format( self.manager.version ) self.acl = ['r', 'w', 'U'] diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/10_plus/get_def.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/10_plus/get_def.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/10_plus/get_def.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/10_plus/get_def.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/backend_support.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/backend_support.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/backend_support.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/backend_support.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/get_def.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/get_def.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/get_def.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/get_def.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/get_dependencies.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/get_dependencies.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/get_dependencies.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/get_dependencies.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/gpdb_5.0_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/gpdb_5.0_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequence/sql/gpdb_5.0_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/templates/sequences/sql/gpdb_5.0_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py index 3234fa73b..7f3c680d7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/__init__.py @@ -175,7 +175,6 @@ class SynonymView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_target_objects': [{'get': 'get_target_objects'}, {'get': 'get_target_objects'}] }) @@ -204,7 +203,7 @@ class SynonymView(PGChildNodeView): ) # we will set template path for sql scripts - self.template_path = 'synonym/sql/#{0}#'.format( + self.template_path = 'synonyms/sql/#{0}#'.format( self.manager.version) return f(*args, **kwargs) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.2_plus/get_objects.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.2_plus/get_objects.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.2_plus/get_objects.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.2_plus/get_objects.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.2_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.2_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.2_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.5_plus/get_objects.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.5_plus/get_objects.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.5_plus/get_objects.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.5_plus/get_objects.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.5_plus/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.5_plus/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.5_plus/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.5_plus/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.5_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.5_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/9.5_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/9.5_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/get_objects.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/get_objects.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/get_objects.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/get_objects.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/get_parent_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/get_parent_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/get_parent_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/get_parent_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonym/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/templates/synonyms/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py index 0f017e885..d0beb8dfb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py @@ -99,10 +99,6 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): * __init__(**kwargs) - Method is used to initialize the TableView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * list() - This function is used to list all the Table nodes within that collection. @@ -222,7 +218,6 @@ class TableView(BaseTableView, DataTypeReader, VacuumSettings): 'stats': [{'get': 'statistics'}, {'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_oftype': [{'get': 'get_oftype'}, {'get': 'get_oftype'}], 'get_inherits': [{'get': 'get_inherits'}, {'get': 'get_inherits'}], 'get_relations': [{'get': 'get_relations'}, {'get': 'get_relations'}], diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py index 66f6df65a..fdf72d73d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/__init__.py @@ -114,10 +114,6 @@ class ColumnsView(PGChildNodeView, DataTypeReader): * __init__(**kwargs) - Method is used to initialize the ColumnView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -189,8 +185,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader): 'msql': [{'get': 'msql'}, {'get': 'msql'}], 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], + 'dependent': [{'get': 'dependents'}] }) def check_precondition(f): @@ -213,7 +208,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader): self.qtTypeIdent = driver.qtTypeIdent # Set the template path for the SQL scripts - self.template_path = 'column/sql/#{0}#'.format( + self.template_path = 'columns/sql/#{0}#'.format( self.manager.version) # Allowed ACL for column 'Select/Update/Insert/References' diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/column/macros/privilege.macros b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/columns/macros/privilege.macros similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/column/macros/privilege.macros rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/columns/macros/privilege.macros diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/column/macros/security.macros b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/columns/macros/security.macros similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/column/macros/security.macros rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/templates/columns/macros/security.macros diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py index 7d90195be..ebc96454a 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/__init__.py @@ -132,22 +132,3 @@ def proplist(**kwargs): response=res, status=200 ) - - -@blueprint.route('/module.js') -def module_js(): - """ - This property defines whether javascript exists for this node. - - """ - return make_response( - render_template( - "constraints/js/constraints.js", - _=gettext, - constraints=[ - (ConstraintRegistry.registry[n])['blueprint'].NODE_TYPE - for n in ConstraintRegistry.registry - ] - ), - 200, {'Content-Type': 'application/javascript'} - ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py index 9437116b3..904e073ca 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py @@ -112,9 +112,6 @@ class CheckConstraintView(PGChildNodeView): Methods: ------- - * module_js(): - - Load JS file (check_constraint.js) for this module. - * check_precondition(f): - Works as a decorator. - Checks database connection status. @@ -183,22 +180,9 @@ class CheckConstraintView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'validate': [{'get': 'validate_check_constraint'}], }) - def module_js(self): - """ - Load JS file (check_constraint.js) for this module. - """ - return make_response( - render_template( - "check_constraint/js/check_constraint.js", - _=_ - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ Works as a decorator. diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py index fbe3a480d..c08e6ef65 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/__init__.py @@ -123,10 +123,6 @@ class ExclusionConstraintView(PGChildNodeView): - Method is used to initialize the ForeignKeyConstraintView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -209,23 +205,9 @@ class ExclusionConstraintView(PGChildNodeView): 'msql': [{'get': 'msql'}, {'get': 'msql'}], 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) - def module_js(self): - """ - This property defines (if javascript) exists for this node. - Override this property for your own logic. - """ - return make_response( - render_template( - "exclusion_constraint/js/exclusion_constraint.js", - _=_ - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py index b581fe834..2105fe210 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/__init__.py @@ -146,10 +146,6 @@ class ForeignKeyConstraintView(PGChildNodeView): - Method is used to initialize the ForeignKeyConstraintView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -217,25 +213,11 @@ class ForeignKeyConstraintView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'indices': [{}, {'get': 'get_indices'}], 'validate': [{'get': 'validate_foreign_key'}], 'get_coveringindex': [{}, {'get': 'get_coveringindex'}] }) - def module_js(self): - """ - This property defines (if javascript) exists for this node. - Override this property for your own logic. - """ - return make_response( - render_template( - "foreign_key/js/foreign_key.js", - _=_ - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py index d1d36d520..fb733ad67 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/__init__.py @@ -150,10 +150,6 @@ class IndexConstraintView(PGChildNodeView): - Method is used to initialize the PrimaryKeyConstraintView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -229,25 +225,9 @@ class IndexConstraintView(PGChildNodeView): 'msql': [{'get': 'msql'}, {'get': 'msql'}], 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) - def module_js(self): - """ - This property defines (if javascript) exists for this node. - Override this property for your own logic. - """ - return make_response( - render_template( - "index_constraint/js/index_constraint.js", - _=_, - node_type=self.node_type, - node_label=self.node_label - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py index 269df983d..fea4ddbfd 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/__init__.py @@ -142,10 +142,6 @@ class IndexesView(PGChildNodeView): * __init__(**kwargs) - Method is used to initialize the IndexView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -221,7 +217,6 @@ class IndexesView(PGChildNodeView): 'stats': [{'get': 'statistics'}, {'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_collations': [{'get': 'get_collations'}, {'get': 'get_collations'}], 'get_access_methods': [{'get': 'get_access_methods'}, @@ -253,7 +248,7 @@ class IndexesView(PGChildNodeView): # we will set template path for sql scripts self.template_path = compile_template_path( - 'index/sql/', + 'indexes/sql/', self.manager.server_type, self.manager.version ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py index b363e2912..61b413aec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/__init__.py @@ -31,7 +31,7 @@ def backend_supported(module, manager, **kwargs): module, manager, **kwargs): conn = manager.connection(did=kwargs['did']) - template_path = 'partition/sql/{0}/#{0}#{1}#'.format( + template_path = 'partitions/sql/{0}/#{0}#{1}#'.format( manager.server_type, manager.version ) SQL = render_template("/".join( diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py index 751b5712d..d0a3b98ee 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/tests/test_backend_supported.py @@ -69,7 +69,7 @@ class TestBackendSupport(BaseTestGenerator): expect_error_response=False, expected_number_calls_on_render_template=1, expect_render_template_to_be_called_with=call( - 'partition/sql/gpdb/#gpdb#5#/backend_support.sql', tid=123 + 'partitions/sql/gpdb/#gpdb#5#/backend_support.sql', tid=123 ) )), ('when error happens while querying the database, ' @@ -88,7 +88,7 @@ class TestBackendSupport(BaseTestGenerator): expect_error_response=True, expected_number_calls_on_render_template=1, expect_render_template_to_be_called_with=call( - 'partition/sql/pg/#pg#10#/backend_support.sql', tid=123 + 'partitions/sql/pg/#pg#10#/backend_support.sql', tid=123 ) )) ] diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py index b45ed3ea9..070875e8f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/__init__.py @@ -175,22 +175,9 @@ class RuleView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'configs': [{'get': 'configs'}] }) - def module_js(self): - """ - This property defines whether Javascript exists for this node. - """ - return make_response( - render_template( - "rules/js/rules.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will check the diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/macros/privilege.macros b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/macros/privilege.macros similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/macros/privilege.macros rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/macros/privilege.macros diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/macros/security.macros b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/macros/security.macros similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/macros/security.macros rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/macros/security.macros diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/create.sql similarity index 92% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/create.sql index 67a7753fb..158e62764 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/create.sql @@ -1,7 +1,7 @@ -{% import 'column/macros/security.macros' as SECLABEL %} -{% import 'column/macros/privilege.macros' as PRIVILEGE %} +{% import 'columns/macros/security.macros' as SECLABEL %} +{% import 'columns/macros/privilege.macros' as PRIVILEGE %} {% import 'macros/variable.macros' as VARIABLE %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {### Add column ###} {% if data.name and data.cltype %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql similarity index 98% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql index 075647d8f..dbc3b7552 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/10_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/10_plus/update.sql @@ -1,7 +1,7 @@ -{% import 'column/macros/security.macros' as SECLABEL %} -{% import 'column/macros/privilege.macros' as PRIVILEGE %} +{% import 'columns/macros/security.macros' as SECLABEL %} +{% import 'columns/macros/privilege.macros' as PRIVILEGE %} {% import 'macros/variable.macros' as VARIABLE %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {### Rename column name ###} {% if data.name and data.name != o_data.name %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.1_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.1_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.1_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.1_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.1_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.1_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.1_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/get_collations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/get_collations.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/get_collations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/get_collations.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/update.sql similarity index 97% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/update.sql index 7c2bfd698..806fb37ed 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/9.2_plus/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/9.2_plus/update.sql @@ -1,7 +1,7 @@ -{% import 'column/macros/security.macros' as SECLABEL %} -{% import 'column/macros/privilege.macros' as PRIVILEGE %} +{% import 'columns/macros/security.macros' as SECLABEL %} +{% import 'columns/macros/privilege.macros' as PRIVILEGE %} {% import 'macros/variable.macros' as VARIABLE %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {### Rename column name ###} {% if data.name and data.name != o_data.name %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql similarity index 87% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql index 6525ff5b2..ecc3ed506 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/create.sql @@ -1,7 +1,7 @@ -{% import 'column/macros/security.macros' as SECLABEL %} -{% import 'column/macros/privilege.macros' as PRIVILEGE %} +{% import 'columns/macros/security.macros' as SECLABEL %} +{% import 'columns/macros/privilege.macros' as PRIVILEGE %} {% import 'macros/variable.macros' as VARIABLE %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {### Add column ###} {% if data.name and data.cltype %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/depend.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/depend.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/depend.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/depend.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/edit_mode_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/edit_mode_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/edit_mode_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/edit_mode_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_collations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_collations.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_collations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_collations.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_inherited_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_inherited_tables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_inherited_tables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_inherited_tables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_parent.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_parent.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_parent.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_parent.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_position.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_position.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_position.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_position.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/is_referenced.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/is_referenced.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/is_referenced.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/is_referenced.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql similarity index 97% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql index 63c822ede..ffbf25035 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/default/update.sql @@ -1,7 +1,7 @@ -{% import 'column/macros/security.macros' as SECLABEL %} -{% import 'column/macros/privilege.macros' as PRIVILEGE %} +{% import 'columns/macros/security.macros' as SECLABEL %} +{% import 'columns/macros/privilege.macros' as PRIVILEGE %} {% import 'macros/variable.macros' as VARIABLE %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {### Rename column name ###} {% if data.name and data.name != o_data.name %} ALTER TABLE {{conn|qtIdent(data.schema, data.table)}} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/gpdb_5.0_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/gpdb_5.0_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/gpdb_5.0_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/gpdb_5.0_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/gpdb_5.0_plus/get_collations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/gpdb_5.0_plus/get_collations.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/gpdb_5.0_plus/get_collations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/columns/sql/gpdb_5.0_plus/get_collations.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/11_plus/column_details.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/column_details.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/11_plus/column_details.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/column_details.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/11_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/11_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/11_plus/include_details.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/include_details.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/11_plus/include_details.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/11_plus/include_details.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/alter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/alter.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/alter.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/alter.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/backend_support.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/backend_support.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/backend_support.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/backend_support.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/coll_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/coll_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/coll_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/coll_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/column_details.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/column_details.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/column_details.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/column_details.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_am.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_am.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_am.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_am.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_collations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_collations.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_collations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_collations.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_op_class.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_op_class.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_op_class.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_op_class.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_parent.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_parent.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/get_parent.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/get_parent.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/gpdb_5.0_plus/column_details.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/gpdb_5.0_plus/column_details.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/gpdb_5.0_plus/column_details.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/gpdb_5.0_plus/column_details.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/gpdb_5.0_plus/get_collations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/gpdb_5.0_plus/get_collations.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/index/sql/gpdb_5.0_plus/get_collations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/indexes/sql/gpdb_5.0_plus/get_collations.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/attach.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/attach.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/attach.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/attach.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/backend_support.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/backend_support.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/backend_support.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/backend_support.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/detach.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/detach.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/detach.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/detach.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/get_attach_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/get_attach_tables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/get_attach_tables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/get_attach_tables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/gpdb/5_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/gpdb/5_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/attach.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/attach.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/attach.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/attach.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/backend_support.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/backend_support.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/backend_support.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/backend_support.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/create.sql similarity index 97% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/create.sql index 19eea8cd4..a033f9c6e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/create.sql @@ -1,4 +1,4 @@ -{% import 'table/sql/macros/constraints.macro' as CONSTRAINTS %} +{% import 'tables/sql/macros/constraints.macro' as CONSTRAINTS %} {#===========================================#} {#====== MAIN TABLE TEMPLATE STARTS HERE ======#} {#===========================================#} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/detach.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/detach.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/detach.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/detach.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/get_attach_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/get_attach_tables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/get_attach_tables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/get_attach_tables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/pg/10_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/pg/10_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/attach.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/attach.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/attach.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/attach.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/backend_support.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/backend_support.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/backend_support.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/backend_support.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/create.sql similarity index 97% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/create.sql index 19eea8cd4..a033f9c6e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/create.sql @@ -1,4 +1,4 @@ -{% import 'table/sql/macros/constraints.macro' as CONSTRAINTS %} +{% import 'tables/sql/macros/constraints.macro' as CONSTRAINTS %} {#===========================================#} {#====== MAIN TABLE TEMPLATE STARTS HERE ======#} {#===========================================#} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/detach.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/detach.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/detach.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/detach.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/get_attach_tables.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/get_attach_tables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/get_attach_tables.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/get_attach_tables.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/ppas/10_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partitions/sql/ppas/10_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/create.sql similarity index 97% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/create.sql index 70c38603f..d582b1563 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/create.sql @@ -1,10 +1,10 @@ {% import 'macros/schemas/security.macros' as SECLABEL %} {% import 'macros/schemas/privilege.macros' as PRIVILEGE %} {% import 'macros/variable.macros' as VARIABLE %} -{% import 'column/macros/security.macros' as COLUMN_SECLABEL %} -{% import 'column/macros/privilege.macros' as COLUMN_PRIVILEGE %} -{% import 'table/sql/macros/constraints.macro' as CONSTRAINTS %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'columns/macros/security.macros' as COLUMN_SECLABEL %} +{% import 'columns/macros/privilege.macros' as COLUMN_PRIVILEGE %} +{% import 'tables/sql/macros/constraints.macro' as CONSTRAINTS %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {#===========================================#} {#====== MAIN TABLE TEMPLATE STARTS HERE ======#} {#===========================================#} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/get_columns_for_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/get_columns_for_table.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/get_columns_for_table.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/get_columns_for_table.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/get_inherits.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/get_inherits.sql similarity index 87% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/get_inherits.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/get_inherits.sql index b8cb3c1d5..b89102422 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/get_inherits.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/get_inherits.sql @@ -1,4 +1,4 @@ -{% import 'table/sql/macros/db_catalogs.macro' as CATALOG %} +{% import 'tables/sql/macros/db_catalogs.macro' as CATALOG %} SELECT c.oid, c.relname , nspname, CASE WHEN nspname NOT LIKE 'pg\_%' THEN quote_ident(nspname)||'.'||quote_ident(c.relname) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/get_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/get_table.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/get_table.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/get_table.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/10_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/10_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/get_inherits.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/get_inherits.sql similarity index 86% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/get_inherits.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/get_inherits.sql index 9d05c70c8..178861395 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/get_inherits.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/get_inherits.sql @@ -1,4 +1,4 @@ -{% import 'table/sql/macros/db_catalogs.macro' as CATALOG %} +{% import 'tables/sql/macros/db_catalogs.macro' as CATALOG %} SELECT c.oid, c.relname , nspname, CASE WHEN nspname NOT LIKE 'pg\_%' THEN quote_ident(nspname)||'.'||quote_ident(c.relname) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.1_plus/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.1_plus/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.2_plus/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.2_plus/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/9.2_plus/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/9.2_plus/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/backend_support.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/backend_support.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/backend_support.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/backend_support.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/coll_table_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/coll_table_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/coll_table_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/coll_table_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql similarity index 96% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql index e82046796..104579088 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/create.sql @@ -1,10 +1,10 @@ {% import 'macros/schemas/security.macros' as SECLABEL %} {% import 'macros/schemas/privilege.macros' as PRIVILEGE %} {% import 'macros/variable.macros' as VARIABLE %} -{% import 'column/macros/security.macros' as COLUMN_SECLABEL %} -{% import 'column/macros/privilege.macros' as COLUMN_PRIVILEGE %} -{% import 'table/sql/macros/constraints.macro' as CONSTRAINTS %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'columns/macros/security.macros' as COLUMN_SECLABEL %} +{% import 'columns/macros/privilege.macros' as COLUMN_PRIVILEGE %} +{% import 'tables/sql/macros/constraints.macro' as CONSTRAINTS %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {#===========================================#} {#====== MAIN TABLE TEMPLATE STARTS HERE ======#} {#===========================================#} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/depend.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/depend.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/depend.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/depend.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/enable_disable_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/enable_disable_trigger.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/enable_disable_trigger.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/enable_disable_trigger.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_columns_for_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_columns_for_table.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_columns_for_table.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_columns_for_table.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_inherits.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_inherits.sql similarity index 87% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_inherits.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_inherits.sql index b640f5af1..943994be6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_inherits.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_inherits.sql @@ -1,4 +1,4 @@ -{% import 'table/sql/macros/db_catalogs.macro' as CATALOG %} +{% import 'tables/sql/macros/db_catalogs.macro' as CATALOG %} SELECT c.oid, c.relname , nspname, CASE WHEN nspname NOT LIKE 'pg\_%' THEN quote_ident(nspname)||'.'||quote_ident(c.relname) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_oftype.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_oftype.sql similarity index 75% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_oftype.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_oftype.sql index 573493556..1cca0f663 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_oftype.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_oftype.sql @@ -1,4 +1,4 @@ -{% import 'table/sql/macros/db_catalogs.macro' as CATALOG %} +{% import 'tables/sql/macros/db_catalogs.macro' as CATALOG %} SELECT c.oid, quote_ident(n.nspname)||'.'||quote_ident(c.relname) AS typname FROM pg_namespace n, pg_class c @@ -6,4 +6,4 @@ WHERE c.relkind = 'c' AND c.relnamespace=n.oid {% if not show_system_objects %} {{ CATALOG.VALID_CATALOGS(server_type) }} {% endif %} -ORDER BY typname; \ No newline at end of file +ORDER BY typname; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_relations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_relations.sql similarity index 78% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_relations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_relations.sql index 20687fab3..ceb1e7a4f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_relations.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_relations.sql @@ -1,4 +1,4 @@ -{% import 'table/sql/macros/db_catalogs.macro' as CATALOG %} +{% import 'tables/sql/macros/db_catalogs.macro' as CATALOG %} SELECT c.oid, quote_ident(n.nspname)||'.'||quote_ident(c.relname) AS like_relation FROM pg_class c, pg_namespace n WHERE c.relnamespace=n.oid @@ -6,4 +6,4 @@ WHERE c.relnamespace=n.oid {% if not show_sys_objects %} {{ CATALOG.VALID_CATALOGS(server_type) }} {% endif %} -ORDER BY 1; \ No newline at end of file +ORDER BY 1; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_schema_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_schema_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_schema_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_schema_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_table.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_table.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_table.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_table.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_table_row_count.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_table_row_count.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_table_row_count.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_table_row_count.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_tables_for_constraints.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_tables_for_constraints.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_tables_for_constraints.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_tables_for_constraints.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_types_where_condition.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_types_where_condition.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/get_types_where_condition.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/get_types_where_condition.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/reset_stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/reset_stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/reset_stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/reset_stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/truncate.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/truncate.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/truncate.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/truncate.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/create.sql similarity index 96% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/create.sql index 86b9278d7..fb2cd3706 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/create.sql @@ -1,10 +1,10 @@ {% import 'macros/schemas/security.macros' as SECLABEL %} {% import 'macros/schemas/privilege.macros' as PRIVILEGE %} {% import 'macros/variable.macros' as VARIABLE %} -{% import 'column/macros/security.macros' as COLUMN_SECLABEL %} -{% import 'column/macros/privilege.macros' as COLUMN_PRIVILEGE %} -{% import 'table/sql/macros/constraints.macro' as CONSTRAINTS %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'columns/macros/security.macros' as COLUMN_SECLABEL %} +{% import 'columns/macros/privilege.macros' as COLUMN_PRIVILEGE %} +{% import 'tables/sql/macros/constraints.macro' as CONSTRAINTS %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {#===========================================#} {#====== MAIN TABLE TEMPLATE STARTS HERE ======#} {#===========================================#} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/stats.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/stats.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/gpdb_5.0_plus/stats.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/gpdb_5.0_plus/stats.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/macros/constraints.macro b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/macros/constraints.macro similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/macros/constraints.macro rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/macros/constraints.macro diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/macros/db_catalogs.macro b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/macros/db_catalogs.macro similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/macros/db_catalogs.macro rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/tables/sql/macros/db_catalogs.macro diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/10_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/10_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/10_plus/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/10_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/10_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/10_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/10_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/10_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/9.1_plus/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/9.1_plus/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/9.1_plus/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/9.1_plus/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/9.1_plus/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/9.1_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/9.1_plus/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/9.1_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/9.1_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/9.1_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/9.1_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/9.1_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/alter.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/alter.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/alter.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/alter.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/backend_support.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/backend_support.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/backend_support.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/backend_support.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/enable_disable_trigger.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/enable_disable_trigger.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/enable_disable_trigger.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/enable_disable_trigger.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/get_columns.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/get_columns.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/get_columns.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/get_columns.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/get_parent.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/get_parent.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/get_parent.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/get_parent.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/get_triggerfunctions.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/get_triggerfunctions.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/get_triggerfunctions.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/get_triggerfunctions.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/trigger/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/triggers/sql/default/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py index 70eb60213..f599892b8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_acl_sql.py @@ -51,6 +51,6 @@ class TestColumnAclSql(SQLTemplateTestBase): @staticmethod def get_template_file(version, filename): return os.path.join( - os.path.dirname(__file__), "..", "templates", "column", "sql", + os.path.dirname(__file__), "..", "templates", "columns", "sql", version, filename ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_properties_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_properties_sql.py index 14a47b786..c098605ec 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_properties_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_column_properties_sql.py @@ -51,6 +51,6 @@ class TestColumnPropertiesSql(SQLTemplateTestBase): @staticmethod def get_template_file(version, filename): return os.path.join( - os.path.dirname(__file__), "..", "templates", "column", "sql", + os.path.dirname(__file__), "..", "templates", "columns", "sql", version, filename ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py index 3e601dd54..4b995e932 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_acl_sql.py @@ -57,6 +57,6 @@ class TestTablesAclSql(SQLTemplateTestBase): @staticmethod def get_template_file(version, filename): return os.path.join( - os.path.dirname(__file__), "..", "templates", "table", "sql", + os.path.dirname(__file__), "..", "templates", "tables", "sql", version, filename ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_node_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_node_sql.py index f0765e7d2..e14df0d6b 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_node_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_node_sql.py @@ -54,6 +54,6 @@ class TestTablesNodeSql(SQLTemplateTestBase): @staticmethod def get_template_file(version, filename): return os.path.join( - os.path.dirname(__file__), "..", "templates", "table", "sql", + os.path.dirname(__file__), "..", "templates", "tables", "sql", version, filename ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py index d3769e331..f1323a3ae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_tables_properties_sql.py @@ -70,6 +70,6 @@ class TestTablesPropertiesSql(SQLTemplateTestBase): @staticmethod def get_template_file(version, filename): return os.path.join( - os.path.dirname(__file__), "..", "templates", "table", "sql", + os.path.dirname(__file__), "..", "templates", "tables", "sql", version, filename ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py index c041899e5..ef9fda32d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_template_create.py @@ -27,7 +27,7 @@ class TestTemplateCreate(BaseTestGenerator): 'when no primary key is present, ' 'it returns "DISTRIBUTED RANDOMLY"', dict( - template_path='table/sql/gpdb_5.0_plus/create.sql', + template_path='tables/sql/gpdb_5.0_plus/create.sql', input_parameters=dict( data=dict() ), @@ -41,7 +41,7 @@ class TestTemplateCreate(BaseTestGenerator): 'when primary key is present, ' 'it returns "DISTRIBUTED BY (attr_primary_key)"', dict( - template_path='table/sql/gpdb_5.0_plus/create.sql', + template_path='tables/sql/gpdb_5.0_plus/create.sql', input_parameters=dict( data=dict( primary_key=[ @@ -66,7 +66,7 @@ class TestTemplateCreate(BaseTestGenerator): 'when distribution is present, ' 'it returns "DISTRIBUTED BY (attr1, attr2, attr4)"', dict( - template_path='table/sql/gpdb_5.0_plus/create.sql', + template_path='tables/sql/gpdb_5.0_plus/create.sql', input_parameters=dict( data=dict( distribution=[1, 2, 4], diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py index 31e25290c..beefe1b07 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_get_oid_sql.py @@ -51,6 +51,6 @@ class TestTriggerGetOidSql(SQLTemplateTestBase): @staticmethod def get_template_file(version, filename): return os.path.join( - os.path.dirname(__file__), "..", "templates", "trigger", "sql", + os.path.dirname(__file__), "..", "templates", "triggers", "sql", version, filename ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_nodes_sql.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_nodes_sql.py index 5686f85bf..6ce354815 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_nodes_sql.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_trigger_nodes_sql.py @@ -42,6 +42,6 @@ class TestTriggerNodesSql(SQLTemplateTestBase): @staticmethod def get_template_file(version, filename): return os.path.join( - os.path.dirname(__file__), "..", "templates", "trigger", "sql", + os.path.dirname(__file__), "..", "templates", "triggers", "sql", version, filename ) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py index 3a2ced909..169cdf1d6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/tests/test_utils.py @@ -52,7 +52,7 @@ class TestUtils(BaseTestGenerator): ) subject.test(did=1, sid=2) self.assertEqual( - subject.table_template_path, 'table/sql/#gpdb#10#') + subject.table_template_path, 'tables/sql/#gpdb#10#') self.assertEqual( subject.data_type_template_path, 'datatype/sql/#gpdb#10#') self.assertEqual( @@ -66,7 +66,7 @@ class TestUtils(BaseTestGenerator): 'foreign_key/sql/#gpdb#10#') self.assertEqual( subject.index_template_path, - 'index/sql/#gpdb#10#') + 'indexes/sql/#gpdb#10#') self.assertEqual( subject.trigger_template_path, - 'trigger/sql/#gpdb#10#') + 'triggers/sql/#gpdb#10#') diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py index 0dc8de6ea..0bdba79bb 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/__init__.py @@ -78,7 +78,7 @@ class TriggerModule(CollectionNodeModule): if 'vid' not in kwargs: return True - template_path = 'trigger/sql/#{0}#'.format(manager.version) + template_path = 'triggers/sql/#{0}#'.format(manager.version) SQL = render_template("/".join( [template_path, 'backend_support.sql']), vid=kwargs['vid'] ) @@ -132,7 +132,7 @@ class TriggerModule(CollectionNodeModule): """ snippets = [ render_template( - "trigger/css/trigger.css", + "triggers/css/trigger.css", node_type=self.node_type ) ] @@ -155,10 +155,6 @@ class TriggerView(PGChildNodeView): * __init__(**kwargs) - Method is used to initialize the TriggerView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -248,7 +244,6 @@ class TriggerView(PGChildNodeView): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_triggerfunctions': [{'get': 'get_trigger_functions'}, {'get': 'get_trigger_functions'}], 'enable': [{'put': 'enable_disable_trigger'}] @@ -277,7 +272,7 @@ class TriggerView(PGChildNodeView): kwargs['did'] in self.manager.db_info else 0 # we will set template path for sql scripts - self.template_path = 'trigger/sql/#{0}#'.format( + self.template_path = 'triggers/sql/#{0}#'.format( self.manager.version) # Store server type self.server_type = self.manager.server_type diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/css/trigger.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/triggers/css/trigger.css similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/css/trigger.css rename to web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/triggers/css/trigger.css diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py index 7815b3252..05a6a2382 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py @@ -110,17 +110,17 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): ver = self.manager.version server_type = self.manager.server_type # Set the template path for the SQL scripts - self.table_template_path = compile_template_path('table/sql', + self.table_template_path = compile_template_path('tables/sql', server_type, ver) self.data_type_template_path = compile_template_path( 'datatype/sql', server_type, ver) self.partition_template_path = \ - 'partition/sql/{0}/#{0}#{1}#'.format(server_type, ver) + 'partitions/sql/{0}/#{0}#{1}#'.format(server_type, ver) # Template for Column ,check constraint and exclusion # constraint node - self.column_template_path = 'column/sql/#{0}#'.format(ver) + self.column_template_path = 'columns/sql/#{0}#'.format(ver) self.check_constraint_template_path = compile_template_path( 'check_constraint/sql', server_type, ver) self.exclusion_constraint_template_path = compile_template_path( @@ -136,11 +136,11 @@ class BaseTableView(PGChildNodeView, BasePartitionTable): # Template for index node self.index_template_path = compile_template_path( - 'index/sql', server_type, ver) + 'indexes/sql', server_type, ver) # Template for trigger node self.trigger_template_path = compile_template_path( - 'trigger/sql', server_type, ver) + 'triggers/sql', server_type, ver) # Template for rules node self.rules_template_path = 'rules/sql' diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/defacl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/defacl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/defacl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/defacl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/get_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/get_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/get_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/is_catalog.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/is_catalog.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/is_catalog.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/is_catalog.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/gpdb_5.0_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/gpdb_5.0_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/defacl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/defacl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/defacl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/defacl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/get_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/get_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/get_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/is_catalog.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/is_catalog.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/is_catalog.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/is_catalog.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/9.2_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/9.2_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/defacl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/defacl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/defacl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/defacl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/get_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/get_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/get_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/is_catalog.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/is_catalog.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/is_catalog.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/is_catalog.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/pg/default/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/pg/default/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/defacl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/defacl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/defacl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/defacl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/get_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/get_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/get_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/is_catalog.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/is_catalog.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/is_catalog.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/is_catalog.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.1_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.1_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/defacl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/defacl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/defacl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/defacl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/get_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/get_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/get_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/get_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/is_catalog.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/is_catalog.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/is_catalog.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/is_catalog.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schema/ppas/9.2_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/templates/schemas/ppas/9.2_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py index a0427a92e..8d428dc1f 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/__init__.py @@ -200,7 +200,6 @@ class TypeView(PGChildNodeView, DataTypeReader): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'get_types': [{'get': 'get_types'}, {'get': 'get_types'}], 'get_stypes': [{'get': 'get_subtypes'}, {'get': 'get_subtypes'}], 'get_subopclass': [{'get': 'get_subtype_opclass'}, @@ -244,7 +243,7 @@ class TypeView(PGChildNodeView, DataTypeReader): ver = self.manager.version server_type = self.manager.server_type # Set the template path for the SQL scripts - self.template_path = 'type/sql/' + ( + self.template_path = 'types/sql/' + ( '#{0}#{1}#'.format(server_type, ver) if server_type == 'gpdb' else '#{0}#'.format(ver) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/macros/get_full_type_sql_format.macros b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/macros/get_full_type_sql_format.macros similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/macros/get_full_type_sql_format.macros rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/macros/get_full_type_sql_format.macros diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/additional_properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/additional_properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/additional_properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/additional_properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/create.sql similarity index 98% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/create.sql index fdcbf0df2..0e4289700 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/create.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/create.sql @@ -1,6 +1,6 @@ {% import 'macros/schemas/security.macros' as SECLABEL %} {% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {## If user selected shell type then just create type template ##} {% if data and data.typtype == 'p' %} CREATE TYPE {{ conn|qtIdent(data.schema, data.name) }}; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_collations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_collations.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_collations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_collations.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_external_functions.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_external_functions.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_external_functions.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_external_functions.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_scid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_scid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_scid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_scid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_subtypes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_subtypes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_subtypes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_subtypes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_types.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_types.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/get_types.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/get_types.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/update.sql similarity index 98% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/update.sql index d79cb6d56..661ac9f11 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/default/update.sql +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/default/update.sql @@ -1,6 +1,6 @@ {% import 'macros/schemas/security.macros' as SECLABEL %} {% import 'macros/schemas/privilege.macros' as PRIVILEGE %} -{% import 'type/macros/get_full_type_sql_format.macros' as GET_TYPE %} +{% import 'types/macros/get_full_type_sql_format.macros' as GET_TYPE %} {#======================================#} {# Below will change object owner #} {% if data.typeowner and data.typeowner != o_data.typeowner %} diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/gpdb_5.0_plus/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/gpdb_5.0_plus/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/gpdb_5.0_plus/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/gpdb_5.0_plus/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/gpdb_5.0_plus/additional_properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/gpdb_5.0_plus/additional_properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/gpdb_5.0_plus/additional_properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/gpdb_5.0_plus/additional_properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/gpdb_5.0_plus/get_collations.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/gpdb_5.0_plus/get_collations.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/gpdb_5.0_plus/get_collations.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/gpdb_5.0_plus/get_collations.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/gpdb_5.0_plus/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/gpdb_5.0_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/gpdb_5.0_plus/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/gpdb_5.0_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/postgres_inbuit_types.txt b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/postgres_inbuit_types.txt similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/type/sql/postgres_inbuit_types.txt rename to web/pgadmin/browser/server_groups/servers/databases/schemas/types/templates/types/sql/postgres_inbuit_types.txt diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py index 44c3bc9e1..42bbbff43 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/__init__.py @@ -106,12 +106,12 @@ class ViewModule(SchemaChildModule): _=gettext ), render_template( - "view/css/view.css", + "views/css/view.css", node_type=self.node_type, _=gettext ), render_template( - "mview/css/mview.css", + "mviews/css/mview.css", node_type='mview', _=gettext ) @@ -189,7 +189,7 @@ def check_precondition(f): _temp = self.pg_template_path(self.manager.version) self.template_path = self.template_initial + '/' + _temp - self.column_template_path = 'column/sql/#{0}#'.format( + self.column_template_path = 'columns/sql/#{0}#'.format( self.manager.version) return f(*args, **kwargs) @@ -206,10 +206,6 @@ class ViewNode(PGChildNodeView, VacuumSettings): * __init__(**kwargs) - Method is used to initialize the ViewNode and it's base view. - * module_js() - - Request handler for module.js routes for the view node module - javascript, which returns javscript for this module. - * list() - This function is used to list all the view nodes within the collection. @@ -282,7 +278,6 @@ class ViewNode(PGChildNodeView, VacuumSettings): 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'configs': [{'get': 'configs'}], 'get_tblspc': [{'get': 'get_tblspc'}, {'get': 'get_tblspc'}], 'select_sql': [{'get': 'select_sql'}, {'get': 'select_sql'}], @@ -305,7 +300,7 @@ class ViewNode(PGChildNodeView, VacuumSettings): self.manager = None self.conn = None self.template_path = None - self.template_initial = 'view' + self.template_initial = 'views' @staticmethod def ppas_template_path(ver): @@ -1298,10 +1293,6 @@ class MViewNode(ViewNode, VacuumSettings): * __init__(**kwargs) - Method is used to initialize the MView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * create(gid, sid, did, scid) - Raise an error - we cannot create a material view. @@ -1327,7 +1318,7 @@ class MViewNode(ViewNode, VacuumSettings): super(MViewNode, self).__init__(*args, **kwargs) - self.template_initial = 'mview' + self.template_initial = 'mviews' @staticmethod def ppas_template_path(ver): diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/css/mview.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/css/mview.css similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/css/mview.css rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/css/mview.css diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/get_view_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/get_view_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/get_view_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/get_view_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/refresh.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/refresh.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/refresh.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/refresh.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.3_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.3_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/get_view_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/get_view_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/get_view_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/get_view_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/refresh.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/refresh.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/refresh.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/refresh.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/pg/9.4_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/pg/9.4_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/get_view_name.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/get_view_name.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/get_view_name.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/get_view_name.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/refresh.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/refresh.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/refresh.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/refresh.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/ppas/9.3_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mviews/ppas/9.3_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/css/view.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/css/view.css similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/css/view.css rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/css/view.css diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/gpdb_5.0_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/gpdb_5.0_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.1_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.1_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.2_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.2_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.3_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.3_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/pg/9.4_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/pg/9.4_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.1_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.1_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.2_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.2_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.3_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.3_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/acl.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/acl.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/acl.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/acl.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/allowed_privs.json b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/allowed_privs.json similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/allowed_privs.json rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/allowed_privs.json diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/create.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/delete.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/delete.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/delete.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/delete.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/get_oid.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/get_oid.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/get_oid.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/get_oid.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/get_schema.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/get_schema.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/get_schema.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/get_schema.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/grant.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/grant.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/grant.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/grant.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/nodes.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/properties.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/properties.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/update.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/update.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/view_id.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/view_id.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/ppas/9.4_plus/sql/view_id.sql rename to web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/views/ppas/9.4_plus/sql/view_id.sql diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py index ea564b91b..9047b7f7f 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/__init__.py @@ -129,10 +129,6 @@ class ResourceGroupView(NodeView): * __init__(**kwargs) - Method is used to initialize the ResourceGroupView and it's base view. - * module_js() - - This property defines (if javascript) exists for this node. - Override this property for your own logic - * check_precondition() - This function will behave as a decorator which will checks database connection before running view, it will also attaches @@ -191,8 +187,7 @@ class ResourceGroupView(NodeView): 'msql': [{'get': 'msql'}, {'get': 'msql'}], 'stats': [{'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], - 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}] + 'dependent': [{'get': 'dependents'}] }) def __init__(self, **kwargs): @@ -209,19 +204,6 @@ class ResourceGroupView(NodeView): super(ResourceGroupView, self).__init__(**kwargs) - def module_js(self): - """ - This property defines (if javascript) exists for this node. - Override this property for your own logic. - """ - return make_response( - render_template( - "resource_groups/js/resource_groups.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks diff --git a/web/pgadmin/browser/server_groups/servers/roles/__init__.py b/web/pgadmin/browser/server_groups/servers/roles/__init__.py index a92d9e40d..eb5dfc978 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/roles/__init__.py @@ -67,7 +67,7 @@ class RoleModule(CollectionNodeModule): "browser/css/collection.css", node_type=self.node_type ), - render_template("role/css/role.css")] + render_template("roles/css/role.css")] for submodule in self.submodules: snippets.extend(submodule.csssnippets) @@ -108,7 +108,6 @@ class RoleView(PGChildNodeView): 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], 'children': [{'get': 'children'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'vopts': [{}, {'get': 'voptions'}], 'variables': [{'get': 'variables'}], }) @@ -470,20 +469,13 @@ rolmembership:{ _("Connection to the server has been lost.") ) - ver = self.manager.version - - self.sql_path = 'role/sql/{0}/'.format( - 'post9_4' if ver >= 90500 else - 'post9_1' if ver >= 90200 else - 'post9_0' if ver >= 90100 else - 'post8_4' - ) + self.sql_path = 'roles/sql/#{0}#'.format(self.manager.version) self.alterKeys = [ u'rolcanlogin', u'rolsuper', u'rolcreatedb', u'rolcreaterole', u'rolinherit', u'rolreplication', u'rolconnlimit', u'rolvaliduntil', u'rolpassword' - ] if ver >= 90200 else [ + ] if self.manager.version >= 90200 else [ u'rolcanlogin', u'rolsuper', u'rolcreatedb', u'rolcreaterole', u'rolinherit', u'rolconnlimit', u'rolvaliduntil', u'rolpassword' diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/create.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/create.sql deleted file mode 100644 index 1a0b08148..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/create.sql +++ /dev/null @@ -1,46 +0,0 @@ -{% import 'macros/security.macros' as SECLABEL %} -{% import 'macros/variable.macros' as VARIABLE %} -CREATE {% if data.rolcanlogin %}USER{% else %}ROLE{% endif %} {{ conn|qtIdent(data.rolname) }} WITH{% if data.rolcanlogin and data.rolcanlogin is sameas True %} - - LOGIN{% else %} - - NOLOGIN{% endif %}{% if data.rolsuper %} - - SUPERUSER{% else %} - - NOSUPERUSER{% endif %}{% if data.rolcreatedb %} - - CREATEDB{% else %} - - NOCREATEDB{% endif %}{% if data.rolcreaterole %} - - CREATEROLE{% else %} - - NOCREATEROLE{% endif %}{% if data.rolinherit is sameas true %} - - INHERIT{% else %} - - NOINHERIT{% endif %}{% if 'rolconnlimit' in data and data.rolconnlimit is number and data.rolconnlimit >= -1 %} - - CONNECTION LIMIT {{ data.rolconnlimit }}{% endif %}{% if data.rolvaliduntil and data.rolvaliduntil is not none %} - - VALID UNTIL {{ data.rolvaliduntil|qtLiteral }} {% endif %}{% if data.rolpassword %} - - PASSWORD {% if data.rolpassword is none %}NULL{% else %}{% if dummy %}'xxxxxx'{% else %} {{ data.rolpassword | qtLiteral }}{% endif %}{% endif %}{% endif %};{% if data.rolsuper and data.rolcatupdate is sameas false %} - - -UPDATE pg_authid SET rolcatupdate=false WHERE rolname = {{ data.rolname|qtLiteral }};{% endif %}{% if data.members and data.members|length > 0 %} - - -GRANT {{ conn|qtIdent(data.members)|join(', ') }} TO {{ conn|qtIdent(data.rolname) }};{% endif %}{% if data.admins and data.admins|length > 0 %} - -GRANT {{ conn|qtIdent(data.admins)|join(', ') }} TO {{ conn|qtIdent(data.rolname) }} WITH ADMIN OPTION;{% endif %}{% if data.variables %} - -{% for var in data.variables %} - -ALTER ROLE {{ self.conn|qtIdent(data.rolname) }} - SET {{ conn|qtIdent(var.name) }} TO {{ var.value }}; -{% endfor %}{% endif %}{% if data.description %} - -COMMENT ON ROLE {{ conn|qtIdent(data.rolname) }} IS {{ data.description|qtLiteral }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/nodes.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/nodes.sql deleted file mode 100644 index 646428c28..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/nodes.sql +++ /dev/null @@ -1,8 +0,0 @@ -SELECT - r.oid, r.rolname, r.rolcanlogin, r.rolsuper -FROM - pg_roles r -{% if rid %} -WHERE r.oid = {{ rid|qtLiteral }}::OID -{% endif %} -ORDER BY r.rolcanlogin, r.rolname diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/properties.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/properties.sql deleted file mode 100644 index 8e560bccb..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/properties.sql +++ /dev/null @@ -1,16 +0,0 @@ -SELECT - r.oid, r.*, - pg_catalog.shobj_description(r.oid, 'pg_authid') AS description, - ARRAY( - SELECT - CASE WHEN am.admin_option THEN '1' ELSE '0' END || rm.rolname - FROM - (SELECT * FROM pg_auth_members WHERE member = r.oid) am - LEFT JOIN pg_catalog.pg_roles rm ON (rm.oid = am.roleid) - ) rolmembership -FROM - pg_roles r -{% if rid %} -WHERE r.oid = {{ rid }}::OID -{% endif %} -ORDER BY r.rolcanlogin, r.rolname diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/sql.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/sql.sql deleted file mode 100644 index 97653efb4..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/sql.sql +++ /dev/null @@ -1,68 +0,0 @@ -SELECT - array_to_string(array_agg(sql), E'\n\n') -FROM -(SELECT - CASE WHEN rolcanlogin THEN '-- User: ' ELSE '-- Role: ' END || - pg_catalog.quote_ident(rolname) || - E'\n-- DROP ' || CASE WHEN rolcanlogin THEN 'USER ' ELSE 'ROLE ' END || - pg_catalog.quote_ident(rolname) || E';\n\nCREATE ' || - CASE WHEN rolcanlogin THEN 'USER ' ELSE 'ROLE ' END || - pg_catalog.quote_ident(rolname) || E' WITH\n ' || - CASE WHEN rolcanlogin THEN 'LOGIN' ELSE 'NOLOGIN' END || E'\n ' || - CASE WHEN rolcanlogin AND rolpassword LIKE 'md5%%' THEN 'ENCRYPTED PASSWORD ' || quote_literal(rolpassword) || E'\n ' ELSE '' END || - CASE WHEN rolsuper THEN 'SUPERUSER' ELSE 'NOSUPERUSER' END || E'\n ' || - CASE WHEN rolinherit THEN 'INHERIT' ELSE 'NOINHERIT' END || E'\n ' || - CASE WHEN rolcreatedb THEN 'CREATEDB' ELSE 'NOCREATEDB' END || E'\n ' || - CASE WHEN rolcreaterole THEN 'CREATEROLE' ELSE 'NOCREATEROLE' END || E'\n ' || - CASE WHEN rolconnlimit > 0 THEN E'\n CONNECTION LIMIT ' || rolconnlimit ELSE '' END || - CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE '' END || ';' || - -- PostgreSQL < 9.5 - CASE WHEN rolsuper AND NOT rolcatupdate THEN E'\n\nUPDATE pg_authid SET rolcatupdate=false WHERE rolname=' || pg_catalog.quote_literal(rolname) || ';' ELSE '' END AS sql -FROM - pg_roles r -WHERE - r.oid=%(rid)s::OID -UNION ALL -(SELECT - array_to_string(array_agg(sql), E'\n') -FROM -(SELECT - 'GRANT ' || array_to_string(array_agg(rolname), ', ') || ' TO ' || pg_catalog.quote_ident(pg_get_userbyid(%(rid)s::OID)) || - CASE WHEN admin_option THEN ' WITH ADMIN OPTION;' ELSE ';' END AS sql -FROM - (SELECT - quote_ident(r.rolname) AS rolname, m.admin_option AS admin_option - FROM - pg_auth_members m - LEFT JOIN pg_roles r ON (m.roleid = r.oid) - WHERE - m.member=%(rid)s::OID - ORDER BY - r.rolname - ) a -GROUP BY admin_option) s) -UNION ALL -(SELECT - array_to_string(array_agg(sql), E'\n') AS sql -FROM -(SELECT - 'ALTER ' || CASE WHEN rolcanlogin THEN 'USER ' ELSE 'ROLE ' END || pg_catalog.quote_ident(rolname) || ' SET ' || param || ' TO ' || CASE WHEN param IN ('search_path', 'temp_tablespaces') THEN value ELSE quote_literal(value) END || ';' AS sql -FROM -(SELECT - rolcanlogin, rolname, split_part(rolconfig, '=', 1) AS param, replace(rolconfig, split_part(rolconfig, '=', 1) || '=', '') AS value -FROM - (SELECT - unnest(rolconfig) AS rolconfig, rolcanlogin, rolname - FROM - pg_catalog.pg_roles - WHERE - oid=%(rid)s::OID - ) r -) a) b) -UNION ALL -(SELECT - 'COMMENT ON ROLE ' || pg_catalog.quote_ident(pg_get_userbyid(%(rid)s::OID)) || ' IS ' || pg_catalog.quote_literal(description) || ';' AS sql -FROM - (SELECT pg_catalog.shobj_description(%(rid)s::OID, 'pg_authid') AS description) a -WHERE - description IS NOT NULL)) AS a diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/update.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/update.sql deleted file mode 100644 index 51df8e903..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/update.sql +++ /dev/null @@ -1,102 +0,0 @@ -{% import 'macros/variable.macros' as VARIABLE %} -{% if 'rolname' in data %} -{% set rolname=data.rolname %} -ALTER{% if rolCanLogin %} USER {% else %} ROLE {% endif %}{{ conn|qtIdent(role) }} - RENAME TO {{ conn|qtIdent(rolname) }}; - -{% else %} -{% set rolname=role %} -{% endif %} -{% if data|hasAny(alterKeys) %} -ALTER {% if rolCanLogin %}USER{% else %}ROLE{% endif %} {{ conn|qtIdent(rolname) }}{% if 'rolcanlogin' in data %} - -{% if data.rolcanlogin %} - LOGIN{% else %} - NOLOGIN{% endif %}{% endif %}{% if 'rolsuper' in data %} - -{% if data.rolsuper %} - SUPERUSER{% else %} - NOSUPERUSER{% endif %}{% endif %}{% if 'rolcreatedb' in data %} - -{% if data.rolcreatedb %} - CREATEDB{% else %} - NOCREATEDB{% endif %}{% endif %}{% if 'rolcreaterole' in data %} - -{% if data.rolcreaterole %} - CREATEROLE{% else %} - NOCREATEROLE{% endif %}{% endif %}{% if 'rolinherit' in data %} - -{% if data.rolinherit %} - INHERIT{% else %} - NOINHERIT{% endif %}{% endif %}{% if 'rolreplication' in data %} - -{% endif %}{% if 'rolconnlimit' in data and data.rolconnlimit is number and data.rolconnlimit >= -1 %} - - CONNECTION LIMIT {{ data.rolconnlimit }} -{% endif %}{% if 'rolvaliduntil' in data %} - VALID UNTIL {% if data.rolvaliduntil %}{{ data.rolvaliduntil|qtLiteral }}{% else %}'infinity' -{% endif %}{% endif %}{% if 'rolpassword' in data %} - - PASSWORD{% if data.rolpassword is none %} NULL{% else %}{% if dummy %} 'xxxxxx'{% else %} {{ data.rolpassword|qtLiteral }}{% endif %}{% endif %}{% endif %};{% endif %} - -{% if - not rolSuper and - 'rolsuper' in data and - 'rolcatupdate' not in data and - data.rolsuper %} - - -UPDATE pg_authid SET rolcatupdate=false WHERE rolname = {{ rolname|qtLiteral }}; - -{% elif - rolSuper and - 'rolsuper' not in data and - 'rolcatupdate' in data %} -{% if data.rolcatupdate %} - - -UPDATE pg_authid SET rolcatupdate=true WHERE rolname = {{ rolname|qtLiteral }}; - -{% else %} - - -UPDATE pg_authid SET rolcatupdate=false WHERE rolname = {{ rolname|qtLiteral }}; - -{% endif %} -{% endif %} -{% if 'revoked_admins' in data and - data.revoked_admins|length > 0 -%} - -REVOKE ADMIN OPTION FOR {{ conn|qtIdent(data.revoked_admins)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if 'revoked' in data and data.revoked|length > 0 %} - -REVOKE {{ conn|qtIdent(data.revoked)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if data.admins and data.admins|length > 0 %} - -GRANT {{ conn|qtIdent(data.admins)|join(', ') }} TO {{ conn|qtIdent(rolname) }} WITH ADMIN OPTION;{% endif %}{% if data.members and data.members|length > 0 %} - -GRANT {{ conn|qtIdent(data.members)|join(', ') }} TO {{ conn|qtIdent(rolname) }};{% endif %} -{% if 'variables' in data and data.variables|length > 0 %} -{% set variables = data.variables %} -{% if 'deleted' in variables and variables.deleted|length > 0 %} - -{% for var in variables.deleted %} -{{ VARIABLE.RESET(conn, var.database, rolname, var.name) }} -{% endfor %}{% endif %} -{% if 'added' in variables and variables.added|length > 0 %} - -{% for var in variables.added %} -ALTER ROLE {{ self.conn|qtIdent(data.rolname) }} - SET {{ conn|qtIdent(var.name) }} TO {{ var.value }}; -{% endfor %}{% endif %} -{% if 'changed' in variables and variables.changed|length > 0 %} - -{% for var in variables.changed %} -{{ VARIABLE.APPLY(conn, var.database, rolname, var.name, var.value) }} -{% endfor %} -{% endif %} -{% endif %} -{% if 'description' in data %} - - -COMMENT ON ROLE {{ conn|qtIdent(rolname) }} IS {{ data.description|qtLiteral }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/create.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/create.sql deleted file mode 100644 index cb870d430..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/create.sql +++ /dev/null @@ -1,45 +0,0 @@ -{% import 'macros/security.macros' as SECLABEL %} -{% import 'macros/variable.macros' as VARIABLE %} -CREATE {% if data.rolcanlogin %}USER{% else %}ROLE{% endif %} {{ conn|qtIdent(data.rolname) }} WITH{% if data.rolcanlogin and data.rolcanlogin is sameas True %} - - LOGIN{% else %} - - NOLOGIN{% endif %}{% if data.rolsuper %} - - SUPERUSER{% else %} - - NOSUPERUSER{% endif %}{% if data.rolcreatedb %} - - CREATEDB{% else %} - - NOCREATEDB{% endif %}{% if data.rolcreaterole %} - - CREATEROLE{% else %} - - NOCREATEROLE{% endif %}{% if data.rolinherit is sameas true %} - - INHERIT{% else %} - - NOINHERIT{% endif %}{% if 'rolconnlimit' in data and data.rolconnlimit is number and data.rolconnlimit >= -1 %} - - CONNECTION LIMIT {{ data.rolconnlimit }}{% endif %}{% if data.rolvaliduntil and data.rolvaliduntil is not none %} - - VALID UNTIL {{ data.rolvaliduntil|qtLiteral }} {% endif %}{% if data.rolpassword %} - - PASSWORD {% if data.rolpassword is none %}NULL{% else %}{% if dummy %}'xxxxxx'{% else %} {{ data.rolpassword | qtLiteral }}{% endif %}{% endif %}{% endif %};{% if data.rolsuper and data.rolcatupdate is sameas false %} - - -UPDATE pg_authid SET rolcatupdate=false WHERE rolname = {{ data.rolname|qtLiteral }};{% endif %}{% if data.members and data.members|length > 0 %} - - -GRANT {{ conn|qtIdent(data.members)|join(', ') }} TO {{ conn|qtIdent(data.rolname) }};{% endif %}{% if data.admins and data.admins|length > 0 %} - -GRANT {{ conn|qtIdent(data.admins)|join(', ') }} TO {{ conn|qtIdent(data.rolname) }} WITH ADMIN OPTION;{% endif %}{% if data.variables %} - -{% for var in data.variables %} - -{{ VARIABLE.APPLY(conn, var.database, data.rolname, var.name, var.value) }} -{% endfor %}{% endif %}{% if data.description %} - -COMMENT ON ROLE {{ conn|qtIdent(data.rolname) }} IS {{ data.description|qtLiteral }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/dependents.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/dependents.sql deleted file mode 100644 index 5ddbcb317..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/dependents.sql +++ /dev/null @@ -1,40 +0,0 @@ -{% if fetch_database %} -SELECT 'd' as type, datname, - datallowconn AND pg_catalog.has_database_privilege(datname, 'CONNECT') AS datallowconn, - datdba, datlastsysoid -FROM pg_database db -UNION -SELECT 'M', spcname, null, null, null - FROM pg_tablespace where spcowner= {{rid}}::oid -ORDER BY 1, 2 -{% endif %} - -{% if fetch_dependents %} -SELECT cl.relkind, COALESCE(cin.nspname, cln.nspname) as nspname, - COALESCE(ci.relname, cl.relname) as relname, cl.relname as indname -FROM pg_class cl -JOIN pg_namespace cln ON cl.relnamespace=cln.oid -LEFT OUTER JOIN pg_index ind ON ind.indexrelid=cl.oid -LEFT OUTER JOIN pg_class ci ON ind.indrelid=ci.oid -LEFT OUTER JOIN pg_namespace cin ON ci.relnamespace=cin.oid -WHERE cl.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND cl.oid > {{lastsysoid}}::oid -UNION ALL SELECT 'n', null, nspname, null - FROM pg_namespace nsp - WHERE nsp.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND nsp.oid > {{lastsysoid}}::oid -UNION ALL SELECT CASE WHEN typtype='d' THEN 'd' ELSE 'y' END, null, typname, null - FROM pg_type ty - WHERE ty.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND ty.oid > {{lastsysoid}}::oid -UNION ALL SELECT 'C', null, conname, null - FROM pg_conversion co - WHERE co.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND co.oid > {{lastsysoid}}::oid -UNION ALL SELECT CASE WHEN prorettype=2279 THEN 'T' ELSE 'p' END, null, proname, null - FROM pg_proc pr - WHERE pr.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND pr.oid > {{lastsysoid}}::oid -UNION ALL SELECT 'o', null, oprname || '('::text || COALESCE(tl.typname, ''::text) || CASE WHEN tl.oid IS NOT NULL - AND tr.oid IS NOT NULL THEN ','::text END || COALESCE(tr.typname, ''::text) || ')'::text, null - FROM pg_operator op - LEFT JOIN pg_type tl ON tl.oid=op.oprleft - LEFT JOIN pg_type tr ON tr.oid=op.oprright - WHERE op.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND op.oid > {{lastsysoid}}::oid -ORDER BY 1,2,3 -{% endif %} \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/nodes.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/nodes.sql deleted file mode 100644 index 646428c28..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/nodes.sql +++ /dev/null @@ -1,8 +0,0 @@ -SELECT - r.oid, r.rolname, r.rolcanlogin, r.rolsuper -FROM - pg_roles r -{% if rid %} -WHERE r.oid = {{ rid|qtLiteral }}::OID -{% endif %} -ORDER BY r.rolcanlogin, r.rolname diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/permission.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/permission.sql deleted file mode 100644 index 111dedd81..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/permission.sql +++ /dev/null @@ -1,5 +0,0 @@ -SELECT - rolname, rolcanlogin, rolcatupdate, rolsuper -FROM - pg_roles -WHERE oid = {{ rid }}::OID diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/properties.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/properties.sql deleted file mode 100644 index 87033f524..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/properties.sql +++ /dev/null @@ -1,16 +0,0 @@ -SELECT - r.oid, r.*, - pg_catalog.shobj_description(r.oid, 'pg_authid') AS description, - ARRAY( - SELECT - CASE WHEN am.admin_option THEN '1' ELSE '0' END || rm.rolname - FROM - (SELECT * FROM pg_auth_members WHERE member = r.oid) am - LEFT JOIN pg_catalog.pg_roles rm ON (rm.oid = am.roleid) - ) rolmembership -FROM - pg_roles r -{% if rid %} -WHERE r.oid = {{ rid|qtLiteral }}::oid -{% endif %} -ORDER BY r.rolcanlogin, r.rolname diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/sql.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/sql.sql deleted file mode 100644 index e3b561ef4..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/sql.sql +++ /dev/null @@ -1,98 +0,0 @@ -SELECT - array_to_string(array_agg(sql), E'\n\n') -FROM -(SELECT - CASE WHEN rolcanlogin THEN '-- User: ' ELSE '-- Role: ' END || - pg_catalog.quote_ident(rolname) || - E'\n-- DROP ' || CASE WHEN rolcanlogin THEN 'USER ' ELSE 'ROLE ' END || - pg_catalog.quote_ident(rolname) || E';\n\nCREATE ' || - CASE WHEN rolcanlogin THEN 'USER ' ELSE 'ROLE ' END || - pg_catalog.quote_ident(rolname) || E' WITH\n ' || - CASE WHEN rolcanlogin THEN 'LOGIN' ELSE 'NOLOGIN' END || E'\n ' || - CASE WHEN rolcanlogin AND rolpassword LIKE 'md5%%' THEN 'ENCRYPTED PASSWORD ' || quote_literal(rolpassword) || E'\n ' ELSE '' END || - CASE WHEN rolsuper THEN 'SUPERUSER' ELSE 'NOSUPERUSER' END || E'\n ' || - CASE WHEN rolinherit THEN 'INHERIT' ELSE 'NOINHERIT' END || E'\n ' || - CASE WHEN rolcreatedb THEN 'CREATEDB' ELSE 'NOCREATEDB' END || E'\n ' || - CASE WHEN rolcreaterole THEN 'CREATEROLE' ELSE 'NOCREATEROLE' END || E'\n ' || - CASE WHEN rolconnlimit > 0 THEN E'\n CONNECTION LIMIT ' || rolconnlimit ELSE '' END || - CASE WHEN rolvaliduntil IS NOT NULL THEN E'\n VALID UNTIL ' || quote_literal(rolvaliduntil::text) ELSE '' END || ';' || - -- PostgreSQL < 9.5 - CASE WHEN rolsuper AND NOT rolcatupdate THEN E'\n\nUPDATE pg_authid SET rolcatupdate=false WHERE rolname=' || pg_catalog.quote_literal(rolname) || ';' ELSE '' END AS sql -FROM - pg_roles r -WHERE - r.oid=%(rid)s::OID -UNION ALL -(SELECT - array_to_string(array_agg(sql), E'\n') -FROM -(SELECT - 'GRANT ' || array_to_string(array_agg(rolname), ', ') || ' TO ' || pg_catalog.quote_ident(pg_get_userbyid(%(rid)s::OID)) || - CASE WHEN admin_option THEN ' WITH ADMIN OPTION;' ELSE ';' END AS sql -FROM - (SELECT - quote_ident(r.rolname) AS rolname, m.admin_option AS admin_option - FROM - pg_auth_members m - LEFT JOIN pg_roles r ON (m.roleid = r.oid) - WHERE - m.member=%(rid)s::OID - ORDER BY - r.rolname - ) a -GROUP BY admin_option) s) -UNION ALL -(SELECT - array_to_string(array_agg(sql), E'\n') AS sql -FROM -(SELECT - 'ALTER ' || CASE WHEN rolcanlogin THEN 'USER ' ELSE 'ROLE ' END || pg_catalog.quote_ident(rolname) || ' SET ' || param || ' TO ' || CASE WHEN param IN ('search_path', 'temp_tablespaces') THEN value ELSE quote_literal(value) END || ';' AS sql -FROM -(SELECT - rolcanlogin, rolname, split_part(rolconfig, '=', 1) AS param, replace(rolconfig, split_part(rolconfig, '=', 1) || '=', '') AS value -FROM - (SELECT - unnest(rolconfig) AS rolconfig, rolcanlogin, rolname - FROM - pg_catalog.pg_roles - WHERE - oid=%(rid)s::OID - ) r -) a) b) --- PostgreSQL >= 9.0 -UNION ALL -(SELECT - array_to_string(array_agg(sql), E'\n') AS sql -FROM - (SELECT - 'ALTER ROLE ' || pg_catalog.quote_ident(pg_get_userbyid(%(rid)s::OID)) || - ' IN DATABASE ' || pg_catalog.quote_ident(datname) || - ' SET ' || param|| ' TO ' || - CASE - WHEN param IN ('search_path', 'temp_tablespaces') THEN value - ELSE quote_literal(value) - END || ';' AS sql - FROM - (SELECT - datname, split_part(rolconfig, '=', 1) AS param, replace(rolconfig, split_part(rolconfig, '=', 1) || '=', '') AS value - FROM - (SELECT - d.datname, unnest(c.setconfig) AS rolconfig - FROM - (SELECT * - FROM - pg_catalog.pg_db_role_setting dr - WHERE - dr.setrole=%(rid)s::OID AND dr.setdatabase!=0) c - LEFT JOIN pg_catalog.pg_database d ON (d.oid = c.setdatabase) - ) a - ) b - ) d -) -UNION ALL -(SELECT - 'COMMENT ON ROLE ' || pg_catalog.quote_ident(pg_get_userbyid(%(rid)s::OID)) || ' IS ' || pg_catalog.quote_literal(description) || ';' AS sql -FROM - (SELECT pg_catalog.shobj_description(%(rid)s::OID, 'pg_authid') AS description) a -WHERE - description IS NOT NULL)) AS a diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/update.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/update.sql deleted file mode 100644 index 263bb510a..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/update.sql +++ /dev/null @@ -1,100 +0,0 @@ -{% import 'macros/variable.macros' as VARIABLE %} -{% if 'rolname' in data %} -{% set rolname=data.rolname %} -ALTER{% if rolCanLogin %} USER {% else %} ROLE {% endif %}{{ conn|qtIdent(role) }} - RENAME TO {{ conn|qtIdent(rolname) }}; - -{% else %} -{% set rolname=role %} -{% endif %} -{% if data|hasAny(alterKeys) %} -ALTER {% if rolCanLogin %}USER{% else %}ROLE{% endif %} {{ conn|qtIdent(rolname) }}{% if 'rolcanlogin' in data %} - -{% if data.rolcanlogin %} - LOGIN{% else %} - NOLOGIN{% endif %}{% endif %}{% if 'rolsuper' in data %} - -{% if data.rolsuper %} - SUPERUSER{% else %} - NOSUPERUSER{% endif %}{% endif %}{% if 'rolcreatedb' in data %} - -{% if data.rolcreatedb %} - CREATEDB{% else %} - NOCREATEDB{% endif %}{% endif %}{% if 'rolcreaterole' in data %} - -{% if data.rolcreaterole %} - CREATEROLE{% else %} - NOCREATEROLE{% endif %}{% endif %}{% if 'rolinherit' in data %} - -{% if data.rolinherit %} - INHERIT{% else %} - NOINHERIT{% endif %}{% endif %}{% if 'rolconnlimit' in data and data.rolconnlimit is number and data.rolconnlimit >= -1 %} - - CONNECTION LIMIT {{ data.rolconnlimit }} -{% endif %}{% if 'rolvaliduntil' in data %} - - VALID UNTIL {% if data.rolvaliduntil %}{{ data.rolvaliduntil|qtLiteral }}{% else %}'infinity' -{% endif %}{% endif %}{% if 'rolpassword' in data %} - - PASSWORD{% if data.rolpassword is none %} NULL{% else %}{% if dummy %} 'xxxxxx'{% else %} {{ data.rolpassword|qtLiteral }}{% endif %}{% endif %}{% endif %};{% endif %} - -{% if - not rolSuper and - 'rolsuper' in data and - 'rolcatupdate' not in data and - data.rolsuper %} - - -UPDATE pg_authid SET rolcatupdate=false WHERE rolname = {{ rolname|qtLiteral }}; - -{% elif - rolSuper and - 'rolsuper' not in data and - 'rolcatupdate' in data %} -{% if data.rolcatupdate %} - - -UPDATE pg_authid SET rolcatupdate=true WHERE rolname = {{ rolname|qtLiteral }}; - -{% else %} - - -UPDATE pg_authid SET rolcatupdate=false WHERE rolname = {{ rolname|qtLiteral }}; - -{% endif %} -{% endif %} -{% if 'revoked_admins' in data and - data.revoked_admins|length > 0 -%} - -REVOKE ADMIN OPTION FOR {{ conn|qtIdent(data.revoked_admins)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if 'revoked' in data and data.revoked|length > 0 %} - -REVOKE {{ conn|qtIdent(data.revoked)|join(', ') }} FROM {{ conn|qtIdent(rolname) }};{% endif %}{% if data.admins and data.admins|length > 0 %} - -GRANT {{ conn|qtIdent(data.admins)|join(', ') }} TO {{ conn|qtIdent(rolname) }} WITH ADMIN OPTION;{% endif %}{% if data.members and data.members|length > 0 %} - -GRANT {{ conn|qtIdent(data.members)|join(', ') }} TO {{ conn|qtIdent(rolname) }};{% endif %} -{% if 'variables' in data and data.variables|length > 0 %} -{% set variables = data.variables %} -{% if 'deleted' in variables and variables.deleted|length > 0 %} - -{% for var in variables.deleted %} -{{ VARIABLE.RESET(conn, var.database, rolname, var.name) }} -{% endfor %}{% endif %} -{% if 'added' in variables and variables.added|length > 0 %} - -{% for var in variables.added %} -{{ VARIABLE.APPLY(conn, var.database, rolname, var.name, var.value) }} -{% endfor %}{% endif %} -{% if 'changed' in variables and variables.changed|length > 0 %} - -{% for var in variables.changed %} -{{ VARIABLE.APPLY(conn, var.database, rolname, var.name, var.value) }} -{% endfor %} -{% endif %} -{% endif %} -{% if 'description' in data %} - - -COMMENT ON ROLE {{ conn|qtIdent(rolname) }} IS {{ data.description|qtLiteral }}; -{% endif %} diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/dependents.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/dependents.sql deleted file mode 100644 index 5ddbcb317..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/dependents.sql +++ /dev/null @@ -1,40 +0,0 @@ -{% if fetch_database %} -SELECT 'd' as type, datname, - datallowconn AND pg_catalog.has_database_privilege(datname, 'CONNECT') AS datallowconn, - datdba, datlastsysoid -FROM pg_database db -UNION -SELECT 'M', spcname, null, null, null - FROM pg_tablespace where spcowner= {{rid}}::oid -ORDER BY 1, 2 -{% endif %} - -{% if fetch_dependents %} -SELECT cl.relkind, COALESCE(cin.nspname, cln.nspname) as nspname, - COALESCE(ci.relname, cl.relname) as relname, cl.relname as indname -FROM pg_class cl -JOIN pg_namespace cln ON cl.relnamespace=cln.oid -LEFT OUTER JOIN pg_index ind ON ind.indexrelid=cl.oid -LEFT OUTER JOIN pg_class ci ON ind.indrelid=ci.oid -LEFT OUTER JOIN pg_namespace cin ON ci.relnamespace=cin.oid -WHERE cl.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND cl.oid > {{lastsysoid}}::oid -UNION ALL SELECT 'n', null, nspname, null - FROM pg_namespace nsp - WHERE nsp.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND nsp.oid > {{lastsysoid}}::oid -UNION ALL SELECT CASE WHEN typtype='d' THEN 'd' ELSE 'y' END, null, typname, null - FROM pg_type ty - WHERE ty.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND ty.oid > {{lastsysoid}}::oid -UNION ALL SELECT 'C', null, conname, null - FROM pg_conversion co - WHERE co.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND co.oid > {{lastsysoid}}::oid -UNION ALL SELECT CASE WHEN prorettype=2279 THEN 'T' ELSE 'p' END, null, proname, null - FROM pg_proc pr - WHERE pr.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND pr.oid > {{lastsysoid}}::oid -UNION ALL SELECT 'o', null, oprname || '('::text || COALESCE(tl.typname, ''::text) || CASE WHEN tl.oid IS NOT NULL - AND tr.oid IS NOT NULL THEN ','::text END || COALESCE(tr.typname, ''::text) || ')'::text, null - FROM pg_operator op - LEFT JOIN pg_type tl ON tl.oid=op.oprleft - LEFT JOIN pg_type tr ON tr.oid=op.oprright - WHERE op.oid IN (SELECT objid FROM pg_shdepend WHERE refobjid={{rid}}::oid) AND op.oid > {{lastsysoid}}::oid -ORDER BY 1,2,3 -{% endif %} \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/permission.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/permission.sql deleted file mode 100644 index 111dedd81..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/permission.sql +++ /dev/null @@ -1,5 +0,0 @@ -SELECT - rolname, rolcanlogin, rolcatupdate, rolsuper -FROM - pg_roles -WHERE oid = {{ rid }}::OID diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/variables.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/variables.sql deleted file mode 100644 index b8620c185..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/variables.sql +++ /dev/null @@ -1,25 +0,0 @@ -SELECT - split_part(rolconfig, '=', 1) AS name, replace(rolconfig, split_part(rolconfig, '=', 1) || '=', '') AS value, NULL::text AS database -FROM - (SELECT - unnest(rolconfig) AS rolconfig, rolcanlogin, rolname - FROM - pg_catalog.pg_roles - WHERE - oid={{ rid|qtLiteral }}::OID - ) r - -UNION ALL -SELECT - split_part(rolconfig, '=', 1) AS name, replace(rolconfig, split_part(rolconfig, '=', 1) || '=', '') AS value, datname AS database -FROM - (SELECT - d.datname, unnest(c.setconfig) AS rolconfig - FROM - (SELECT * - FROM pg_catalog.pg_db_role_setting dr - WHERE - dr.setrole={{ rid|qtLiteral }}::OID AND dr.setdatabase!=0 - ) c - LEFT JOIN pg_catalog.pg_database d ON (d.oid = c.setdatabase) - ) a; diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/variables.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/variables.sql deleted file mode 100644 index b8620c185..000000000 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/variables.sql +++ /dev/null @@ -1,25 +0,0 @@ -SELECT - split_part(rolconfig, '=', 1) AS name, replace(rolconfig, split_part(rolconfig, '=', 1) || '=', '') AS value, NULL::text AS database -FROM - (SELECT - unnest(rolconfig) AS rolconfig, rolcanlogin, rolname - FROM - pg_catalog.pg_roles - WHERE - oid={{ rid|qtLiteral }}::OID - ) r - -UNION ALL -SELECT - split_part(rolconfig, '=', 1) AS name, replace(rolconfig, split_part(rolconfig, '=', 1) || '=', '') AS value, datname AS database -FROM - (SELECT - d.datname, unnest(c.setconfig) AS rolconfig - FROM - (SELECT * - FROM pg_catalog.pg_db_role_setting dr - WHERE - dr.setrole={{ rid|qtLiteral }}::OID AND dr.setdatabase!=0 - ) c - LEFT JOIN pg_catalog.pg_database d ON (d.oid = c.setdatabase) - ) a; diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/css/role.css b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/css/role.css similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/css/role.css rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/css/role.css diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/create.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/create.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/dependents.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/dependents.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/dependents.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/dependents.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/nodes.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/nodes.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/permission.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/permission.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/permission.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/permission.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/properties.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/properties.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/sql.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/sql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/sql.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/sql.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/update.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_1/update.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/variables.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post8_4/variables.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.1_plus/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/create.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/create.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/create.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/create.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/dependents.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/dependents.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/dependents.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/dependents.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/nodes.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/nodes.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/nodes.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/nodes.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/permission.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/permission.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/permission.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/permission.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/properties.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/properties.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/properties.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/properties.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/sql.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/sql.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/sql.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/sql.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/update.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/update.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_4/update.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/update.sql diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/variables.sql b/web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/variables.sql similarity index 100% rename from web/pgadmin/browser/server_groups/servers/roles/templates/role/sql/post9_0/variables.sql rename to web/pgadmin/browser/server_groups/servers/roles/templates/roles/sql/9.4_plus/variables.sql diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py index 5317ea712..426ead52b 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/__init__.py @@ -89,25 +89,11 @@ class TablespaceView(PGChildNodeView): 'stats': [{'get': 'statistics'}, {'get': 'statistics'}], 'dependency': [{'get': 'dependencies'}], 'dependent': [{'get': 'dependents'}], - 'module.js': [{}, {}, {'get': 'module_js'}], 'vopts': [{}, {'get': 'variable_options'}], 'move_objects': [{'put': 'move_objects'}], 'move_objects_sql': [{'get': 'move_objects_sql'}], }) - def module_js(self): - """ - This property defines (if javascript) exists for this node. - Override this property for your own logic. - """ - return make_response( - render_template( - "tablespaces/js/tablespaces.js", - _=gettext - ), - 200, {'Content-Type': 'application/javascript'} - ) - def check_precondition(f): """ This function will behave as a decorator which will checks diff --git a/web/pgadmin/browser/utils.py b/web/pgadmin/browser/utils.py index 2fe2d9080..d2adcf4cd 100644 --- a/web/pgadmin/browser/utils.py +++ b/web/pgadmin/browser/utils.py @@ -289,18 +289,6 @@ class NodeView(with_metaclass(MethodViewType, View)): methods=c['methods'] ) - def module_js(self, **kwargs): - """ - This property defines (if javascript) exists for this node. - Override this property for your own logic. - """ - return flask.make_response( - flask.render_template( - "{0}/js/{0}.js".format(self.node_type) - ), - 200, {'Content-Type': 'application/javascript'} - ) - def children(self, *args, **kwargs): """Build a list of treeview nodes from the child nodes.""" children = [] diff --git a/web/pgadmin/tools/sqleditor/__init__.py b/web/pgadmin/tools/sqleditor/__init__.py index e979637d9..b99d1304d 100644 --- a/web/pgadmin/tools/sqleditor/__init__.py +++ b/web/pgadmin/tools/sqleditor/__init__.py @@ -444,7 +444,7 @@ def poll(trans_id): command_obj = pickle.loads(session_obj['command_obj']) if hasattr(command_obj, 'obj_id'): # Get the template path for the column - template_path = 'column/sql/#{0}#'.format( + template_path = 'columns/sql/#{0}#'.format( conn.manager.version ) diff --git a/web/webpack.shim.js b/web/webpack.shim.js index 53c00ba3e..0d86dcc89 100644 --- a/web/webpack.shim.js +++ b/web/webpack.shim.js @@ -264,7 +264,7 @@ var webpackShimConfig = { 'pgadmin.node.trigger_function': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function'), 'pgadmin.node.type': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type'), 'pgadmin.node.unique_constraint': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint'), - 'pgadmin.node.user_mapping': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping'), + 'pgadmin.node.user_mapping': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping'), 'pgadmin.node.view': path.join(__dirname, './pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view'), 'pgadmin.preferences': path.join(__dirname, './pgadmin/preferences/static/js/preferences'), 'pgadmin.settings': path.join(__dirname, './pgadmin/settings/static/js/settings'),